- tor-commits - lists.torproject.org

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 08 Mar '16

08 Mar '16

commit eec47b94fbf18c81d286611de937f617759c0222 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 7 21:45:03 2016 +0000 Update translations for bridgedb --- be/LC_MESSAGES/bridgedb.po | 348 +++++++++++++++++++++++---------------------- 1 file changed, 175 insertions(+), 173 deletions(-) diff --git a/be/LC_MESSAGES/bridgedb.po b/be/LC_MESSAGES/bridgedb.po index aba8259..8bb4e10 100644 --- a/be/LC_MESSAGES/bridgedb.po +++ b/be/LC_MESSAGES/bridgedb.po @@ -4,19 +4,21 @@ # # Translators: # Aleh Ladutska <lad-oleg(a)yandex.ru>, 2014 +# Сілкін Станіслаў <moonblr29(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Belarusian (http://www.transifex.com/projects/p/torproject/language/be/)\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2016-03-07 21:31+0000\n" +"Last-Translator: Сілкін Станіслаў <moonblr29(a)gmail.com>\n" +"Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: be\n" -"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): @@ -29,57 +31,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Выбачайце! Штосьці пайшле не так пад час адпраўкі вашага запыта." +msgstr "Выбачайце! Штосьці пайшло не так падчас адпраўкі вашага запыта." -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "Паведамiць пра баг." + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "Зыходны Код" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "Гісторыя зменаў" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "Абраць Усё" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "Паказаць QR-код" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "Вой, божухна!" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "Здаецца, адбылася памылка падчас атрымання Вашага QR-кода." + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "" + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "На дадзены момант няма даступных мастоў." + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Магчыма, вам трэба паспрабаваць %s вярнуцца назад %s і абраць іншы тып маста." + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Крок %s1%s" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Запампаваць %s Tor Browser %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Крок %s2%s" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Крок %s3%s" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Цяпер %s дадайце масты ў Tor Browser %s" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "Дадатковыя Налады" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "Не" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "%sТ%sак!" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "[Гэта аўтаматычнае паведамленне; каліласка, не адказвайце на яго.]" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "Вось вашыя масты:" -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." msgstr "" -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "Рады вітаць вас у BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "Прывітанне, %s!" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "Вітаю, сябра!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" msgstr "Публічныя Ключы" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:37 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" @@ -90,7 +217,7 @@ msgstr "Гэты імэйл быў створаны чароўнымі медз #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor". #. TRANSLATORS: Please DO NOT translate "Tor Network". -#: lib/bridgedb/strings.py:47 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -101,7 +228,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -113,7 +240,7 @@ msgstr "" #. regular, or unexciting". Like vanilla ice cream. It refers to bridges #. which do not have Pluggable Transports, and only speak the regular, #. boring Tor protocol. Translate it as you see fit. Have fun with it. -#: lib/bridgedb/strings.py:63 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -122,20 +249,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "" -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -143,61 +270,61 @@ msgid "" "%s, %s or %s." msgstr "" -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" -msgstr "" +msgstr "Мае масты не працуюць! Патрэбная дапамога!" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "" +msgstr "Калі Ваш Tor не працуе, звярніцеся па e-mail адрасе %s." #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:96 +#: bridgedb/strings.py:121 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." msgstr "" -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "Атрымаць масты!" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" -msgstr "Каліласка, абярыце налады для тыпу маста:" +msgstr "Калі ласка, абярыце налады для тыпу маста:" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "Ці патрэбны вам IPv6 адрасы?" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "Ці патрэбны вам %s?" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "Ваш браўзэр адлюстроўвае выявы некарэктна." -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "" -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "Як пачаць карыстацца мастамі" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -206,21 +333,21 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "Калі выскакне даялогавае вакенца \"Сеткавыя налады Tor\" націсніце \"Наладзіць\" і кіруйцеся\nпраграмай усталёўкі пакуль яна не спытае:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:130 +#: bridgedb/strings.py:155 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "Ці блакуе ваш інтэрнэт-правайдэр злучэнне з сеткай Tor, альбо як-небудзь\nпа-іншаму цэнзуріруе яго?" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:134 +#: bridgedb/strings.py:159 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -228,153 +355,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Абярыце \"Так\" а затым націсніце \"Далей\". Каб наладзіць масты скаріуйце і\nўстаўце радкі мастоў у тэкставае вакенца. Потым націсніце \"Злучыцца\"\nі можаце пачынаць карыстацца браўзэрам. Калі вы сутыкнуліся з праблемамі,\nпаспрабуйце націснуць \"Дапамога\" у вакенцы \"Сеткавыя налады Tor\" каб атрымаць падтрымку." -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 msgid "Displays this message." msgstr "Адлюстраваць гэтае паведамленне." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: lib/bridgedb/strings.py:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "Запытаць масты IPv6." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:152 +#: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "Паведамiць аб баге." - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "Зыходны Код" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "" - -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:115 -#: lib/bridgedb/templates/bridges.html:175 -msgid "Uh oh, spaghettios!" -msgstr "Вой, божухна!" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:121 -msgid "" -"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" -" your bridge lines onto mobile and other devices." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "На дадзены момант няма даступных мастоў." - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "Магчыма вам трэба паспрабаваць %s вярнуцца назад %s і абраць іншы тып маста." - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "Крок %s1%s" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "Запампаваць %s Tor Browser %s" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. (These are used to insert HTML5 underlining tags, to mark accesskeys -#. for disabled users.) -#: lib/bridgedb/templates/options.html:38 -#, python-format -msgid "%sJ%sust give me bridges!" -msgstr "" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "Не" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:127 -#, python-format -msgid "%sY%ses!" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:151 -#, python-format -msgid "%sG%set Bridges" -msgstr ""

1 0

[stem/master] Deprecated the DescriptorDownloader's get_microdescriptors()
by atagar＠torproject.org 08 Mar '16

08 Mar '16

