October 2015 - tor-commits - lists.torproject.org

[stem/master] Compare descriptor parsing libraries
by atagar＠torproject.org 18 Oct '15

18 Oct '15

commit d6985eeec6d42ddcf043f898e4a0a2026a56dd48 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 18 14:34:46 2015 -0700 Compare descriptor parsing libraries First step for the scheme Karsten and I hatched to comparing our libraries... https://lists.torproject.org/pipermail/tor-dev/2015-October/009606.html This is the easy part. Next up need to write some metrics-lib scripts to get some performance benchmarks... --- docs/_static/style.css | 10 ++++++ docs/tutorials/mirror_mirror_on_the_wall.rst | 42 ++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/docs/_static/style.css b/docs/_static/style.css index 098529d..fe9db20 100644 --- a/docs/_static/style.css +++ b/docs/_static/style.css @@ -5,3 +5,13 @@ div.literal-block-wrapper { span.caption-text { float: right; } + +span.red { + color: red; + font-weight: bold; +} + +span.green { + color: green; + font-weight: bold; +} diff --git a/docs/tutorials/mirror_mirror_on_the_wall.rst b/docs/tutorials/mirror_mirror_on_the_wall.rst index 2677aeb..1e6aadc 100644 --- a/docs/tutorials/mirror_mirror_on_the_wall.rst +++ b/docs/tutorials/mirror_mirror_on_the_wall.rst @@ -12,6 +12,7 @@ with what they are and where to get them then you may want to skip to the end. * :ref:`validating-the-descriptors-content` * :ref:`saving-and-loading-descriptors` * :ref:`putting-it-together` +* :ref:`are-there-any-other-parsing-libraries` .. _what-is-a-descriptor: @@ -248,3 +249,44 @@ could use any of the methods above, but for this example we'll use 14. politkovskaja2 (24.93 MB/s) 15. wau (24.72 MB/s) +.. _are-there-any-other-parsing-libraries: + +Are there any other parsing libraries? +-------------------------------------- + +Yup! Stem isn't the only game in town when it comes to parsing. `Metrics-lib +<https://gitweb.torproject.org/metrics-lib.git/>`_ is a highly mature parsing +library for Java, and `Zoossh +<https://gitweb.torproject.org/user/phw/zoossh.git/>`_ is available for Go. +Each library has its own capabilities... + +.. role:: red +.. role:: green + +=========================== ================= =============== ============== +Capability Stem Metrics-lib Zoossh +=========================== ================= =============== ============== +Language :green:`Python` :green:`Java` :green:`Go` +Checks signatures :green:`Mostly` :red:`No` :red:`No` +Create new descriptors :red:`No` :red:`No` :red:`No` +Lazy parsing :green:`Yes` :red:`No` :green:`Yes` +Type detection by @type :green:`Yes` :green:`Yes` :red:`No` +Type detection by filename :green:`Yes` :red:`No` :red:`No` +Packages :green:`Several` :red:`None` :red:`None` +**Can Read/Download From** +Files :green:`Yes` :green:`Yes` :green:`Yes` +Tarballs :green:`Yes` :green:`Yes` :red:`No` +Directory Authorities :green:`Yes` :green:`Yes` :red:`No` +CollecTor :red:`No` :green:`Yes` :red:`No` +**Supported Types** +Server Descriptors :green:`Yes` :green:`Yes` :green:`Partly` +Extrainfo Descriptors :green:`Yes` :green:`Yes` :red:`No` +Microdescriptors :green:`Yes` :green:`Yes` :red:`No` +Consensus :green:`Yes` :green:`Yes` :green:`Partly` +Bridge Descriptors :green:`Yes` :green:`Yes` :red:`No` +Hidden Service Descriptors :green:`Yes` :red:`No` :red:`No` +Bridge Pool Assignments :red:`No` :green:`Yes` :red:`No` +Torperf :red:`No` :green:`Yes` :red:`No` +Tordnsel :green:`Yes` :green:`Yes` :red:`No` +=========================== ================= =============== ============== +

1 0

[metrics-db/master] Rename directories to match what's served in recent/.
by karsten＠torproject.org 18 Oct '15

18 Oct '15

