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

[webwml/staging] spaces
by sebastian＠torproject.org 12 Feb '15

12 Feb '15

commit c81e08d9823cd38435b0d524919abef9b5b29338 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Feb 11 12:21:24 2015 +0100 spaces --- docs/en/tor-doc-windows.wml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/en/tor-doc-windows.wml b/docs/en/tor-doc-windows.wml index dbeae88..0cef883 100644 --- a/docs/en/tor-doc-windows.wml +++ b/docs/en/tor-doc-windows.wml @@ -11,8 +11,8 @@ <a href="<page index>">Home » </a> <a href="<page docs/documentation>">Documentation » </a> <a href="<page docs/tor-doc-windows>">Windows Client</a> - </div> - <div id="maincol"> + </div> + <div id="maincol"> <h1>Running the <a href="<page index>">Tor</a> client on Microsoft Windows</h1> <br> @@ -21,28 +21,28 @@ href="<page projects/torbrowser>">Tor Browser</a> and you are done. </h2> - + <p>If it's still not working, look at <a href="<page docs/faq>#DoesntWork">this FAQ entry</a> for hints.</p> - + <p> Once it's working, learn more about <a href="<page download/download>#Warning">what Tor does and does not offer</a>. </p> - + <hr> <a id="server"></a> <a id="relay"></a> <h2><a class="anchor" href="#relay">Configuring Tor as a relay</a></h2> <br> - + <p>The Tor network relies on volunteers to donate bandwidth. If you want to help <strong>make the Tor network faster</strong>, please consider <a href="<page docs/tor-doc-relay>">running a relay</a>.</p> - + <hr> - + <p>If you have suggestions for improving this document, please <a href="<page about/contact>">send them to us</a>. Thanks!</p> </div> @@ -54,4 +54,4 @@  </div>  -#include <foot.wmi> +#include <foot.wmi>

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 12 Feb '15

12 Feb '15

commit 6d0fac2c0dc635050f14ee9e2e395da80ff179af Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 12 07:45:15 2015 +0000 Update translations for whisperback_completed --- id/id.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/id.po b/id/id.po index 102dad6..44b2bda 100644 --- a/id/id.po +++ b/id/id.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 17:40+0100\n" -"PO-Revision-Date: 2015-02-12 02:33+0000\n" +"PO-Revision-Date: 2015-02-12 07:18+0000\n" "Last-Translator: Astryd Viandila Dahlan <astrydviandila(a)yahoo.com>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" "MIME-Version: 1.0\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 12 Feb '15

12 Feb '15

commit 15c9f0bb8f81bff58cf44a31f6974aa7ca9f3c9f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 12 07:45:11 2015 +0000 Update translations for whisperback --- id/id.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id/id.po b/id/id.po index 102dad6..44b2bda 100644 --- a/id/id.po +++ b/id/id.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 17:40+0100\n" -"PO-Revision-Date: 2015-02-12 02:33+0000\n" +"PO-Revision-Date: 2015-02-12 07:18+0000\n" "Last-Translator: Astryd Viandila Dahlan <astrydviandila(a)yahoo.com>\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" "MIME-Version: 1.0\n"

1 0

[webwml/master] Fixed version tags and windows package name
by sebastian＠torproject.org 12 Feb '15

12 Feb '15