commit 2860a3f66bc59a8f33223980fa79046ce5dcdd0b Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 6 17:29:11 2016 -0800 Deprecated the DescriptorDownloader's get_microdescriptors() This methed never worked since it was never actually implemented in tor... https://trac.torproject.org/projects/tor/ticket/9271 --- docs/change_log.rst | 1 + stem/descriptor/remote.py | 19 ++++--------------- test/integ/descriptor/remote.py | 40 ++-------------------------------------- 3 files changed, 7 insertions(+), 53 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 26e9966..a414835 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -69,6 +69,7 @@ The following are only available within Stem's `git repository * TypeError under python3 when using 'use_mirrors = True' (:trac:`17083`) * Deprecated hidden service descriptor's *introduction_points_auth* field, which was never implemented in tor (:trac:`15190`, :spec:`9c218f9`) * :func:`~stem.control.Controller.get_hidden_service_descriptor` errored when provided a *servers* argument (:trac:`18401`) + * Deprecated :func:`~stem.descriptor.remote.DescriptorDownloader.get_microdescriptors` as it was never implemented in tor (:trac:`9271`) * Fixed parsing of server descriptor's *allow-single-hop-exits* and *caches-extra-info* lines * Bracketed IPv6 addresses were mistreated as being invalid content * Updated dannenberg's v3ident (:trac:`17906`) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 09aba84..859eb24 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -47,7 +47,6 @@ content. For example... get_instance - Provides a singleton DescriptorDownloader used for... |- get_server_descriptors - provides present server descriptors |- get_extrainfo_descriptors - provides present extrainfo descriptors - |- get_microdescriptors - provides present microdescriptors +- get_consensus - provides the present consensus or router status entries get_authorities - Provides tor directory information. @@ -66,7 +65,6 @@ content. For example... |- use_directory_mirrors - use directory mirrors to download future descriptors |- get_server_descriptors - provides present server descriptors |- get_extrainfo_descriptors - provides present extrainfo descriptors - |- get_microdescriptors - provides present microdescriptors |- get_consensus - provides the present consensus or router status entries |- get_key_certificates - provides present authority key certificates +- query - request an arbitrary descriptor resource @@ -123,7 +121,6 @@ def get_instance(): * :func:`stem.descriptor.remote.get_server_descriptors` * :func:`stem.descriptor.remote.get_extrainfo_descriptors` - * :func:`stem.descriptor.remote.get_microdescriptors` * :func:`stem.descriptor.remote.get_consensus` .. versionadded:: 1.5.0 @@ -163,18 +160,6 @@ def get_extrainfo_descriptors(fingerprints = None, **query_args): return get_instance().get_extrainfo_descriptors(fingerprints, **query_args) -def get_microdescriptors(hashes, **query_args): - """ - Shorthand for - :func:`~stem.descriptor.remote.DescriptorDownloader.get_microdescriptors` - on our singleton instance. - - .. versionadded:: 1.5.0 - """ - - return get_instance().get_microdescriptors(hashes, **query_args) - - def get_consensus(authority_v3ident = None, **query_args): """ Shorthand for @@ -587,6 +572,10 @@ class DescriptorDownloader(object): that these are only provided via a microdescriptor consensus (such as 'cached-microdesc-consensus' in your data directory). + .. deprecated:: 1.5.0 + This function has never worked, as it was never implemented in tor + (:trac:`9271`). + :param str,list hashes: microdescriptor hash or list of hashes to be retrieved :param query_args: additional arguments for the diff --git a/test/integ/descriptor/remote.py b/test/integ/descriptor/remote.py index ef556ae..5fe6cc1 100644 --- a/test/integ/descriptor/remote.py +++ b/test/integ/descriptor/remote.py @@ -6,12 +6,10 @@ import unittest import stem.descriptor import stem.descriptor.extrainfo_descriptor -import stem.descriptor.microdescriptor import stem.descriptor.networkstatus import stem.descriptor.remote import stem.descriptor.router_status_entry import stem.descriptor.server_descriptor -import test.runner from test.runner import ( require_online, @@ -28,15 +26,12 @@ class TestDescriptorDownloader(unittest.TestCase): descriptors. """ - desc = list(stem.descriptor.remote.get_server_descriptors('9695DFC35FFEB861329B9F1AB04C46397020CE31'))[0] + desc = list(stem.descriptor.remote.get_server_descriptors('9695DFC35FFEB861329B9F1AB04C46397020CE31').run())[0] self.assertEqual('moria1', desc.nickname) - desc = list(stem.descriptor.remote.get_extrainfo_descriptors('9695DFC35FFEB861329B9F1AB04C46397020CE31'))[0] + desc = list(stem.descriptor.remote.get_extrainfo_descriptors('9695DFC35FFEB861329B9F1AB04C46397020CE31').run())[0] self.assertEqual('moria1', desc.nickname) - desc = list(stem.descriptor.remote.get_microdescriptors('6dCl6ab8CLo0LeMjxi/MZgVJiZgWN8WKTesWPBMtyTo'))[0] - self.assertEqual('moria1', desc.digest) - consensus = list(stem.descriptor.remote.get_consensus()) self.assertTrue(len(consensus) > 50) @@ -171,37 +166,6 @@ class TestDescriptorDownloader(unittest.TestCase): @require_online @only_run_once - def test_get_microdescriptors(self): - """ - Exercises the downloader's get_microdescriptors() method. - """ - - # TODO: method needs to be fixed - not quite sure what's going wrong... - - test.runner.skip(self, '(test currently broken)') - return - - downloader = stem.descriptor.remote.DescriptorDownloader(validate = True) - - single_query = downloader.get_microdescriptors('6dCl6ab8CLo0LeMjxi/MZgVJiZgWN8WKTesWPBMtyTo') - - multiple_query = downloader.get_microdescriptors([ - '6dCl6ab8CLo0LeMjxi/MZgVJiZgWN8WKTesWPBMtyTo', # moria1 - 'oXBV80OwMACBJpqNeZrYSXF18l9EJCi4/mB8UOl9sME', # tor26 - ]) - - single_query.run() - multiple_query.run() - - single_query_results = list(single_query) - self.assertEqual(1, len(single_query_results)) - self.assertEqual('moria1', single_query_results[0].digest) - self.assertTrue(isinstance(single_query_results[0], stem.descriptor.microdescriptor.Microdescriptor)) - - self.assertEqual(2, len(list(multiple_query))) - - @require_online - @only_run_once def test_get_consensus(self): """ Exercises the downloader's get_consensus() method.

1 0

[stem/master] Key fallback directories on fingerprint
by atagar＠torproject.org 08 Mar '16

08 Mar '16

commit 9fa650f3e20508a366ce71333b96015c54d2d70d Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 6 16:15:53 2016 -0800 Key fallback directories on fingerprint Internal detail, but in our config file we keyed fallback directories on their nickname. This made the config more readable but is a no-go since nicknames are non-unique. At present tor has two Unnamed fallback directories and as a result we could only have information about one. This is all internal details. Only impact for users is that we're no longer missing one of the fallbacks. --- cache_fallback_directories.py | 10 +- stem/descriptor/fallback_directories.cfg | 254 ++++++++++++++++--------------- stem/descriptor/remote.py | 24 +-- 3 files changed, 146 insertions(+), 142 deletions(-) diff --git a/cache_fallback_directories.py b/cache_fallback_directories.py index d6a58a9..138f767 100755 --- a/cache_fallback_directories.py +++ b/cache_fallback_directories.py @@ -55,10 +55,10 @@ if __name__ == '__main__': conf.set('stem_commit', stem_commit) for directory in latest_fallback_directories.values(): - nickname = directory.nickname - conf.set('%s.address' % nickname, directory.address) - conf.set('%s.or_port' % nickname, str(directory.or_port)) - conf.set('%s.dir_port' % nickname, str(directory.dir_port)) - conf.set('%s.fingerprint' % nickname, directory.fingerprint) + fingerprint = directory.fingerprint + conf.set('%s.address' % fingerprint, directory.address) + conf.set('%s.or_port' % fingerprint, str(directory.or_port)) + conf.set('%s.dir_port' % fingerprint, str(directory.dir_port)) + conf.set('%s.nickname' % fingerprint, directory.nickname) conf.save(stem.descriptor.remote.CACHE_PATH) diff --git a/stem/descriptor/fallback_directories.cfg b/stem/descriptor/fallback_directories.cfg index faf6105..d420fb5 100644 --- a/stem/descriptor/fallback_directories.cfg +++ b/stem/descriptor/fallback_directories.cfg @@ -1,126 +1,130 @@ tor_commit e2202146d16af22502fd4166ac926fefa6528dff -stem_commit 7fceffac0f988670f4fd6b5eb061b2ebeee9e560 -Doedel22.address 178.254.44.135 -Doedel22.or_port 9001 -Doedel22.dir_port 9030 -Doedel22.fingerprint 8FA37B93397015B2BC5A525C908485260BE9F422 -Logforme.address 84.219.173.60 -Logforme.or_port 443 -Logforme.dir_port 9030 -Logforme.fingerprint 855BC2DABE24C861CD887DB9B2E950424B49FC34 -Doedel21.address 178.254.44.135 -Doedel21.or_port 443 -Doedel21.dir_port 80 -Doedel21.fingerprint AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2 -kitten4.address 212.47.237.95 -kitten4.or_port 9101 -kitten4.dir_port 9130 -kitten4.fingerprint 6FB38EB22E57EF7ED5EF00238F6A48E553735D88 -kitten3.address 212.47.237.95 -kitten3.or_port 9001 -kitten3.dir_port 9030 -kitten3.fingerprint 3F5D8A879C58961BB45A3D26AC41B543B40236D6 -Unnamed.address 217.12.199.208 -Unnamed.or_port 443 -Unnamed.dir_port 80 -Unnamed.fingerprint DF3AED4322B1824BF5539AE54B2D1B38E080FF05 -coby.address 51.255.33.237 -coby.or_port 9001 -coby.dir_port 9091 -coby.fingerprint A360C21FA87FFA2046D92C17086A6B47E5C68109 -Binnacle.address 108.53.208.157 -Binnacle.or_port 443 -Binnacle.dir_port 80 -Binnacle.fingerprint 4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2 -fluxe3.address 78.47.18.110 -fluxe3.or_port 80 -fluxe3.dir_port 443 -fluxe3.fingerprint F8D27B163B9247B232A2EEE68DD8B698695C28DE -rueckgrat.address 5.9.110.236 -rueckgrat.or_port 9001 -rueckgrat.dir_port 9030 -rueckgrat.fingerprint 0756B7CD4DFC8182BE23143FAC0642F515182CEB -Nurnberg01.address 213.239.210.204 -Nurnberg01.or_port 443 -Nurnberg01.dir_port 22 -Nurnberg01.fingerprint 5BFDECCE9B4A23AE14EC767C5A2C1E10558B00B9 -wagner.address 5.175.233.86 -wagner.or_port 443 -wagner.dir_port 80 -wagner.fingerprint 5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33 -kitten2.address 62.210.124.124 -kitten2.or_port 9101 -kitten2.dir_port 9130 -kitten2.fingerprint 2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E -Nurnberg02.address 213.239.220.25 -Nurnberg02.or_port 443 -Nurnberg02.dir_port 22 -Nurnberg02.fingerprint BEE2317AE127EB681C5AE1551C1EA0630580638A -eriador.address 85.25.138.93 -eriador.or_port 4029 -eriador.dir_port 9030 -eriador.fingerprint 6DE61A6F72C1E5418A66BFED80DFB63E4C77668F -Doedel26.address 178.254.20.134 -Doedel26.or_port 443 -Doedel26.dir_port 80 -Doedel26.fingerprint 9F5068310818ED7C70B0BC4087AB55CB12CB4377 -kitten1.address 62.210.124.124 -kitten1.or_port 9001 -kitten1.dir_port 9030 -kitten1.fingerprint 86E78DD3720C78DA8673182EF96C54B162CD660C -bakunin.address 178.16.208.57 -bakunin.or_port 443 -bakunin.dir_port 80 -bakunin.fingerprint 92CFD9565B24646CAC2D172D3DB503D69E777B8A -PedicaboMundi.address 144.76.14.145 -PedicaboMundi.or_port 143 -PedicaboMundi.dir_port 110 -PedicaboMundi.fingerprint 14419131033443AE6E21DA82B0D307F7CAE42BDB -tornoderdednl.address 178.62.199.226 -tornoderdednl.or_port 443 -tornoderdednl.dir_port 80 -tornoderdednl.fingerprint CBEFF7BA4A4062045133C053F2D70524D8BBE5BE -ratchet.address 170.130.1.7 -ratchet.or_port 9001 -ratchet.dir_port 9030 -ratchet.fingerprint FA3415659444AE006E7E9E5375E82F29700CFDFD -Freebird32.address 178.254.13.126 -Freebird32.or_port 9001 -Freebird32.dir_port 9030 -Freebird32.fingerprint 0C475BA4D3AA3C289B716F95954CAD616E50C4E5 -Freebird31.address 178.254.13.126 -Freebird31.or_port 443 -Freebird31.dir_port 80 -Freebird31.fingerprint F9246DEF2B653807236DA134F2AEAB103D58ABFE -12xBTME1.address 81.7.17.171 -12xBTME1.or_port 443 -12xBTME1.dir_port 80 -12xBTME1.fingerprint 00C4B4731658D3B4987132A3F77100CFCB190D97 -kili.address 178.62.173.203 -kili.or_port 9001 -kili.dir_port 9030 -kili.fingerprint DD85503F2D1F52EF9EAD621E942298F46CD2FC10 -fluxe4.address 131.188.40.188 -fluxe4.or_port 80 -fluxe4.dir_port 443 -fluxe4.fingerprint EBE718E1A49EE229071702964F8DB1F318075FF8 -pixelminer.address 81.7.14.246 -pixelminer.or_port 443 -pixelminer.dir_port 80 -pixelminer.fingerprint CE75BF0972ADD52AF8807602374E495C815DB304 -Nurnberg04.address 88.198.38.226 -Nurnberg04.or_port 443 -Nurnberg04.dir_port 22 -Nurnberg04.fingerprint 4B9E2C56FB42B891794FE2CD2FCAD08A320CC3BB -Nurnberg03.address 85.10.201.38 -Nurnberg03.or_port 443 -Nurnberg03.dir_port 22 -Nurnberg03.fingerprint F6279A203C1950ACF592322A235647A05BFBCF91 -Doedel24.address 178.254.20.134 -Doedel24.or_port 9001 -Doedel24.dir_port 9030 -Doedel24.fingerprint 2CE96A8A1DA032664C90F574AFFBECE18A6E8DFC -horizons.address 167.114.35.28 -horizons.or_port 9001 -horizons.dir_port 9030 -horizons.fingerprint E65D300F11E1DB12C534B0146BDAB6972F1A8A48 +stem_commit a96ec510539f2918bf93c50d63ce68e919f71209 +8FA37B93397015B2BC5A525C908485260BE9F422.address 178.254.44.135 +8FA37B93397015B2BC5A525C908485260BE9F422.or_port 9001 +8FA37B93397015B2BC5A525C908485260BE9F422.dir_port 9030 +8FA37B93397015B2BC5A525C908485260BE9F422.nickname Doedel22 +855BC2DABE24C861CD887DB9B2E950424B49FC34.address 84.219.173.60 +855BC2DABE24C861CD887DB9B2E950424B49FC34.or_port 443 +855BC2DABE24C861CD887DB9B2E950424B49FC34.dir_port 9030 +855BC2DABE24C861CD887DB9B2E950424B49FC34.nickname Logforme +AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2.address 178.254.44.135 +AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2.or_port 443 +AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2.dir_port 80 +AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2.nickname Doedel21 +6FB38EB22E57EF7ED5EF00238F6A48E553735D88.address 212.47.237.95 +6FB38EB22E57EF7ED5EF00238F6A48E553735D88.or_port 9101 +6FB38EB22E57EF7ED5EF00238F6A48E553735D88.dir_port 9130 +6FB38EB22E57EF7ED5EF00238F6A48E553735D88.nickname kitten4 +3F5D8A879C58961BB45A3D26AC41B543B40236D6.address 212.47.237.95 +3F5D8A879C58961BB45A3D26AC41B543B40236D6.or_port 9001 +3F5D8A879C58961BB45A3D26AC41B543B40236D6.dir_port 9030 +3F5D8A879C58961BB45A3D26AC41B543B40236D6.nickname kitten3 +943C0C6841C1E914B9FCA796C6846620A5AF9BC7.address 217.12.210.214 +943C0C6841C1E914B9FCA796C6846620A5AF9BC7.or_port 443 +943C0C6841C1E914B9FCA796C6846620A5AF9BC7.dir_port 80 +943C0C6841C1E914B9FCA796C6846620A5AF9BC7.nickname Unnamed +A360C21FA87FFA2046D92C17086A6B47E5C68109.address 51.255.33.237 +A360C21FA87FFA2046D92C17086A6B47E5C68109.or_port 9001 +A360C21FA87FFA2046D92C17086A6B47E5C68109.dir_port 9091 +A360C21FA87FFA2046D92C17086A6B47E5C68109.nickname coby +4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2.address 108.53.208.157 +4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2.or_port 443 +4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2.dir_port 80 +4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2.nickname Binnacle +F8D27B163B9247B232A2EEE68DD8B698695C28DE.address 78.47.18.110 +F8D27B163B9247B232A2EEE68DD8B698695C28DE.or_port 80 +F8D27B163B9247B232A2EEE68DD8B698695C28DE.dir_port 443 +F8D27B163B9247B232A2EEE68DD8B698695C28DE.nickname fluxe3 +0756B7CD4DFC8182BE23143FAC0642F515182CEB.address 5.9.110.236 +0756B7CD4DFC8182BE23143FAC0642F515182CEB.or_port 9001 +0756B7CD4DFC8182BE23143FAC0642F515182CEB.dir_port 9030 +0756B7CD4DFC8182BE23143FAC0642F515182CEB.nickname rueckgrat +5BFDECCE9B4A23AE14EC767C5A2C1E10558B00B9.address 213.239.210.204 +5BFDECCE9B4A23AE14EC767C5A2C1E10558B00B9.or_port 443 +5BFDECCE9B4A23AE14EC767C5A2C1E10558B00B9.dir_port 22 +5BFDECCE9B4A23AE14EC767C5A2C1E10558B00B9.nickname Nurnberg01 +5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33.address 5.175.233.86 +5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33.or_port 443 +5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33.dir_port 80 +5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33.nickname wagner +2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.address 62.210.124.124 +2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.or_port 9101 +2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.dir_port 9130 +2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.nickname kitten2 +BEE2317AE127EB681C5AE1551C1EA0630580638A.address 213.239.220.25 +BEE2317AE127EB681C5AE1551C1EA0630580638A.or_port 443 +BEE2317AE127EB681C5AE1551C1EA0630580638A.dir_port 22 +BEE2317AE127EB681C5AE1551C1EA0630580638A.nickname Nurnberg02 +DF3AED4322B1824BF5539AE54B2D1B38E080FF05.address 217.12.199.208 +DF3AED4322B1824BF5539AE54B2D1B38E080FF05.or_port 443 +DF3AED4322B1824BF5539AE54B2D1B38E080FF05.dir_port 80 +DF3AED4322B1824BF5539AE54B2D1B38E080FF05.nickname Unnamed +6DE61A6F72C1E5418A66BFED80DFB63E4C77668F.address 85.25.138.93 +6DE61A6F72C1E5418A66BFED80DFB63E4C77668F.or_port 4029 +6DE61A6F72C1E5418A66BFED80DFB63E4C77668F.dir_port 9030 +6DE61A6F72C1E5418A66BFED80DFB63E4C77668F.nickname eriador +9F5068310818ED7C70B0BC4087AB55CB12CB4377.address 178.254.20.134 +9F5068310818ED7C70B0BC4087AB55CB12CB4377.or_port 443 +9F5068310818ED7C70B0BC4087AB55CB12CB4377.dir_port 80 +9F5068310818ED7C70B0BC4087AB55CB12CB4377.nickname Doedel26 +86E78DD3720C78DA8673182EF96C54B162CD660C.address 62.210.124.124 +86E78DD3720C78DA8673182EF96C54B162CD660C.or_port 9001 +86E78DD3720C78DA8673182EF96C54B162CD660C.dir_port 9030 +86E78DD3720C78DA8673182EF96C54B162CD660C.nickname kitten1 +92CFD9565B24646CAC2D172D3DB503D69E777B8A.address 178.16.208.57 +92CFD9565B24646CAC2D172D3DB503D69E777B8A.or_port 443 +92CFD9565B24646CAC2D172D3DB503D69E777B8A.dir_port 80 +92CFD9565B24646CAC2D172D3DB503D69E777B8A.nickname bakunin +14419131033443AE6E21DA82B0D307F7CAE42BDB.address 144.76.14.145 +14419131033443AE6E21DA82B0D307F7CAE42BDB.or_port 143 +14419131033443AE6E21DA82B0D307F7CAE42BDB.dir_port 110 +14419131033443AE6E21DA82B0D307F7CAE42BDB.nickname PedicaboMundi +CBEFF7BA4A4062045133C053F2D70524D8BBE5BE.address 178.62.199.226 +CBEFF7BA4A4062045133C053F2D70524D8BBE5BE.or_port 443 +CBEFF7BA4A4062045133C053F2D70524D8BBE5BE.dir_port 80 +CBEFF7BA4A4062045133C053F2D70524D8BBE5BE.nickname tornoderdednl +FA3415659444AE006E7E9E5375E82F29700CFDFD.address 170.130.1.7 +FA3415659444AE006E7E9E5375E82F29700CFDFD.or_port 9001 +FA3415659444AE006E7E9E5375E82F29700CFDFD.dir_port 9030 +FA3415659444AE006E7E9E5375E82F29700CFDFD.nickname ratchet +0C475BA4D3AA3C289B716F95954CAD616E50C4E5.address 178.254.13.126 +0C475BA4D3AA3C289B716F95954CAD616E50C4E5.or_port 9001 +0C475BA4D3AA3C289B716F95954CAD616E50C4E5.dir_port 9030 +0C475BA4D3AA3C289B716F95954CAD616E50C4E5.nickname Freebird32 +F9246DEF2B653807236DA134F2AEAB103D58ABFE.address 178.254.13.126 +F9246DEF2B653807236DA134F2AEAB103D58ABFE.or_port 443 +F9246DEF2B653807236DA134F2AEAB103D58ABFE.dir_port 80 +F9246DEF2B653807236DA134F2AEAB103D58ABFE.nickname Freebird31 +00C4B4731658D3B4987132A3F77100CFCB190D97.address 81.7.17.171 +00C4B4731658D3B4987132A3F77100CFCB190D97.or_port 443 +00C4B4731658D3B4987132A3F77100CFCB190D97.dir_port 80 +00C4B4731658D3B4987132A3F77100CFCB190D97.nickname 12xBTME1 +DD85503F2D1F52EF9EAD621E942298F46CD2FC10.address 178.62.173.203 +DD85503F2D1F52EF9EAD621E942298F46CD2FC10.or_port 9001 +DD85503F2D1F52EF9EAD621E942298F46CD2FC10.dir_port 9030 +DD85503F2D1F52EF9EAD621E942298F46CD2FC10.nickname kili +EBE718E1A49EE229071702964F8DB1F318075FF8.address 131.188.40.188 +EBE718E1A49EE229071702964F8DB1F318075FF8.or_port 80 +EBE718E1A49EE229071702964F8DB1F318075FF8.dir_port 443 +EBE718E1A49EE229071702964F8DB1F318075FF8.nickname fluxe4 +CE75BF0972ADD52AF8807602374E495C815DB304.address 81.7.14.246 +CE75BF0972ADD52AF8807602374E495C815DB304.or_port 443 +CE75BF0972ADD52AF8807602374E495C815DB304.dir_port 80 +CE75BF0972ADD52AF8807602374E495C815DB304.nickname pixelminer +4B9E2C56FB42B891794FE2CD2FCAD08A320CC3BB.address 88.198.38.226 +4B9E2C56FB42B891794FE2CD2FCAD08A320CC3BB.or_port 443 +4B9E2C56FB42B891794FE2CD2FCAD08A320CC3BB.dir_port 22 +4B9E2C56FB42B891794FE2CD2FCAD08A320CC3BB.nickname Nurnberg04 +F6279A203C1950ACF592322A235647A05BFBCF91.address 85.10.201.38 +F6279A203C1950ACF592322A235647A05BFBCF91.or_port 443 +F6279A203C1950ACF592322A235647A05BFBCF91.dir_port 22 +F6279A203C1950ACF592322A235647A05BFBCF91.nickname Nurnberg03 +2CE96A8A1DA032664C90F574AFFBECE18A6E8DFC.address 178.254.20.134 +2CE96A8A1DA032664C90F574AFFBECE18A6E8DFC.or_port 9001 +2CE96A8A1DA032664C90F574AFFBECE18A6E8DFC.dir_port 9030 +2CE96A8A1DA032664C90F574AFFBECE18A6E8DFC.nickname Doedel24 +E65D300F11E1DB12C534B0146BDAB6972F1A8A48.address 167.114.35.28 +E65D300F11E1DB12C534B0146BDAB6972F1A8A48.or_port 9001 +E65D300F11E1DB12C534B0146BDAB6972F1A8A48.dir_port 9030 +E65D300F11E1DB12C534B0146BDAB6972F1A8A48.nickname horizons diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 1afa70a..baba8ac 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -948,34 +948,34 @@ class FallbackDirectory(Directory): results = {} - for nickname in set([key.split('.')[0] for key in conf.keys()]): - if nickname in ('tor_commit', 'stem_commit'): + for fingerprint in set([key.split('.')[0] for key in conf.keys()]): + if fingerprint in ('tor_commit', 'stem_commit'): continue attr = {} - for attr_name in ('address', 'or_port', 'dir_port', 'fingerprint'): - key = '%s.%s' % (nickname, attr_name) + for attr_name in ('address', 'or_port', 'dir_port', 'nickname'): + key = '%s.%s' % (fingerprint, attr_name) attr[attr_name] = conf.get(key) if not attr[attr_name]: raise IOError("'%s' is missing from %s" % (key, CACHE_PATH)) if not connection.is_valid_ipv4_address(attr['address']): - raise IOError("'%s.address' was an invalid address (%s)" % (nickname, attr['address'])) + raise IOError("'%s.address' was an invalid address (%s)" % (fingerprint, attr['address'])) elif not connection.is_valid_port(attr['or_port']): - raise IOError("'%s.or_port' was an invalid port (%s)" % (nickname, attr['or_port'])) + raise IOError("'%s.or_port' was an invalid port (%s)" % (fingerprint, attr['or_port'])) elif not connection.is_valid_port(attr['dir_port']): - raise IOError("'%s.dir_port' was an invalid port (%s)" % (nickname, attr['dir_port'])) - elif not tor_tools.is_valid_fingerprint(attr['fingerprint']): - raise IOError("'%s.fingerprint' was an invalid fingerprint (%s)" % (nickname, attr['fingerprint'])) + raise IOError("'%s.dir_port' was an invalid port (%s)" % (fingerprint, attr['dir_port'])) + elif not tor_tools.is_valid_nickname(attr['nickname']): + raise IOError("'%s.nickname' was an invalid nickname (%s)" % (fingerprint, attr['nickname'])) - results[attr['fingerprint']] = FallbackDirectory( + results[fingerprint] = FallbackDirectory( address = attr['address'], or_port = int(attr['or_port']), dir_port = int(attr['dir_port']), - fingerprint = attr['fingerprint'], - nickname = nickname, + fingerprint = fingerprint, + nickname = attr['nickname'], ) return results

1 0

[stem/master] test_shorthand_aliases integ test broken
by atagar＠torproject.org 08 Mar '16

08 Mar '16

commit e4dc4e7560cc980257fdd96ba9b58c326b138af6 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 7 13:08:07 2016 -0800 test_shorthand_aliases integ test broken Our unit tests caused us to cache a Mock object rather than a DescriptorDownloader for our singleton. This in turn broke our later integ tests... ====================================================================== ERROR: test_shorthand_aliases ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/runner.py", line 161, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/test/runner.py", line 178, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/test/integ/descriptor/remote.py", line 31, in test_shorthand_aliases desc = list(stem.descriptor.remote.get_server_descriptors('9695DFC35FFEB861329B9F1AB04C46397020CE31').run())[0] IndexError: list index out of range --- test/unit/tutorial.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/unit/tutorial.py b/test/unit/tutorial.py index 3c5bfd6..ac0bdd4 100644 --- a/test/unit/tutorial.py +++ b/test/unit/tutorial.py @@ -5,6 +5,8 @@ Tests for the examples given in stem's tutorial. import io import unittest +import stem.descriptor.remote + from stem.control import Controller from stem.descriptor.reader import DescriptorReader from stem.descriptor.server_descriptor import RelayDescriptor @@ -38,6 +40,12 @@ MIRROR_MIRROR_OUTPUT = """\ class TestTutorial(unittest.TestCase): + def tearDown(self): + # Ensure we don't cache a Mock object as our downloader. Otherwise future + # tests will understandably be very sad. :P + + stem.descriptor.remote.SINGLETON_DOWNLOADER = None + @patch('sys.stdout', new_callable = StringIO) @patch('stem.control.Controller.from_port', spec = Controller) def test_the_little_relay_that_could(self, from_port_mock, stdout_mock):

1 0

[stem/master] Use dirauth for last request
by atagar＠torproject.org 08 Mar '16

08 Mar '16

commit 3e0c2f4262d34939046d2f88af1dd0993cf2ef8d Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 6 16:36:46 2016 -0800 Use dirauth for last request When request descriptors we default to using a directory authority for our last attempt if earlier tries failed. Mistakenly we were including fallback directories in this final selection. --- stem/descriptor/remote.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index baba8ac..2374071 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -429,7 +429,12 @@ class Query(object): :returns: **str** for the url being queried by this request """ - if use_authority or not self.endpoints: + if use_authority: + directories = get_authorities().values() + + picked = random.choice(directories) + address, dirport = picked.address, picked.dir_port + elif not self.endpoints: directories = get_authorities().values() + FallbackDirectory.from_cache().values() picked = random.choice(directories)

1 0

[stem/master] Don't use fallback directories when fetching descriptors
by atagar＠torproject.org 08 Mar '16

08 Mar '16

commit 758f632de2acc90bd0d7d1f1022624b723b288ae Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 6 17:13:15 2016 -0800 Don't use fallback directories when fetching descriptors Bah. Added fallback directories into our default pool to lessen load on dirauths, but they can't serve extrainfo descriptors... https://trac.torproject.org/projects/tor/ticket/18489 This is usually fine for tor clients, but not for us. --- docs/change_log.rst | 1 - stem/descriptor/remote.py | 11 +++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 3ce6df2..26e9966 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -61,7 +61,6 @@ The following are only available within Stem's `git repository * `Shorthand functions for stem.descriptor.remote <api/descriptor/remote.html#stem.descriptor.remote.get_instance>`_ * Added `fallback directory information <api/descriptor/remote.html#stem.descriptor.remote.FallbackDirectory>`_. - * Lessened dirauth load of `stem.descriptor.remote <api/descriptor/remote.html>`_ by using fallback directories as well * Support for ed25519 descriptor fields (:spec:`5a79d67`) * Server descriptor validation fails with 'extra-info-digest line had an invalid value' from additions in proposal 228 (:trac:`16227`) * :class:`~stem.descriptor.server_descriptor.BridgeDescriptor` now has 'ntor_onion_key' like its unsanitized counterparts diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 2374071..09aba84 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -429,16 +429,11 @@ class Query(object): :returns: **str** for the url being queried by this request """ - if use_authority: + if use_authority or not self.endpoints: directories = get_authorities().values() picked = random.choice(directories) address, dirport = picked.address, picked.dir_port - elif not self.endpoints: - directories = get_authorities().values() + FallbackDirectory.from_cache().values() - - picked = random.choice(directories) - address, dirport = picked.address, picked.dir_port else: address, dirport = random.choice(self.endpoints) @@ -487,7 +482,7 @@ class DescriptorDownloader(object): def __init__(self, use_mirrors = False, **default_args): self._default_args = default_args - directories = list(get_authorities().values()) + list(FallbackDirectory.from_cache().values()) + directories = list(get_authorities().values()) self._endpoints = [(directory.address, directory.dir_port) for directory in directories] if use_mirrors: @@ -509,7 +504,7 @@ class DescriptorDownloader(object): :raises: **Exception** if unable to determine the directory mirrors """ - directories = get_authorities().values() + FallbackDirectory.from_cache().values() + directories = get_authorities().values() new_endpoints = set([(directory.address, directory.dir_port) for directory in directories]) consensus = list(self.get_consensus(document_handler = stem.descriptor.DocumentHandler.DOCUMENT).run())[0]

