- tor-commits - lists.torproject.org

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

03 Mar '16

commit e0924b3e8f0d291d380cf6a7ffd06c5e7e1c5ab3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 3 12:45:03 2016 +0000 Update translations for bridgedb --- nl/LC_MESSAGES/bridgedb.po | 339 +++++++++++++++++++++++---------------------- 1 file changed, 170 insertions(+), 169 deletions(-) diff --git a/nl/LC_MESSAGES/bridgedb.po b/nl/LC_MESSAGES/bridgedb.po index 5646414..aa7aa12 100644 --- a/nl/LC_MESSAGES/bridgedb.po +++ b/nl/LC_MESSAGES/bridgedb.po @@ -5,7 +5,7 @@ # Translators: # Adriaan Callaerts <adriaan.callaerts(a)gmail.com>, 2013 # Ann Boen <ann.boen(a)gmail.com>, 2014 -# Cleveridge <erwin.de.laat(a)cleveridge.org>, 2014 +# Cleveridge <erwin.de.laat(a)cleveridge.org>, 2014,2016 # Dick, 2014 # Johann Behrens <info(a)wmrkameleon.nl>, 2013 # Mart3000, 2015 @@ -18,14 +18,15 @@ 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-06-19 21:02+0000\n" -"Last-Translator: Mart3000\n" -"Language-Team: Dutch (http://www.transifex.com/projects/p/torproject/language/nl/)\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-03 12:38+0000\n" +"Last-Translator: Cleveridge <erwin.de.laat(a)cleveridge.org>\n" +"Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\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: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -40,57 +41,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 "Sorry! Er is iets mis gegaan met je verzoek." -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "Rapporteer een bug" + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "Broncode" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "Wijzigingslogboek" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "Contact" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "Alles selecteren" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "Laat de QRCode zien" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "QRCode voor uw bridge regels" + +#. 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 "Helaas pindakaas!" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "Er was een fout tijdens het ophalen van uw QRCode" + +#: 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 "Deze QRCode bevat uw bridge regels. Scan het met een QRCode lezer om uw bridge regels te kopiëren naar mobiele of andere apparaten." + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "Er zijn momenteel geen bridges beschikbaar..." + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Misschien moet je proberen %s terug te gaan %s en een ander bridge type te selecteren!" + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Stap %s1%s" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Download %s Tor Browser %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Stap %s2%s" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "Download %s bridges %s" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Stap %s3%s" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Nu %s voeg de bridges toe aan 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 "%sG%seef me gewoon bridges!" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "Geavanceerde Opties" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "Nee" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "geen" + +#. 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 "%sJ%sa!" + +#. 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 "%sK%srijg Bridges" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "[Dit is een automatisch bericht, gelieve niet te beantwoorden.]" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "Hier zijn je bridges:" -#: 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 "Je hebt de rate limiet overschreden. Graag rustiger aan! De minimale tijd tussen\ne-mailberichten is %s uur. Alle verdere e-mails gedurende deze periode worden genegeerd." -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "COMMANDs: (combineer commando's om meerdere opties tegelijkertijd te specificeren)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "Welkom bij 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 "Huidig ondersteunde transport TYPEs:" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "Hoi, %s!" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "Hallo, vriend!" -#: 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 "Publieke Sleutels" #. 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" @@ -101,7 +227,7 @@ msgstr "Deze email is gegenereerd met regenbogen, eenhoorns, en fonkelingen voor #. 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" @@ -112,7 +238,7 @@ msgid "" msgstr "BridgeDB kan voorzien in bridges met meerdere Pluggable Transports%s %stypes,\ndie helpen bij het verduisteren van uw connecties naar het Tor netwerk,\nwaardoor het moeilijker wordt voor anderen om uw internet traffic te bekijken en vast te stellen dat u Tor gebruikt.\n\n" #. 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" @@ -124,7 +250,7 @@ msgstr "Sommige bridges met IPv6 adressen zijn eveneens beschikbaar, maar sommig #. 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" @@ -133,20 +259,20 @@ msgid "" "\n" msgstr "Verder heeft BridgeDB genoeg oude vanilla bridges %s zonder enige\nPluggable Transports %s wat mogelijk niet zo cool klinkt, maar deze kunnen nog steeds helpen bij het omzeilen van internetcensuur in de meeste gevallen.\n\n" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "Wat zijn bridges?" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "%s Bridges %s zijn Tor relays die je helpen censuur te omzeilen." -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "Ik heb een alternatieve manier nodig om bridges te verkrijgen!" -#: 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" @@ -154,12 +280,12 @@ msgid "" "%s, %s or %s." msgstr "Een alternatieve manier om bridges te verkrijgen is door een email te sturen naar %s. Houd er wel rekening mee dat je\nde email verstuurd via een van de volgende email aanbieders:\n%s, %s of %s." -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" msgstr "Mijn bridges werken niet! Ik heb hulp nodig!" #. 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 "Als uw Tor niet werkt, email dan naar %s." @@ -167,48 +293,48 @@ msgstr "Als uw Tor niet werkt, email dan naar %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 "Probeer zoveel mogelijk informatie toe te voegen over je situatie als je kan, waaronder de lijst met \nbridges en Pluggable Transports die je geprobeerd hebt te gebruiken, je Tor Browser versie,\nen alle meldingen welke Tor heeft uitgegeven, etc." -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "Hier zijn je bridge regels:" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "Krijg Bridges!" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" msgstr "Selecteer opties voor bridge type:" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "Heeft u IPv6 adressen nodig?" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "Heeft u een %s nodig?" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "Uw browser vertoont afbeeldingen niet naar behoren." -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "Voer de karakters in van de afbeelding hier beneden..." -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "Hoe te starten met het gebruik van je bridges" #. 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" @@ -217,21 +343,21 @@ msgid "" msgstr "Om bridges toe te voegen in Tor Browser, ga eerst naar %s Tor Browser download pagina %s en volg dan de instructies voor het downloaden en starten van Tor Browser." #. 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 "Wanneer de 'Tor Network Settings' dialoog opent, klik 'Configure' en volg\nde wizard totdat deze vraagt om:" #. 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 "Blokkeert of censureert je internetprovider (ISP) verbindingen\nnaar het Tor netwerk?" #. 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" @@ -239,153 +365,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Selecteer 'Ja' en klik vervolgens 'Next'. Om je nieuwe bridges te configureren, kopieer en\nplak je de bridge regels in het invoerveld. Vervolgens klik je 'Connect', en\nben je klaar om te gaan! Als je problemen ervaart, klik dan de 'Help'\nknop in de 'Tor Network Settings' wizard voor verdere hulp." -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 msgid "Displays this message." msgstr "Toont dit bericht." #. 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 "Vraag vanilla bridges aan." -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "Verzoek IPv6 bridges" #. 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 "Vraag een Pluggable Transport op TYPE aan." #. 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 "Verkrijg een kopie van BridgeDB's publieke GnuPG key." - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "Rapporteer een bug" - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "Broncode" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "Wijzigingslogboek" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "Contact" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "Alles selecteren" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "Laat de QRCode zien" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "QRCode voor je bridge regels" - -#. 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 "Helaas pindakaas!" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -msgstr "Er was een fout tijdens het ophalen van je QRCode" - -#: 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 "Deze QRCode bevat je bridge regels. Scan het met een QRCode lezer om je bridge regels te kopiëren naar een mobiel of andere apparaten." - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "Er zijn momenteel geen bridges beschikbaar..." - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "Misschien moet je proberen %s terug te gaan %s en een ander bridge type te selecteren!" - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "Stap %s1%s" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "Download %s Tor Browser %s" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "Stap %s2%s" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "Download %s bridges %s" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "Stap %s3%s" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Nu %s voeg de bridges toe aan 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.) -#: lib/bridgedb/templates/options.html:38 -#, python-format -msgid "%sJ%sust give me bridges!" -msgstr "Geef me %sg%sewoon bridges!" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "Geavanceerde Opties" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "Nee" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "geen" - -#. 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 "%sJ%sa!" - -#. 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 "%sK%srijg Bridges"

