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

[ooni-probe/master] Added a simple tutorial on how to write test helpers.
by art＠torproject.org 30 Jan '16

30 Jan '16

commit d16f45eab8c134634819a301f97623dec935869f Author: seamus tuohy <s2e(a)seamustuohy.com> Date: Mon Jan 18 14:24:59 2016 -0500 Added a simple tutorial on how to write test helpers. --- docs/source/writing_test_helpers.rst | 137 +++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) diff --git a/docs/source/writing_test_helpers.rst b/docs/source/writing_test_helpers.rst new file mode 100644 index 0000000..2206115 --- /dev/null +++ b/docs/source/writing_test_helpers.rst @@ -0,0 +1,137 @@ +Writing Test Helpers +======== + +OONI test helpers are... + +Writing a Censorship Directionality Test Helper +-------------------------- + +Our goal is to write an OONI test helper that helps an OONI-probe client determine the directionality of keyword censorship it has detected. To do this our helper will receive "encoded" data from an OONI-probe client, decode that data into a text string, and send the OONI-probe client a confirmation packet and a second packet containing the decoded string. + +The OONI-backend code-base has many concise examples of test-helpers that you can build off to create your own. For this tutorial I used the `TCP echo test-helper <https://github.com/TheTorProject/ooni-backend/blob/479a1bb154037b834292ccc4…>` as my guide. + +Following this tutorial requires basic knowledge of event-driven programming (specifically 'Twisted'). You will be more than ready to build and implement a test-helper after reading though one or two `tutorials online. <http://krondo.com/?page_id=1327>` + +Creating the test helper +-------------- + +OONI-backend keeps all the test-helpers in the `oonib/testhelpers directory <https://github.com/TheTorProject/ooni-backend/tree/master/oonib/testhelpers>` Each individual test helper is a twisted service. Most of the current test-helpers consists of a twisted Factory and a twisted Protocol defined in the test helpers directory and a `stock Twisted Server <https://twistedmatrix.com/documents/current/api/twisted.application.interne…>` that is defined in the backend code. We will follow this model in the tutorial. + +Because of how simple this example test-helper is the job of our test-helper factory is merely to deploy a single instance of our protocol each time it's buildProtocol method is called. Because we have our factory inheret from the base `Factory object <https://twistedmatrix.com/trac/browser/tags/releases/twisted-15.5.0/twisted…>` we merely have to define its ``protocol`` property to point to our protocol.:: + + class TCPDirectionalityTestHelper(Factory): + """ + A test helper for checking for directionality of censorship + """ + protocol = TCPDirectionalityTestProtocol + + +The protocol for this helper needs to do two things. First, upon receiving encoded data it needs to send the OONI-probe client back confirmation that the data has been received. Second, it needs to send the decoded data back to the OONI-probe client. Because we are extending the `Protocol object <https://twistedmatrix.com/trac/browser/tags/releases/twisted-15.5.0/twisted…>` we can rewrite its ``dataReceived`` method which is called and passed data whenever it is received.:: + + + class TCPDirectionalityTestProtocol(Protocol): + """Takes encoded packet data, decodes it, and then sends it back. + + This protocol sends two packets in response to an encoded packet. + It first sends a confirmation packet, and then follows with a packet + containing the decoded data requested from the test. + """ + def dataReceived(self, data): + # send back receipt of the packet + self.transport.write(data) + # send back the decoded term to test against. + original_string = data.decode("rot13").decode("unicode-escape").encode("utf-8") + self.transport.write(original_string) + + +In order to make this test-helper slightly more flexible we will be allowing the backend to determine the encoding within their config file. To this end we will have to retreive the encoding from the config file.:: + + + def dataReceived(self, data): + # send back receipt of the packet + self.transport.write(data) + + # Get the encoding from the config or fallback to rot13 + if config.helpers['tcp-directionality'].encoding: + tcp_dir_encoding = config.helpers['tcp-directionality'].encoding + else: + tcp_dir_encoding = "rot13" + + # send back the decoded term to test against. + original_string = data.decode("rot13").decode("unicode-escape").encode("utf-8") + self.transport.write(original_string) + + +With this added we have completed the base of simple test-helper and now just have to integrate it into the rest of the backend. + + +Adding the helper to the config file +------ + +OONI-backend uses a config file located at `/etc/oonibackend.conf <https://github.com/TheTorProject/ooni-backend/blob/master/oonib.conf.example>`. This file contains a `section where each test-helper can be configured. <https://github.com/TheTorProject/ooni-backend/blob/479a1bb154037b834292ccc4…>`. + +The test-helper will need to be given a unique identifyer so that it can be called from the config file. In this example we use ``tcp-directionality`` as our identifyer. + +For a helper to be used in the ooni-backend it needs to be given an identifyer so that it can be called from the config file.:: + + tcp-echo: + encoding: rot13 + port: 57009 + +Adding the helper to the backend +------ + +For a helper to be integrated into the ooni-backend it needs to be added to the initialization scripts contained within `oonibackend.py <https://github.com/TheTorProject/ooni-backend/blob/master/oonib/oonibackend…>`. + +The OONI test-helper system is a collection of `Twisted services <https://twistedmatrix.com/documents/current/core/howto/application.html>`. For our test-helper we will need to define a service that will run our test-helper factory.:: + + # Create the service that will run our test-helpers factory. + tcp_directionality_helper = internet.TCPServer(int(port), + tcp_helpers.TCPDirectionalityTestHelper()) + +**NOTE:** In this example I have placed the original service in the existing tcp_helpers file. If you created your own file for your test-helper you will have to make sure that you import that file at the top of `oonibackend.py <https://github.com/TheTorProject/ooni-backend/blob/master/oonib/oonibackend…>`. + +OONI uses a `Multi Service <https://twistedmatrix.com/documents/current/api/twisted.application.service…>` which allows them to combine all the OONI test-helpers and the report-collector into a singlular service for easier management. The next step for creating our test-helper is to add it to the OONI-backend `multiService <https://github.com/TheTorProject/ooni-backend/blob/479a1bb154037b834292ccc4…>`:: + + # Add the helper as a child of the backends multi-service test-helper + multiService.addService(tcp_directionality_helper) + +Finally, we need to start our service.:: + + # Start the test-helpers service + tcp_directionality_helper.startService() + +In order for our test-helper to be managed using the backend config file we will need to modify this code to check the config file for a test-helper that uses the identifyer we selected earlier. For the directionality helper we check to see if our test-helper had its port specified in the config file to determine if it should be run. I also added a default encoding in case + +This snippet contains the final code that would be inserted into `oonibackend.py <https://github.com/TheTorProject/ooni-backend/blob/master/oonib/oonibackend…>`.:: + + # Check to see if our test-helper was defined in the config + if config.helpers['tcp-directionality'].port: + print "Starting TCP directionality helper on %s" % config.helpers['tcp-directionality'].port + + # Check for encoding in our config file and set default if missing + if config.helpers['tcp-directionality'].encoding: + tcp_dir_encoding = config.helpers['tcp-directionality'].encoding + else: + tcp_dir_encoding = "rot13" + # Get & set the port and encoding from our config file + tcp_directionality_helper = internet.TCPServer(int(config.helpers['tcp-directionality'].port), + tcp_helpers.TCPDirectionalityTestHelper(tcp_dir_encoding)) + + # Add the helper as a child of the backends multi-service test-helper + multiService.addService(tcp_directionality_helper) + + # Start the test-helpers service + tcp_directionality_helper.startService() + + +Requiring the helper in a test +------------- + +If you are creating tests that rely on custom test-hepers you will want to make sure that you do not get innacturate results because your test-helper being missing in the OONI-backend you are testing against. You can specify required test-helpers within a OONI-probe test by setting its ``requiredTestHelpers`` property. In this example we have made our test helper require the tcp-directionality test that we created above.:: + + class MyDirectionalityTest(nettest.NetTestCase): + """ An example test.""" + + requiredTestHelpers = {'backend': 'tcp-directionality'} + ...

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 30 Jan '16