commit 812b87e4c257dc2233c1d80bd231b34ff3e0afab Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Oct 18 22:49:44 2015 +0200 Rename directories to match what's served in recent/. --- .../torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java | 4 ++-- src/org/torproject/ernie/db/relaydescs/ArchiveWriter.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java index 7311e9a..3bccd6f 100644 --- a/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/bridgedescs/SanitizedBridgesWriter.java @@ -914,7 +914,7 @@ public class SanitizedBridgesWriter extends Thread { + descriptorDigest.charAt(1) + "/" + descriptorDigest); File rsyncCatFile = new File("rsync/bridge-descriptors/" - + "server-descriptors-cat/" + this.rsyncCatString + + "server-descriptors/" + this.rsyncCatString + "-server-descriptors.tmp"); File[] outputFiles = new File[] { tarballFile, rsyncCatFile }; boolean[] append = new boolean[] { false, true }; @@ -1187,7 +1187,7 @@ public class SanitizedBridgesWriter extends Thread { + descriptorDigest.charAt(1) + "/" + descriptorDigest); File rsyncCatFile = new File("rsync/bridge-descriptors/" - + "extra-infos-cat/" + this.rsyncCatString + "-extra-infos.tmp"); + + "extra-infos/" + this.rsyncCatString + "-extra-infos.tmp"); File[] outputFiles = new File[] { tarballFile, rsyncCatFile }; boolean[] append = new boolean[] { false, true }; try { diff --git a/src/org/torproject/ernie/db/relaydescs/ArchiveWriter.java b/src/org/torproject/ernie/db/relaydescs/ArchiveWriter.java index 1304cd5..1bee4d4 100644 --- a/src/org/torproject/ernie/db/relaydescs/ArchiveWriter.java +++ b/src/org/torproject/ernie/db/relaydescs/ArchiveWriter.java @@ -465,7 +465,7 @@ public class ArchiveWriter extends Thread { + digest); boolean tarballFileExistedBefore = tarballFile.exists(); File rsyncCatFile = new File("rsync/relay-descriptors/" - + "server-descriptors-cat/" + this.rsyncCatString + + "server-descriptors/" + this.rsyncCatString + "-server-descriptors.tmp"); File[] outputFiles = new File[] { tarballFile, rsyncCatFile }; boolean[] append = new boolean[] { false, true }; @@ -497,7 +497,7 @@ public class ArchiveWriter extends Thread { + extraInfoDigest); boolean tarballFileExistedBefore = tarballFile.exists(); File rsyncCatFile = new File("rsync/relay-descriptors/" - + "extra-infos-cat/" + this.rsyncCatString + "-extra-infos.tmp"); + + "extra-infos/" + this.rsyncCatString + "-extra-infos.tmp"); File[] outputFiles = new File[] { tarballFile, rsyncCatFile }; boolean[] append = new boolean[] { false, true }; if (this.store(EXTRA_INFO_ANNOTATION, data, outputFiles, append)) { @@ -533,7 +533,7 @@ public class ArchiveWriter extends Thread { + microdescriptorDigest); boolean tarballFileExistedBefore = tarballFile.exists(); File rsyncCatFile = new File("rsync/relay-descriptors/" - + "microdescs/micro-cat/" + this.rsyncCatString + + "microdescs/micro/" + this.rsyncCatString + "-micro.tmp"); File[] outputFiles = new File[] { tarballFile, rsyncCatFile }; boolean[] append = new boolean[] { false, true };

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 18 Oct '15

18 Oct '15

commit c33d89d0fc592754fa7bd19ae3dda2834e579304 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 18 20:15:42 2015 +0000 Update translations for tor-launcher-network-settings_completed --- id/network-settings.dtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/id/network-settings.dtd b/id/network-settings.dtd index e410043..2062d8c 100644 --- a/id/network-settings.dtd +++ b/id/network-settings.dtd @@ -1,5 +1,9 @@ <!ENTITY torsettings.dialog.title "Pengaturan Jaringan Tor"> + +<!ENTITY torlauncher.localePicker.title "Bahasa Peramban Tor"> +<!ENTITY torlauncher.localePicker.prompt "Silahkan pilih bahasa."> +  <!ENTITY torsettings.prompt "Sebelum Anda terhubung ke jaringan Tor, Anda perlu memberikan informasi tentang koneksi internet komputer ini.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 18 Oct '15