1 0

[tor-messenger-build/master] Add a tor-messenger-release makefile rule
by boklm＠torproject.org 08 Mar '16

08 Mar '16

commit be9a70bbc271a0d5eba080c49694b6477c6e31a0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Mar 7 19:45:36 2016 +0100 Add a tor-messenger-release makefile rule This rule will build Tor Messenger for all platforms, rename files to their final name and generate an sha256sums.txt file. --- Makefile | 3 +++ README | 4 ++++ projects/tor-messenger-release/config | 43 +++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/Makefile b/Makefile index f203ea5..0e539d1 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,9 @@ all: tor-messenger tor-messenger: tor-messenger-linux-x86_64 tor-messenger-linux-i686 tor-messenger-windows-i686 tor-messenger-osx-x86_64 +tor-messenger-release: + $(rbm) build tor-messenger-release + tor-mail: tor-mail-linux-x86_64 tor-mail-linux-i686 tor-messenger-linux-x86_64: submodule-update diff --git a/README b/README index cc09732..6b4a642 100644 --- a/README +++ b/README @@ -52,6 +52,10 @@ If you want to build only one architecture, you can run something like The resulting builds are stored in the out/tor-messenger directory. +You can also run "make tor-messenger-release" to build it for all +architectures, rename files to their final name and generate an +sha256sums.txt file in the directory release/$version. + Updating git and hg sources --------------------------- diff --git a/projects/tor-messenger-release/config b/projects/tor-messenger-release/config new file mode 100644 index 0000000..87185ca --- /dev/null +++ b/projects/tor-messenger-release/config @@ -0,0 +1,43 @@ +# vim: filetype=yaml sw=2 +version: '[% c("var/tormessenger_version") %]' +output_dir: 'release' + +input_files: + + - name: linux-x86_64 + project: tor-messenger + target: + - tor-messenger + - linux-x86_64 + + - name: linux-i686 + project: tor-messenger + target: + - tor-messenger + - linux-i686 + + - name: windows-i686 + project: tor-messenger + target: + - tor-messenger + - windows-i686 + + - name: osx-x86_64 + project: tor-messenger + target: + - tor-messenger + - osx-x86_64 + +build: | + #!/bin/sh + set -e + export LC_ALL=C + destdir="[% dest_dir _ '/' _ c("version") %]" + mkdir -p "$destdir" + mv [% c('input_files_by_name/linux-x86_64') %] "$destdir"/tor-messenger-linux64-[% c("version") %]_en-US.tar.xz + mv [% c('input_files_by_name/linux-i686') %] "$destdir"/tor-messenger-linux32-[% c("version") %]_en-US.tar.xz + mv [% c('input_files_by_name/windows-i686') %] "$destdir"/tormessenger-install-[% c("version") %]_en-US.exe + mv [% c('input_files_by_name/osx-x86_64') %] "$destdir"/TorMessenger-[% c("version") %]-osx64_en-US.dmg + cd "$destdir" + sha256sum $(ls -1 *.exe *.tar.xz *.dmg | sort) > sha256sums.txt + cat sha256sums.txt

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 08 Mar '16