30 Jan '16

commit d5218bb5c5ea4c157ff1c84eeafacbc40587319d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 30 16:45:16 2016 +0000 Update translations for https_everywhere --- mr/https-everywhere.dtd | 8 ++++---- mr/https-everywhere.properties | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mr/https-everywhere.dtd b/mr/https-everywhere.dtd index 154f607..9ba278a 100644 --- a/mr/https-everywhere.dtd +++ b/mr/https-everywhere.dtd @@ -16,10 +16,10 @@ <!ENTITY https-everywhere.menu.about "सर्वत्र HTTPS बद्दल"> <!ENTITY https-everywhere.menu.observatory "एसएसएल प्राधान्ये"> -<!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests"> -<!ENTITY https-everywhere.menu.showCounter "Show Counter"> +<!ENTITY https-everywhere.menu.globalEnable "सर्वत्र HTTPS सक्षम करा"> +<!ENTITY https-everywhere.menu.globalDisable "सर्वत्र HTTPS अक्षम करा"> +<!ENTITY https-everywhere.menu.blockHttpRequests "सर्व HTTP विनंत्यां बंद करा"> +<!ENTITY https-everywhere.menu.showCounter "काउंटर दाखवा"> <!ENTITY https-everywhere.menu.viewAllRules "View All Rules"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences"> diff --git a/mr/https-everywhere.properties b/mr/https-everywhere.properties index be83831..c12fb3e 100644 --- a/mr/https-everywhere.properties +++ b/mr/https-everywhere.properties @@ -1,5 +1,5 @@ -https-everywhere.menu.globalEnable = Enable HTTPS Everywhere -https-everywhere.menu.globalDisable = Disable HTTPS Everywhere +https-everywhere.menu.globalEnable = सर्वत्र HTTPS सक्षम करा +https-everywhere.menu.globalDisable = सर्वत्र HTTPS अक्षम करा https-everywhere.menu.enableDisable = Enable / Disable Rules https-everywhere.menu.noRules = (No Rules for This Page) https-everywhere.menu.unknownRules = (Rules for This Page Unknown)

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 30 Jan '16