1 0

[tor-browser-bundle/maint-5.5] Fix up broken HTTPS-E key
by gk＠torproject.org 03 Mar '16

03 Mar '16

commit a3ec494a4aeda4435ccd98de5d6709756cf690fb Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 3 09:46:22 2016 +0000 Fix up broken HTTPS-E key --- gitian/gpg/https-everywhere.gpg | Bin 194394 -> 194393 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/https-everywhere.gpg b/gitian/gpg/https-everywhere.gpg index 86fce24..fdd8d4f 100644 Binary files a/gitian/gpg/https-everywhere.gpg and b/gitian/gpg/https-everywhere.gpg differ

1 0

[tor-browser-bundle/maint-5.5] Bump HTTPS-Everywhere version
by gk＠torproject.org 03 Mar '16

03 Mar '16

commit 6f0377fe746773f4defe7eb963203b2ccb96c481 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 2 07:17:07 2016 +0000 Bump HTTPS-Everywhere version We bump the version to 5.1.4 and add the new signing key --- gitian/gpg/https-everywhere.gpg | Bin 188424 -> 194394 bytes gitian/versions | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/gpg/https-everywhere.gpg b/gitian/gpg/https-everywhere.gpg index 43aa4e4..86fce24 100644 Binary files a/gitian/gpg/https-everywhere.gpg and b/gitian/gpg/https-everywhere.gpg differ diff --git a/gitian/versions b/gitian/versions index dbe56fa..81bc055 100755 --- a/gitian/versions +++ b/gitian/versions @@ -15,7 +15,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.7.8 TORBUTTON_TAG=1.9.4.3 -HTTPSE_TAG=5.1.2 +HTTPSE_TAG=5.1.4 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable

1 0

[tor-browser-bundle/maint-5.5] Release preparations for 5.5.3
by gk＠torproject.org 03 Mar '16

03 Mar '16

commit 10e4f9e121c3bc2eaf97f4d24a17b3dcb90393ad Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 3 09:21:08 2016 +0000 Release preparations for 5.5.3 --- Bundle-Data/Docs/ChangeLog.txt | 17 +++++++++++++++++ gitian/versions | 12 ++++++------ tools/update-responses/config.yml | 13 ++++++------- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index e257d11..c84ed0a 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,20 @@ +Tor Browser 5.5.3 -- March 8 2016 + * All Platforms + * Update Firefox to 38.7.0esr + * Update OpenSSL to 1.0.1s + * Update NoScript to 2.9.0.4 + * Update HTTPS Everywhere to 5.1.4 + * Update Torbutton to 1.9.4.4 + * Bug 16990: Don't mishandle multiline commands + * Bug 18144: about:tor update arrow position is wrong + * Bug 16725: Allow resizing with non-default homepage + * Translation updates + * Bug 18030: Isolate favicon requests on Page Info dialog + * Bug 18297: Use separate Noto JP,KR,SC,TC fonts + * Bug 18170: Make sure the homepage is shown after an update as well + * Windows + * Bug 18292: Disable staged updates on Windows + Tor Browser 5.5.2 -- February 12 2016 * All Platforms * Update Firefox to 38.6.1esr diff --git a/gitian/versions b/gitian/versions index 81bc055..6e00e0a 100755 --- a/gitian/versions +++ b/gitian/versions @@ -7,14 +7,14 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.6.1esr +FIREFOX_VERSION=38.7.0esr TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.7.8 -TORBUTTON_TAG=1.9.4.3 +TORBUTTON_TAG=1.9.4.4 HTTPSE_TAG=5.1.4 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 @@ -38,7 +38,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux -OPENSSL_VER=1.0.1q +OPENSSL_VER=1.0.1s GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -59,7 +59,7 @@ GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.3-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.4-fx+fn+sm.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -87,13 +87,13 @@ NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 +OPENSSL_HASH=e7e81d82f3cd538ab0cdba494006d44aab9dd96b7f6233ce9971fb7c7916d511 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=097298d5004c1f384f3af508cb1915921145f0f962e78c977a62f405bd7eb2d9 +NOSCRIPT_HASH=94d036ff45116023bde97e6dee6c79daf2d28804764bfa8937f5d4d3463173f5 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 922cf7c..59635b5 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,15 +10,14 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 5.5a6 - release: 5.5.2 + release: 5.5.3 versions: - 5.5.2: - platformVersion: 38.6.1 - detailsURL: https://blog.torproject.org/blog/tor-browser-552-released - download_url: https://www.torproject.org/dist/torbrowser/5.5.2 + 5.5.3: + platformVersion: 38.7.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-553-released + download_url: https://www.torproject.org/dist/torbrowser/5.5.3 incremental_from: - - 5.5 - - 5.5.1 + - 5.5.2 migrate_archs: osx32: osx64 osx32:

1 0

[torbutton/maint-1.9.4] Bug 16725: Allow resizing with non-default homepage
by gk＠torproject.org 03 Mar '16

03 Mar '16