18 Oct '15

commit 2e0784c856dfe343ecc5800a036e96385d32ac87 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 18 20:15:38 2015 +0000 Update translations for tor-launcher-network-settings --- id/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/id/network-settings.dtd b/id/network-settings.dtd index 8089887..2062d8c 100644 --- a/id/network-settings.dtd +++ b/id/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Pengaturan Jaringan Tor">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "Bahasa Peramban Tor"> +<!ENTITY torlauncher.localePicker.prompt "Silahkan pilih bahasa.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 18 Oct '15

18 Oct '15

commit 0409c31ddc6f442b2224ac5398b9b0ed92f17f89 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 18 19:45:39 2015 +0000 Update translations for tor-launcher-network-settings --- fr/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/network-settings.dtd b/fr/network-settings.dtd index c9ed25c..9b4f6d0 100644 --- a/fr/network-settings.dtd +++ b/fr/network-settings.dtd @@ -2,7 +2,7 @@  <!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.prompt "Merci de sélectionner une langue.">

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 18 Oct '15

18 Oct '15

commit 0d88c129c5cd9f10b4d640516a5df8c8e62747d6 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 18 18:45:21 2015 +0000 Update translations for https_everywhere_completed --- tr/https-everywhere.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/https-everywhere.properties b/tr/https-everywhere.properties index 7375f42..7666fa4 100644 --- a/tr/https-everywhere.properties +++ b/tr/https-everywhere.properties @@ -4,5 +4,5 @@ https-everywhere.menu.enableDisable = Kuralları Etkinleştir / Etkisizleştir https-everywhere.menu.noRules = (Bu Sayfa için Kural Yok) https-everywhere.menu.unknownRules = (Bu Sayfanın Kuralları Bilinmiyor) https-everywhere.toolbar.hint = HTTPS Everywhere kullanılıyor. Adres çubuğundaki simgeye tıklayarak istediğiniz siteler için açıp kapatabilirsiniz. -https-everywhere.migration.notification0 = Bu güncelleme, önemli bir düzeltmeyi uygulamak için, HTTPS Everywhere kural ayarlarınızı varsayılan değerlerine çevirir. -https-everywhere.menu.ruleset-tests = HTTPS Everywhere Kural Kümesi Sınamalarını Yap +https-everywhere.migration.notification0 = Bu güncelleme, önemli bir düzeltmeyi uygulamak için HTTPS Everywhere kural ayarlarınızı varsayılan değerlerine sıfırlar. +https-everywhere.menu.ruleset-tests = HTTPS Everywhere Kural Kümesi Sınamalarını Çalıştır

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 18 Oct '15

18 Oct '15

commit 15e9c0eec22787e309657495d2c6cd8293a93a2e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 18 18:45:16 2015 +0000 Update translations for https_everywhere --- tr/https-everywhere.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/https-everywhere.properties b/tr/https-everywhere.properties index 7375f42..7666fa4 100644 --- a/tr/https-everywhere.properties +++ b/tr/https-everywhere.properties @@ -4,5 +4,5 @@ https-everywhere.menu.enableDisable = Kuralları Etkinleştir / Etkisizleştir https-everywhere.menu.noRules = (Bu Sayfa için Kural Yok) https-everywhere.menu.unknownRules = (Bu Sayfanın Kuralları Bilinmiyor) https-everywhere.toolbar.hint = HTTPS Everywhere kullanılıyor. Adres çubuğundaki simgeye tıklayarak istediğiniz siteler için açıp kapatabilirsiniz. -https-everywhere.migration.notification0 = Bu güncelleme, önemli bir düzeltmeyi uygulamak için, HTTPS Everywhere kural ayarlarınızı varsayılan değerlerine çevirir. -https-everywhere.menu.ruleset-tests = HTTPS Everywhere Kural Kümesi Sınamalarını Yap +https-everywhere.migration.notification0 = Bu güncelleme, önemli bir düzeltmeyi uygulamak için HTTPS Everywhere kural ayarlarınızı varsayılan değerlerine sıfırlar. +https-everywhere.menu.ruleset-tests = HTTPS Everywhere Kural Kümesi Sınamalarını Çalıştır

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 18 Oct '15

