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

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit fc5a3d09da831e8f37ddb2b7a91a75c024450c44 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 08:15:33 2015 +0000 Update translations for liveusb-creator --- zh_TW/zh_TW.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 0bc5e7f..8cce9bd 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -10,15 +10,15 @@ # Nicholas Ou <oldmonou(a)gmail.com>, 2014 # Terry Chuang <tchuang(a)redhat.com>, 2009 # Wei-Lun Chao <william.chao(a)ossii.com.tw>, 2009 -# x4r <xatierlike(a)gmail.com>, 2014 +# x4r <xatierlike(a)gmail.com>, 2014-2015 # x4r <xatierlike(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-11 19:14+0100\n" -"PO-Revision-Date: 2015-02-14 09:01+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2015-02-23 13:07+0100\n" +"PO-Revision-Date: 2015-03-23 08:11+0000\n" +"Last-Translator: x4r <xatierlike(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -389,7 +389,7 @@ msgstr "無論如何仍嘗試繼續。" #: ../liveusb/gui.py:407 msgid "USB drive found" -msgstr "" +msgstr "找到 USB 裝置" #: ../liveusb/creator.py:958 #, python-format

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit f4d90e2b6fd854be38235a4101d4966cbadab8f8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 08:15:29 2015 +0000 Update translations for https_everywhere_completed --- zh_TW/https-everywhere.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zh_TW/https-everywhere.dtd b/zh_TW/https-everywhere.dtd index 7552a31..86a1dad 100644 --- a/zh_TW/https-everywhere.dtd +++ b/zh_TW/https-everywhere.dtd @@ -8,12 +8,14 @@ <!ENTITY https-everywhere.about.contribute "若您喜歡 HTTPS Everywhere，您或許可以考慮"> <!ENTITY https-everywhere.about.donate_tor "贊助 Tor"> <!ENTITY https-everywhere.about.tor_lang_code "zh-TW"> +<!ENTITY https-everywhere.about.or "或"> <!ENTITY https-everywhere.about.donate_eff "贊助 EFF"> <!ENTITY https-everywhere.menu.about "關於 HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory "SSL 觀測站偏好設定"> <!ENTITY https-everywhere.menu.globalEnable "啟用 HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "停用 HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.blockHttpRequests "阻擋所有　HTTP 請求"> <!ENTITY https-everywhere.menu.showCounter "顯示計數器"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere 偏好設定">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit 74d6bb4efc9d72d39e82f5c5416b2afa7afd1c51 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 08:15:24 2015 +0000 Update translations for https_everywhere --- zh_TW/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_TW/https-everywhere.dtd b/zh_TW/https-everywhere.dtd index c6ef43b..86a1dad 100644 --- a/zh_TW/https-everywhere.dtd +++ b/zh_TW/https-everywhere.dtd @@ -15,7 +15,7 @@ <!ENTITY https-everywhere.menu.observatory "SSL 觀測站偏好設定"> <!ENTITY https-everywhere.menu.globalEnable "啟用 HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "停用 HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.blockHttpRequests "Block all HTTP requests"> +<!ENTITY https-everywhere.menu.blockHttpRequests "阻擋所有　HTTP 請求"> <!ENTITY https-everywhere.menu.showCounter "顯示計數器"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere 偏好設定">

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit dfffb67c12406843a64d68b5e04fe88d2f7fc3d3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 08:15:17 2015 +0000 Update translations for torcheck_completed --- zh_TW/torcheck.po | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/zh_TW/torcheck.po b/zh_TW/torcheck.po index 4e6d879..9dee9b1 100644 --- a/zh_TW/torcheck.po +++ b/zh_TW/torcheck.po @@ -3,17 +3,17 @@ # # Translators: # cges30901 <cges30901(a)gmail.com>, 2014 -# chinrur <chinrur(a)gmail.com>, 2013 -# chinrur <chinrur(a)gmail.com>, 2013 +# Chinrur Yang <chinrur(a)gmail.com>, 2013 +# Chinrur Yang <chinrur(a)gmail.com>, 2013 # danfong <danfong.hsieh(a)gmail.com>, 2014 -# x4r <xatierlike(a)gmail.com>, 2014 +# x4r <xatierlike(a)gmail.com>, 2014-2015 # cges30901 <cges30901(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-10-15 17:11+0000\n" -"Last-Translator: danfong <danfong.hsieh(a)gmail.com>\n" +"PO-Revision-Date: 2015-03-23 08:11+0000\n" +"Last-Translator: x4r <xatierlike(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,8 +31,8 @@ msgid "" "the Internet anonymously." msgstr "請參閱<a href=\"https://www.torproject.org/\">Tor 網站</a>有關安全使用 Tor 的進一步資訊。您現在是以匿名方式瀏覽網際網路。" -msgid "There is a security update available for the Tor Browser Bundle." -msgstr "Tor 瀏覽器套件有安全更新可用。" +msgid "There is a security update available for Tor Browser." +msgstr "有可取得的 Tor 瀏覽器安全性更新" msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " @@ -98,5 +98,11 @@ msgstr "JavaScript 已啟用。" msgid "JavaScript is disabled." msgstr "JavaScript 已停用。" -msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "然而，這個不會出現在 Tor 瀏覽器套件裡。" +msgid "However, it does not appear to be Tor Browser." +msgstr "然而，這不會成為 Tor 瀏覽器" + +msgid "Run a Relay" +msgstr "執行 Relay" + +msgid "Stay Anonymous" +msgstr "保持匿名"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit bc1d18105049b7ee5737dd199331c654dde3b3fc Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 08:15:14 2015 +0000 Update translations for torcheck --- zh_TW/torcheck.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/zh_TW/torcheck.po b/zh_TW/torcheck.po index b8edb2a..9dee9b1 100644 --- a/zh_TW/torcheck.po +++ b/zh_TW/torcheck.po @@ -6,14 +6,14 @@ # Chinrur Yang <chinrur(a)gmail.com>, 2013 # Chinrur Yang <chinrur(a)gmail.com>, 2013 # danfong <danfong.hsieh(a)gmail.com>, 2014 -# x4r <xatierlike(a)gmail.com>, 2014 +# x4r <xatierlike(a)gmail.com>, 2014-2015 # cges30901 <cges30901(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-02-14 08:38+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-03-23 08:11+0000\n" +"Last-Translator: x4r <xatierlike(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +32,7 @@ msgid "" msgstr "請參閱<a href=\"https://www.torproject.org/\">Tor 網站</a>有關安全使用 Tor 的進一步資訊。您現在是以匿名方式瀏覽網際網路。" msgid "There is a security update available for Tor Browser." -msgstr "" +msgstr "有可取得的 Tor 瀏覽器安全性更新" msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " @@ -99,10 +99,10 @@ msgid "JavaScript is disabled." msgstr "JavaScript 已停用。" msgid "However, it does not appear to be Tor Browser." -msgstr "" +msgstr "然而，這不會成為 Tor 瀏覽器" msgid "Run a Relay" -msgstr "" +msgstr "執行 Relay" msgid "Stay Anonymous" -msgstr "" +msgstr "保持匿名"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit 3697520d506a2f7036114d41d30b33195e68c0e6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 08:15:07 2015 +0000 Update translations for bridgedb_completed --- zh_TW/LC_MESSAGES/bridgedb.po | 54 +++++++++++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/zh_TW/LC_MESSAGES/bridgedb.po b/zh_TW/LC_MESSAGES/bridgedb.po index acda44c..c36c522 100644 --- a/zh_TW/LC_MESSAGES/bridgedb.po +++ b/zh_TW/LC_MESSAGES/bridgedb.po @@ -1,17 +1,18 @@ # Translations template for BridgeDB. -# Copyright (C) 2014 'The Tor Project, Inc.' +# Copyright (C) 2015 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: # danfong <danfong.hsieh(a)gmail.com>, 2014 # LNDDYL, 2014 +# x4r <xatierlike(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…'\n" -"POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-11-24 09:10+0000\n" -"Last-Translator: LNDDYL\n" +"POT-Creation-Date: 2015-02-03 03:24+0000\n" +"PO-Revision-Date: 2015-03-23 08:01+0000\n" +"Last-Translator: x4r <xatierlike(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,7 +32,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:121 +#: lib/bridgedb/HTTPServer.py:122 msgid "Sorry! Something went wrong with your request." msgstr "抱歉!您的請求發生錯誤。" @@ -74,7 +75,7 @@ msgstr "嘿，%s!" msgid "Hello, friend!" msgstr "朋友，您好!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" msgstr "公開金鑰" @@ -255,35 +256,58 @@ msgstr "按照 TYPE 請求 Pluggable Transport。" msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "取得 BridgeDB 的公共 GnuPG 金鑰副本。" -#: lib/bridgedb/templates/base.html:92 +#: lib/bridgedb/templates/base.html:89 msgid "Report a Bug" msgstr "回報錯誤" -#: lib/bridgedb/templates/base.html:94 +#: lib/bridgedb/templates/base.html:92 msgid "Source Code" msgstr "原始程式碼" -#: lib/bridgedb/templates/base.html:97 +#: lib/bridgedb/templates/base.html:95 msgid "Changelog" msgstr "變更記錄" -#: lib/bridgedb/templates/base.html:99 +#: 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 "出示 QRCode" + +#: lib/bridgedb/templates/bridges.html:100 +msgid "QRCode for your bridge lines" +msgstr "您的橋接的 QRCode" + #. 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:66 +#: lib/bridgedb/templates/bridges.html:115 +#: lib/bridgedb/templates/bridges.html:175 msgid "Uh oh, spaghettios!" msgstr "有問題!" -#: lib/bridgedb/templates/bridges.html:72 +#: lib/bridgedb/templates/bridges.html:116 +msgid "It seems there was an error getting your QRCode." +msgstr "掃描 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 "這個 QRCode 還有您的橋接資訊。在行動裝置上掃描以獲得您的橋接資訊" + +#: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." msgstr "目前沒有任何橋接可用..." -#: lib/bridgedb/templates/bridges.html:73 +#: lib/bridgedb/templates/bridges.html:182 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -344,7 +368,7 @@ 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:130 +#: lib/bridgedb/templates/options.html:127 #, python-format msgid "%sY%ses!" msgstr "%sY%ses!" @@ -352,7 +376,7 @@ msgstr "%sY%ses!" #. 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:154 +#: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" msgstr "%sG%set Bridges"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 23 Mar '15