08 Mar '16

commit e241df9f2bcd1524836208a84d89272289d5a8c6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 7 20:45:50 2016 +0000 Update translations for tails-misc_completed --- fr.po | 82 +++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/fr.po b/fr.po index 8bf3022..606c792 100644 --- a/fr.po +++ b/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-11 21:00+0100\n" -"PO-Revision-Date: 2016-01-19 20:39+0000\n" +"POT-Creation-Date: 2016-02-24 21:38+0100\n" +"PO-Revision-Date: 2016-03-07 20:34+0000\n" "Last-Translator: Towinet\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -56,30 +56,30 @@ msgid "" "\n" msgstr "<h1>Aidez-nous à corriger votre bogue !</h1>\nLisez <a href=\"%s\">nos instructions de rapport de bogue</a>.\nN'incluez pas plus d'informations personnelles que nécessaire !\n<h2>Nous donner une adresse courriel</h2>\n\nNous donner une adresse courriel nous permet de vous contacter pour clarifier le problème.\nCeci est nécessaire pour la vaste majorité des rapports que nous recevons car la\nplupart des rapports sans information de contact sont inutiles. D'un autre côté,\ncela donne l'occasion aux oreilles électroniques indiscrètes, comme votre fournisseur\nde service Internet ou de courriel, de confirmer que vous utilisez Tails.\n\n" -#: config/chroot_local-includes/usr/local/bin/electrum:14 +#: config/chroot_local-includes/usr/local/bin/electrum:17 msgid "Persistence is disabled for Electrum" msgstr "La persistance est désactivée pour Electrum" -#: config/chroot_local-includes/usr/local/bin/electrum:16 +#: config/chroot_local-includes/usr/local/bin/electrum:19 msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your " "Bitcoin wallet. It is strongly recommended to only run Electrum when its " "persistence feature is activated." msgstr "Lorsque vous redémarrez Tails, toutes les données d'Electrum sont perdues, y compris votre portefeuille Bitcoin. Il est fortement recommandé de n'exécuter Electrum que lorsque la fonction persistance est activée." -#: config/chroot_local-includes/usr/local/bin/electrum:18 +#: config/chroot_local-includes/usr/local/bin/electrum:21 msgid "Do you want to start Electrum anyway?" msgstr "Voulez-vous démarrer Electrum malgré tout ?" -#: config/chroot_local-includes/usr/local/bin/electrum:20 -#: config/chroot_local-includes/usr/local/bin/icedove:22 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 +#: config/chroot_local-includes/usr/local/bin/electrum:23 +#: config/chroot_local-includes/usr/local/bin/icedove:23 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "_Lancer" -#: config/chroot_local-includes/usr/local/bin/electrum:21 -#: config/chroot_local-includes/usr/local/bin/icedove:23 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37 +#: config/chroot_local-includes/usr/local/bin/electrum:24 +#: config/chroot_local-includes/usr/local/bin/icedove:24 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "_Sortir" @@ -240,11 +240,11 @@ msgstr "Voici la sortie de GnuPG :" msgid "Other messages provided by GnuPG:" msgstr "Autres messages fournis par GnuPG :" -#: config/chroot_local-includes/usr/local/bin/icedove:18 +#: config/chroot_local-includes/usr/local/bin/icedove:19 msgid "The Claws Mail persistence feature is activated." msgstr "La fonctionnalité persistance de Claws Mail est activée." -#: config/chroot_local-includes/usr/local/bin/icedove:20 +#: config/chroot_local-includes/usr/local/bin/icedove:21 msgid "" "If you have emails saved in Claws Mail, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" @@ -325,40 +325,40 @@ msgstr "Cette version de Tails a des problèmes de sécurité avérés :" msgid "Known security issues" msgstr "Problèmes de sécurité connus" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 #, sh-format msgid "Network card ${nic} disabled" msgstr "Carte réseau ${nic} désactivée" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing." msgstr "L'usurpation MAC a échoué pour la carte réseau ${nic_name} (${nic}), cette fonctionnalité est donc temporairement désactivée.\nVous pouvez néanmoins redémarrer Tails et désactiver complètement la fonctionnalité d'usurpation MAC." -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:61 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 msgid "All networking disabled" msgstr "Toutes les connexions réseau sont désactivées" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:63 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" "You might prefer to restart Tails and disable MAC spoofing." msgstr "L'usurpation MAC a échoué pour la carte réseau ${nic_name} (${nic}). La récupération d'erreur a également échouée et les fonctionnalités réseau ont donc été désactivées.\nVous pouvez redémarrer Tails et désactiver l'usurpation MAC." -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:18 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:24 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 msgid "error:" msgstr "erreur :" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:23 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:25 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28 msgid "Error" msgstr "Erreur" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:39 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:45 msgid "" "Not enough memory available to check for upgrades.\n" "\n" @@ -397,52 +397,52 @@ msgstr "Le système d'exploitation \"hôte\" et le logiciel de virtualisation pe msgid "Learn more" msgstr "En savoir plus" -#: config/chroot_local-includes/usr/local/bin/tor-browser:29 +#: config/chroot_local-includes/usr/local/bin/tor-browser:40 msgid "Tor is not ready" msgstr "Tor n'est pas opérationnel" -#: config/chroot_local-includes/usr/local/bin/tor-browser:30 +#: config/chroot_local-includes/usr/local/bin/tor-browser:41 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "Tor n'est pas opérationnel. Démarrer malgré tout le navigateur Tor?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:31 +#: config/chroot_local-includes/usr/local/bin/tor-browser:42 msgid "Start Tor Browser" msgstr "Démarrer le navigateur Tor?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:32 +#: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Cancel" msgstr "Annuler" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:33 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38 msgid "Do you really want to launch the Unsafe Browser?" msgstr "Êtes-vous sûr de vouloir utiliser le Navigateur Non-sécurisé ?" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40 msgid "" "Network activity within the Unsafe Browser is not anonymous.\\nOnly " "use the Unsafe Browser if necessary, for example\\nif you have to login or " "register to activate your Internet connection." msgstr "La navigation via le navigateur non-sécurisé n'est pas anonyme. \\nN'utilisez le navigateur non-sécurisé que si c'est nécessaire, par exemple\\n si vous devez vous identifier ou vous enregistrer pour activer votre accès à Internet." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52 msgid "Starting the Unsafe Browser..." msgstr "Démarrage du navigateur non-sécurisé..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 msgid "This may take a while, so please be patient." msgstr "Ceci peut prendre un certain temps, veuillez patienter." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 msgid "Shutting down the Unsafe Browser..." msgstr "Fermeture du Navigateur Non-sécurisé..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:59 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "Ceci peut prendre un certain temps, et vous ne devriez pas redémarrer le navigateur non-sécurisé avant son arrêt complet." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:66 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71 msgid "Failed to restart Tor." msgstr "Le redémarrage de Tor a échoué." @@ -481,40 +481,40 @@ msgstr "Échec de configuration du navigateur." msgid "Failed to run browser." msgstr "Échec de démarrage du navigateur." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:34 msgid "I2P failed to start" msgstr "Le démarrage d'I2P a échoué." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:36 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." msgstr "Une erreur s'est produite au démarrage de I2P. Vérifiez les logs dans /var/log/i2p pour plus d'information." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:52 msgid "I2P's router console is ready" msgstr "La console du routeur I2P est prête" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:54 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 msgid "You can now access I2P's router console in the I2P Browser." msgstr "Vous pouvez maintenant accéder à la console du routeur dans le navigateur I2P." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:58 msgid "I2P is not ready" msgstr "I2P n'est pas prêt" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 msgid "" "Eepsite tunnel not built within six minutes. Check the router console in the" " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " "the network to try again." msgstr "Le tunnel Eepsite n'a pas été construit en six minutes.\nVérifier la console du routeur dans le navigateur I2P ou dans les journaux à /var/log/I2p pour plus d'informations.\nReconnectez-vous au réseau à nouveau." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:71 msgid "I2P is ready" msgstr "I2P est prêt" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:73 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 msgid "You can now access services on I2P." msgstr "Vous pouvez maintenant accéder aux services sur I2P."

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 08 Mar '16