commit 8efd31f48447b454de98708fa899ab7bc12f85ae Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 19 09:51:18 2016 +0000 Bug 16725: Allow resizing with non-default homepage --- src/chrome/content/torbutton.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 25b61fb..bf45fea 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1115,10 +1115,6 @@ function torbutton_on_abouttor_load(aDoc) { m_tb_prefs. setBoolPref("extensions.torbutton.show_slider_notification", false); } - - // OS-specific window maximization on start-up should be done by now. Disable - // the respective preference to make sure the user is seeing our notification. - m_tb_prefs.setBoolPref(k_tb_tor_resize_warn_pref, false); } function torbutton_is_abouttor_doc(aDoc) { @@ -3428,6 +3424,11 @@ var torbutton_resizelistener = setTimeout(function() { resizeInnerWindowTo(width, height); quantizeBrowserSize(window, 100, 100); + // OS-specific window maximization on start-up should + // be done by now. Disable the respective preference + // to make sure the user is seeing our notification. + m_tb_prefs.setBoolPref(k_tb_tor_resize_warn_pref, + false); }, 0); mut_observer.disconnect(); }

1 0

[torbutton/maint-1.9.4] Release preparations
by gk＠torproject.org 03 Mar '16

03 Mar '16

commit 90fa61653ca822e3e9fe4dca08d19cb4f54c1ba7 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Mar 3 08:22:48 2016 +0000 Release preparations Bump version to 1.9.4.4, update CHANGELOG and update translations --- src/CHANGELOG | 5 +++++ src/chrome/locale/ar/aboutTBUpdate.dtd | 2 +- src/chrome/locale/ar/torbutton.dtd | 6 +++--- src/chrome/locale/ar/torbutton.properties | 10 +++++----- src/chrome/locale/eu/aboutTor.dtd | 6 +++--- src/chrome/locale/it/torbutton.dtd | 2 +- src/install.rdf | 2 +- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 933eeeb..8b2ddb1 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.9.4.4 + * Bug 16990: Don't mishandle multiline commands + * Bug 18144: about:tor update arrow position is wrong + * Bug 16725: Allow resizing with non-default homepage + 1.9.4.3 * Bug 16990: Show circuit display for connections using multi-party channels * Bug 18019: Avoid empty prompt shown after non-en-US update diff --git a/src/chrome/locale/ar/aboutTBUpdate.dtd b/src/chrome/locale/ar/aboutTBUpdate.dtd index ce40b98..41fd873 100644 --- a/src/chrome/locale/ar/aboutTBUpdate.dtd +++ b/src/chrome/locale/ar/aboutTBUpdate.dtd @@ -3,4 +3,4 @@ <!ENTITY aboutTBUpdate.linkPrefix "للحصول على أحدث المعلومات حول هذا الإصدار."> <!ENTITY aboutTBUpdate.linkLabel "زُر موقعنا"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> +<!ENTITY aboutTBUpdate.changeLogHeading "تغير سجل:"> diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index ebcbf72..b9f7205 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -161,7 +161,7 @@ <!ENTITY torbutton.prefs.sec_some_jit_desc "بعض محسنات نصوص الجافا معطلة"> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "سكربت في بعض المواقع قد تعمل بشكل بطيئ"> <!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> <!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> @@ -170,13 +170,13 @@ <!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_desc "بعض ميزات إظهار الخطوط معطلة "> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> +<!ENTITY torbutton.prefs.sec_svg_desc "بعض الانواع من الصور معطله"> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled."> <!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> <!ENTITY torbutton.prefs.sec_high "عالٍ"> <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled."> +<!ENTITY torbutton.prefs.sec_audio_video_desc "معضم صيغ السمعيات والمرئيات معطلة"> <!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> <!ENTITY torbutton.prefs.sec_webfonts_desc "من الممكن أن بعض الخطوط والايقونات معروضة خطأ"> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties index 6828a3e..4603989 100644 --- a/src/chrome/locale/ar/torbutton.properties +++ b/src/chrome/locale/ar/torbutton.properties @@ -2,12 +2,12 @@ torbutton.button.tooltip.disabled = فعّل تور torbutton.button.tooltip.enabled = عطّل تور torbutton.circuit_display.internet = انترنت torbutton.circuit_display.ip_unknown = IP غير معروف -torbutton.circuit_display.onion_site = Onion site +torbutton.circuit_display.onion_site = موقع اونيون torbutton.circuit_display.this_browser = هذا المتصفح -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = مُرحل torbutton.circuit_display.tor_bridge = جسر torbutton.circuit_display.unknown_country = بلد غير معروف -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = يضيف متصفح تور هذا الهامش لابقاء نافذتك غير مميزه، لتقليل امكانيه تقفيك عبر الانترنت. torbutton.panel.tooltip.disabled = انقر لتفعيل تور torbutton.panel.tooltip.enabled = انقر لتعطيل تور torbutton.panel.plugins.disabled = انقر لتفعيل الملحقات @@ -59,7 +59,7 @@ torbutton.popup.confirm_newnym = متصفح تور torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = تكبير متصفح تور قد يسمح لبعض المواقع بالتعرف على حجم شاشتك، واستخدام هذه المعلومات لتقفيك. نوصي بابقاء نافذه متصف تور على حجمها الافتراضي. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=هذا الموقع (٪ S) حاول استخراج بيانات الصورة HTML5، والتي يمكن استخدامها لتحديد مكانك وتحديد الكومبيوتر.\n\nهل تريد أن يسمح متصفح Tor لهذا الموقع لاستخراج بيانات الصورة ؟ @@ -72,7 +72,7 @@ canvas.neverAccessKey=ط # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%S Profile Problem +profileProblemTitle=%Sمشكله في ملف شخصي profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd index 76020fc..7524fc2 100644 --- a/src/chrome/locale/eu/aboutTor.dtd +++ b/src/chrome/locale/eu/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "Tori buruz"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "KONUTZ: nabigatzaile hau zaharkituta dago."> <!ENTITY aboutTor.outOfDateTorOff.label "BAITA, nabigatzaile hau zaharkituta dago."> <!ENTITY aboutTor.outOfDate2.label "Tipulan sakatu eta ondoren Tor Browser Bundlea egiaztatu hautatu"> <!ENTITY aboutTor.check.label "Tor sare ezarpenak frogatu"> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "Ongi etorri Tor Browserera"> +<!ENTITY aboutTor.success2.label "Tor sarera konektatuta."> <!ENTITY aboutTor.success3.label "Aske zara orain Internet anonimotasunez nabigatzeko."> <!ENTITY aboutTor.failure.label "Zerbait gaizki joan da!"> <!ENTITY aboutTor.failure2.label "Tor ez da nabigatzaile honetan funtzionatzen ari."> diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index c92526f..f08b41d 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -180,6 +180,6 @@ <!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM è l'unico codec che rimane abilitato."> <!ENTITY torbutton.prefs.sec_webfonts_desc "Alcuni caratteri e icone possono non essere visualizzati correttamente."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "I font provvisti dal sito sono bloccati."> -<!ENTITY torbutton.prefs.sec_custom "Valori Customizzabili"> +<!ENTITY torbutton.prefs.sec_custom "Valori personalizzati"> <!ENTITY torbutton.circuit_display.title "Circuito Tor per questo sito"> diff --git a/src/install.rdf b/src/install.rdf index 0e59a9a..da11107 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.4.3</em:version> + <em:version>1.9.4.4</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[webwml/master] Fix another instance of What else instead of Where else
by sebastian＠torproject.org 03 Mar '16