23 Mar '15

commit 4c2211d6c352bc4008e09e2d9e257cf27ac2fb05 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 23 08:15:03 2015 +0000 Update translations for bridgedb --- zh_TW/LC_MESSAGES/bridgedb.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/zh_TW/LC_MESSAGES/bridgedb.po b/zh_TW/LC_MESSAGES/bridgedb.po index 1e5f568..c36c522 100644 --- a/zh_TW/LC_MESSAGES/bridgedb.po +++ b/zh_TW/LC_MESSAGES/bridgedb.po @@ -5,13 +5,14 @@ # Translators: # danfong <danfong.hsieh(a)gmail.com>, 2014 # LNDDYL, 2014 +# x4r <xatierlike(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…'\n" "POT-Creation-Date: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-02-14 08:51+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-03-23 08:01+0000\n" +"Last-Translator: x4r <xatierlike(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -277,11 +278,11 @@ msgstr "選擇全部" #: lib/bridgedb/templates/bridges.html:87 msgid "Show QRCode" -msgstr "" +msgstr "出示 QRCode" #: lib/bridgedb/templates/bridges.html:100 msgid "QRCode for your bridge lines" -msgstr "" +msgstr "您的橋接的 QRCode" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -294,13 +295,13 @@ msgstr "有問題!" #: lib/bridgedb/templates/bridges.html:116 msgid "It seems there was an error getting your QRCode." -msgstr "" +msgstr "掃描 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 "" +msgstr "這個 QRCode 還有您的橋接資訊。在行動裝置上掃描以獲得您的橋接資訊" #: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..."