08 Mar '16

commit bf0decd14d5787a554e6d87b17bfe3d45c370082 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 7 20:45:46 2016 +0000 Update translations for tails-misc --- fr.po | 82 +++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/fr.po b/fr.po index 8bf3022..606c792 100644 --- a/fr.po +++ b/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-11 21:00+0100\n" -"PO-Revision-Date: 2016-01-19 20:39+0000\n" +"POT-Creation-Date: 2016-02-24 21:38+0100\n" +"PO-Revision-Date: 2016-03-07 20:34+0000\n" "Last-Translator: Towinet\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -56,30 +56,30 @@ msgid "" "\n" msgstr "<h1>Aidez-nous à corriger votre bogue !</h1>\nLisez <a href=\"%s\">nos instructions de rapport de bogue</a>.\nN'incluez pas plus d'informations personnelles que nécessaire !\n<h2>Nous donner une adresse courriel</h2>\n\nNous donner une adresse courriel nous permet de vous contacter pour clarifier le problème.\nCeci est nécessaire pour la vaste majorité des rapports que nous recevons car la\nplupart des rapports sans information de contact sont inutiles. D'un autre côté,\ncela donne l'occasion aux oreilles électroniques indiscrètes, comme votre fournisseur\nde service Internet ou de courriel, de confirmer que vous utilisez Tails.\n\n" -#: config/chroot_local-includes/usr/local/bin/electrum:14 +#: config/chroot_local-includes/usr/local/bin/electrum:17 msgid "Persistence is disabled for Electrum" msgstr "La persistance est désactivée pour Electrum" -#: config/chroot_local-includes/usr/local/bin/electrum:16 +#: config/chroot_local-includes/usr/local/bin/electrum:19 msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your " "Bitcoin wallet. It is strongly recommended to only run Electrum when its " "persistence feature is activated." msgstr "Lorsque vous redémarrez Tails, toutes les données d'Electrum sont perdues, y compris votre portefeuille Bitcoin. Il est fortement recommandé de n'exécuter Electrum que lorsque la fonction persistance est activée." -#: config/chroot_local-includes/usr/local/bin/electrum:18 +#: config/chroot_local-includes/usr/local/bin/electrum:21 msgid "Do you want to start Electrum anyway?" msgstr "Voulez-vous démarrer Electrum malgré tout ?" -#: config/chroot_local-includes/usr/local/bin/electrum:20 -#: config/chroot_local-includes/usr/local/bin/icedove:22 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 +#: config/chroot_local-includes/usr/local/bin/electrum:23 +#: config/chroot_local-includes/usr/local/bin/icedove:23 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "_Lancer" -#: config/chroot_local-includes/usr/local/bin/electrum:21 -#: config/chroot_local-includes/usr/local/bin/icedove:23 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37 +#: config/chroot_local-includes/usr/local/bin/electrum:24 +#: config/chroot_local-includes/usr/local/bin/icedove:24 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "_Sortir" @@ -240,11 +240,11 @@ msgstr "Voici la sortie de GnuPG :" msgid "Other messages provided by GnuPG:" msgstr "Autres messages fournis par GnuPG :" -#: config/chroot_local-includes/usr/local/bin/icedove:18 +#: config/chroot_local-includes/usr/local/bin/icedove:19 msgid "The Claws Mail persistence feature is activated." msgstr "La fonctionnalité persistance de Claws Mail est activée." -#: config/chroot_local-includes/usr/local/bin/icedove:20 +#: config/chroot_local-includes/usr/local/bin/icedove:21 msgid "" "If you have emails saved in Claws Mail, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" @@ -325,40 +325,40 @@ msgstr "Cette version de Tails a des problèmes de sécurité avérés :" msgid "Known security issues" msgstr "Problèmes de sécurité connus" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 #, sh-format msgid "Network card ${nic} disabled" msgstr "Carte réseau ${nic} désactivée" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing." msgstr "L'usurpation MAC a échoué pour la carte réseau ${nic_name} (${nic}), cette fonctionnalité est donc temporairement désactivée.\nVous pouvez néanmoins redémarrer Tails et désactiver complètement la fonctionnalité d'usurpation MAC." -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:61 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 msgid "All networking disabled" msgstr "Toutes les connexions réseau sont désactivées" -#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:63 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" "You might prefer to restart Tails and disable MAC spoofing." msgstr "L'usurpation MAC a échoué pour la carte réseau ${nic_name} (${nic}). La récupération d'erreur a également échouée et les fonctionnalités réseau ont donc été désactivées.\nVous pouvez redémarrer Tails et désactiver l'usurpation MAC." -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:18 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:24 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 msgid "error:" msgstr "erreur :" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:23 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:25 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28 msgid "Error" msgstr "Erreur" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:39 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:45 msgid "" "Not enough memory available to check for upgrades.\n" "\n" @@ -397,52 +397,52 @@ msgstr "Le système d'exploitation \"hôte\" et le logiciel de virtualisation pe msgid "Learn more" msgstr "En savoir plus" -#: config/chroot_local-includes/usr/local/bin/tor-browser:29 +#: config/chroot_local-includes/usr/local/bin/tor-browser:40 msgid "Tor is not ready" msgstr "Tor n'est pas opérationnel" -#: config/chroot_local-includes/usr/local/bin/tor-browser:30 +#: config/chroot_local-includes/usr/local/bin/tor-browser:41 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "Tor n'est pas opérationnel. Démarrer malgré tout le navigateur Tor?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:31 +#: config/chroot_local-includes/usr/local/bin/tor-browser:42 msgid "Start Tor Browser" msgstr "Démarrer le navigateur Tor?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:32 +#: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Cancel" msgstr "Annuler" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:33 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38 msgid "Do you really want to launch the Unsafe Browser?" msgstr "Êtes-vous sûr de vouloir utiliser le Navigateur Non-sécurisé ?" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40 msgid "" "Network activity within the Unsafe Browser is not anonymous.\\nOnly " "use the Unsafe Browser if necessary, for example\\nif you have to login or " "register to activate your Internet connection." msgstr "La navigation via le navigateur non-sécurisé n'est pas anonyme. \\nN'utilisez le navigateur non-sécurisé que si c'est nécessaire, par exemple\\n si vous devez vous identifier ou vous enregistrer pour activer votre accès à Internet." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52 msgid "Starting the Unsafe Browser..." msgstr "Démarrage du navigateur non-sécurisé..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 msgid "This may take a while, so please be patient." msgstr "Ceci peut prendre un certain temps, veuillez patienter." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 msgid "Shutting down the Unsafe Browser..." msgstr "Fermeture du Navigateur Non-sécurisé..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:59 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "Ceci peut prendre un certain temps, et vous ne devriez pas redémarrer le navigateur non-sécurisé avant son arrêt complet." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:66 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71 msgid "Failed to restart Tor." msgstr "Le redémarrage de Tor a échoué." @@ -481,40 +481,40 @@ msgstr "Échec de configuration du navigateur." msgid "Failed to run browser." msgstr "Échec de démarrage du navigateur." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:34 msgid "I2P failed to start" msgstr "Le démarrage d'I2P a échoué." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:36 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." msgstr "Une erreur s'est produite au démarrage de I2P. Vérifiez les logs dans /var/log/i2p pour plus d'information." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:52 msgid "I2P's router console is ready" msgstr "La console du routeur I2P est prête" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:54 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 msgid "You can now access I2P's router console in the I2P Browser." msgstr "Vous pouvez maintenant accéder à la console du routeur dans le navigateur I2P." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:58 msgid "I2P is not ready" msgstr "I2P n'est pas prêt" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 msgid "" "Eepsite tunnel not built within six minutes. Check the router console in the" " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " "the network to try again." msgstr "Le tunnel Eepsite n'a pas été construit en six minutes.\nVérifier la console du routeur dans le navigateur I2P ou dans les journaux à /var/log/I2p pour plus d'informations.\nReconnectez-vous au réseau à nouveau." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:71 msgid "I2P is ready" msgstr "I2P est prêt" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:73 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 msgid "You can now access services on I2P." msgstr "Vous pouvez maintenant accéder aux services sur I2P."

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 08 Mar '16

