December 2012 - tor-commits - lists.torproject.org

[flashproxy/master] Add opt-in page html and javascript.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 453589d0c15428428a48970c416be3748b90d7fd Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Tue Dec 4 21:33:33 2012 -0500 Add opt-in page html and javascript. Add some functional html and javascript for the opt-in page (ticket #7063). There is no CSS for the page yet. --- proxy/options.html | 32 +++++++++++++++++++++++++ proxy/options.js | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 0 deletions(-) diff --git a/proxy/options.html b/proxy/options.html new file mode 100644 index 0000000..109c626 --- /dev/null +++ b/proxy/options.html @@ -0,0 +1,32 @@ +<!DOCTYPE html> +<html> +<head> +<meta charset="utf-8"> +</head> +<body> +<div> + <h4>Flash proxy options</h4> + <p> + This page enables you to use your web browser as a proxy to help + censored Internet users. When you click yes, your browser will act as a + censorship circumvention proxy as long as you are viewing a page with the + flash proxy badge: <img src="badge.png" alt="Internet Freedom"> + </p> + <p> + <a href="http://crypto.stanford.edu/flashproxy/">For more information on this system click here</a>. + </p> +</div> +<div id="setting"> +</div> +<div id="buttons" style="display: none;"> + <button id="yes">Yes</button><button id="no">No</button> +</div> +<div id="cookies_disabled" style="display: none;"> + <p> + It seems your browser has cookies disabled. You will need to enable them in + order to set flash proxy settings. + </p> +</div> +<script type="text/javascript" src="options.js"></script> +</body> +</html> diff --git a/proxy/options.js b/proxy/options.js new file mode 100644 index 0000000..9dd06d2 --- /dev/null +++ b/proxy/options.js @@ -0,0 +1,66 @@ +/* This is the javascript for the opt-in page. It sets/deletes + a cookie which controls whether the flashproxy javascript + code should run or disable itself. */ + +var COOKIE_NAME = "flashproxy"; +/* In seconds. */ +var COOKIE_LIFETIME = 60 * 60 * 24 * 365; + +window.addEventListener("load", function () { + + /* This checks if cookies are enabled in the browser. + document.cookie has special behavior, if cookies + are disabled it will not retain any values stored in it. */ + function cookies_enabled() { + /*Not supported in all browsers.*/ + if (navigator.cookieEnabled) { + return true; + } else if (navigator.cookieEnabled === undefined) { + document.cookie = "test"; + if (document.cookie.indexOf("test") !== -1) + return true; + } + return false; + } + + /* Updates the text telling the user what his current setting is. + According to the DOM level 2 specification, + http://www.w3.org/TR/DOM-Level-2-HTML/html.html#ID-8747038, + document.cookie is always defined and non-null, so this function + is safe if cookies are disabled. */ + function update_setting_text() { + var setting = document.getElementById("setting"); + var prefix = "<p>Your current setting is: "; + + if (document.cookie.indexOf(COOKIE_NAME) !== -1) { + setting.innerHTML = prefix + "use my browser as a proxy. " + + "Click no below to change your setting.</p>"; + } else { + setting.innerHTML = prefix + "do not use my browser as a proxy. " + + "Click yes below to change your setting.</p>"; + } + } + + function set_cookie() { + document.cookie = COOKIE_NAME + "=; max-age=" + COOKIE_LIFETIME; + } + + function del_cookie() { + document.cookie = COOKIE_NAME + "=; expires=Thu, 01 Jan 1970 00:00:00 GMT"; + } + + if (cookies_enabled()) { + var buttons = document.getElementById("buttons"); + buttons.addEventListener("click", update_setting_text); + document.getElementById("yes").addEventListener("click", set_cookie); + document.getElementById("no").addEventListener("click", del_cookie); + buttons.style.display = "block"; + update_setting_text(); + } else { + document.getElementById("cookies_disabled").style.display = "block"; + /* Manually set the text here as it refers to the buttons, + which won't show up if cookies are disabled. */ + document.getElementById("setting").innerHTML = "<p>Your current setting is: " + + "do not use my browser as a proxy.</p>"; + } +});

1 0

[flashproxy/master] Merge branch 'opt-in' of https://github.com/aallai/flashproxy into opt-in
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit fcc67c203e7246e4cd92f1fdeea2f16e3d3562bd Merge: 453589d 1f20f59 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Tue Dec 4 21:39:48 2012 -0500 Merge branch 'opt-in' of https://github.com/aallai/flashproxy into opt-in

1 0

[flashproxy/master] Clarify a comment.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 790d91fbd1c278b70459d11629c18636837a11a8 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Wed Dec 5 19:47:38 2012 -0500 Clarify a comment. The wording of the comment about manually setting text about the user's setting is confusing, stating the manually-set text refers to the page buttons, which it doesn't. --- proxy/options.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/options.js b/proxy/options.js index 5e3a9df..1377373 100644 --- a/proxy/options.js +++ b/proxy/options.js @@ -54,8 +54,8 @@ window.addEventListener("load", function () { update_setting_text(); } else { document.getElementById("cookies_disabled").style.display = "block"; - /* Manually set the text here as it refers to the buttons, - which won't show up if cookies are disabled. */ + /* Manually set the text here as otherwise it will refer to + the buttons, which don't show if cookies are disabled. */ document.getElementById("setting").innerHTML = "<p>Your current setting is: " + "do not use my browser as a proxy.</p>"; }

1 0

[flashproxy/master] Remove comment that is no longer relevant.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 320a03e473ce29072540bf40d7f507ccd7db91f4 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Tue Dec 4 21:43:23 2012 -0500 Remove comment that is no longer relevant. Remove the comment above update_setting_text which asserts the function is safe to call with cookies disabled, since it is no longer called when cookies are disabled. --- proxy/options.js | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/proxy/options.js b/proxy/options.js index 9dd06d2..5e3a9df 100644 --- a/proxy/options.js +++ b/proxy/options.js @@ -23,11 +23,7 @@ window.addEventListener("load", function () { return false; } - /* Updates the text telling the user what his current setting is. - According to the DOM level 2 specification, - http://www.w3.org/TR/DOM-Level-2-HTML/html.html#ID-8747038, - document.cookie is always defined and non-null, so this function - is safe if cookies are disabled. */ + /* Updates the text telling the user what his current setting is.*/ function update_setting_text() { var setting = document.getElementById("setting"); var prefix = "<p>Your current setting is: ";

1 0

[flashproxy/master] Add CSS and noscript for options page.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 13711698e9326138dc5dd176080581b21829379b Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Wed Dec 5 22:23:15 2012 -0500 Add CSS and noscript for options page. Add CSS for the options page, largely borrowed from crypto.stanford.edu/flashproxy. Also add a noscript tag in case the user has JavaScript disabled. The top-gradient.gif file is used in the background for the CSS. --- proxy/options.html | 54 ++++++++++++++++++++++++++++++++++++++++++++++- proxy/top-gradient.gif | Bin 0 -> 1992 bytes 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/proxy/options.html b/proxy/options.html index 109c626..343aab7 100644 --- a/proxy/options.html +++ b/proxy/options.html @@ -2,20 +2,69 @@ <html> <head> <meta charset="utf-8"> +<style type="text/css"> +body { + font-family: Calibri, Arial, sans-serif; + font-size: small; + background-image: url(top-gradient.gif); + background-repeat: repeat-x; + background-color: #E7D19A; + text-align: center; +} +.content { + width: 760px; + margin: 0 auto; + background-color: white; + text-align: left; + border-style: solid; + border-width: 1px; + border-color: #D0A760; +} +h1 { + padding: 18px 7px; + margin: 0 auto; + background-color: #900; + color: white; + font-size: 200%; + font-weight: bold; +} +p { + margin: 7px; +} +button { + margin: 0px 7px 7px; +} +.blank-link { + text-decoration: none; + color: white; +} +#flashproxy-badge { + background-color: #227; + vertical-align: middle; + margin-left: 2px; +} +</style> </head> <body> +<div class="content"> <div> - <h4>Flash proxy options</h4> + <h1>Flash proxy options</h1> <p> This page enables you to use your web browser as a proxy to help censored Internet users. When you click yes, your browser will act as a censorship circumvention proxy as long as you are viewing a page with the - flash proxy badge: <img src="badge.png" alt="Internet Freedom"> + flash proxy badge:<a class="blank-link" href="http://crypto.stanford.edu/flashproxy/"><img id="flashproxy-badge" src="badge.png" alt="Internet Freedom"></a>. </p> <p> <a href="http://crypto.stanford.edu/flashproxy/">For more information on this system click here</a>. </p> </div> +<noscript> + <p> + While javascript is disabled, your computer will not be a proxy. + Enable JavaScript to change your options. + </p> +</noscript> <div id="setting"> </div> <div id="buttons" style="display: none;"> @@ -27,6 +76,7 @@ order to set flash proxy settings. </p> </div> +</div> <script type="text/javascript" src="options.js"></script> </body> </html> diff --git a/proxy/top-gradient.gif b/proxy/top-gradient.gif new file mode 100644 index 0000000..ba8e7ca Binary files /dev/null and b/proxy/top-gradient.gif differ

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 28 Dec '12

28 Dec '12

commit 5e74085b667cb6919ac3c91d51ab37a92c6edb1f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 28 13:45:28 2012 +0000 Update translations for vidalia_help --- lv/config.po | 12 ++++++------ lv/services.po | 4 +--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lv/config.po b/lv/config.po index b371ab9..ca8afaf 100644 --- a/lv/config.po +++ b/lv/config.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2012-12-28 13:09+0000\n" +"PO-Revision-Date: 2012-12-28 13:36+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -100,7 +100,7 @@ msgid "" "listening on the ports allowed by your firewall or proxy. Simply enter a " "list of ports permitted by your firewall or proxy, separated by commas. " "(<i>Example: 80,443,8080</i>)" -msgstr "" +msgstr "<b>Mans ugunsmūris ļauj man savienoties tikai caur noteiktiem portiem</b>: Ja atrodaties aiz ierobežojoša ugunsmūra vai starpnieka, kuri ierobežo savienojuma izveidei pieejamos portus, tad varat konfigurēt Tor tā, lai tas veidotu tiešus savienojumus vienīgi ar retranslatoriem, kas klausās portos, kuri ir Jūsu ugunsmūra vai starpnieka atļauti. Vienkārši ierakstiet Jūsu ugunsmūra vai starpnieka atļauto portu sarakstu, portus pierakstā atdalot ar komatu. (<i>Piemērs: 80,443,8080</i>)" #. type: Content of: <html><body><ul><li> #: en/config.html:69 @@ -111,7 +111,7 @@ msgid "" "to the Tor network through relays called <i>bridges</i> (Tor 0.2.0.3-alpha " "or newer only). You can add bridge relays by specifying either their address" " and port number, or their address, port number, and fingerprint." -msgstr "" +msgstr "<b>Mans IPS bloķē savienojumus ar tīklu Tor</b>: Ja Jūsu ISP (Interneta pakalpojumu sniedzējs) bloķē savienojumus ar tīklu Tor, Tor var mēģināt izvairīties no filtrēšanas šifrējot savus direktoriju savienojumus un veidojot savienojumus ar tīklu Tor caur retranslatoriem, sauktiem <i>tilti</i> (tikai Tor 0.2.0.3-alpha vai jaunākām versijām). Tilta retranslatorus ir iespējams pievienot vai nu norādot to adresi un portu numuru, vai arī adresi, porta numuru un ciparvirkni." #. type: Content of: <html><body><ul><li> #: en/config.html:77 @@ -185,7 +185,7 @@ msgid "" "incorrectly, or if you prefer a different language, you can choose another " "language from the dropdown box. You will need to restart Vidalia after " "changing the displayed language for the changes to take effect." -msgstr "" +msgstr "<b>Valoda</b>: Esam pateicīgi brīvprātīgajiem, kas ir pārtulkojuši Vidalia's saskarni daudzās valodās. Kad pirmo reizi Vidalia tiek izpildīta, tā centīsies uzminēt kādu valodu dators pašreiz izmanto. Ja Vidalia minējums nav pareizs, vai Jūs vēlaties lietot citu valodu, tad varat izvēlēties citu valodu norādītu nolaižamajā dialoglodziņā. Lai izmaiņas, kuras saistītas ar attēlojamās valodas nomaiņu, stātos spēkā, būs nepieciešams restartēt Vidalia." #. type: Content of: <html><body><ul><li> #: en/config.html:124 @@ -235,7 +235,7 @@ msgid "" "<b>None</b> -- No authentication is required. Use of this option is " "<b>strongly</b> discouraged. Any application or user on your computer can " "reconfigure your Tor installation." -msgstr "" +msgstr "<b>Nav</b> -- Autentifikācija nav nepieciešama. No šīs izvēles iespējas <b>uzstājīgi</b> iesakām izvairīties. Ikviena Jūsu datora lietotne vai lietotājs var rekonfigurēt Tor'a instalāciju." #. type: Content of: <html><body><ul><li><ul><li> #: en/config.html:155 @@ -298,4 +298,4 @@ msgstr "Slēptu pakalpojumu iestatījumi" msgid "" "Hidden services allow you to provide any kind of TCP-based service, e.g. an" " HTTP service, to others without revealing your IP address." -msgstr "" +msgstr "Slēptie pakalpojumi ļauj Jums sniegt citiem dažādu veidu TCP-bāzētus pakalpojumus, piem., HTTP pakalpojumu, neatklājot Jūsu IP adresi." diff --git a/lv/services.po b/lv/services.po index 179cf4c..93db66d 100644 --- a/lv/services.po +++ b/lv/services.po @@ -12,7 +12,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: lv\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" #. type: Content of: <html><body><h1> #: en/services.html:16 @@ -244,5 +244,3 @@ msgid "" "client application if it's not a web service), and Tor does the rest for " "you. There is no need to specifically configure Tor for that." msgstr "" - -

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 28 Dec '12

28 Dec '12

commit 52d722bd0bafd3fd837e5887be4d9be93da3b941 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 28 13:15:27 2012 +0000 Update translations for vidalia_help --- lv/config.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lv/config.po b/lv/config.po index 9320042..b371ab9 100644 --- a/lv/config.po +++ b/lv/config.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2012-12-28 11:59+0000\n" +"PO-Revision-Date: 2012-12-28 13:09+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -89,7 +89,7 @@ msgid "" "proxy is listening for connections. If your proxy requires authentication, " "you can also enter the <i>Username</i> and <i>Password</i> you use to " "connect to your proxy. Otherwise, you can leave those fields blank." -msgstr "" +msgstr "<b>Es interneta piekļuvei lietoju starpnieku</b>: Ja Jūsu interneta savienojumam nepieciešams HTTP starpnieks, tad ir iespējams konfigurēt Tor, lai tas caur Jūsu starpnieku nosūtītu visus Tor'a direktoriju pieprasījumus un retranslēšanas savienojumus. Jānorāda vismaz starpnieka adrese vai nosaukums, kā arī ports caur kuru Jūsu starpnieks klausās savienojumu izveides pieprasījumus. Ja Jūsu starpnieks pieprasa autentifikāciju, tad ir iespējams ievadīt savus <i>Lietotājvārds</i> un <i>Parole</i>, kurus izmantojat, lai savienotos ar starpnieku. Ja tas nav nepieciešams, varat neaizpildīt šos laukus." #. type: Content of: <html><body><ul><li> #: en/config.html:62

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 28 Dec '12

28 Dec '12

commit a6267e5dd01b0af3ed1508cc9d511f4b13656b13 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 28 12:15:35 2012 +0000 Update translations for vidalia_help --- lv/config.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lv/config.po b/lv/config.po index b2389ce..9320042 100644 --- a/lv/config.po +++ b/lv/config.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2012-12-28 11:26+0000\n" +"PO-Revision-Date: 2012-12-28 11:59+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -52,7 +52,7 @@ msgid "" "of Tor installed, you can tell Vidalia which version you would like to run " "by clicking the <i>Browse</i> button and navigating to the particular Tor " "installation you want." -msgstr "" +msgstr "<b>Tor izpildāms objekts</b>: Šis ir tas Tor izpildāms objekts, kuru Vidalia izpildīs, ja no ikonjoslas izvēnes izvēlēsities <i>Start</i>. Ja ir instalētas vairākas Tor versijas, varat norādīt izpildāmo Vidalia versiju, noklikšķinot pogu <i>Pārlūkot</i> un pārvietojoties uz vēlamo konkrēto Tor instalāciju." #. type: Content of: <html><body><ul><li> #: en/config.html:39 @@ -193,7 +193,7 @@ msgid "" "<b>Style</b>: In most cases, Vidalia will default to using your platform's " "default interface style. If you dislike the default, you can choose " "whichever interface style you prefer from the dropdown box." -msgstr "" +msgstr "<b>Stils</b>: Vairumā gadījumu Vidalia pēc noklusējuma lietos platformas saskarnes noklusējuma stilu. Ja noklusējuma stilu vēlams mainīt, no nolaižamās kastītes iespējams izvēlēties jebkuru citu stilu." #. type: Content of: <html><body> #: en/config.html:131

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 28 Dec '12

28 Dec '12

commit a826c849420b682dedd8a260a452bb9d6593c83a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 28 12:15:20 2012 +0000 Update translations for vidalia_completed --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index ae56d1a..2f49d75 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-12-27 19:32+0000\n" +"PO-Revision-Date: 2012-12-28 11:46+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -3010,7 +3010,7 @@ msgstr "Puertos no configurados por las demás preferencias" msgctxt "ServerPage" msgid "Misc Other Services" -msgstr "Otros servicios misceláneos" +msgstr "Otros servicios" msgctxt "ServerPage" msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 28 Dec '12

28 Dec '12

commit f410704ae4efb791c991e00f063998e104d4f778 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 28 12:15:16 2012 +0000 Update translations for vidalia --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index ae56d1a..2f49d75 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-12-27 19:32+0000\n" +"PO-Revision-Date: 2012-12-28 11:46+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -3010,7 +3010,7 @@ msgstr "Puertos no configurados por las demás preferencias" msgctxt "ServerPage" msgid "Misc Other Services" -msgstr "Otros servicios misceláneos" +msgstr "Otros servicios" msgctxt "ServerPage" msgid "Ports 706, 1863, 5050, 5190, 5222, 5223, 8300 and 8888"

1 0