03 Mar '16

commit e11433f0bdcafcdb6866493614f0bbca918de716 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Mar 2 16:06:16 2016 +0100 Fix another instance of What else instead of Where else --- projects/en/torbrowser.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index a5b45c5..15ef9e9 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -680,7 +680,7 @@ href="https://trac.torproject.org/projects/tor/wiki/doc/TorBrowser/Hacking">Tor Browser Hacking</a> intro document useful for learning about the build system and our development processes. </p> - <p><strong><em>What else can I get Tor Browser?</em></strong> + <p><strong><em>Where else can I get Tor Browser?</em></strong> <br>In some countries the Tor Project website is blocked or censored and it is not possible to download Tor directly. The Tor Project also hosts a mirror of <a href="https://github.com/TheTorProject/gettorbrowser">Tor Browser Bundle on Github</a>.</p> <p>The <a href="https://www.torproject.org/projects/gettor">GetTor</a> service can also be used to download Tor Browser when the Project website and mirrors are blocked.</p>

1 0

[webwml/master] Match Android before Linux in jquery.client
by sebastian＠torproject.org 03 Mar '16

03 Mar '16

commit 895feefa1533818851df224f6e4d425f28b745ee Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Wed Mar 2 15:38:19 2016 +0100 Match Android before Linux in jquery.client Some Android browsers provide a Linux tag in their navigator.platform tab. This was resulting in Android being misidentified as a Linux browser as the Linux platform was matching first. This commit moves the Android check to match first. --- js/jquery.client.min.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/jquery.client.min.js b/js/jquery.client.min.js index c24627d..4daf45b 100644 --- a/js/jquery.client.min.js +++ b/js/jquery.client.min.js @@ -1,4 +1,4 @@ (function(){var BrowserDetect={init:function(){this.browser=this.searchString(this.dataBrowser)||"An unknown browser";this.version=this.searchVersion(navigator.userAgent)||this.searchVersion(navigator.appVersion)||"an unknown version";this.OS=this.searchString(this.dataOS)||"an unknown OS";},searchString:function(data){for(var i=0;i<data.length;i++){var dataString=data[i].string;var dataProp=data[i].prop;this.versionSearchString=data[i].versionSearch||data[i].identity;if(dataString){if(dataString.indexOf(data[i].subString)!=-1) return data[i].identity;} else if(dataProp) -return data[i].identity;}},searchVersion:function(dataString){var index=dataString.indexOf(this.versionSearchString);if(index==-1)return;return parseFloat(dataString.substring(index+this.versionSearchString.length+1));},dataBrowser:[{string:navigator.userAgent,subString:"Chrome",identity:"Chrome"},{string:navigator.userAgent,subString:"OmniWeb",versionSearch:"OmniWeb/",identity:"OmniWeb"},{string:navigator.vendor,subString:"Apple",identity:"Safari",versionSearch:"Version"},{prop:window.opera,identity:"Opera"},{string:navigator.vendor,subString:"iCab",identity:"iCab"},{string:navigator.vendor,subString:"KDE",identity:"Konqueror"},{string:navigator.userAgent,subString:"Firefox",identity:"Firefox"},{string:navigator.vendor,subString:"Camino",identity:"Camino"},{string:navigator.userAgent,subString:"Netscape",identity:"Netscape"},{string:navigator.userAgent,subString:"MSIE",identity:"Explorer",versionSearch:"MSIE"},{string:navigator.userAgent,subString:"Gecko",identity:"Mozilla",version Search:"rv"},{string:navigator.userAgent,subString:"Mozilla",identity:"Netscape",versionSearch:"Mozilla"}],dataOS:[{string:navigator.platform,subString:"Win",identity:"Windows"},{string:navigator.platform,subString:"Mac",identity:"Mac"},{string:navigator.userAgent,subString:"iPhone",identity:"iPhone/iPod"},{string:navigator.platform,subString:"Linux",identity:"Linux"},{string:navigator.userAgent,subString:"Android",identity:"Android"}]};BrowserDetect.init();window.$.client={os:BrowserDetect.OS,browser:BrowserDetect.browser};})(); +return data[i].identity;}},searchVersion:function(dataString){var index=dataString.indexOf(this.versionSearchString);if(index==-1)return;return parseFloat(dataString.substring(index+this.versionSearchString.length+1));},dataBrowser:[{string:navigator.userAgent,subString:"Chrome",identity:"Chrome"},{string:navigator.userAgent,subString:"OmniWeb",versionSearch:"OmniWeb/",identity:"OmniWeb"},{string:navigator.vendor,subString:"Apple",identity:"Safari",versionSearch:"Version"},{prop:window.opera,identity:"Opera"},{string:navigator.vendor,subString:"iCab",identity:"iCab"},{string:navigator.vendor,subString:"KDE",identity:"Konqueror"},{string:navigator.userAgent,subString:"Firefox",identity:"Firefox"},{string:navigator.vendor,subString:"Camino",identity:"Camino"},{string:navigator.userAgent,subString:"Netscape",identity:"Netscape"},{string:navigator.userAgent,subString:"MSIE",identity:"Explorer",versionSearch:"MSIE"},{string:navigator.userAgent,subString:"Gecko",identity:"Mozilla",version Search:"rv"},{string:navigator.userAgent,subString:"Mozilla",identity:"Netscape",versionSearch:"Mozilla"}],dataOS:[{string:navigator.userAgent,subString:"Android",identity:"Android"},{string:navigator.platform,subString:"Win",identity:"Windows"},{string:navigator.platform,subString:"Mac",identity:"Mac"},{string:navigator.userAgent,subString:"iPhone",identity:"iPhone/iPod"},{string:navigator.platform,subString:"Linux",identity:"Linux"}]};BrowserDetect.init();window.$.client={os:BrowserDetect.OS,browser:BrowserDetect.browser};})();

