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

[stem/master] Replace parse_bytes() with a from_str() method
by atagar＠torproject.org 21 Nov '18

21 Nov '18

commit 2192228e436fce49a2abfa6d44242e407f15d8dc Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Nov 20 13:29:43 2018 -0800 Replace parse_bytes() with a from_str() method Shifting to the same pattern we used with the stem.response.ControlMessage method... https://stem.torproject.org/api/response.html#stem.response.ControlMessage.… Also making this provide a single descriptor by default (the more common use case) with a 'multiple = True' option, and tests. --- docs/change_log.rst | 3 +- stem/descriptor/__init__.py | 74 ++++++++++++++++++++++++++------------ test/settings.cfg | 1 + test/unit/descriptor/descriptor.py | 51 ++++++++++++++++++++++++++ 4 files changed, 106 insertions(+), 23 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 2fb3ae7e..e99e933f 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -51,7 +51,8 @@ The following are only available within Stem's `git repository * **Descriptors** - * Added :func:`~stem.descriptor.Descriptor.type_annotation` method (:trac:`28397`) + * Added :func:`~stem.descriptor.__init__.Descriptor.from_str` method (:trac:`28450`) + * Added :func:`~stem.descriptor.__init__.Descriptor.type_annotation` method (:trac:`28397`) * Added the **hash_type** and **encoding** arguments to `ServerDescriptor <api/descriptor/server_descriptor.html#stem.descriptor.server_descriptor.ServerDescriptor.digest>`_ and `ExtraInfo's <api/descriptor/extrainfo_descriptor.html#stem.descriptor.extrainfo_descriptor.ExtraInfoDescriptor.digest>`_ digest methods (:trac:`28398`) * Added the network status vote's new bandwidth_file_digest attribute (:spec:`1b686ef`) * Added :func:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3.is_valid` and :func:`~stem.descriptor.networkstatus.NetworkStatusDocumentV3.is_fresh` methods (:trac:`28448`) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index a003d603..17bea678 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -8,12 +8,12 @@ Package for parsing and processing descriptor data. :: - parse_bytes - Parses the descriptors in a :class:`bytes`. parse_file - Parses the descriptors in a file. create - Creates a new custom descriptor. create_signing_key - Cretes a signing key that can be used for creating descriptors. Descriptor - Common parent for all descriptor file types. + |- from_str - provides a parsed descriptor for the given string |- get_path - location of the descriptor on disk if it came from a file |- get_archive_path - location of the descriptor within the archive it came from |- get_bytes - similar to str(), but provides our original bytes content @@ -117,16 +117,15 @@ __all__ = [ 'networkstatus', 'router_status_entry', 'tordnsel', - 'parse_bytes', 'parse_file', 'Descriptor', ] UNSEEKABLE_MSG = """\ -File object isn't seekable. Try using parse_bytes() instead: +File object isn't seekable. Try using Descriptor.from_str() instead: content = my_file.read() - parsed_descriptors = stem.descriptor.parse_bytes(content) + parsed_descriptors = stem.descriptor.Descriptor.from_str(content) """ KEYWORD_CHAR = 'a-zA-Z0-9-' @@ -195,24 +194,6 @@ class SigningKey(collections.namedtuple('SigningKey', ['private', 'public', 'pub """ -def parse_bytes(descriptor_bytes, **kwargs): - """ - Read the descriptor contents from a :class:`bytes`, providing an iterator - for its :class:`~stem.descriptor.__init__.Descriptor` contents. - - :param bytes descriptor_bytes: Raw descriptor - :param dict kwargs: Keyword arguments as used for :func:`parse_file`. - - :returns: iterator for :class:`~stem.descriptor.__init__.Descriptor` instances in the file - - :raises: - * **ValueError** if the contents is malformed and validate is True - * **TypeError** if we can't match the contents of the file to a descriptor type - * **IOError** if unable to read from the descriptor_file - """ - return parse_file(io.BytesIO(descriptor_bytes), **kwargs) - - def parse_file(descriptor_file, descriptor_type = None, validate = False, document_handler = DocumentHandler.ENTRIES, normalize_newlines = None, **kwargs): """ Simple function to read the descriptor contents from a file, providing an @@ -721,6 +702,55 @@ class Descriptor(object): self._unrecognized_lines = [] @classmethod + def from_str(cls, content, **kwargs): + """ + Provides a :class:`~stem.descriptor.__init__.Descriptor` for the given content. + + To parse a descriptor we must know its type. There are three ways to + convey this... + + :: + + # use a descriptor_type argument + desc = Descriptor.from_str(content, descriptor_type = 'server-descriptor 1.0') + + # prefixing the content with a "@type" annotation + desc = Descriptor.from_str('@type server-descriptor 1.0\\n' + content) + + # use this method from a subclass + desc = stem.descriptor.server_descriptor.RelayDescriptor.from_str(content) + + .. versionadded:: 1.8.0 + + :param bytes content: string to construct the descriptor from + :param bool multiple: if provided with **True** this provides a list of + descriptors rather than a single one + :param dict kwargs: additional arguments for :func:`~stem.descriptor.__init__.parse_file` + + :returns: :class:`~stem.descriptor.__init__.Descriptor` subclass for the + given content, or a **list** of descriptors if **multiple = True** is + provided + + :raises: + * **ValueError** if the contents is malformed and validate is True + * **TypeError** if we can't match the contents of the file to a descriptor type + * **IOError** if unable to read from the descriptor_file + """ + + if 'descriptor_type' not in kwargs and cls.TYPE_ANNOTATION_NAME is not None: + kwargs['descriptor_type'] = str(TypeAnnotation(cls.TYPE_ANNOTATION_NAME, 1, 0))[6:] + + is_multiple = kwargs.pop('multiple', False) + results = list(parse_file(io.BytesIO(content), **kwargs)) + + if is_multiple: + return results + elif len(results) == 1: + return results[0] + else: + raise ValueError("Descriptor.from_str() expected a single descriptor, but had %i instead. Please include 'multiple = True' if you want a list of results instead." % len(results)) + + @classmethod def content(cls, attr = None, exclude = (), sign = False): """ Creates descriptor content with the given attributes. Mandatory fields are diff --git a/test/settings.cfg b/test/settings.cfg index 8423614b..727bfc80 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -207,6 +207,7 @@ test.unit_tests |test.unit.util.tor_tools.TestTorTools |test.unit.util.__init__.TestBaseUtil |test.unit.installation.TestInstallation +|test.unit.descriptor.descriptor.TestDescriptor |test.unit.descriptor.export.TestExport |test.unit.descriptor.reader.TestDescriptorReader |test.unit.descriptor.remote.TestDescriptorDownloader diff --git a/test/unit/descriptor/descriptor.py b/test/unit/descriptor/descriptor.py new file mode 100644 index 00000000..cedb3832 --- /dev/null +++ b/test/unit/descriptor/descriptor.py @@ -0,0 +1,51 @@ +""" +Unit tests for the base stem.descriptor module. +""" + +import unittest + +from stem.descriptor import Descriptor +from stem.descriptor.server_descriptor import RelayDescriptor + + +class TestDescriptor(unittest.TestCase): + def test_from_str(self): + """ + Basic exercise for Descriptor.from_str(). + """ + + desc_text = RelayDescriptor.content({'router': 'caerSidi 71.35.133.197 9001 0 0'}) + desc = Descriptor.from_str(desc_text, descriptor_type = 'server-descriptor 1.0') + self.assertEqual('caerSidi', desc.nickname) + + def test_from_str_type_handling(self): + """ + Check our various methods of conveying the descriptor type. There's three: + @type annotations, a descriptor_type argument, and using the from_str() of + a particular subclass. + """ + + desc_text = RelayDescriptor.content({'router': 'caerSidi 71.35.133.197 9001 0 0'}) + + desc = Descriptor.from_str(desc_text, descriptor_type = 'server-descriptor 1.0') + self.assertEqual('caerSidi', desc.nickname) + + desc = Descriptor.from_str('@type server-descriptor 1.0\n' + desc_text) + self.assertEqual('caerSidi', desc.nickname) + + desc = RelayDescriptor.from_str(desc_text) + self.assertEqual('caerSidi', desc.nickname) + + self.assertRaisesWith(TypeError, "Unable to determine the descriptor's type. filename: '<undefined>', first line: 'router caerSidi 71.35.133.197 9001 0 0'", Descriptor.from_str, desc_text) + + def test_from_str_multiple(self): + desc_text = '\n'.join(( + '@type server-descriptor 1.0', + RelayDescriptor.content({'router': 'relay1 71.35.133.197 9001 0 0'}), + RelayDescriptor.content({'router': 'relay2 71.35.133.197 9001 0 0'}), + )) + + self.assertEqual(2, len(RelayDescriptor.from_str(desc_text, multiple = True))) + self.assertEqual(0, len(RelayDescriptor.from_str('', multiple = True))) + + self.assertRaisesWith(ValueError, "Descriptor.from_str() expected a single descriptor, but had 2 instead. Please include 'multiple = True' if you want a list of results instead.", RelayDescriptor.from_str, desc_text)