commit fba8f12cb418638c66e17cb8eb84151a41c82119 Author: ilv <ilv(a)users.noreply.github.com> Date: Thu Feb 12 00:04:48 2015 -0300 Fixed version tags and windows package name --- docs/en/verifying-signatures.wml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml index d4bc169..8791165 100644 --- a/docs/en/verifying-signatures.wml +++ b/docs/en/verifying-signatures.wml @@ -85,7 +85,7 @@ <p>To verify the signature of the package you downloaded, you will need to download the ".asc" file as well. Assuming you downloaded the package and its signature to your Desktop, run:</p> - <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --verify C:\Users\Alice\Desktop\tor-browser-2.3.25-13_en-US.exe.asc C:\Users\Alice\Desktop\tor-browser-2.3.25-13_en-US.exe</pre> + <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --verify C:\Users\Alice\Desktop\torbrowser-install-<version-torbrowserbundle>_en-US.exe.asc C:\Users\Alice\Desktop\torbrowser-install-<version-torbrowserbundle>_en-US.exe</pre> <p>The output should say "Good signature": </p> <pre> gpg: Signature made Wed 31 Aug 2011 06:37:01 PM EDT using RSA key ID 63FEE659 @@ -137,14 +137,13 @@ <p>To verify the signature of the package you downloaded, you will need to download the ".asc" file as well. Assuming you downloaded the - package and its signature to your Desktop, run (where <version> stands - for the version of Tor Browser you downloaded):</p> + package and its signature to your Desktop, run:</p> - <strong>For Mac OS X users</strong>: - <pre>gpg --verify ~/Desktop/TorBrowser-<version>-osx32_en-US.dmg{.asc*,}</pre> + <strong>For Mac OS X users</strong>:<br /> + <pre>gpg --verify ~/Desktop/TorBrowser-<version-torbrowserbundleosx32>-osx32_en-US.dmg{.asc*,}</pre> - <strong>For Linux users</strong> (change 32 by 64 if you have the 64-bit package): - <pre>gpg --verify ~/Desktop/tor-browser-linux32-<version>_en-US.tar.xz{.asc*,}</pre> + <strong>For Linux users</strong> (change 32 by 64 if you have the 64-bit package):<br /> + <pre>gpg --verify ~/Desktop/tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz{.asc*,}</pre> <p>The output should say "Good signature": </p>

1 0

[webwml/master] Fix grammar as pointed out by arma
by sebastian＠torproject.org 12 Feb '15

12 Feb '15

commit 7463e885872e92ee32ebcdb271bc4e77ea598a1b Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Feb 12 07:59:31 2015 +0100 Fix grammar as pointed out by arma --- docs/en/verifying-signatures.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml index 8791165..af3e437 100644 --- a/docs/en/verifying-signatures.wml +++ b/docs/en/verifying-signatures.wml @@ -142,7 +142,7 @@ <strong>For Mac OS X users</strong>:<br /> <pre>gpg --verify ~/Desktop/TorBrowser-<version-torbrowserbundleosx32>-osx32_en-US.dmg{.asc*,}</pre> - <strong>For Linux users</strong> (change 32 by 64 if you have the 64-bit package):<br /> + <strong>For Linux users</strong> (change 32 to 64 if you have the 64-bit package):<br /> <pre>gpg --verify ~/Desktop/tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz{.asc*,}</pre> <p>The output should say "Good signature": </p>

1 0