1 0

[tor-browser/tor-browser-31.5.0esr-4.5-1] Merge remote-tracking branch 'pc/bug13548-01' into tor-browser-31.5.0esr-4.5-1
by gk＠torproject.org 23 Mar '15

23 Mar '15

commit 04e603a60a13aed5434a6d5450b432a8f5ab7c46 Merge: 709dd9e 5b48b32 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Mar 23 08:02:02 2015 +0000 Merge remote-tracking branch 'pc/bug13548-01' into tor-browser-31.5.0esr-4.5-1 content/base/public/nsNameSpaceManager.h | 11 +++++--- content/base/src/nsNameSpaceManager.cpp | 43 ++++++++++++++++++++++++++++-- 2 files changed, 49 insertions(+), 5 deletions(-) diff --cc content/base/src/nsNameSpaceManager.cpp index 3f4f9f8,d2a9722..d81d8d8 --- a/content/base/src/nsNameSpaceManager.cpp +++ b/content/base/src/nsNameSpaceManager.cpp @@@ -152,9 -166,20 +167,20 @@@ NS_NewElement(Element** aResult } #endif if (ns == kNameSpaceID_MathML) { - return NS_NewMathMLElement(aResult, ni.forget()); + // If the mathml.disabled pref. is true, convert all MathML nodes into + // generic XML nodes by swapping the namespace. + nsNameSpaceManager* nsmgr = nsNameSpaceManager::GetInstance(); + if (nsmgr && !nsmgr->mIsMathMLDisabled) { + return NS_NewMathMLElement(aResult, ni.forget()); + } + + nsNodeInfoManager *niMgr = ni->NodeInfoManager(); + nsCOMPtr<nsINodeInfo> genericXMLNI = niMgr->GetNodeInfo(ni->NameAtom(), + ni->GetPrefixAtom(), kNameSpaceID_XML, + ni->NodeType(), ni->GetExtraName()); + return NS_NewXMLElement(aResult, genericXMLNI.forget()); } - if (ns == kNameSpaceID_SVG) { + if (ns == kNameSpaceID_SVG && NS_SVGEnabled(ni->GetDocument())) { return NS_NewSVGElement(aResult, ni.forget(), aFromParser); } if (ns == kNameSpaceID_XBL && ni->Equals(nsGkAtoms::children)) {