1 0

[tor-browser-build/master] Bug 28144: Update projects/tor-browser for Android
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit 6028be7e4b62d6ab419258dc3237e395f1dc34e6 Author: sisbell <shane.isbell(a)gmail.com> Date: Tue Nov 6 17:54:05 2018 -0800 Bug 28144: Update projects/tor-browser for Android --- projects/tor-browser/build.android | 18 ++++++++++++++++++ projects/tor-browser/config | 15 ++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android new file mode 100644 index 0000000..24bdc70 --- /dev/null +++ b/projects/tor-browser/build.android @@ -0,0 +1,18 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +ext_dir=assets/distribution/extensions +qa_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") %]-[% c("var/osname") %]-qa.apk +apk=$rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-unsigned-unaligned.apk + +mkdir -p /var/tmp/build/$ext_dir [% dest_dir _ '/' _ c('filename') %] +cd /var/tmp/build + +mv $rootdir/[% c('input_files_by_name/https-everywhere') %] $ext_dir/https-everywhere-eff(a)eff.org.xpi +mv $rootdir/[% c('input_files_by_name/noscript') %] $ext_dir/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi + +zip -d $apk META-INF/\* +zip -r $apk $ext_dir + +# Sign a QA build. This apk is not a debug version and doesn't contain a debug flag in the manifest +keytool -genkey -v -keystore qa.keystore -storepass android -alias androidqakey -keypass android -keyalg RSA -keysize 2048 -validity 10000 -dname "CN=Android Tor QA,O=Tor,C=US" +jarsigner -verbose -digestalg SHA1 -sigalg MD5withRSA -keystore qa.keystore -signedjar $qa_apk $apk androidqakey -storepass android -keypass android diff --git a/projects/tor-browser/config b/projects/tor-browser/config index bb1c259..e4e3a03 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -41,29 +41,41 @@ targets: windows-x86_64: var: mar_osname: win64 + android-armv7: + build: '[% INCLUDE build.android %]' + var: + arch_deps: + - openjdk-8-jdk input_files: - project: container-image - filename: run_scripts + enable: '[% ! c("var/android") %]' - project: firefox name: firefox - project: tor name: tor + enable: '[% ! c("var/android") %]' - project: firefox-langpacks name: firefox-langpacks - enable: '[% c("var/locales").size %]' + enable: '[% c("var/locales").size && ! c("var/android") %]' - project: tor-launcher name: tor-launcher + enable: '[% ! c("var/android") %]' - project: torbutton name: torbutton + enable: '[% ! c("var/android") %]' - project: https-everywhere name: https-everywhere - project: fonts name: fonts + enable: '[% ! c("var/android") %]' - project: meek name: meek + enable: '[% ! c("var/android") %]' - project: obfs4 name: obfs4 + enable: '[% ! c("var/android") %]' - project: fteproxy name: fteproxy enable: '[% c("var/fteproxy") %]' @@ -71,6 +83,7 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data + enable: '[% ! c("var/android") %]' - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript sha256sum: e7ec0345c2174e64c7552ab708a59c8efd7c1078fedda64d9c9ad06a899194b9