18 Oct '15

commit 0b3d299e29cf422f57710e7e2886f79686b3b92a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 18 18:15:21 2015 +0000 Update translations for https_everywhere_completed --- tr/https-everywhere.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/https-everywhere.properties b/tr/https-everywhere.properties index 5702a91..7375f42 100644 --- a/tr/https-everywhere.properties +++ b/tr/https-everywhere.properties @@ -1,6 +1,6 @@ https-everywhere.menu.globalEnable = HTTPS Everywhere'i Etkinleştir -https-everywhere.menu.globalDisable = HTTPS Everywhere'i Devre Dışı Bırak -https-everywhere.menu.enableDisable = Kuralları Aç / Kapat +https-everywhere.menu.globalDisable = HTTPS Everywhere'i Etkisizleştir +https-everywhere.menu.enableDisable = Kuralları Etkinleştir / Etkisizleştir https-everywhere.menu.noRules = (Bu Sayfa için Kural Yok) https-everywhere.menu.unknownRules = (Bu Sayfanın Kuralları Bilinmiyor) https-everywhere.toolbar.hint = HTTPS Everywhere kullanılıyor. Adres çubuğundaki simgeye tıklayarak istediğiniz siteler için açıp kapatabilirsiniz.

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 18 Oct '15

18 Oct '15

commit b28e5a4ea6b55ab23af05b756a65c5b7fa552cad Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 18 18:15:16 2015 +0000 Update translations for https_everywhere --- tr/https-everywhere.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/https-everywhere.properties b/tr/https-everywhere.properties index 5702a91..7375f42 100644 --- a/tr/https-everywhere.properties +++ b/tr/https-everywhere.properties @@ -1,6 +1,6 @@ https-everywhere.menu.globalEnable = HTTPS Everywhere'i Etkinleştir -https-everywhere.menu.globalDisable = HTTPS Everywhere'i Devre Dışı Bırak -https-everywhere.menu.enableDisable = Kuralları Aç / Kapat +https-everywhere.menu.globalDisable = HTTPS Everywhere'i Etkisizleştir +https-everywhere.menu.enableDisable = Kuralları Etkinleştir / Etkisizleştir https-everywhere.menu.noRules = (Bu Sayfa için Kural Yok) https-everywhere.menu.unknownRules = (Bu Sayfanın Kuralları Bilinmiyor) https-everywhere.toolbar.hint = HTTPS Everywhere kullanılıyor. Adres çubuğundaki simgeye tıklayarak istediğiniz siteler için açıp kapatabilirsiniz.

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 18 Oct '15

18 Oct '15

commit 72f9765c36354e0da2cd8e944443f11d5d12f04f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Oct 18 17:45:04 2015 +0000 Update translations for bridgedb --- ka/LC_MESSAGES/bridgedb.po | 338 ++++++++++++++++++++++---------------------- 1 file changed, 170 insertions(+), 168 deletions(-) diff --git a/ka/LC_MESSAGES/bridgedb.po b/ka/LC_MESSAGES/bridgedb.po index a3e26f9..2ee7c30 100644 --- a/ka/LC_MESSAGES/bridgedb.po +++ b/ka/LC_MESSAGES/bridgedb.po @@ -4,17 +4,19 @@ # # Translators: # George Rommel <x0rmia(a)gmail.com>, 2013 +# Shanidze <sandro.shanidze(a)gmail.com>, 2015 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: Georgian (http://www.transifex.com/projects/p/torproject/language/ka/)\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: 2015-10-18 17:27+0000\n" +"Last-Translator: Shanidze <sandro.shanidze(a)gmail.com>\n" +"Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\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: ka\n" "Plural-Forms: nplurals=1; plural=0;\n" @@ -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 "უკაცრავად! თქვენს მოთხოვნასთან დაკავშირებით რაღაც აირია." + +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "კავშირი" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "მონიშნე ყველა" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "" + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "" + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "" + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" msgstr "" -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "" -#: 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" @@ -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,12 +270,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 "" @@ -156,48 +283,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" @@ -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 "" #. 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" @@ -228,153 +355,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 "" - -#: 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