08 Mar '16

commit feb0f0dc0c11e5ca625df93408d096d6f402f99a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 7 20:45:15 2016 +0000 Update translations for https_everywhere --- fr/https-everywhere.dtd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index 6e2578c..c3a38b0 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.dtd @@ -14,7 +14,7 @@ <!ENTITY https-everywhere.about.or "ou"> <!ENTITY https-everywhere.about.donate_eff "Faire un Don à EFF"> -<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "Faites un don à EFF"> <!ENTITY https-everywhere.menu.about "À propos de HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory "Préférences de l'Observatoire SSL "> <!ENTITY https-everywhere.menu.globalEnable "Activer HTTPS Everywhere"> @@ -42,15 +42,15 @@ <!ENTITY https-everywhere.chrome.stable_rules_description "Forcer le chiffrement des connexions pour les sites internet suivant:"> <!ENTITY https-everywhere.chrome.experimental_rules "Règles expérimentales"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Peut causer des alertes ou des ruptures. Désactivé par défaut."> -<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site"> -<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site"> -<!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host"> -<!ENTITY https-everywhere.chrome.host "Host:"> -<!ENTITY https-everywhere.chrome.show_advanced "Show advanced"> -<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced"> -<!ENTITY https-everywhere.chrome.rule_name "Rule name"> +<!ENTITY https-everywhere.chrome.add_rule "Ajouter une règle pour ce site"> +<!ENTITY https-everywhere.chrome.add_new_rule "Ajouter une nouvelle règle pour ce site"> +<!ENTITY https-everywhere.chrome.always_https_for_host "Toujours utiliser https pour ce serveur"> +<!ENTITY https-everywhere.chrome.host "Serveur :"> +<!ENTITY https-everywhere.chrome.show_advanced "Montrer l'onglet avancé"> +<!ENTITY https-everywhere.chrome.hide_advanced "Cacher l'onglet avancé"> +<!ENTITY https-everywhere.chrome.rule_name "Nom de la règle"> <!ENTITY https-everywhere.chrome.regex "Matching regex"> -<!ENTITY https-everywhere.chrome.redirect_to "Redirect to"> -<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel"> +<!ENTITY https-everywhere.chrome.redirect_to "Rediriger vers"> +<!ENTITY https-everywhere.chrome.status_cancel_button "Annuler">

1 0