1 0

[tor-browser-build/master] Bug 28472: Add Android Makefile Rules
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit 836a8b56606978fa7a140cfd1a9d9ddb6b2e41e2 Author: sisbell <shane.isbell(a)gmail.com> Date: Thu Nov 15 20:27:38 2018 -0800 Bug 28472: Add Android Makefile Rules --- Makefile | 15 +++++++++++++++ projects/release/build | 4 ++++ projects/release/config | 11 +++++++++++ 3 files changed, 30 insertions(+) diff --git a/Makefile b/Makefile index 4c21a83..8ec5d0c 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,9 @@ all: release release: submodule-update $(rbm) build release --target release --target torbrowser-all +release-android-armv7: submodule-update + $(rbm) build release --target release --target torbrowser-android-armv7 + release-linux-x86_64: submodule-update $(rbm) build release --target release --target torbrowser-linux-x86_64 @@ -26,6 +29,9 @@ release-osx-x86_64: submodule-update alpha: submodule-update $(rbm) build release --target alpha --target torbrowser-all +alpha-android-armv7: submodule-update + $(rbm) build release --target alpha --target torbrowser-android-armv7 + alpha-linux-x86_64: submodule-update $(rbm) build release --target alpha --target torbrowser-linux-x86_64 @@ -47,6 +53,9 @@ alpha-osx-x86_64: submodule-update nightly: submodule-update $(rbm) build release --target nightly --target torbrowser-all +nightly-android-armv7: submodule-update + $(rbm) build release --target nightly --target torbrowser-android-armv7 + nightly-linux-x86_64: submodule-update $(rbm) build release --target nightly --target torbrowser-linux-x86_64 @@ -68,6 +77,9 @@ nightly-osx-x86_64: submodule-update alpha_nightly: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-all +alpha_nightly-android-armv7: submodule-update + $(rbm) build release --target alpha_nightly --target torbrowser-android-armv7 + alpha_nightly-linux-x86_64: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-linux-x86_64 @@ -86,6 +98,9 @@ alpha_nightly-osx-x86_64: submodule-update testbuild: submodule-update $(rbm) build release --target testbuild --target torbrowser-all +testbuild-android-armv7: submodule-update + $(rbm) build release --target testbuild --target torbrowser-android-armv7 + testbuild-linux-x86_64: submodule-update $(rbm) build release --target testbuild --target torbrowser-linux-x86_64 diff --git a/projects/release/build b/projects/release/build index 882d26d..2c9912f 100644 --- a/projects/release/build +++ b/projects/release/build @@ -4,6 +4,10 @@ [% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" mkdir -p "$destdir" +[% IF c("var/torbrowser-android-armv7") -%] + mv [% c('input_files_by_name/android-armv7') %]/* "$destdir"/ + [% RETURN %] +[% END -%] [% IF c("var/torbrowser-windows-i686") -%] mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ diff --git a/projects/release/config b/projects/release/config index 8605aa2..65e297d 100644 --- a/projects/release/config +++ b/projects/release/config @@ -14,6 +14,10 @@ targets: - torbrowser-windows-i686 - torbrowser-windows-x86_64 - torbrowser-osx-x86_64 + - torbrowser-android-armv7 + torbrowser-android-armv7: + var: + torbrowser-android-armv7: 1 torbrowser-linux-x86_64: var: torbrowser-linux-x86_64: 1 @@ -80,6 +84,13 @@ targets: input_files: # Release + - name: android-armv7 + project: tor-browser + enable: '[% c("var/torbrowser-android-armv7") %]' + target: + - '[% c("var/build_target") %]' + - torbrowser-android-armv7 + - name: linux-x86_64 project: tor-browser enable: '[% c("var/torbrowser-linux-x86_64") %]'

1 0

[tor-browser-build/master] Bug 28483: Modify Android Toolchain API Version
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit d66abd6cb81944bb24f9ec4255a5311bdebf58da Author: sisbell <shane.isbell(a)gmail.com> Date: Fri Nov 16 12:17:26 2018 -0800 Bug 28483: Modify Android Toolchain API Version --- projects/android-toolchain/build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index 325a543..a9d3139 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -17,7 +17,8 @@ unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME cd $NDK_HOME mv android-ndk-r15c/* . rm -fR android-ndk-r15c -./build/tools/make_standalone_toolchain.py --api 26 --arch arm --install-dir=./arm +# API 16 is the minimum we currently support for Tor Browser on Android +./build/tools/make_standalone_toolchain.py --api 16 --arch arm --install-dir=./arm # Tool Archives cd $SDK_HOME

1 0

[tor-browser-build/master] Bug 28468: Modify Android toolchain to support Orbot
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit 5e3b6403e384198f0f85c482777970340333bc5a Author: sisbell <shane.isbell(a)gmail.com> Date: Fri Nov 16 12:18:52 2018 -0800 Bug 28468: Modify Android toolchain to support Orbot --- projects/android-toolchain/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 122ae5f..c14f90e 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -13,6 +13,8 @@ var: export ANDROID_SDK_HOME=/var/tmp/dist/[% project %]/android-sdk-linux export ANDROID_NDK_HOME=/var/tmp/dist/[% project %]/android-ndk export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle + export ANDROID_HOME=$ANDROID_SDK_HOME + export GRADLE_USER_HOME=$GRADLE_HOME google_repo: https://dl.google.com/android/repository input_files: - project: container-image

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 20 Nov '18

20 Nov '18

commit ad5d08dd845ef0b5bd412a0ffe49a21423d882a8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 20 19:49:24 2018 +0000 Update translations for support-portal_completed --- contents+fr.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 48be07941..f87183a5a 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1006,7 +1006,7 @@ msgstr "" #: http//localhost/tbb/tbb-21/ #: (content/tbb/tbb-21/contents+en.lrquestion.seo_slug) msgid "view-tor-browser-message-log" -msgstr "voir-journal-messages-navigateur-tor" +msgstr "voir-journal-des-messages-du-navigateur-tor" #: http//localhost/tbb/tbb-22/ #: (content/tbb/tbb-22/contents+en.lrquestion.title) @@ -1032,7 +1032,8 @@ msgid "" msgstr "" "Le réseau Tor répond à plus d’un million d’utilisateurs par jour, avec " "seulement un peu plus de 6 000 relais pour acheminer tout leur trafic. La " -"charge subite par chaque serveur peut parfois entraîner une latence." +"charge à laquelle chaque serveur doit répondre peut parfois entraîner une " +"latence." #: http//localhost/tbb/tbb-22/ #: (content/tbb/tbb-22/contents+en.lrquestion.description) @@ -1162,7 +1163,7 @@ msgstr "" #: http//localhost/tbb/tbb-26/ #: (content/tbb/tbb-26/contents+en.lrquestion.seo_slug) msgid "problem-with-https-everywhere" -msgstr "problème-avec-https-partout-everywhere" +msgstr "problème-avec-https-partout" #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.title)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 20 Nov '18

20 Nov '18

commit 6e57fbbdc27015d99004931f71c80d71c84d86ad Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 20 19:49:17 2018 +0000 Update translations for support-portal --- contents+fr.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 48be07941..f87183a5a 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1006,7 +1006,7 @@ msgstr "" #: http//localhost/tbb/tbb-21/ #: (content/tbb/tbb-21/contents+en.lrquestion.seo_slug) msgid "view-tor-browser-message-log" -msgstr "voir-journal-messages-navigateur-tor" +msgstr "voir-journal-des-messages-du-navigateur-tor" #: http//localhost/tbb/tbb-22/ #: (content/tbb/tbb-22/contents+en.lrquestion.title) @@ -1032,7 +1032,8 @@ msgid "" msgstr "" "Le réseau Tor répond à plus d’un million d’utilisateurs par jour, avec " "seulement un peu plus de 6 000 relais pour acheminer tout leur trafic. La " -"charge subite par chaque serveur peut parfois entraîner une latence." +"charge à laquelle chaque serveur doit répondre peut parfois entraîner une " +"latence." #: http//localhost/tbb/tbb-22/ #: (content/tbb/tbb-22/contents+en.lrquestion.description) @@ -1162,7 +1163,7 @@ msgstr "" #: http//localhost/tbb/tbb-26/ #: (content/tbb/tbb-26/contents+en.lrquestion.seo_slug) msgid "problem-with-https-everywhere" -msgstr "problème-avec-https-partout-everywhere" +msgstr "problème-avec-https-partout" #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.title)

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 20 Nov '18

20 Nov '18

commit f24760c2344d995b4ed2ffe6631b65a269ab8c1a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 20 19:15:22 2018 +0000 Update translations for donatepages-messagespot --- locale/ru/LC_MESSAGES/messages.po | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po index 42119ad4f..b367d3ba2 100644 --- a/locale/ru/LC_MESSAGES/messages.po +++ b/locale/ru/LC_MESSAGES/messages.po @@ -119,6 +119,10 @@ msgid "" "target=\"_blank\" href=\"https://www.irs.gov/pub/irs-" "pdf/f990ezb.pdf\">Schedule B of the Form 990</a>." msgstr "" +"Если вы пожертвуете более $5,000 и нам известны ваше имя и адресс, то мы " +"будем обязаны поделиться этой информацией с IRS в <a class=\"hyperlinks " +"links\" target=\"_blank\" href=\"https://www.irs.gov/pub/irs-" +"pdf/f990ezb.pdf\">Schedule of the Form 990</a>." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:89 msgid "" @@ -130,6 +134,7 @@ msgstr "" msgid "" "We will never publicly identify you as a donor without your permission." msgstr "" +"Мы никогда публично не идентифицируем вас как донора без вашего разрешения." #: tmp/cache_locale/fa/fadd8d2107638a3de94449a9eddfca4e8f010bb26f3f6a71e2d875cb910cc5f1.php:96 msgid "We do not publish, sell, trade, or rent any information about you." @@ -192,7 +197,7 @@ msgstr "Классический" #: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:56 msgid "European" -msgstr "" +msgstr "Европейский" #: tmp/cache_locale/ce/ce708c1cd991748e8c1c29f932e6ddbd1be5be1b4cc2c5b49b607cae1df80432.php:66 msgid "Size" @@ -278,7 +283,7 @@ msgstr "Всего Пожертвованно" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:155 msgid "Total Raised with Mozilla's Match" -msgstr "" +msgstr "Всего Собрано При Поддержке Mozilla" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:163 #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:169 @@ -296,7 +301,7 @@ msgstr "ежемесячно" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:178 #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:331 msgid "Want to donate Bitcoin, Stock, or via snail mail?" -msgstr "" +msgstr "Хотите пожертвовать Bitcoin, Stock или через snail mail?" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:193 msgid "invalid amount" @@ -356,7 +361,7 @@ msgstr "" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:280 msgid "Tor at the Heart of Internet Freedom" -msgstr "" +msgstr "Tor в Сердце Интернет Свободы" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:284 msgid "Powering the Digital Resistance" @@ -482,7 +487,7 @@ msgstr "" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:488 msgid "Strength in Numbers T-Shirt" -msgstr "" +msgstr "Strength in Numbers T-Shirt" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:492 msgid "Choose your size." @@ -548,7 +553,7 @@ msgstr "Спасибо!" #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:48 msgid "Thank you for supporting Tor's Strength in Numbers campaign." -msgstr "" +msgstr "Спасибо за поддержку компании Tor Strength in Numbers" #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:50 msgid "You should receive an email receipt shortly." @@ -728,13 +733,16 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:97 msgid "Who uses Tor?" -msgstr "" +msgstr "Кто использует Tor?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:101 msgid "" "The vast majority of Tor users are ordinary people who want control of their" " privacy online or people whose internet use is censored." msgstr "" +"Подавляющее большинство пользователей Tor — обычный люди, которые хотят " +"контроля над своей приватностью в сети или люди, чей интернет подвергается " +"цензуре." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:103 msgid "" @@ -748,7 +756,7 @@ msgstr "" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:113 msgid "Yes! Tor is free, and anyone can use it." -msgstr "" +msgstr "Да! Tor бесплатный, и кто-угодно может им пользоваться." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:115 msgid "" @@ -756,6 +764,9 @@ msgid "" "href=\"https://www.torproject.org/projects/torbrowser.html.en\">download Tor Browser</a>." msgstr "" +"Для начала нужно <a class=\"hyperlinks\" target=\"_blank\" " +"href=\"https://www.torproject.org/projects/torbrowser.html.en\">скачать Tor Browser</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:117 msgid "" @@ -767,14 +778,21 @@ msgid "" "OS X</a> and <a class=\"hyperlinks links\" target=\"_blank\" " "href=\"https://www.torproject.org/projects/torbrowser.html.en#linux\">Linux</a>." msgstr "" +"Вот инструкции по скачиванию для <a class=\"hyperlinks links\" " +"target=\"_blank\" " +"href=\"https://www.torproject.org/projects/torbrowser.html.en#windows\">Windows</a>," +" <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/projects/torbrowser.html.en#macosx\">Max " +"OS X</a> и <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/projects/torbrowser.html.en#linux\">Linux</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:123 msgid "What kinds of people support Tor?" -msgstr "" +msgstr "Какие люди поддерживают Tor?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:127 msgid "All kinds of people." -msgstr "" +msgstr "Различные люди." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:129 msgid ""

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 20 Nov '18

20 Nov '18

commit 2ff62fb77946e8bbbe1671c558af6827533a6718 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 20 18:49:34 2018 +0000 Update translations for support-portal_completed --- contents+fr.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index ab2f9c166..48be07941 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -627,7 +627,7 @@ msgid "" msgstr "" "Les connexions de toutes les autres applications sur votre système (dont les" " autres navigateurs) ne seront pas acheminées par le réseau Tor ni ne seront" -" pas protégées." +" protégées." #: http//localhost/tbb/tbb-13/ #: (content/tbb/tbb-13/contents+en.lrquestion.description) @@ -642,10 +642,11 @@ msgid "" "operating system</a> which you can start on almost any computer from " "a USB stick or a DVD." msgstr "" -"Si vous avez besoin de vous assurer que tout trafic passe par le réseau Tor," -" jetez un coup d’œil au <a href=\"https://tails.boum.org/\">système " -"d’exploitation autonome Tails</a>, que vous pouvez lancer sur presque" -" n’importe quel ordinateur à partir d’une clé USB ou d’un DVD." +"Si vous avez besoin de vous assurer que tout le trafic passe par le réseau " +"Tor, jetez un coup d’œil au <a " +"href=\"https://tails.boum.org/\">système d’exploitation autonome " +"Tails</a>, que vous pouvez lancer sur presque n’importe quel " +"ordinateur à partir d’une clé USB ou d’un DVD." #: http//localhost/tbb/tbb-13/ #: (content/tbb/tbb-13/contents+en.lrquestion.seo_slug) @@ -781,9 +782,9 @@ msgid "" "href=\"https://www.torbsd.org/\">TorBSD project</a>, but their Tor " "Browser is not officially supported." msgstr "" -"Il existe quelque chose qui s’appelle le <a " -"href=\"https://www.torbsd.org/\">Projet TorBSD</a>, mais leur " -"Navigateur Tor n’est pas pris en charge officiellement." +"Il existe bien le <a href=\"https://www.torbsd.org/\">Projet " +"TorBSD</a>, mais leur Navigateur Tor n’est pas pris en charge " +"officiellement." #: http//localhost/tbb/tbb-18/ #: (content/tbb/tbb-18/contents+en.lrquestion.seo_slug) @@ -810,8 +811,8 @@ msgstr "" msgid "" "You might be on a censored network, and so you should try using bridges." msgstr "" -"Il se peut que vous soyez sur un réseau censuré, et vous devriez donc " -"essayer d’utiliser des ponts." +"Il se peut que vous soyez sur un réseau censuré et vous devriez donc essayer" +" d’utiliser des ponts." #: http//localhost/tbb/tbb-19/ #: (content/tbb/tbb-19/contents+en.lrquestion.description)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 20 Nov '18

20 Nov '18

commit 064759c231f5f12c759a6c661dbc7e1f119ef6d3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 20 18:49:27 2018 +0000 Update translations for support-portal --- contents+fr.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index ab2f9c166..48be07941 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -627,7 +627,7 @@ msgid "" msgstr "" "Les connexions de toutes les autres applications sur votre système (dont les" " autres navigateurs) ne seront pas acheminées par le réseau Tor ni ne seront" -" pas protégées." +" protégées." #: http//localhost/tbb/tbb-13/ #: (content/tbb/tbb-13/contents+en.lrquestion.description) @@ -642,10 +642,11 @@ msgid "" "operating system</a> which you can start on almost any computer from " "a USB stick or a DVD." msgstr "" -"Si vous avez besoin de vous assurer que tout trafic passe par le réseau Tor," -" jetez un coup d’œil au <a href=\"https://tails.boum.org/\">système " -"d’exploitation autonome Tails</a>, que vous pouvez lancer sur presque" -" n’importe quel ordinateur à partir d’une clé USB ou d’un DVD." +"Si vous avez besoin de vous assurer que tout le trafic passe par le réseau " +"Tor, jetez un coup d’œil au <a " +"href=\"https://tails.boum.org/\">système d’exploitation autonome " +"Tails</a>, que vous pouvez lancer sur presque n’importe quel " +"ordinateur à partir d’une clé USB ou d’un DVD." #: http//localhost/tbb/tbb-13/ #: (content/tbb/tbb-13/contents+en.lrquestion.seo_slug) @@ -781,9 +782,9 @@ msgid "" "href=\"https://www.torbsd.org/\">TorBSD project</a>, but their Tor " "Browser is not officially supported." msgstr "" -"Il existe quelque chose qui s’appelle le <a " -"href=\"https://www.torbsd.org/\">Projet TorBSD</a>, mais leur " -"Navigateur Tor n’est pas pris en charge officiellement." +"Il existe bien le <a href=\"https://www.torbsd.org/\">Projet " +"TorBSD</a>, mais leur Navigateur Tor n’est pas pris en charge " +"officiellement." #: http//localhost/tbb/tbb-18/ #: (content/tbb/tbb-18/contents+en.lrquestion.seo_slug) @@ -810,8 +811,8 @@ msgstr "" msgid "" "You might be on a censored network, and so you should try using bridges." msgstr "" -"Il se peut que vous soyez sur un réseau censuré, et vous devriez donc " -"essayer d’utiliser des ponts." +"Il se peut que vous soyez sur un réseau censuré et vous devriez donc essayer" +" d’utiliser des ponts." #: http//localhost/tbb/tbb-19/ #: (content/tbb/tbb-19/contents+en.lrquestion.description)

1 0