[torbutton/master] fixup! Bug 9387: Bind jar: pref to security slider
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit 1e727db8e063928d48d1bfbcdedd7bc7f64295f1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 11 16:54:29 2015 -0800 fixup! Bug 9387: Bind jar: pref to security slider Fix a missing :. --- src/chrome/content/torbutton.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 752206e..2fa7189 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2161,7 +2161,7 @@ var torbutton_sec_ml_bool_prefs = { "javascript.options.asmjs" : false, "noscript.forbidMedia" : true, "media.webaudio.enabled" : false, - "network.jar.block-remote-files", true, + "network.jar.block-remote-files" : true, // XXX: pref for disabling MathML is missing };

1 0

[torbutton/master] Bug 14392: Make about:tor behave like other initial pages.
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit 4d194b2b827b65f357f6c0a9e02ac719bad86afc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 11 16:46:10 2015 -0800 Bug 14392: Make about:tor behave like other initial pages. In particular: Don't steal focus from the URL bar. --- src/chrome/content/aboutTor/aboutTor.xhtml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index c13f60e..9b77af2 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -33,7 +33,6 @@ function onLoad() window.setTimeout( function() { adjustToolbarIconArrow(); - document.getElementById('sx').focus(); }, 0); }

1 0

[torbutton/master] Bug 11236: Don't set search engines in extension
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit 4c35e375ff74614b84ff722e9214d757fed07b01 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 23 12:09:45 2015 +0000 Bug 11236: Don't set search engines in extension We risk search engine names getting translated which results in broken search boxes if we expose them in locale files. As we only use en-US search engines (i.e. no localized ones) we can avoid that risk by removing these language strings and adding the search engines names directly into a central preference file shared by all localized bundles. --- src/chrome/locale/en/browser.properties | 8 -------- src/defaults/preferences/preferences.js | 6 +----- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/chrome/locale/en/browser.properties b/src/chrome/locale/en/browser.properties index 295a03a..8849b67 100644 --- a/src/chrome/locale/en/browser.properties +++ b/src/chrome/locale/en/browser.properties @@ -3,11 +3,3 @@ browser.startup.homepage=about:tor # Spell checker dictionary spellchecker.dictionary=en_US - -# Default search engine -browser.search.defaultenginename=Startpage - -# Search engine order (order displayed in the search bar dropdown) -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 3e02b77..c6fb8e4 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -225,10 +225,6 @@ pref("extensions.torbutton.cookie_js_allow", true); pref("extensions.torbutton.prompt_torbrowser", true); pref("extensions.torbutton.confirm_plugins", true); -// Browser home page, spell checker dictionary, and search engine overrides: +// Browser home page, and spell checker dictionary: pref("browser.startup.homepage", "chrome://torbutton/locale/browser.properties"); pref("spellchecker.dictionary", "chrome://torbutton/locale/browser.properties"); -pref("browser.search.defaultenginename", "chrome://torbutton/locale/browser.properties"); -pref("browser.search.order.1", "chrome://torbutton/locale/browser.properties"); -pref("browser.search.order.2", "chrome://torbutton/locale/browser.properties"); -pref("browser.search.order.3", "chrome://torbutton/locale/browser.properties");

1 0

[torbutton/master] Bug 14490: Make disconnect search the default search engine.
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit 699f82654904841df2691fe020928933afe312ff Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 11 16:57:08 2015 -0800 Bug 14490: Make disconnect search the default search engine. --- src/chrome/content/aboutTor/aboutTor.xhtml | 8 ++++---- src/chrome/locale/en/aboutTor.dtd | 1 + src/chrome/locale/en/aboutTor.properties | 6 ++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 9b77af2..95807fd 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -112,9 +112,9 @@ function insertPropertyStrings() Components.utils.import("resource://gre/modules/Services.jsm"); var gStringBundle = Services.strings.createBundle(kPropertiesURL); - var s1 = gStringBundle.GetStringFromName("aboutTor.searchSP.privacy.link"); - var s2 = gStringBundle.GetStringFromName("aboutTor.searchSP.search.link"); - var result = gStringBundle.formatStringFromName("aboutTor.searchSP.privacy", + var s1 = gStringBundle.GetStringFromName("aboutTor.searchDC.privacy.link"); + var s2 = gStringBundle.GetStringFromName("aboutTor.searchDC.search.link"); + var result = gStringBundle.formatStringFromName("aboutTor.searchDC.privacy", [s1, s2], 2); if (result) { var elem = document.getElementById("searchProviderInfo"); @@ -165,7 +165,7 @@ window.addEventListener("pageshow", function() { </div> <div class="searchbox hideIfTorOff">  - <form action="&aboutTor.searchSPPost.link;" method="post"> + <form action="&aboutTor.searchDCPost.link;" method="post"> <div id="sxw"> <div id="sbutton"> <input name="b" id="sb" value="" title="&aboutTor.search.label;" diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 6f63ff7..771f8ae 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -25,6 +25,7 @@ <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> +<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> diff --git a/src/chrome/locale/en/aboutTor.properties b/src/chrome/locale/en/aboutTor.properties index 02088f0..d607324 100644 --- a/src/chrome/locale/en/aboutTor.properties +++ b/src/chrome/locale/en/aboutTor.properties @@ -13,3 +13,9 @@ aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>. +# The following string is a link which replaces %1$S above. +aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +# The following string is a link which replaces %2$S above. +aboutTor.searchDC.search.link=https://search.disconnect.me/

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! Bug #4902: Add DDG and StartPage to Omnibox.
by mikeperry＠torproject.org 12 Feb '15

12 Feb '15

commit d653d7bdff8e36366d551968dfac1cad9cd1dbef Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 23 12:03:52 2015 +0000 fixup! Bug #4902: Add DDG and StartPage to Omnibox. We don't mess with the region.properties anymore as this is fragile: Translators start to translate the search engine names (see #11236). We put the necessary values into our central preference file, 000-tor-browser.js, instead of overriding the values set in the respective locales. --- browser/locales/en-US/chrome/browser-region/region.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties index 16963f3..e078ed5 100644 --- a/browser/locales/en-US/chrome/browser-region/region.properties +++ b/browser/locales/en-US/chrome/browser-region/region.properties @@ -3,12 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine -browser.search.defaultenginename=Startpage +browser.search.defaultenginename=Google # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Startpage -browser.search.order.2=DuckDuckGo -browser.search.order.3=Google +browser.search.order.1=Google +browser.search.order.2=Yahoo +browser.search.order.3=Bing # This is the default set of web based feed handlers shown in the reader # selection UI

1 0