1 0

[webwml/master] Display Orbot on Tor download page
by sebastian＠torproject.org 03 Mar '16

03 Mar '16

commit e72ad6bf1b0537acfea83c8c2d67b0f92725e581 Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Tue Mar 1 18:04:44 2016 +0100 Display Orbot on Tor download page This commit adds a box on the download-easy.html.en webpage which includes links to install Orbot. The jquery.client.min.js script is from 2009 and does not detect Android. I've added JS Android detection. --- download/en/download-easy.wml | 14 ++++++++++++++ js/dlpage01.js | 6 +++++- js/jquery.client.min.js | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml index 5885a70..91f98b0 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -137,6 +137,19 @@ <p class="alt-dl">Not Using GNU/Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p> </div> </div> + + <div id="android" class="easy android"> + <div class="package" style="padding-top: 13px; border-top: 0px;"> + <div class="desc"> + <h2>Orbot - Tor for Android</h2> + <p>Our software is available for Android-based phones, tablets, and computers from the <a href="https://guardianproject.info/">Guardian Project</a> in their <a href= "https://guardianproject.info/2012/03/15/our-new-f-droid-app-repository/">F-Droid Repository</a> or the <a href="https://play.google.com/store/apps/details?id=org.torproject.android">Google Play Store</a>.</p> + <a href="https://www.torproject.org/docs/android.html.en">Learn more »</a></p> + </div> + <form class="downloads"> + <a class="button lin-orbot" href="https://guardianproject.info/apps/orbot/?src=tbb_download"><span class="strong">Download</span><span class="normal">Orbot</span></a> + </form> + </div> + </div> <p class="all-dl">Looking For Something Else? <a href="<page download/download>">View All Downloads</a></p> <br> </div>  @@ -313,6 +326,7 @@ the issues</a>.</p> <li class="dropdown"><a href="#windows">Microsoft Windows</a></li> <li class="dropdown"><a href="#mac">Apple OS X</a></li> <li class="dropdown"><a href="#linux">Linux/Unix</a></li> +<li class="dropdown"><a href="#android">Android</a></li> <li class="dropdown"><a href="<page download/download>">All Downloads</a></li> </ul> </div> diff --git a/js/dlpage01.js b/js/dlpage01.js index a4bc89f..2adc2bd 100644 --- a/js/dlpage01.js +++ b/js/dlpage01.js @@ -17,6 +17,8 @@ function OScheck() { $('.easy.windows').css('display', 'block'); }else if(clientos == "Mac"){ $('.easy.mac').css('display', 'block'); + }else if(clientos == "Android"){ + $('.easy.android').css('display', 'block'); }else{ $('.easy').css('display', 'block'); } @@ -63,7 +65,7 @@ $(document).ready(function () { var url = $.param.fragment(); // Toggle the '.easy' divs to off - if(url == 'windows'|url == 'mac'|url == 'linux'){ + if(url == 'windows'|url == 'mac'|url == 'linux'|url == 'android'){ $('.easy').css('display', 'none'); } @@ -74,6 +76,8 @@ $(document).ready(function () { $('.easy.mac').css('display', 'block'); } else if(url == 'linux'){ $('.easy.linux').css('display', 'block'); + } else if(url == 'android'){ + $('.easy.android').css('display', 'block'); } else { $('.easy').css('display', 'none'); $(function(){OScheck();}); diff --git a/js/jquery.client.min.js b/js/jquery.client.min.js index 44ea629..c24627d 100644 --- a/js/jquery.client.min.js +++ b/js/jquery.client.min.js @@ -1,4 +1,4 @@ (function(){var BrowserDetect={init:function(){this.browser=this.searchString(this.dataBrowser)||"An unknown browser";this.version=this.searchVersion(navigator.userAgent)||this.searchVersion(navigator.appVersion)||"an unknown version";this.OS=this.searchString(this.dataOS)||"an unknown OS";},searchString:function(data){for(var i=0;i<data.length;i++){var dataString=data[i].string;var dataProp=data[i].prop;this.versionSearchString=data[i].versionSearch||data[i].identity;if(dataString){if(dataString.indexOf(data[i].subString)!=-1) return data[i].identity;} else if(dataProp) -return data[i].identity;}},searchVersion:function(dataString){var index=dataString.indexOf(this.versionSearchString);if(index==-1)return;return parseFloat(dataString.substring(index+this.versionSearchString.length+1));},dataBrowser:[{string:navigator.userAgent,subString:"Chrome",identity:"Chrome"},{string:navigator.userAgent,subString:"OmniWeb",versionSearch:"OmniWeb/",identity:"OmniWeb"},{string:navigator.vendor,subString:"Apple",identity:"Safari",versionSearch:"Version"},{prop:window.opera,identity:"Opera"},{string:navigator.vendor,subString:"iCab",identity:"iCab"},{string:navigator.vendor,subString:"KDE",identity:"Konqueror"},{string:navigator.userAgent,subString:"Firefox",identity:"Firefox"},{string:navigator.vendor,subString:"Camino",identity:"Camino"},{string:navigator.userAgent,subString:"Netscape",identity:"Netscape"},{string:navigator.userAgent,subString:"MSIE",identity:"Explorer",versionSearch:"MSIE"},{string:navigator.userAgent,subString:"Gecko",identity:"Mozilla",version Search:"rv"},{string:navigator.userAgent,subString:"Mozilla",identity:"Netscape",versionSearch:"Mozilla"}],dataOS:[{string:navigator.platform,subString:"Win",identity:"Windows"},{string:navigator.platform,subString:"Mac",identity:"Mac"},{string:navigator.userAgent,subString:"iPhone",identity:"iPhone/iPod"},{string:navigator.platform,subString:"Linux",identity:"Linux"}]};BrowserDetect.init();window.$.client={os:BrowserDetect.OS,browser:BrowserDetect.browser};})(); \ No newline at end of file +return data[i].identity;}},searchVersion:function(dataString){var index=dataString.indexOf(this.versionSearchString);if(index==-1)return;return parseFloat(dataString.substring(index+this.versionSearchString.length+1));},dataBrowser:[{string:navigator.userAgent,subString:"Chrome",identity:"Chrome"},{string:navigator.userAgent,subString:"OmniWeb",versionSearch:"OmniWeb/",identity:"OmniWeb"},{string:navigator.vendor,subString:"Apple",identity:"Safari",versionSearch:"Version"},{prop:window.opera,identity:"Opera"},{string:navigator.vendor,subString:"iCab",identity:"iCab"},{string:navigator.vendor,subString:"KDE",identity:"Konqueror"},{string:navigator.userAgent,subString:"Firefox",identity:"Firefox"},{string:navigator.vendor,subString:"Camino",identity:"Camino"},{string:navigator.userAgent,subString:"Netscape",identity:"Netscape"},{string:navigator.userAgent,subString:"MSIE",identity:"Explorer",versionSearch:"MSIE"},{string:navigator.userAgent,subString:"Gecko",identity:"Mozilla",version Search:"rv"},{string:navigator.userAgent,subString:"Mozilla",identity:"Netscape",versionSearch:"Mozilla"}],dataOS:[{string:navigator.platform,subString:"Win",identity:"Windows"},{string:navigator.platform,subString:"Mac",identity:"Mac"},{string:navigator.userAgent,subString:"iPhone",identity:"iPhone/iPod"},{string:navigator.platform,subString:"Linux",identity:"Linux"},{string:navigator.userAgent,subString:"Android",identity:"Android"}]};BrowserDetect.init();window.$.client={os:BrowserDetect.OS,browser:BrowserDetect.browser};})();