30 Jan '16

commit 021aa7c4fab9f743b964401a81b49995cd2525a1 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 30 14:45:30 2016 +0000 Update translations for liveusb-creator --- mr/mr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mr/mr.po b/mr/mr.po index 6a784f4..d224efc 100644 --- a/mr/mr.po +++ b/mr/mr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2015-11-03 09:24+0000\n" +"PO-Revision-Date: 2016-01-30 14:27+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Marathi (http://www.transifex.com/otf/torproject/language/mr/)\n" "MIME-Version: 1.0\n" @@ -604,4 +604,4 @@ msgstr "" #: ../liveusb/dialog.py:162 msgid "or" -msgstr "" +msgstr "किंवा"

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 30 Jan '16

30 Jan '16

commit 048e663bb115942864bbc6b963d15c7d26610728 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 30 14:45:21 2016 +0000 Update translations for https_everywhere --- mr/https-everywhere.dtd | 28 ++++++++++++++-------------- mr/ssl-observatory.dtd | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/mr/https-everywhere.dtd b/mr/https-everywhere.dtd index ac40971..154f607 100644 --- a/mr/https-everywhere.dtd +++ b/mr/https-everywhere.dtd @@ -1,21 +1,21 @@ -<!ENTITY https-everywhere.about.title "About HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites."> +<!ENTITY https-everywhere.about.title "HTTPS सर्वत्र बद्दल"> +<!ENTITY https-everywhere.about.ext_name "HTTPS सर्वत्र"> +<!ENTITY https-everywhere.about.ext_description "वेब कूटबद्ध करा ! आपोआप अनेक साइटवर HTTPS सुरक्षा वापरा."> <!ENTITY https-everywhere.about.version "आवृत्ती"> -<!ENTITY https-everywhere.about.created_by "Created by"> -<!ENTITY https-everywhere.about.and ", and"> -<!ENTITY https-everywhere.about.librarians "Ruleset Librarians"> +<!ENTITY https-everywhere.about.created_by "ने निर्मित"> +<!ENTITY https-everywhere.about.and ", आणि"> +<!ENTITY https-everywhere.about.librarians "नियमावली संचय"> <!ENTITY https-everywhere.about.thanks "धन्यवाद"> -<!ENTITY https-everywhere.about.many_contributors "Many many contributors, including"> +<!ENTITY https-everywhere.about.many_contributors "अनेक योगदानकर्ते, यासह"> <!ENTITY https-everywhere.about.noscript "Also, portions of HTTPS Everywhere are based on code from NoScript, by Giorgio Maone and others. We are grateful for their excellent work!"> -<!ENTITY https-everywhere.about.contribute "If you like HTTPS Everywhere, you might consider"> -<!ENTITY https-everywhere.about.donate_tor "Donating to Tor"> -<!ENTITY https-everywhere.about.tor_lang_code "en"> -<!ENTITY https-everywhere.about.or "or"> -<!ENTITY https-everywhere.about.donate_eff "Donating to EFF"> +<!ENTITY https-everywhere.about.contribute "आपणास सर्वत्र HTTPS आवडत असेल तर, विचार करा"> +<!ENTITY https-everywhere.about.donate_tor "टोर ला देणगी देण्यासाठी"> +<!ENTITY https-everywhere.about.tor_lang_code "इ एन"> +<!ENTITY https-everywhere.about.or "किंवा"> +<!ENTITY https-everywhere.about.donate_eff "इ एफ एफ ला देणगी देण्यासाठी "> -<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences"> +<!ENTITY https-everywhere.menu.about "सर्वत्र HTTPS बद्दल"> +<!ENTITY https-everywhere.menu.observatory "एसएसएल प्राधान्ये"> <!ENTITY https-everywhere.menu.globalEnable "Enable HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "Disable HTTPS Everywhere"> <!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests"> diff --git a/mr/ssl-observatory.dtd b/mr/ssl-observatory.dtd index e3bc42c..633d8a1 100644 --- a/mr/ssl-observatory.dtd +++ b/mr/ssl-observatory.dtd @@ -86,7 +86,7 @@ looked at. Mouseover the options for further details:"> <!ENTITY ssl-observatory.prefs.show "Show advanced options"> -<!ENTITY ssl-observatory.prefs.title "SSL Observatory Preferences"> +<!ENTITY ssl-observatory.prefs.title "एसएसएल प्राधान्ये"> <!ENTITY ssl-observatory.prefs.use "Use the Observatory?"> <!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">

1 0

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

30 Jan '16

commit 3fd4ce54b8e820bfcddeb3eed36f0606b3a2e8f7 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 30 14:45:02 2016 +0000 Update translations for bridgedb --- mr/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mr/LC_MESSAGES/bridgedb.po b/mr/LC_MESSAGES/bridgedb.po index eb8cead..742e799 100644 --- a/mr/LC_MESSAGES/bridgedb.po +++ b/mr/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-01-30 14:14+0000\n" +"PO-Revision-Date: 2016-01-30 14:16+0000\n" "Last-Translator: Vikrant Korde <vikrant.korde(a)gmail.com>\n" "Language-Team: Marathi (http://www.transifex.com/otf/torproject/language/mr/)\n" "MIME-Version: 1.0\n" @@ -343,7 +343,7 @@ msgstr "" msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "" +msgstr "आपला इंटरनेट सेवा प्रदाता (ISP) टोर कनेक्शन ब्लॉक किंवा सेन्सॉर \nकरते आहे का?" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:159

1 0

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

30 Jan '16

commit df374d04fa2a0088322d1b2e73909b18f2f14615 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 30 14:15:03 2016 +0000 Update translations for bridgedb --- mr/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mr/LC_MESSAGES/bridgedb.po b/mr/LC_MESSAGES/bridgedb.po index 0c0318c..eb8cead 100644 --- a/mr/LC_MESSAGES/bridgedb.po +++ b/mr/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-01-30 12:12+0000\n" +"PO-Revision-Date: 2016-01-30 14:14+0000\n" "Last-Translator: Vikrant Korde <vikrant.korde(a)gmail.com>\n" "Language-Team: Marathi (http://www.transifex.com/otf/torproject/language/mr/)\n" "MIME-Version: 1.0\n" @@ -259,7 +259,7 @@ msgstr "" #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" -msgstr "" +msgstr "मला ब्रिजेस मिळवण्यासाठी पर्यायी मार्ग हवा आहे!" #: bridgedb/strings.py:108 #, python-format @@ -271,13 +271,13 @@ msgstr "" #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" -msgstr "" +msgstr "माझे ब्रिजेस कार्य करत नाही! मला मदत हवी आहे!" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "" +msgstr "आपले टोर चालत नसेल तर, %s इथे ईमेल करा." #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser".

1 0

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

30 Jan '16

commit d3aaf72e259f51a94c1e991539aff135e8d27718 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 30 13:45:03 2016 +0000 Update translations for bridgedb --- sr(a)latin/LC_MESSAGES/bridgedb.po | 56 ++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/sr(a)latin/LC_MESSAGES/bridgedb.po b/sr(a)latin/LC_MESSAGES/bridgedb.po index 45ff5c2..ae69a54 100644 --- a/sr(a)latin/LC_MESSAGES/bridgedb.po +++ b/sr(a)latin/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-01-30 13:15+0000\n" +"PO-Revision-Date: 2016-01-30 13:41+0000\n" "Last-Translator: Dejan Andric <el.dejan.andric(a)gmail.com>\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/otf/torproject/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -56,11 +56,11 @@ msgstr "Označite sve" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "" +msgstr "Prikaži QR kodnu sliku" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "" +msgstr "QR kodna slika za spajanje ruta" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -69,58 +69,58 @@ msgstr "" #: bridgedb/https/templates/bridges.html:67 #: bridgedb/https/templates/bridges.html:125 msgid "Uh oh, spaghettios!" -msgstr "" +msgstr "Opa, špagete!" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "" +msgstr "Čini se da se dogodila greška prilikom prijema QR koda." #: 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 "" +msgstr "Ovaj QR kod sadrži vaše rute. Skenirajte pomoću QR čitača da biste kopirali rute na svoj mobilni ili neki drugi uređaj." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "" +msgstr "Trenutno nema slobodnih ruta..." #: bridgedb/https/templates/bridges.html:132 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "" +msgstr "Bilo bi dobro da načinite %s korak unazad %s i odaberete drugi način rutiranja!" #: bridgedb/https/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "Korak %s1%s" #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "" +msgstr "Svucite %s Tor Pregledač %s" #: bridgedb/https/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "" +msgstr "Korak %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "" +msgstr "Unesi %s rute %s" #: bridgedb/https/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "" +msgstr "Korak %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" +msgstr "Sada je potrebno %s dodati rute u Tor Pregledač %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -129,11 +129,11 @@ msgstr "" #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "" +msgstr "%sS%samo mi prikaži rute!" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" -msgstr "" +msgstr "Napredna podešavanja" #: bridgedb/https/templates/options.html:86 msgid "No" @@ -141,7 +141,7 @@ msgstr "Ne" #: bridgedb/https/templates/options.html:87 msgid "none" -msgstr "" +msgstr "bez" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -149,7 +149,7 @@ msgstr "" #: bridgedb/https/templates/options.html:124 #, python-format msgid "%sY%ses!" -msgstr "" +msgstr "%sD%sa!" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -157,50 +157,50 @@ msgstr "" #: bridgedb/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "" +msgstr "%sU%snesi Rute" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" -msgstr "" +msgstr "[Automatska poruka; Molimo Vas da na ovu poruku ne odgovarate.]" #: bridgedb/strings.py:45 msgid "Here are your bridges:" -msgstr "" +msgstr "Ovo su vaše rute:" #: 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 "" +msgstr "Premašena brzina slanja. Molimo usporite! Vreme između slanja dve email poruke je %s sati. Sve email poruke unutar ovog vremenskog okvira biće zanemarene." #: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "" +msgstr "KOMANDE: (kombinujte KOMANDE da označite više izbora istovremeno)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" -msgstr "" +msgstr "Dobrodošli na BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" -msgstr "" +msgstr "Trenutno su podržani ovi TIPOVI prenosa:" #: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" -msgstr "" +msgstr "Hej, %s!" #: bridgedb/strings.py:57 msgid "Hello, friend!" -msgstr "" +msgstr "Zdravo, drugar!" #: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" -msgstr "" +msgstr "Javni Ključ" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles

1 0

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

30 Jan '16

commit eefe647f5c18fd899963108a281525bd1dcef770 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 30 13:15:03 2016 +0000 Update translations for bridgedb --- sr(a)latin/LC_MESSAGES/bridgedb.po | 338 ++++++++++++++++++++------------------- 1 file changed, 170 insertions(+), 168 deletions(-) diff --git a/sr(a)latin/LC_MESSAGES/bridgedb.po b/sr(a)latin/LC_MESSAGES/bridgedb.po index 466542b..45ff5c2 100644 --- a/sr(a)latin/LC_MESSAGES/bridgedb.po +++ b/sr(a)latin/LC_MESSAGES/bridgedb.po @@ -3,17 +3,19 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Dejan Andric <el.dejan.andric(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: Serbian (Latin) (http://www.transifex.com/projects/p/torproject/language/sr@latin/)\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-01-30 13:15+0000\n" +"Last-Translator: Dejan Andric <el.dejan.andric(a)gmail.com>\n" +"Language-Team: Serbian (Latin) (http://www.transifex.com/otf/torproject/language/sr@latin/)\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: sr@latin\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" @@ -28,57 +30,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 "Izvinjenje! Dogodila se greška prilikom slanja zahteva." + +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "Prijavite smetnju" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "Izvorni kod programa" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "Sve promene" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "Stupite u vezu" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "Označite sve" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." msgstr "" -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "" + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "" + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "Ne" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "" -#: 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 "" #. 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 "" -#: 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" @@ -89,7 +216,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" @@ -100,7 +227,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" @@ -112,7 +239,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" @@ -121,20 +248,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" @@ -142,12 +269,12 @@ 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 "" #. 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 "" @@ -155,48 +282,48 @@ msgstr "" #. 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 "" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "" -#: 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" @@ -205,21 +332,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 "" #. 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 "" #. 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" @@ -227,153 +354,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: 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 "" #. 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 "" - -#: 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 "" - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "" - -#: 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 "Ne" - -#: 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

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

30 Jan '16

commit 6fd43e73988c7a0bc7ae5c128eeca85d733b072e Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 30 12:45:53 2016 +0000 Update translations for tails-misc_completed --- pt_BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 64ae4d6..c2e3a75 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -21,9 +21,9 @@ 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-26 04:08+0000\n" -"Last-Translator: Leonardo Vieira de Souza <leonardo.v.souza(a)gmail.com>\n" +"POT-Creation-Date: 2016-01-25 17:49+0100\n" +"PO-Revision-Date: 2016-01-30 12:31+0000\n" +"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

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

30 Jan '16

commit 6c72a7db30401a71a0da07e6eb980b182fdff81f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 30 12:45:47 2016 +0000 Update translations for tails-misc --- pt_BR.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 64ae4d6..c2e3a75 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -21,9 +21,9 @@ 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-26 04:08+0000\n" -"Last-Translator: Leonardo Vieira de Souza <leonardo.v.souza(a)gmail.com>\n" +"POT-Creation-Date: 2016-01-25 17:49+0100\n" +"PO-Revision-Date: 2016-01-30 12:31+0000\n" +"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0