1 0

[tor-browser/tor-browser-31.5.0esr-4.5-1] Bug 13548: Create preference to disable MathML.
by gk＠torproject.org 23 Mar '15

23 Mar '15

commit 5b48b325cf54fe341c9c6c417ecfbb83cc5625be Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Mar 5 18:50:59 2015 -0500 Bug 13548: Create preference to disable MathML. If the mathml.disabled preference is true, treat <math> and other MathML elements as generic XML elements. --- content/base/public/nsNameSpaceManager.h | 11 +++++--- content/base/src/nsNameSpaceManager.cpp | 43 ++++++++++++++++++++++++++++-- 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/content/base/public/nsNameSpaceManager.h b/content/base/public/nsNameSpaceManager.h index 7f222a6..24b85f3 100644 --- a/content/base/public/nsNameSpaceManager.h +++ b/content/base/public/nsNameSpaceManager.h @@ -8,6 +8,7 @@ #include "nsDataHashtable.h" #include "nsTArray.h" +#include "nsIObserver.h" #include "mozilla/StaticPtr.h" @@ -84,10 +85,13 @@ private: * */ -class nsNameSpaceManager +class nsNameSpaceManager : public nsIObserver { public: - virtual ~nsNameSpaceManager() {} + NS_DECL_ISUPPORTS + NS_DECL_NSIOBSERVER + + virtual ~nsNameSpaceManager(); virtual nsresult RegisterNameSpace(const nsAString& aURI, int32_t& aNameSpaceID); @@ -98,6 +102,7 @@ public: virtual bool HasElementCreator(int32_t aNameSpaceID); static nsNameSpaceManager* GetInstance(); + bool mIsMathMLDisabled; private: bool Init(); nsresult AddNameSpace(const nsAString& aURI, const int32_t aNameSpaceID); @@ -105,7 +110,7 @@ private: nsDataHashtable<nsNameSpaceKey,int32_t> mURIToIDTable; nsTArray< nsAutoPtr<nsString> > mURIArray; - static mozilla::StaticAutoPtr<nsNameSpaceManager> sInstance; + static mozilla::StaticRefPtr<nsNameSpaceManager> sInstance; }; #endif // nsNameSpaceManager_h___ diff --git a/content/base/src/nsNameSpaceManager.cpp b/content/base/src/nsNameSpaceManager.cpp index 409e08c..d2a9722 100644 --- a/content/base/src/nsNameSpaceManager.cpp +++ b/content/base/src/nsNameSpaceManager.cpp @@ -20,6 +20,7 @@ #include "mozilla/ClearOnShutdown.h" #include "mozilla/dom/XBLChildrenElement.h" #include "mozilla/dom/Element.h" +#include "mozilla/Preferences.h" using namespace mozilla; using namespace mozilla::dom; @@ -35,7 +36,14 @@ using namespace mozilla::dom; #define kXULNameSpaceURI "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" #define kSVGNameSpaceURI "http://www.w3.org/2000/svg" -StaticAutoPtr<nsNameSpaceManager> nsNameSpaceManager::sInstance; +static const char kMathMLDisabledPrefName[] = "mathml.disabled"; + +static const char* kObservedPrefs[] = { + kMathMLDisabledPrefName, + nullptr +}; + +StaticRefPtr<nsNameSpaceManager> nsNameSpaceManager::sInstance; /* static */ nsNameSpaceManager* nsNameSpaceManager::GetInstance() { @@ -52,6 +60,10 @@ nsNameSpaceManager::GetInstance() { return sInstance; } +nsNameSpaceManager::~nsNameSpaceManager() { + mozilla::Preferences::RemoveObservers(this, kObservedPrefs); +} + bool nsNameSpaceManager::Init() { nsresult rv; @@ -73,6 +85,9 @@ bool nsNameSpaceManager::Init() #undef REGISTER_NAMESPACE + mozilla::Preferences::AddStrongObservers(this, kObservedPrefs); + mIsMathMLDisabled = mozilla::Preferences::GetBool(kMathMLDisabledPrefName); + return true; } @@ -151,7 +166,18 @@ NS_NewElement(Element** aResult, } #endif if (ns == kNameSpaceID_MathML) { - return NS_NewMathMLElement(aResult, ni.forget()); + // If the mathml.disabled pref. is true, convert all MathML nodes into + // generic XML nodes by swapping the namespace. + nsNameSpaceManager* nsmgr = nsNameSpaceManager::GetInstance(); + if (nsmgr && !nsmgr->mIsMathMLDisabled) { + return NS_NewMathMLElement(aResult, ni.forget()); + } + + nsNodeInfoManager *niMgr = ni->NodeInfoManager(); + nsCOMPtr<nsINodeInfo> genericXMLNI = niMgr->GetNodeInfo(ni->NameAtom(), + ni->GetPrefixAtom(), kNameSpaceID_XML, + ni->NodeType(), ni->GetExtraName()); + return NS_NewXMLElement(aResult, genericXMLNI.forget()); } if (ns == kNameSpaceID_SVG) { return NS_NewSVGElement(aResult, ni.forget(), aFromParser); @@ -197,3 +223,16 @@ nsresult nsNameSpaceManager::AddNameSpace(const nsAString& aURI, return NS_OK; } + +// nsISupports +NS_IMPL_ISUPPORTS(nsNameSpaceManager, + nsIObserver) + +// nsIObserver +NS_IMETHODIMP +nsNameSpaceManager::Observe(nsISupports* aObject, const char* aTopic, + const char16_t* aMessage) +{ + mIsMathMLDisabled = mozilla::Preferences::GetBool(kMathMLDisabledPrefName); + return NS_OK; +}

1 0

[tor-browser/tor-browser-31.5.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 23 Mar '15

23 Mar '15

commit 1ca437755964660f39630f82cc1305670fef7874 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Mar 23 08:07:55 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 2e2984c..2d93908 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -117,7 +117,10 @@ pref("plugin.state.flash", 1); pref("plugins.hide_infobar_for_missing_plugin", true); pref("plugins.hideMissingPluginsNotification", true); pref("media.peerconnection.enabled", false); // Disable WebRTC interfaces -pref("svg.in-content.enabled", true); // May be disabled via Torbutton's security slider. + +// Security slider +pref("svg.in-content.enabled", true); +pref("mathml.disabled", false); // Network and performance pref("network.http.pipelining", true);

1 0