1 0

[webwml/master] Tweak wording for gettor/github addition
by sebastian＠torproject.org 03 Mar '16

03 Mar '16

commit c2e5f13a51be658f555ac845c539e4b7986824af Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Mar 2 14:23:28 2016 +0100 Tweak wording for gettor/github addition --- download/en/download-easy.wml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml index c2bee90..58a6ba8 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -300,10 +300,15 @@ use Tor, too!</p> This list of pitfalls isn't complete, and we need your help <a href="<page getinvolved/volunteer>#Documentation">identifying and documenting all the issues</a>.</p><br /> -<h2><a class="anchor" href="#mirror">What else can I get Tor?</a></h2> -<p>In some countries the Tor Project website is blocked or censored and it is not possible to download - Tor directly. The Tor Project also hosts a mirror of <a href="https://github.com/TheTorProject/gettorbrowser">Tor Browser Bundle on Github</a>.</p><br /> -<p>The <a href="https://www.torproject.org/projects/gettor">GetTor</a> service can also be used to download Tor Browser when the Project website and mirrors are blocked.</p> +<h2><a class="anchor" href="#mirror">Where else can I get Tor?</a></h2> +<p>In some countries the Tor Project website is blocked or censored and +it is not possible to download Tor directly. The Tor Project hosts a +Tor Browser <a +href="https://github.com/TheTorProject/gettorbrowser">mirror on Github</a>.</p><br /> +<p>Using the <a +href="https://www.torproject.org/projects/gettor">GetTor</a> service is +another way to download Tor Browser when the Project website and mirrors +are blocked.</p> </div>

1 0