- tbb-commits - lists.torproject.org

[tor-browser-bundle/maint-3.6] Back out Torbutton 1.6.12.3
by mikeperry＠torproject.org 24 Sep '14

24 Sep '14

commit d37da21a366199555c67c11e984cddddbbc66301 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Sep 24 00:38:38 2014 -0700 Back out Torbutton 1.6.12.3 GeKo has concerns about testing and the potential for additional hangs. --- Bundle-Data/Docs/ChangeLog.txt | 3 --- gitian/versions | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index e927d9c..5aa2c5c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,9 +5,6 @@ Tor Browser Bundle 3.6.6 -- Sep 24 2014 * Update NoScript to 2.6.8.42 * Update HTTPS Everywhere to 4.0.1 * Bug 12998: Prevent intermediate certs from being written to disk - * Update Torbutton to 1.6.12.3 - * Bug 13091: Use "Tor Browser" everywhere - * Bug 10804: Workaround fix for some cases of startup hang * Linux * Bug 9150: Make RPATH unavailable on Tor binary. * Bug 13031: Add full RELRO protection. diff --git a/gitian/versions b/gitian/versions index c07a09d..6f5c161 100755 --- a/gitian/versions +++ b/gitian/versions @@ -9,7 +9,7 @@ FIREFOX_VERSION=24.8.1esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1 TOR_TAG=tor-0.2.4.24 TORLAUNCHER_TAG=0.2.5.6 -TORBUTTON_TAG=1.6.12.3 +TORBUTTON_TAG=1.6.12.1 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8

1 0

[tor-browser-bundle/maint-3.6] Update subkeys for Mike Perry and Torbutton.
by mikeperry＠torproject.org 24 Sep '14

24 Sep '14

commit 75f103a5d294a5c839944e45984bf4bf9bcfa4f9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Sep 23 22:46:31 2014 -0700 Update subkeys for Mike Perry and Torbutton. --- gitian/gpg/mikeperry.gpg | Bin 7813 -> 15716 bytes gitian/gpg/torbutton.gpg | Bin 7813 -> 15716 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/mikeperry.gpg b/gitian/gpg/mikeperry.gpg index ab4acc0..7f14ee3 100644 Binary files a/gitian/gpg/mikeperry.gpg and b/gitian/gpg/mikeperry.gpg differ diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg index ab4acc0..7f14ee3 100644 Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ

1 0

[tor-browser-bundle/master] Update subkeys for Mike Perry.
by mikeperry＠torproject.org 24 Sep '14

24 Sep '14

commit 123bd9783692471258258042770c1fe58126d3d7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Sep 23 22:44:13 2014 -0700 Update subkeys for Mike Perry. --- gitian/gpg/mikeperry.gpg | Bin 7813 -> 15716 bytes gitian/gpg/torbutton.gpg | Bin 7813 -> 15716 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/mikeperry.gpg b/gitian/gpg/mikeperry.gpg index ab4acc0..7f14ee3 100644 Binary files a/gitian/gpg/mikeperry.gpg and b/gitian/gpg/mikeperry.gpg differ diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg index ab4acc0..7f14ee3 100644 Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ

1 0

[tor-browser-bundle/maint-3.6] Update changelog and versions for 3.6.6.
by mikeperry＠torproject.org 24 Sep '14

24 Sep '14

commit 7edebbe2c3f5ece67e4395f3209c866179c904ec Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Sep 23 22:30:21 2014 -0700 Update changelog and versions for 3.6.6. --- Bundle-Data/Docs/ChangeLog.txt | 14 ++++++++++++++ gitian/versions | 16 ++++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 6688bf1..e927d9c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,17 @@ +Tor Browser Bundle 3.6.6 -- Sep 24 2014 + * All Platforms + * Update Tor to tor-0.2.4.24 + * Update Firefox to 24.8.1esr + * Update NoScript to 2.6.8.42 + * Update HTTPS Everywhere to 4.0.1 + * Bug 12998: Prevent intermediate certs from being written to disk + * Update Torbutton to 1.6.12.3 + * Bug 13091: Use "Tor Browser" everywhere + * Bug 10804: Workaround fix for some cases of startup hang + * Linux + * Bug 9150: Make RPATH unavailable on Tor binary. + * Bug 13031: Add full RELRO protection. + Tor Browser Bundle 3.6.5 -- Sep 2 2014 * All Platforms * Update Firefox to 24.8.0esr diff --git a/gitian/versions b/gitian/versions index 4096ec0..c07a09d 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,15 +1,15 @@ -TORBROWSER_VERSION=3.6.5 +TORBROWSER_VERSION=3.6.6 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=24.8.0esr +FIREFOX_VERSION=24.8.1esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1 -TOR_TAG=tor-0.2.4.23 +TOR_TAG=tor-0.2.4.24 TORLAUNCHER_TAG=0.2.5.6 -TORBUTTON_TAG=1.6.12.1 +TORBUTTON_TAG=1.6.12.3 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 @@ -42,12 +42,12 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=4.0.0 +HTTPSE_VER=4.0.1 ## 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.6.8.39-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.42-fx+fn+sm.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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 @@ -75,8 +75,8 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=6b97c02b3ceab452f0ceec0f8918e0653837b24f376ba1a9dd78bb551bae3715 -HTTPSE_HASH=1241631091f9ceb417f639a6df76425cda36ee4b38b78ce8d318088eb17a7219 +NOSCRIPT_HASH=b474156fd6b9957b38054a34c8acb581204f08733cce898ed581c67d425dda33 +HTTPSE_HASH=cd811b1d424ff24939249de1e2b745ba86cbd7e6804699a9460c631a0b3474fe MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Update changelog for 3.6.6, and add an omission to 4.0a3.
by mikeperry＠torproject.org 24 Sep '14

24 Sep '14

commit a5c222038f94752618db15831e3a63a2120ff65a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Sep 23 22:21:46 2014 -0700 Update changelog for 3.6.6, and add an omission to 4.0a3. --- Bundle-Data/Docs/ChangeLog.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index a41d0d5..6f3ea04 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -10,10 +10,25 @@ Tor Browser 4.0-alpha-3 -- Sep 24 2014 * Bug 13091: Use "Tor Browser" everywhere * Bug 13049: Browser update failure (self.update is undefined) * Bug 13047: Updater should not send Kernel and GTK version + * Bug 12998: Prevent intermediate certs from being written to disk * Linux: * Bug 9150: Make RPATH unavailable on Tor binary. * Bug 13031: Add full RELRO protection. +Tor Browser Bundle 3.6.6 -- Sep 24 2014 + * All Platforms + * Update Tor to tor-0.2.4.24 + * Update Firefox to 24.8.1esr + * Update NoScript to 2.6.8.42 + * Update HTTPS Everywhere to 4.0.1 + * Bug 12998: Prevent intermediate certs from being written to disk + * Update Torbutton to 1.6.12.3 + * Bug 13091: Use "Tor Browser" everywhere + * Bug 10804: Workaround fix for some cases of startup hang + * Linux + * Bug 9150: Make RPATH unavailable on Tor binary. + * Bug 13031: Add full RELRO protection. + Tor Browser Bundle 4.0-alpha-2 -- Sep 2 2014 * All Platforms * Update Firefox to 24.8.0esr

1 0

[tor-browser-bundle/master] Bump versions and update changelog for 4.0a3.
by mikeperry＠torproject.org 24 Sep '14

24 Sep '14

commit 0d9c56ed19745b4bb5203d0ad0ad4d065235b03d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Sep 23 22:10:27 2014 -0700 Bump versions and update changelog for 4.0a3. --- Bundle-Data/Docs/ChangeLog.txt | 8 +++++--- gitian/versions.alpha | 10 +++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 24fb9b1..a41d0d5 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,10 +1,12 @@ Tor Browser 4.0-alpha-3 -- Sep 24 2014 * All Platforms - * Update Tor to 0.2.5.7-rc + * Update Tor to 0.2.5.8-rc + * Update Firefox to 24.8.1esr * Update meek to 0.11 - * Update NoScript to 2.6.8.41 - * Update Torbutton to 1.6.12.2 + * Update NoScript to 2.6.8.42 + * Update Torbutton to 1.6.12.3 * Bug 13091: Use "Tor Browser" everywhere + * Bug 10804: Workaround fix for some cases of startup hang * Bug 13091: Use "Tor Browser" everywhere * Bug 13049: Browser update failure (self.update is undefined) * Bug 13047: Updater should not send Kernel and GTK version diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 25b35e5..66f0e52 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -4,14 +4,14 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=24.8.0esr +FIREFOX_VERSION=24.8.1esr TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 -TOR_TAG=tor-0.2.5.7-rc +TOR_TAG=tor-0.2.5.8-rc TORLAUNCHER_TAG=0.2.7.0 -TORBUTTON_TAG=1.6.12.2 +TORBUTTON_TAG=1.6.12.3 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 @@ -52,7 +52,7 @@ GO_VER=1.3 ## 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.6.8.41-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.42-fx+fn+sm.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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 @@ -80,7 +80,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=ac8b2febff44a437e00bd261570af9f7aba8cc2f49e69ffb631a0578af6facc1 +NOSCRIPT_HASH=b474156fd6b9957b38054a34c8acb581204f08733cce898ed581c67d425dda33 HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[torbutton/master] Bump version and update changelog for 1.6.12.3.
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

commit 7f46869cd1b53e9a94dda54bd8101f66b78ed3ab Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 22 23:24:28 2014 -0700 Bump version and update changelog for 1.6.12.3. --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index f5d32e9..1f925c6 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.6.12.3 + 23 Sep 2014 + * Bug 10804: Workaround for some TBB startup hangs + 1.6.12.2 22 Sep 2014 * Bug 13091: Use "Tor Browser" everywhere diff --git a/src/install.rdf b/src/install.rdf index 7e2f4fc..bf5ec16 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.6.12.2</em:version> + <em:version>1.6.12.3</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

[torbutton/master] Bug 10804: Relocate event queue draining inside control port call.
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

commit bc58adf6e2ba152cca0d92f5f828e3b8b2d06798 Author: Agent Smith <smith007(a)not.gov> Date: Fri Sep 19 18:28:40 2014 +0200 Bug 10804: Relocate event queue draining inside control port call. This patch relocates the event queue draining hack from bug #9531 from New Identity to all control port commands. This should help address hangs at startup due to HTTPS activity (and other usage of the control port while the TLS stack is live). --- src/chrome/content/torbutton.js | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 4cd9c3d..9ded64b 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1428,6 +1428,19 @@ function torbutton_array_to_hexdigits(array) { // Executes a command on the control port. // Return a string response upon success and null upon error. function torbutton_send_ctrl_cmd(command) { + + // We spin the event queue until it is empty and we can be sure that sending + // NEWNYM is not leading to a deadlock (see bug 9531 comment 23 for an + // invstigation on why and when this may happen). This is surrounded by + // suppressing/unsuppressing user initiated events in a window's document to + // be sure that these events are not interfering with processing events being + // in the event queue. + var thread = Cc["@mozilla.org/thread-manager;1"]. + getService(Ci.nsIThreadManager).currentThread; + m_tb_domWindowUtils.suppressEventHandling(true); + while (thread.processNextEvent(false)) {} + m_tb_domWindowUtils.suppressEventHandling(false); + try { var socketTransportService = Components.classes["@mozilla.org/network/socket-transport-service;1"] .getService(Components.interfaces.nsISocketTransportService); @@ -1700,18 +1713,6 @@ function torbutton_do_new_identity() { getService(Ci.nsIPermissionManager); pm.removeAll(); - // We spin the event queue until it is empty and we can be sure that sending - // NEWNYM is not leading to a deadlock (see bug 9531 comment 23 for an - // invstigation on why and when this may happen). This is surrounded by - // suppressing/unsuppressing user initiated events in a window's document to - // be sure that these events are not interfering with processing events being - // in the event queue. - var thread = Cc["@mozilla.org/thread-manager;1"]. - getService(Ci.nsIThreadManager).currentThread; - m_tb_domWindowUtils.suppressEventHandling(true); - while (thread.processNextEvent(false)) {} - m_tb_domWindowUtils.suppressEventHandling(false); - torbutton_log(3, "New Identity: Sending NEWNYM"); // We only support TBB for newnym.

1 0

[tor-browser/tor-browser-24.8.0esr-3.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

commit 3c180c71ebadcea1e7913723f5404baba399d657 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Aug 29 15:34:39 2014 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. (missing pref setting for "Bug #2949: Make Intermediate Cert Store memory-only") --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index a58ce4a..93ed957 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -19,6 +19,7 @@ pref("dom.indexedDB.enabled", false); pref("permissions.memory_only", true); pref("network.cookie.lifetimePolicy", 2); pref("browser.download.manager.retention", 1); +pref("security.nocertdb", true); // Disk activity: TBB Directory Isolation pref("browser.download.useDownloadDir", false);

1 0

[tor-browser/tor-browser-24.8.0esr-4.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

commit 86e814b7e3693a7e3a5f3339683208d9e7fcabeb Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Aug 29 15:34:39 2014 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. (missing pref setting for "Bug #2949: Make Intermediate Cert Store memory-only") --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index c557d98..8635015 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -18,6 +18,7 @@ pref("dom.indexedDB.enabled", false); pref("permissions.memory_only", true); pref("network.cookie.lifetimePolicy", 2); pref("browser.download.manager.retention", 1); +pref("security.nocertdb", true); // Disk activity: TBB Directory Isolation pref("browser.download.useDownloadDir", false);

1 0

[tor-browser/tor-browser-24.8.0esr-4.x-1] Bug 13047: Updater should not send Kernel/GTK version
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

commit e4eca4759ead07562e4f6526b1ce79fe056fd03a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Sep 18 13:51:43 2014 -0400 Bug 13047: Updater should not send Kernel/GTK version Removed the %OS_VERSION% component from the update URL and replaced the /update/ component of the URL with /update_2/. Added support for minSupportedOSVersion, an attribute of the <update> element that may be used to trigger Firefox's "unsupported platform" behavior. Older versions of TB will ignore this (unknown to them) attribiute. --- browser/app/profile/firefox.js | 2 +- toolkit/mozapps/update/nsUpdateService.js | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 3e3a77c..620a7a9 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -152,7 +152,7 @@ pref("app.update.silent", false); pref("app.update.staging.enabled", true); // Update service URL: -pref("app.update.url", "https://www.torproject.org/dist/torbrowser/update/%CHANNEL%/%BUILD_TARGET%/…"); +pref("app.update.url", "https://www.torproject.org/dist/torbrowser/update_2/%CHANNEL%/%BUILD_TARGET…"); // app.update.url.manual is in branding section // app.update.url.details is in branding section diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js index eb4a74a..fbf99a7 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -1598,7 +1598,17 @@ function Update(update) { this._patches.push(patch); } - if (this._patches.length == 0 && !update.hasAttribute("unsupported")) + if (update.hasAttribute("unsupported")) + this.unsupported = ("true" == update.getAttribute("unsupported")); + else if (update.hasAttribute("minSupportedOSVersion")) { + let minOSVersion = update.getAttribute("minSupportedOSVersion"); + try { + let osVersion = Services.sysinfo.getProperty("version"); + this.unsupported = (Services.vc.compare(osVersion, minOSVersion) < 0); + } catch (e) {} + } + + if (this._patches.length == 0 && !this.unsupported) throw Cr.NS_ERROR_ILLEGAL_VALUE; // Fallback to the behavior prior to bug 530872 if the update does not have an @@ -1643,15 +1653,13 @@ function Update(update) { if(!isNaN(attr.value)) this.promptWaitTime = parseInt(attr.value); } - else if (attr.name == "unsupported") - this.unsupported = attr.value == "true"; else if (attr.name == "version") { // Prevent version from replacing displayVersion if displayVersion is // present in the update xml. if (!this.displayVersion) this.displayVersion = attr.value; } - else { + else if (attr.name != "unsupported") { this[attr.name] = attr.value; switch (attr.name) {

1 0

[tor-browser/tor-browser-24.8.0esr-4.x-1] Merge remote-tracking branch 'brade/bug13049' into tor-browser-24.8.0esr-4.x-1
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

commit 4424293819b0ae7b184b5e0703e2b4511d1b24f4 Merge: b269bb0 9906e7e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 22 20:12:12 2014 -0700 Merge remote-tracking branch 'brade/bug13049' into tor-browser-24.8.0esr-4.x-1 browser/base/content/aboutDialog.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[tor-browser/tor-browser-24.8.0esr-4.x-1] Merge remote-tracking branch 'brade/bug13047-03' into tor-browser-24.8.0esr-4.x-1
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

commit b0cd4e20527b9c1fc603ab1b18a5f36ffc3f726f Merge: 4424293 e4eca47 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 22 20:19:28 2014 -0700 Merge remote-tracking branch 'brade/bug13047-03' into tor-browser-24.8.0esr-4.x-1 browser/app/profile/firefox.js | 2 +- toolkit/mozapps/update/nsUpdateService.js | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-)

1 0

[tor-browser/tor-browser-24.8.0esr-4.x-1] Bug 13091: Use "Tor Browser" everywhere (space included)
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

commit b269bb036db77aef26bef86d947006c27992b683 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Sep 9 11:52:08 2014 -0400 Bug 13091: Use "Tor Browser" everywhere (space included) Changed MOZ_APP_DISPLAYNAME and brandShortName from "TorBrowser" to "Tor Browser". --- .mozconfig | 2 +- .mozconfig-asan | 2 +- .mozconfig-mac | 2 +- .mozconfig-mingw | 2 +- browser/branding/official/configure.sh | 2 +- browser/branding/official/locales/en-US/brand.dtd | 2 +- browser/branding/official/locales/en-US/brand.properties | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.mozconfig b/.mozconfig index 97e0349..f0c5510 100755 --- a/.mozconfig +++ b/.mozconfig @@ -1,7 +1,7 @@ . $topsrcdir/browser/config/mozconfig mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ -mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 diff --git a/.mozconfig-asan b/.mozconfig-asan index 32e3096..ffbde72 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -10,7 +10,7 @@ export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fsanitize=undefined -st export LDFLAGS="-fsanitize=address -fsanitize=undefined" mk_add_option sMOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ -mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 diff --git a/.mozconfig-mac b/.mozconfig-mac index 7f28096..01ed601 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -25,7 +25,7 @@ LD=$ROOTDIR/x86_64-apple-darwin10-ld STRIP=$ROOTDIR/x86_64-apple-darwin10-strip mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos -mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 9c8695d..f3fc080 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -5,7 +5,7 @@ ac_add_options --enable-application=browser ac_add_options --target=i686-w64-mingw32 ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw -mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 diff --git a/browser/branding/official/configure.sh b/browser/branding/official/configure.sh index 33102b0..2b1b638 100644 --- a/browser/branding/official/configure.sh +++ b/browser/branding/official/configure.sh @@ -2,5 +2,5 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZ_APP_DISPLAYNAME=TorBrowser +MOZ_APP_DISPLAYNAME="Tor Browser" MOZ_UA_BUILDID=20100101 diff --git a/browser/branding/official/locales/en-US/brand.dtd b/browser/branding/official/locales/en-US/brand.dtd index 76e405d..59f665e 100644 --- a/browser/branding/official/locales/en-US/brand.dtd +++ b/browser/branding/official/locales/en-US/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/browser/branding/official/locales/en-US/brand.properties b/browser/branding/official/locales/en-US/brand.properties index 9ae168e..f63def3 100644 --- a/browser/branding/official/locales/en-US/brand.properties +++ b/browser/branding/official/locales/en-US/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project

1 0

[tor-browser/tor-browser-24.8.0esr-4.x-1] Bug 13049: updater fails (self.update is undefined).
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

commit 9906e7e26e1dcbf313121dbf46e5a22aa185fd05 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Sep 3 13:56:57 2014 -0400 Bug 13049: updater fails (self.update is undefined). Replace "self.update" with "this.update" in two add-on compatibility check functions. Using self.update (which is undefined) caused the updater to silently fail if one or more installed add-ons were marked in their install.rdf file as not compatible with the new platformVersion. We also replaced "TBB" with "Tor Browser" in the about box text. --- browser/base/content/aboutDialog.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js index c72c828..431d520 100644 --- a/browser/base/content/aboutDialog.js +++ b/browser/base/content/aboutDialog.js @@ -49,7 +49,7 @@ function init(aEvent) #ifdef TOR_BROWSER_VERSION let versionElem = document.getElementById("version"); if (versionElem) - versionElem.textContent += " (TBB " + TOR_BROWSER_VERSION + ")"; + versionElem.textContent += " (Tor Browser " + TOR_BROWSER_VERSION + ")"; #endif #ifdef MOZ_UPDATER @@ -444,9 +444,9 @@ appUpdater.prototype = checkAddonsForUpdates: function() { this.addons.forEach(function(aAddon) { #ifdef TOR_BROWSER_UPDATE - let compatVersion = self.update.platformVersion; + let compatVersion = this.update.platformVersion; #else - let compatVersion = self.update.appVersion; + let compatVersion = this.update.appVersion; #endif aAddon.findUpdates(this, AddonManager.UPDATE_WHEN_NEW_APP_DETECTED, compatVersion, @@ -471,9 +471,9 @@ appUpdater.prototype = */ onUpdateAvailable: function(aAddon, aInstall) { #ifdef TOR_BROWSER_UPDATE - let compatVersion = self.update.platformVersion; + let compatVersion = this.update.platformVersion; #else - let compatVersion = self.update.appVersion; + let compatVersion = this.update.appVersion; #endif if (!Services.blocklist.isAddonBlocklisted(aAddon.id, aInstall.version, compatVersion,

1 0

[torbutton/master] Bug 13091: Use "Tor Browser" everywhere (space included)
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

commit 1eaed5a1f0d9fc01c9db8e1759c7dc3fc17337ad Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Sep 9 16:57:54 2014 -0400 Bug 13091: Use "Tor Browser" everywhere (space included) Changed MOZ_APP_DISPLAYNAME and brandShortName from "TorBrowser" to "Tor Browser". --- src/chrome/locale/af/brand.dtd | 2 +- src/chrome/locale/af/brand.properties | 2 +- src/chrome/locale/ak/brand.dtd | 2 +- src/chrome/locale/ak/brand.properties | 2 +- src/chrome/locale/am/brand.dtd | 2 +- src/chrome/locale/am/brand.properties | 2 +- src/chrome/locale/arn/brand.dtd | 2 +- src/chrome/locale/arn/brand.properties | 2 +- src/chrome/locale/ast/brand.dtd | 2 +- src/chrome/locale/ast/brand.properties | 2 +- src/chrome/locale/az/brand.dtd | 2 +- src/chrome/locale/az/brand.properties | 2 +- src/chrome/locale/be/brand.dtd | 2 +- src/chrome/locale/be/brand.properties | 2 +- src/chrome/locale/bg/brand.dtd | 2 +- src/chrome/locale/bg/brand.properties | 2 +- src/chrome/locale/bn-IN/brand.dtd | 2 +- src/chrome/locale/bn-IN/brand.properties | 2 +- src/chrome/locale/bn/brand.dtd | 2 +- src/chrome/locale/bn/brand.properties | 2 +- src/chrome/locale/bo/brand.dtd | 2 +- src/chrome/locale/bo/brand.properties | 2 +- src/chrome/locale/br/brand.dtd | 2 +- src/chrome/locale/br/brand.properties | 2 +- src/chrome/locale/bs/brand.dtd | 2 +- src/chrome/locale/bs/brand.properties | 2 +- src/chrome/locale/ca/brand.dtd | 2 +- src/chrome/locale/ca/brand.properties | 2 +- src/chrome/locale/cs/brand.dtd | 2 +- src/chrome/locale/cs/brand.properties | 2 +- src/chrome/locale/csb/brand.dtd | 2 +- src/chrome/locale/csb/brand.properties | 2 +- src/chrome/locale/cy/brand.dtd | 2 +- src/chrome/locale/cy/brand.properties | 2 +- src/chrome/locale/da/brand.dtd | 2 +- src/chrome/locale/da/brand.properties | 2 +- src/chrome/locale/de/brand.dtd | 2 +- src/chrome/locale/de/brand.properties | 2 +- src/chrome/locale/dz/brand.dtd | 2 +- src/chrome/locale/dz/brand.properties | 2 +- src/chrome/locale/el/brand.dtd | 2 +- src/chrome/locale/el/brand.properties | 2 +- src/chrome/locale/en/brand.dtd | 2 +- src/chrome/locale/en/brand.properties | 2 +- src/chrome/locale/eo/brand.dtd | 2 +- src/chrome/locale/eo/brand.properties | 2 +- src/chrome/locale/es/brand.dtd | 2 +- src/chrome/locale/es/brand.properties | 2 +- src/chrome/locale/et/brand.dtd | 2 +- src/chrome/locale/et/brand.properties | 2 +- src/chrome/locale/eu/brand.dtd | 2 +- src/chrome/locale/eu/brand.properties | 2 +- src/chrome/locale/fi/brand.dtd | 2 +- src/chrome/locale/fi/brand.properties | 2 +- src/chrome/locale/fil/brand.dtd | 2 +- src/chrome/locale/fil/brand.properties | 2 +- src/chrome/locale/fo/brand.dtd | 2 +- src/chrome/locale/fo/brand.properties | 2 +- src/chrome/locale/fur/brand.dtd | 2 +- src/chrome/locale/fur/brand.properties | 2 +- src/chrome/locale/fy/brand.dtd | 2 +- src/chrome/locale/fy/brand.properties | 2 +- src/chrome/locale/ga/brand.dtd | 2 +- src/chrome/locale/ga/brand.properties | 2 +- src/chrome/locale/gl/brand.dtd | 2 +- src/chrome/locale/gl/brand.properties | 2 +- src/chrome/locale/gu/brand.dtd | 2 +- src/chrome/locale/gu/brand.properties | 2 +- src/chrome/locale/gun/brand.dtd | 2 +- src/chrome/locale/gun/brand.properties | 2 +- src/chrome/locale/ha/brand.dtd | 2 +- src/chrome/locale/ha/brand.properties | 2 +- src/chrome/locale/he/brand.dtd | 2 +- src/chrome/locale/he/brand.properties | 2 +- src/chrome/locale/hi/brand.dtd | 2 +- src/chrome/locale/hi/brand.properties | 2 +- src/chrome/locale/hr/brand.dtd | 2 +- src/chrome/locale/hr/brand.properties | 2 +- src/chrome/locale/ht/brand.dtd | 2 +- src/chrome/locale/ht/brand.properties | 2 +- src/chrome/locale/hu/brand.dtd | 2 +- src/chrome/locale/hu/brand.properties | 2 +- src/chrome/locale/hy/brand.dtd | 2 +- src/chrome/locale/hy/brand.properties | 2 +- src/chrome/locale/id/brand.dtd | 2 +- src/chrome/locale/id/brand.properties | 2 +- src/chrome/locale/is/brand.dtd | 2 +- src/chrome/locale/is/brand.properties | 2 +- src/chrome/locale/it/brand.dtd | 2 +- src/chrome/locale/it/brand.properties | 2 +- src/chrome/locale/ja/brand.dtd | 2 +- src/chrome/locale/ja/brand.properties | 2 +- src/chrome/locale/jv/brand.dtd | 2 +- src/chrome/locale/jv/brand.properties | 2 +- src/chrome/locale/ka/brand.dtd | 2 +- src/chrome/locale/ka/brand.properties | 2 +- src/chrome/locale/km/brand.dtd | 2 +- src/chrome/locale/km/brand.properties | 2 +- src/chrome/locale/kn/brand.dtd | 2 +- src/chrome/locale/kn/brand.properties | 2 +- src/chrome/locale/ku/brand.dtd | 2 +- src/chrome/locale/ku/brand.properties | 2 +- src/chrome/locale/kw/brand.dtd | 2 +- src/chrome/locale/kw/brand.properties | 2 +- src/chrome/locale/ky/brand.dtd | 2 +- src/chrome/locale/ky/brand.properties | 2 +- src/chrome/locale/lb/brand.dtd | 2 +- src/chrome/locale/lb/brand.properties | 2 +- src/chrome/locale/ln/brand.dtd | 2 +- src/chrome/locale/ln/brand.properties | 2 +- src/chrome/locale/lo/brand.dtd | 2 +- src/chrome/locale/lo/brand.properties | 2 +- src/chrome/locale/lt/brand.dtd | 2 +- src/chrome/locale/lt/brand.properties | 2 +- src/chrome/locale/lv/brand.dtd | 2 +- src/chrome/locale/lv/brand.properties | 2 +- src/chrome/locale/mg/brand.dtd | 2 +- src/chrome/locale/mg/brand.properties | 2 +- src/chrome/locale/mi/brand.dtd | 2 +- src/chrome/locale/mi/brand.properties | 2 +- src/chrome/locale/mk/brand.dtd | 2 +- src/chrome/locale/mk/brand.properties | 2 +- src/chrome/locale/ml/brand.dtd | 2 +- src/chrome/locale/ml/brand.properties | 2 +- src/chrome/locale/mn/brand.dtd | 2 +- src/chrome/locale/mn/brand.properties | 2 +- src/chrome/locale/mr/brand.dtd | 2 +- src/chrome/locale/mr/brand.properties | 2 +- src/chrome/locale/ms/brand.dtd | 2 +- src/chrome/locale/ms/brand.properties | 2 +- src/chrome/locale/mt/brand.dtd | 2 +- src/chrome/locale/mt/brand.properties | 2 +- src/chrome/locale/my/brand.dtd | 2 +- src/chrome/locale/my/brand.properties | 2 +- src/chrome/locale/nah/brand.dtd | 2 +- src/chrome/locale/nah/brand.properties | 2 +- src/chrome/locale/nap/brand.dtd | 2 +- src/chrome/locale/nap/brand.properties | 2 +- src/chrome/locale/nb/brand.dtd | 2 +- src/chrome/locale/nb/brand.properties | 2 +- src/chrome/locale/ne/brand.dtd | 2 +- src/chrome/locale/ne/brand.properties | 2 +- src/chrome/locale/nl/brand.dtd | 2 +- src/chrome/locale/nl/brand.properties | 2 +- src/chrome/locale/nn/brand.dtd | 2 +- src/chrome/locale/nn/brand.properties | 2 +- src/chrome/locale/nso/brand.dtd | 2 +- src/chrome/locale/nso/brand.properties | 2 +- src/chrome/locale/oc/brand.dtd | 2 +- src/chrome/locale/oc/brand.properties | 2 +- src/chrome/locale/or/brand.dtd | 2 +- src/chrome/locale/or/brand.properties | 2 +- src/chrome/locale/pa/brand.dtd | 2 +- src/chrome/locale/pa/brand.properties | 2 +- src/chrome/locale/pap/brand.dtd | 2 +- src/chrome/locale/pap/brand.properties | 2 +- src/chrome/locale/pms/brand.dtd | 2 +- src/chrome/locale/pms/brand.properties | 2 +- src/chrome/locale/ps/brand.dtd | 2 +- src/chrome/locale/ps/brand.properties | 2 +- src/chrome/locale/pt-BR/brand.dtd | 2 +- src/chrome/locale/pt-BR/brand.properties | 2 +- src/chrome/locale/ro/brand.dtd | 2 +- src/chrome/locale/ro/brand.properties | 2 +- src/chrome/locale/ru/brand.dtd | 2 +- src/chrome/locale/ru/brand.properties | 2 +- src/chrome/locale/sco/brand.dtd | 2 +- src/chrome/locale/sco/brand.properties | 2 +- src/chrome/locale/sk/brand.dtd | 2 +- src/chrome/locale/sk/brand.properties | 2 +- src/chrome/locale/sl/brand.dtd | 2 +- src/chrome/locale/sl/brand.properties | 2 +- src/chrome/locale/so/brand.dtd | 2 +- src/chrome/locale/so/brand.properties | 2 +- src/chrome/locale/son/brand.dtd | 2 +- src/chrome/locale/son/brand.properties | 2 +- src/chrome/locale/sq/brand.dtd | 2 +- src/chrome/locale/sq/brand.properties | 2 +- src/chrome/locale/sr/brand.dtd | 2 +- src/chrome/locale/sr/brand.properties | 2 +- src/chrome/locale/st/brand.dtd | 2 +- src/chrome/locale/st/brand.properties | 2 +- src/chrome/locale/su/brand.dtd | 2 +- src/chrome/locale/su/brand.properties | 2 +- src/chrome/locale/sv/brand.dtd | 2 +- src/chrome/locale/sv/brand.properties | 2 +- src/chrome/locale/sw/brand.dtd | 2 +- src/chrome/locale/sw/brand.properties | 2 +- src/chrome/locale/ta/brand.dtd | 2 +- src/chrome/locale/ta/brand.properties | 2 +- src/chrome/locale/te/brand.dtd | 2 +- src/chrome/locale/te/brand.properties | 2 +- src/chrome/locale/tg/brand.dtd | 2 +- src/chrome/locale/tg/brand.properties | 2 +- src/chrome/locale/th/brand.dtd | 2 +- src/chrome/locale/th/brand.properties | 2 +- src/chrome/locale/ti/brand.dtd | 2 +- src/chrome/locale/ti/brand.properties | 2 +- src/chrome/locale/tk/brand.dtd | 2 +- src/chrome/locale/tk/brand.properties | 2 +- src/chrome/locale/tr/brand.dtd | 2 +- src/chrome/locale/tr/brand.properties | 2 +- src/chrome/locale/uk/brand.dtd | 2 +- src/chrome/locale/uk/brand.properties | 2 +- src/chrome/locale/ur/brand.dtd | 2 +- src/chrome/locale/ur/brand.properties | 2 +- src/chrome/locale/ve/brand.dtd | 2 +- src/chrome/locale/ve/brand.properties | 2 +- src/chrome/locale/vi/brand.dtd | 2 +- src/chrome/locale/vi/brand.properties | 2 +- src/chrome/locale/wa/brand.dtd | 2 +- src/chrome/locale/wa/brand.properties | 2 +- src/chrome/locale/wo/brand.dtd | 2 +- src/chrome/locale/wo/brand.properties | 2 +- src/chrome/locale/zh-CN/brand.dtd | 2 +- src/chrome/locale/zh-CN/brand.properties | 2 +- src/chrome/locale/zh-HK/brand.dtd | 2 +- src/chrome/locale/zh-HK/brand.properties | 2 +- src/chrome/locale/zh-TW/brand.dtd | 2 +- src/chrome/locale/zh-TW/brand.properties | 2 +- src/chrome/locale/zu/brand.dtd | 2 +- src/chrome/locale/zu/brand.properties | 2 +- 222 files changed, 222 insertions(+), 222 deletions(-) diff --git a/src/chrome/locale/af/brand.dtd b/src/chrome/locale/af/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/af/brand.dtd +++ b/src/chrome/locale/af/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/af/brand.properties b/src/chrome/locale/af/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/af/brand.properties +++ b/src/chrome/locale/af/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ak/brand.dtd b/src/chrome/locale/ak/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/ak/brand.dtd +++ b/src/chrome/locale/ak/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/ak/brand.properties b/src/chrome/locale/ak/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/ak/brand.properties +++ b/src/chrome/locale/ak/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/am/brand.dtd b/src/chrome/locale/am/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/am/brand.dtd +++ b/src/chrome/locale/am/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/am/brand.properties b/src/chrome/locale/am/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/am/brand.properties +++ b/src/chrome/locale/am/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/arn/brand.dtd b/src/chrome/locale/arn/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/arn/brand.dtd +++ b/src/chrome/locale/arn/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/arn/brand.properties b/src/chrome/locale/arn/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/arn/brand.properties +++ b/src/chrome/locale/arn/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ast/brand.dtd b/src/chrome/locale/ast/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/ast/brand.dtd +++ b/src/chrome/locale/ast/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/ast/brand.properties b/src/chrome/locale/ast/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/ast/brand.properties +++ b/src/chrome/locale/ast/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/az/brand.dtd b/src/chrome/locale/az/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/az/brand.dtd +++ b/src/chrome/locale/az/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/az/brand.properties b/src/chrome/locale/az/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/az/brand.properties +++ b/src/chrome/locale/az/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/be/brand.dtd b/src/chrome/locale/be/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/be/brand.dtd +++ b/src/chrome/locale/be/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/be/brand.properties b/src/chrome/locale/be/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/be/brand.properties +++ b/src/chrome/locale/be/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/bg/brand.dtd b/src/chrome/locale/bg/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/bg/brand.dtd +++ b/src/chrome/locale/bg/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/bg/brand.properties b/src/chrome/locale/bg/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/bg/brand.properties +++ b/src/chrome/locale/bg/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/bn-IN/brand.dtd b/src/chrome/locale/bn-IN/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/bn-IN/brand.dtd +++ b/src/chrome/locale/bn-IN/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/bn-IN/brand.properties b/src/chrome/locale/bn-IN/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/bn-IN/brand.properties +++ b/src/chrome/locale/bn-IN/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/bn/brand.dtd b/src/chrome/locale/bn/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/bn/brand.dtd +++ b/src/chrome/locale/bn/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/bn/brand.properties b/src/chrome/locale/bn/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/bn/brand.properties +++ b/src/chrome/locale/bn/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/bo/brand.dtd b/src/chrome/locale/bo/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/bo/brand.dtd +++ b/src/chrome/locale/bo/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/bo/brand.properties b/src/chrome/locale/bo/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/bo/brand.properties +++ b/src/chrome/locale/bo/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/br/brand.dtd b/src/chrome/locale/br/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/br/brand.dtd +++ b/src/chrome/locale/br/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/br/brand.properties b/src/chrome/locale/br/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/br/brand.properties +++ b/src/chrome/locale/br/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/bs/brand.dtd b/src/chrome/locale/bs/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/bs/brand.dtd +++ b/src/chrome/locale/bs/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/bs/brand.properties b/src/chrome/locale/bs/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/bs/brand.properties +++ b/src/chrome/locale/bs/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ca/brand.dtd b/src/chrome/locale/ca/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/ca/brand.dtd +++ b/src/chrome/locale/ca/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/ca/brand.properties b/src/chrome/locale/ca/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/ca/brand.properties +++ b/src/chrome/locale/ca/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/cs/brand.dtd b/src/chrome/locale/cs/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/cs/brand.dtd +++ b/src/chrome/locale/cs/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/cs/brand.properties b/src/chrome/locale/cs/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/cs/brand.properties +++ b/src/chrome/locale/cs/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/csb/brand.dtd b/src/chrome/locale/csb/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/csb/brand.dtd +++ b/src/chrome/locale/csb/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/csb/brand.properties b/src/chrome/locale/csb/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/csb/brand.properties +++ b/src/chrome/locale/csb/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/cy/brand.dtd b/src/chrome/locale/cy/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/cy/brand.dtd +++ b/src/chrome/locale/cy/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/cy/brand.properties b/src/chrome/locale/cy/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/cy/brand.properties +++ b/src/chrome/locale/cy/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/da/brand.dtd b/src/chrome/locale/da/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/da/brand.dtd +++ b/src/chrome/locale/da/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/da/brand.properties b/src/chrome/locale/da/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/da/brand.properties +++ b/src/chrome/locale/da/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/de/brand.dtd b/src/chrome/locale/de/brand.dtd index cbe3b6b..e3a2aae 100644 --- a/src/chrome/locale/de/brand.dtd +++ b/src/chrome/locale/de/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor-Browser"> <!ENTITY brandFullName "Tor-Browser"> <!ENTITY vendorShortName "Tor-Projekt"> <!ENTITY trademarkInfo.part1 "Firefox und die Firefox-Logos sind Warenzeichen der Mozilla Foundation."> diff --git a/src/chrome/locale/de/brand.properties b/src/chrome/locale/de/brand.properties index 9e215e9..84e9a07 100644 --- a/src/chrome/locale/de/brand.properties +++ b/src/chrome/locale/de/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor-Browser brandFullName=Tor-Browser vendorShortName=Tor-Projekt diff --git a/src/chrome/locale/dz/brand.dtd b/src/chrome/locale/dz/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/dz/brand.dtd +++ b/src/chrome/locale/dz/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/dz/brand.properties b/src/chrome/locale/dz/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/dz/brand.properties +++ b/src/chrome/locale/dz/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/el/brand.dtd b/src/chrome/locale/el/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/el/brand.dtd +++ b/src/chrome/locale/el/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/el/brand.properties b/src/chrome/locale/el/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/el/brand.properties +++ b/src/chrome/locale/el/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/en/brand.dtd b/src/chrome/locale/en/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/en/brand.dtd +++ b/src/chrome/locale/en/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/en/brand.properties b/src/chrome/locale/en/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/en/brand.properties +++ b/src/chrome/locale/en/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/eo/brand.dtd b/src/chrome/locale/eo/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/eo/brand.dtd +++ b/src/chrome/locale/eo/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/eo/brand.properties b/src/chrome/locale/eo/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/eo/brand.properties +++ b/src/chrome/locale/eo/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/es/brand.dtd b/src/chrome/locale/es/brand.dtd index b2fd420..7710d47 100644 --- a/src/chrome/locale/es/brand.dtd +++ b/src/chrome/locale/es/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "NavegadorTor"> +<!ENTITY brandShortName "Navegador Tor"> <!ENTITY brandFullName "Navegador Tor"> <!ENTITY vendorShortName "Proyecto Tor"> <!ENTITY trademarkInfo.part1 "Firefox y los logotipos de Firefox son marcas registradas de la Mozilla Foundation."> diff --git a/src/chrome/locale/es/brand.properties b/src/chrome/locale/es/brand.properties index 3015f97..035057f 100644 --- a/src/chrome/locale/es/brand.properties +++ b/src/chrome/locale/es/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=NavegadorTor +brandShortName=Navegador Tor brandFullName=Navegador Tor vendorShortName=Proyecto Tor diff --git a/src/chrome/locale/et/brand.dtd b/src/chrome/locale/et/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/et/brand.dtd +++ b/src/chrome/locale/et/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/et/brand.properties b/src/chrome/locale/et/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/et/brand.properties +++ b/src/chrome/locale/et/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/eu/brand.dtd b/src/chrome/locale/eu/brand.dtd index 94325ee..f144e27 100644 --- a/src/chrome/locale/eu/brand.dtd +++ b/src/chrome/locale/eu/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox eta Firefox logoak Mozilla Fundazioaren marka errgistratuak dira."> diff --git a/src/chrome/locale/eu/brand.properties b/src/chrome/locale/eu/brand.properties index 0c4713e..341c4df 100644 --- a/src/chrome/locale/eu/brand.properties +++ b/src/chrome/locale/eu/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/fi/brand.dtd b/src/chrome/locale/fi/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/fi/brand.dtd +++ b/src/chrome/locale/fi/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/fi/brand.properties b/src/chrome/locale/fi/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/fi/brand.properties +++ b/src/chrome/locale/fi/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/fil/brand.dtd b/src/chrome/locale/fil/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/fil/brand.dtd +++ b/src/chrome/locale/fil/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/fil/brand.properties b/src/chrome/locale/fil/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/fil/brand.properties +++ b/src/chrome/locale/fil/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/fo/brand.dtd b/src/chrome/locale/fo/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/fo/brand.dtd +++ b/src/chrome/locale/fo/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/fo/brand.properties b/src/chrome/locale/fo/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/fo/brand.properties +++ b/src/chrome/locale/fo/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/fur/brand.dtd b/src/chrome/locale/fur/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/fur/brand.dtd +++ b/src/chrome/locale/fur/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/fur/brand.properties b/src/chrome/locale/fur/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/fur/brand.properties +++ b/src/chrome/locale/fur/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/fy/brand.dtd b/src/chrome/locale/fy/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/fy/brand.dtd +++ b/src/chrome/locale/fy/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/fy/brand.properties b/src/chrome/locale/fy/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/fy/brand.properties +++ b/src/chrome/locale/fy/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ga/brand.dtd b/src/chrome/locale/ga/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/ga/brand.dtd +++ b/src/chrome/locale/ga/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/ga/brand.properties b/src/chrome/locale/ga/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/ga/brand.properties +++ b/src/chrome/locale/ga/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/gl/brand.dtd b/src/chrome/locale/gl/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/gl/brand.dtd +++ b/src/chrome/locale/gl/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/gl/brand.properties b/src/chrome/locale/gl/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/gl/brand.properties +++ b/src/chrome/locale/gl/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/gu/brand.dtd b/src/chrome/locale/gu/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/gu/brand.dtd +++ b/src/chrome/locale/gu/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/gu/brand.properties b/src/chrome/locale/gu/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/gu/brand.properties +++ b/src/chrome/locale/gu/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/gun/brand.dtd b/src/chrome/locale/gun/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/gun/brand.dtd +++ b/src/chrome/locale/gun/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/gun/brand.properties b/src/chrome/locale/gun/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/gun/brand.properties +++ b/src/chrome/locale/gun/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ha/brand.dtd b/src/chrome/locale/ha/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/ha/brand.dtd +++ b/src/chrome/locale/ha/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/ha/brand.properties b/src/chrome/locale/ha/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/ha/brand.properties +++ b/src/chrome/locale/ha/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/he/brand.dtd b/src/chrome/locale/he/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/he/brand.dtd +++ b/src/chrome/locale/he/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/he/brand.properties b/src/chrome/locale/he/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/he/brand.properties +++ b/src/chrome/locale/he/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/hi/brand.dtd b/src/chrome/locale/hi/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/hi/brand.dtd +++ b/src/chrome/locale/hi/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/hi/brand.properties b/src/chrome/locale/hi/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/hi/brand.properties +++ b/src/chrome/locale/hi/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/hr/brand.dtd b/src/chrome/locale/hr/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/hr/brand.dtd +++ b/src/chrome/locale/hr/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/hr/brand.properties b/src/chrome/locale/hr/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/hr/brand.properties +++ b/src/chrome/locale/hr/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ht/brand.dtd b/src/chrome/locale/ht/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/ht/brand.dtd +++ b/src/chrome/locale/ht/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/ht/brand.properties b/src/chrome/locale/ht/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/ht/brand.properties +++ b/src/chrome/locale/ht/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/hu/brand.dtd b/src/chrome/locale/hu/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/hu/brand.dtd +++ b/src/chrome/locale/hu/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/hu/brand.properties b/src/chrome/locale/hu/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/hu/brand.properties +++ b/src/chrome/locale/hu/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/hy/brand.dtd b/src/chrome/locale/hy/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/hy/brand.dtd +++ b/src/chrome/locale/hy/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/hy/brand.properties b/src/chrome/locale/hy/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/hy/brand.properties +++ b/src/chrome/locale/hy/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/id/brand.dtd b/src/chrome/locale/id/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/id/brand.dtd +++ b/src/chrome/locale/id/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/id/brand.properties b/src/chrome/locale/id/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/id/brand.properties +++ b/src/chrome/locale/id/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/is/brand.dtd b/src/chrome/locale/is/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/is/brand.dtd +++ b/src/chrome/locale/is/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/is/brand.properties b/src/chrome/locale/is/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/is/brand.properties +++ b/src/chrome/locale/is/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/it/brand.dtd b/src/chrome/locale/it/brand.dtd index b8f6fe9..f813020 100644 --- a/src/chrome/locale/it/brand.dtd +++ b/src/chrome/locale/it/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox e i loghi Firefox sono marchi registrati della Mozilla Foundation."> diff --git a/src/chrome/locale/it/brand.properties b/src/chrome/locale/it/brand.properties index ee1a15f..3308a03 100644 --- a/src/chrome/locale/it/brand.properties +++ b/src/chrome/locale/it/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ja/brand.dtd b/src/chrome/locale/ja/brand.dtd index 72bd4a1..dd9e0d2 100644 --- a/src/chrome/locale/ja/brand.dtd +++ b/src/chrome/locale/ja/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "FirefoxおよびFirefoxのロゴはMozilla財団の登録商標です。"> diff --git a/src/chrome/locale/ja/brand.properties b/src/chrome/locale/ja/brand.properties index 2f0fa2c..e7f8d56 100644 --- a/src/chrome/locale/ja/brand.properties +++ b/src/chrome/locale/ja/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/jv/brand.dtd b/src/chrome/locale/jv/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/jv/brand.dtd +++ b/src/chrome/locale/jv/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/jv/brand.properties b/src/chrome/locale/jv/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/jv/brand.properties +++ b/src/chrome/locale/jv/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ka/brand.dtd b/src/chrome/locale/ka/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/ka/brand.dtd +++ b/src/chrome/locale/ka/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/ka/brand.properties b/src/chrome/locale/ka/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/ka/brand.properties +++ b/src/chrome/locale/ka/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/km/brand.dtd b/src/chrome/locale/km/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/km/brand.dtd +++ b/src/chrome/locale/km/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/km/brand.properties b/src/chrome/locale/km/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/km/brand.properties +++ b/src/chrome/locale/km/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/kn/brand.dtd b/src/chrome/locale/kn/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/kn/brand.dtd +++ b/src/chrome/locale/kn/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/kn/brand.properties b/src/chrome/locale/kn/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/kn/brand.properties +++ b/src/chrome/locale/kn/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ku/brand.dtd b/src/chrome/locale/ku/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/ku/brand.dtd +++ b/src/chrome/locale/ku/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/ku/brand.properties b/src/chrome/locale/ku/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/ku/brand.properties +++ b/src/chrome/locale/ku/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/kw/brand.dtd b/src/chrome/locale/kw/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/kw/brand.dtd +++ b/src/chrome/locale/kw/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/kw/brand.properties b/src/chrome/locale/kw/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/kw/brand.properties +++ b/src/chrome/locale/kw/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ky/brand.dtd b/src/chrome/locale/ky/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/ky/brand.dtd +++ b/src/chrome/locale/ky/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/ky/brand.properties b/src/chrome/locale/ky/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/ky/brand.properties +++ b/src/chrome/locale/ky/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/lb/brand.dtd b/src/chrome/locale/lb/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/lb/brand.dtd +++ b/src/chrome/locale/lb/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/lb/brand.properties b/src/chrome/locale/lb/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/lb/brand.properties +++ b/src/chrome/locale/lb/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ln/brand.dtd b/src/chrome/locale/ln/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/ln/brand.dtd +++ b/src/chrome/locale/ln/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/ln/brand.properties b/src/chrome/locale/ln/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/ln/brand.properties +++ b/src/chrome/locale/ln/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/lo/brand.dtd b/src/chrome/locale/lo/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/lo/brand.dtd +++ b/src/chrome/locale/lo/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/lo/brand.properties b/src/chrome/locale/lo/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/lo/brand.properties +++ b/src/chrome/locale/lo/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/lt/brand.dtd b/src/chrome/locale/lt/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/lt/brand.dtd +++ b/src/chrome/locale/lt/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/lt/brand.properties b/src/chrome/locale/lt/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/lt/brand.properties +++ b/src/chrome/locale/lt/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/lv/brand.dtd b/src/chrome/locale/lv/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/lv/brand.dtd +++ b/src/chrome/locale/lv/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/lv/brand.properties b/src/chrome/locale/lv/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/lv/brand.properties +++ b/src/chrome/locale/lv/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/mg/brand.dtd b/src/chrome/locale/mg/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/mg/brand.dtd +++ b/src/chrome/locale/mg/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/mg/brand.properties b/src/chrome/locale/mg/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/mg/brand.properties +++ b/src/chrome/locale/mg/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/mi/brand.dtd b/src/chrome/locale/mi/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/mi/brand.dtd +++ b/src/chrome/locale/mi/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/mi/brand.properties b/src/chrome/locale/mi/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/mi/brand.properties +++ b/src/chrome/locale/mi/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/mk/brand.dtd b/src/chrome/locale/mk/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/mk/brand.dtd +++ b/src/chrome/locale/mk/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/mk/brand.properties b/src/chrome/locale/mk/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/mk/brand.properties +++ b/src/chrome/locale/mk/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ml/brand.dtd b/src/chrome/locale/ml/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/ml/brand.dtd +++ b/src/chrome/locale/ml/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/ml/brand.properties b/src/chrome/locale/ml/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/ml/brand.properties +++ b/src/chrome/locale/ml/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/mn/brand.dtd b/src/chrome/locale/mn/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/mn/brand.dtd +++ b/src/chrome/locale/mn/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/mn/brand.properties b/src/chrome/locale/mn/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/mn/brand.properties +++ b/src/chrome/locale/mn/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/mr/brand.dtd b/src/chrome/locale/mr/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/mr/brand.dtd +++ b/src/chrome/locale/mr/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/mr/brand.properties b/src/chrome/locale/mr/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/mr/brand.properties +++ b/src/chrome/locale/mr/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ms/brand.dtd b/src/chrome/locale/ms/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/ms/brand.dtd +++ b/src/chrome/locale/ms/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/ms/brand.properties b/src/chrome/locale/ms/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/ms/brand.properties +++ b/src/chrome/locale/ms/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/mt/brand.dtd b/src/chrome/locale/mt/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/mt/brand.dtd +++ b/src/chrome/locale/mt/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/mt/brand.properties b/src/chrome/locale/mt/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/mt/brand.properties +++ b/src/chrome/locale/mt/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/my/brand.dtd b/src/chrome/locale/my/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/my/brand.dtd +++ b/src/chrome/locale/my/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/my/brand.properties b/src/chrome/locale/my/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/my/brand.properties +++ b/src/chrome/locale/my/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/nah/brand.dtd b/src/chrome/locale/nah/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/nah/brand.dtd +++ b/src/chrome/locale/nah/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/nah/brand.properties b/src/chrome/locale/nah/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/nah/brand.properties +++ b/src/chrome/locale/nah/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/nap/brand.dtd b/src/chrome/locale/nap/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/nap/brand.dtd +++ b/src/chrome/locale/nap/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/nap/brand.properties b/src/chrome/locale/nap/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/nap/brand.properties +++ b/src/chrome/locale/nap/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/nb/brand.dtd b/src/chrome/locale/nb/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/nb/brand.dtd +++ b/src/chrome/locale/nb/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/nb/brand.properties b/src/chrome/locale/nb/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/nb/brand.properties +++ b/src/chrome/locale/nb/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ne/brand.dtd b/src/chrome/locale/ne/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/ne/brand.dtd +++ b/src/chrome/locale/ne/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/ne/brand.properties b/src/chrome/locale/ne/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/ne/brand.properties +++ b/src/chrome/locale/ne/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/nl/brand.dtd b/src/chrome/locale/nl/brand.dtd index 111e9a9..af3e58a 100644 --- a/src/chrome/locale/nl/brand.dtd +++ b/src/chrome/locale/nl/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and het Firefox logo zijn handelsmerken van de Mozilla Foundation."> diff --git a/src/chrome/locale/nl/brand.properties b/src/chrome/locale/nl/brand.properties index b03e3a7..33caa67 100644 --- a/src/chrome/locale/nl/brand.properties +++ b/src/chrome/locale/nl/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/nn/brand.dtd b/src/chrome/locale/nn/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/nn/brand.dtd +++ b/src/chrome/locale/nn/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/nn/brand.properties b/src/chrome/locale/nn/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/nn/brand.properties +++ b/src/chrome/locale/nn/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/nso/brand.dtd b/src/chrome/locale/nso/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/nso/brand.dtd +++ b/src/chrome/locale/nso/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/nso/brand.properties b/src/chrome/locale/nso/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/nso/brand.properties +++ b/src/chrome/locale/nso/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/oc/brand.dtd b/src/chrome/locale/oc/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/oc/brand.dtd +++ b/src/chrome/locale/oc/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/oc/brand.properties b/src/chrome/locale/oc/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/oc/brand.properties +++ b/src/chrome/locale/oc/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/or/brand.dtd b/src/chrome/locale/or/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/or/brand.dtd +++ b/src/chrome/locale/or/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/or/brand.properties b/src/chrome/locale/or/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/or/brand.properties +++ b/src/chrome/locale/or/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/pa/brand.dtd b/src/chrome/locale/pa/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/pa/brand.dtd +++ b/src/chrome/locale/pa/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/pa/brand.properties b/src/chrome/locale/pa/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/pa/brand.properties +++ b/src/chrome/locale/pa/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/pap/brand.dtd b/src/chrome/locale/pap/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/pap/brand.dtd +++ b/src/chrome/locale/pap/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/pap/brand.properties b/src/chrome/locale/pap/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/pap/brand.properties +++ b/src/chrome/locale/pap/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/pms/brand.dtd b/src/chrome/locale/pms/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/pms/brand.dtd +++ b/src/chrome/locale/pms/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/pms/brand.properties b/src/chrome/locale/pms/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/pms/brand.properties +++ b/src/chrome/locale/pms/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ps/brand.dtd b/src/chrome/locale/ps/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/ps/brand.dtd +++ b/src/chrome/locale/ps/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/ps/brand.properties b/src/chrome/locale/ps/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/ps/brand.properties +++ b/src/chrome/locale/ps/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/pt-BR/brand.dtd b/src/chrome/locale/pt-BR/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/pt-BR/brand.dtd +++ b/src/chrome/locale/pt-BR/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/pt-BR/brand.properties b/src/chrome/locale/pt-BR/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/pt-BR/brand.properties +++ b/src/chrome/locale/pt-BR/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ro/brand.dtd b/src/chrome/locale/ro/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/ro/brand.dtd +++ b/src/chrome/locale/ro/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/ro/brand.properties b/src/chrome/locale/ro/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/ro/brand.properties +++ b/src/chrome/locale/ro/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ru/brand.dtd b/src/chrome/locale/ru/brand.dtd index b41f8ab..043e478 100644 --- a/src/chrome/locale/ru/brand.dtd +++ b/src/chrome/locale/ru/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Проект Tor"> <!ENTITY trademarkInfo.part1 "Firefox и его логотипы это торговые знаки Mozilla Foundation."> diff --git a/src/chrome/locale/ru/brand.properties b/src/chrome/locale/ru/brand.properties index d4788a7..93347e1 100644 --- a/src/chrome/locale/ru/brand.properties +++ b/src/chrome/locale/ru/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Проект Tor diff --git a/src/chrome/locale/sco/brand.dtd b/src/chrome/locale/sco/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/sco/brand.dtd +++ b/src/chrome/locale/sco/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/sco/brand.properties b/src/chrome/locale/sco/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/sco/brand.properties +++ b/src/chrome/locale/sco/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/sk/brand.dtd b/src/chrome/locale/sk/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/sk/brand.dtd +++ b/src/chrome/locale/sk/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/sk/brand.properties b/src/chrome/locale/sk/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/sk/brand.properties +++ b/src/chrome/locale/sk/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/sl/brand.dtd b/src/chrome/locale/sl/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/sl/brand.dtd +++ b/src/chrome/locale/sl/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/sl/brand.properties b/src/chrome/locale/sl/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/sl/brand.properties +++ b/src/chrome/locale/sl/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/so/brand.dtd b/src/chrome/locale/so/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/so/brand.dtd +++ b/src/chrome/locale/so/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/so/brand.properties b/src/chrome/locale/so/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/so/brand.properties +++ b/src/chrome/locale/so/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/son/brand.dtd b/src/chrome/locale/son/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/son/brand.dtd +++ b/src/chrome/locale/son/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/son/brand.properties b/src/chrome/locale/son/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/son/brand.properties +++ b/src/chrome/locale/son/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/sq/brand.dtd b/src/chrome/locale/sq/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/sq/brand.dtd +++ b/src/chrome/locale/sq/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/sq/brand.properties b/src/chrome/locale/sq/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/sq/brand.properties +++ b/src/chrome/locale/sq/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/sr/brand.dtd b/src/chrome/locale/sr/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/sr/brand.dtd +++ b/src/chrome/locale/sr/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/sr/brand.properties b/src/chrome/locale/sr/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/sr/brand.properties +++ b/src/chrome/locale/sr/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/st/brand.dtd b/src/chrome/locale/st/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/st/brand.dtd +++ b/src/chrome/locale/st/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/st/brand.properties b/src/chrome/locale/st/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/st/brand.properties +++ b/src/chrome/locale/st/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/su/brand.dtd b/src/chrome/locale/su/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/su/brand.dtd +++ b/src/chrome/locale/su/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/su/brand.properties b/src/chrome/locale/su/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/su/brand.properties +++ b/src/chrome/locale/su/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/sv/brand.dtd b/src/chrome/locale/sv/brand.dtd index bb0174f..72b2120 100644 --- a/src/chrome/locale/sv/brand.dtd +++ b/src/chrome/locale/sv/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor webbläsaren"> <!ENTITY vendorShortName "Tor projektet"> <!ENTITY trademarkInfo.part1 "Firefox och Firefox logotypen är varumärken tillhörande Mozilla Foundation."> diff --git a/src/chrome/locale/sv/brand.properties b/src/chrome/locale/sv/brand.properties index 3bf264b..2b65162 100644 --- a/src/chrome/locale/sv/brand.properties +++ b/src/chrome/locale/sv/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor webbläsaren vendorShortName=Tor projektet diff --git a/src/chrome/locale/sw/brand.dtd b/src/chrome/locale/sw/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/sw/brand.dtd +++ b/src/chrome/locale/sw/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/sw/brand.properties b/src/chrome/locale/sw/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/sw/brand.properties +++ b/src/chrome/locale/sw/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ta/brand.dtd b/src/chrome/locale/ta/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/ta/brand.dtd +++ b/src/chrome/locale/ta/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/ta/brand.properties b/src/chrome/locale/ta/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/ta/brand.properties +++ b/src/chrome/locale/ta/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/te/brand.dtd b/src/chrome/locale/te/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/te/brand.dtd +++ b/src/chrome/locale/te/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/te/brand.properties b/src/chrome/locale/te/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/te/brand.properties +++ b/src/chrome/locale/te/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/tg/brand.dtd b/src/chrome/locale/tg/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/tg/brand.dtd +++ b/src/chrome/locale/tg/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/tg/brand.properties b/src/chrome/locale/tg/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/tg/brand.properties +++ b/src/chrome/locale/tg/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/th/brand.dtd b/src/chrome/locale/th/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/th/brand.dtd +++ b/src/chrome/locale/th/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/th/brand.properties b/src/chrome/locale/th/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/th/brand.properties +++ b/src/chrome/locale/th/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ti/brand.dtd b/src/chrome/locale/ti/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/ti/brand.dtd +++ b/src/chrome/locale/ti/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/ti/brand.properties b/src/chrome/locale/ti/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/ti/brand.properties +++ b/src/chrome/locale/ti/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/tk/brand.dtd b/src/chrome/locale/tk/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/tk/brand.dtd +++ b/src/chrome/locale/tk/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/tk/brand.properties b/src/chrome/locale/tk/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/tk/brand.properties +++ b/src/chrome/locale/tk/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/tr/brand.dtd b/src/chrome/locale/tr/brand.dtd index 68f8c1c..f07182a 100644 --- a/src/chrome/locale/tr/brand.dtd +++ b/src/chrome/locale/tr/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorTarayıcı"> +<!ENTITY brandShortName "Tor Tarayıcı"> <!ENTITY brandFullName "Tor Tarayıcı"> <!ENTITY vendorShortName "Tor Projesi"> <!ENTITY trademarkInfo.part1 "Firefox ve Firefox logoları Mozilla Vakfı'nın ticari markalarıdır."> diff --git a/src/chrome/locale/tr/brand.properties b/src/chrome/locale/tr/brand.properties index a4220f9..2ae02b1 100644 --- a/src/chrome/locale/tr/brand.properties +++ b/src/chrome/locale/tr/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorTarayıcı +brandShortName=Tor Tarayıcı brandFullName=Tor Tarayıcı vendorShortName=Tor Projesi diff --git a/src/chrome/locale/uk/brand.dtd b/src/chrome/locale/uk/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/uk/brand.dtd +++ b/src/chrome/locale/uk/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/uk/brand.properties b/src/chrome/locale/uk/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/uk/brand.properties +++ b/src/chrome/locale/uk/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ur/brand.dtd b/src/chrome/locale/ur/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/ur/brand.dtd +++ b/src/chrome/locale/ur/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/ur/brand.properties b/src/chrome/locale/ur/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/ur/brand.properties +++ b/src/chrome/locale/ur/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/ve/brand.dtd b/src/chrome/locale/ve/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/ve/brand.dtd +++ b/src/chrome/locale/ve/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/ve/brand.properties b/src/chrome/locale/ve/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/ve/brand.properties +++ b/src/chrome/locale/ve/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/vi/brand.dtd b/src/chrome/locale/vi/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/vi/brand.dtd +++ b/src/chrome/locale/vi/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/vi/brand.properties b/src/chrome/locale/vi/brand.properties index 8f3610e..e2b5250 100644 --- a/src/chrome/locale/vi/brand.properties +++ b/src/chrome/locale/vi/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/wa/brand.dtd b/src/chrome/locale/wa/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/wa/brand.dtd +++ b/src/chrome/locale/wa/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/wa/brand.properties b/src/chrome/locale/wa/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/wa/brand.properties +++ b/src/chrome/locale/wa/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/wo/brand.dtd b/src/chrome/locale/wo/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/wo/brand.dtd +++ b/src/chrome/locale/wo/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/wo/brand.properties b/src/chrome/locale/wo/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/wo/brand.properties +++ b/src/chrome/locale/wo/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/zh-CN/brand.dtd b/src/chrome/locale/zh-CN/brand.dtd index e6464da..7868d2d 100644 --- a/src/chrome/locale/zh-CN/brand.dtd +++ b/src/chrome/locale/zh-CN/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox 与 Firefox 图标为 Mozilla Foundation 的商标。"> diff --git a/src/chrome/locale/zh-CN/brand.properties b/src/chrome/locale/zh-CN/brand.properties index 151e991..5f9a8c7 100644 --- a/src/chrome/locale/zh-CN/brand.properties +++ b/src/chrome/locale/zh-CN/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/zh-HK/brand.dtd b/src/chrome/locale/zh-HK/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/zh-HK/brand.dtd +++ b/src/chrome/locale/zh-HK/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/zh-HK/brand.properties b/src/chrome/locale/zh-HK/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/zh-HK/brand.properties +++ b/src/chrome/locale/zh-HK/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/zh-TW/brand.dtd b/src/chrome/locale/zh-TW/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/zh-TW/brand.dtd +++ b/src/chrome/locale/zh-TW/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/zh-TW/brand.properties b/src/chrome/locale/zh-TW/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/zh-TW/brand.properties +++ b/src/chrome/locale/zh-TW/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project diff --git a/src/chrome/locale/zu/brand.dtd b/src/chrome/locale/zu/brand.dtd index 76e405d..59f665e 100644 --- a/src/chrome/locale/zu/brand.dtd +++ b/src/chrome/locale/zu/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/src/chrome/locale/zu/brand.properties b/src/chrome/locale/zu/brand.properties index 9ae168e..f63def3 100644 --- a/src/chrome/locale/zu/brand.properties +++ b/src/chrome/locale/zu/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project

1 0

[torbutton/master] Update translations from transifex.
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

commit 0683ce614724600e2d87c44726a11203e575ee11 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 22 20:00:01 2014 -0700 Update translations from transifex. --- src/chrome/locale/ja/torbutton.properties | 8 ++++---- src/chrome/locale/sv/torbutton.properties | 8 ++++---- src/chrome/locale/zh-CN/torbutton.properties | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties index eda48d7..4d10949 100644 --- a/src/chrome/locale/ja/torbutton.properties +++ b/src/chrome/locale/ja/torbutton.properties @@ -48,10 +48,10 @@ torbutton.popup.confirm_plugins = Flashなどのプラグインはあなたの torbutton.popup.never_ask_again = 次からはたずねない # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? -canvas.notNow=Not Now +canvas.siteprompt=このWebサイト(%S)がHTML5 canvas画像を使用しようとしています。これはあなたのコンピューターを識別するために使われる可能性があります。\n\nTor ブラウザーにHTML5 canvas画像の使用を許可しますか？ +canvas.notNow=今は許可しない canvas.notNowAccessKey=N -canvas.allow=Allow in the future +canvas.allow=許可する canvas.allowAccessKey=A -canvas.never=Never for this site (recommended) +canvas.never=このサイトには許可しない(推奨) canvas.neverAccessKey=e diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index aab3f2f..d1cc52a 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -48,10 +48,10 @@ torbutton.popup.confirm_plugins = Insticksmoduler så som Flash kan äventyra di torbutton.popup.never_ask_again = Fråga aldrig igen # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? -canvas.notNow=Not Now +canvas.siteprompt=Denna webbsida (%S) försökte komma åt HTML5-bilddata på ett kanvas, som skulle kunna användas för att identifiera just din dator.\n\nSka Tor Browser tillåta den här webbsidan att använda HTML5-bilddata på kanvas? +canvas.notNow=Inte just nu canvas.notNowAccessKey=N -canvas.allow=Allow in the future +canvas.allow=Ja, tillåt alltid canvas.allowAccessKey=A -canvas.never=Never for this site (recommended) +canvas.never=Aldrig för denna sida (rekommenderas) canvas.neverAccessKey=e diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties index 619b638..6425d8c 100644 --- a/src/chrome/locale/zh-CN/torbutton.properties +++ b/src/chrome/locale/zh-CN/torbutton.properties @@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = 点击启用插件 torbutton.panel.plugins.enabled = 点击禁用插件 torbutton.panel.label.disabled = Tor 已禁用 torbutton.panel.label.enabled = Tor 已启用 -extensions.torbutton(a)torproject.org.description = Torbutton 提供了一个按钮，可对“Tor 设置”进行配置，并可快速而方便地清除浏览器隐私数据。 +extensions.torbutton(a)torproject.org.description = Torbutton 是一个可以配置Tor并能简单快速清理个人浏览数据的按钮。 torbutton.popup.history.warning = Torbutton 屏蔽了在其他 Tor 状态下加载的标签的活动。\n\n这是用于暂时解决 Firefox Bug 409737 和 417869。\n如果这个弹出窗口在您不知情的情况下弹出，则您的标签之一正试图在后台重新载入自己，然而这样的行为是被屏蔽的。\n\n要刷新当前 Tor 状态下的标签，将焦点置于在地址栏并按回车键。\n\n torbutton.popup.plugin.warning = Torbutton 阻止了浏览器戴 Tor 时直接加载需要插件支持的内容。\n\n请使用“另存为”(保存后浏览)。\n\n torbutton.popup.confirm_ca_certs = Torbutton 注意：浏览器似乎缺少自定义的CA(证书颁发机构)。检查CA列表是一项耗时的操作，障碍Tor的切换。您是否希望禁用对CA证书的隔离？)如果您不懂，可以选择“确定”)

1 0

[torbutton/master] Merge remote-tracking branch 'brade/bug13091'
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

1 0

[torbutton/master] Bump version and update changelog for 1.6.12.2.
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

commit 0b02de380a388e8abe1be0a55631414c04dd71eb Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 22 20:04:04 2014 -0700 Bump version and update changelog for 1.6.12.2. --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 0943687..f5d32e9 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.6.12.2 + 22 Sep 2014 + * Bug 13091: Use "Tor Browser" everywhere + 1.6.12.1 1 Sep 2014 * Bug 12684: Add `canvas.notNow` UI strings to torbutton.properties file. diff --git a/src/install.rdf b/src/install.rdf index de66e4e..7e2f4fc 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.6.12.1</em:version> + <em:version>1.6.12.2</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

[gitian-builder/tor-browser-builder-3] Bug 13215: Use 15GiB VM space if needed.
by gk＠torproject.org 22 Sep '14

22 Sep '14

commit e371d36c295a11bca2c6d3f59777f8a1177e4c14 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 22 11:55:42 2014 +0000 Bug 13215: Use 15GiB VM space if needed. With Firefox ESR 31 10GiB is not enough anymore to build Tor Browser for 64 Bit Linux systems. We bump the upper limit to 15GiB in order to account for the additional capacity needed when starting with the hardened build series. --- bin/make-base-vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/make-base-vm b/bin/make-base-vm index dccd237..cc5fe5b 100755 --- a/bin/make-base-vm +++ b/bin/make-base-vm @@ -99,7 +99,7 @@ if [ -e $OUT.qcow2 ]; then fi rm -rf $OUT -sudo vmbuilder kvm ubuntu --rootsize 10240 --arch=$ARCH --suite=$SUITE --addpkg=$addpkg --removepkg=$removepkg --ssh-key=var/id_dsa.pub --ssh-user-key=var/id_dsa.pub --mirror=$MIRROR --security-mirror=$SECURITY_MIRROR --dest=$OUT --flavour=$FLAVOUR --firstboot=`pwd`/target-bin/bootstrap-fixup +sudo vmbuilder kvm ubuntu --rootsize 15360 --arch=$ARCH --suite=$SUITE --addpkg=$addpkg --removepkg=$removepkg --ssh-key=var/id_dsa.pub --ssh-user-key=var/id_dsa.pub --mirror=$MIRROR --security-mirror=$SECURITY_MIRROR --dest=$OUT --flavour=$FLAVOUR --firstboot=`pwd`/target-bin/bootstrap-fixup mv $OUT/*.qcow2 $OUT.qcow2 rm -rf $OUT

1 0

[tor-browser-bundle/master] Update changelog file.
by gk＠torproject.org 22 Sep '14

22 Sep '14

commit 8c01d6bb195d38d3e236c5ff746b7bf7dc1c5562 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 22 10:07:10 2014 +0000 Update changelog file. --- Bundle-Data/Docs/ChangeLog.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index bd49d11..24fb9b1 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 4.0-alpha-3 -- Sep 21 2014 +Tor Browser 4.0-alpha-3 -- Sep 24 2014 * All Platforms * Update Tor to 0.2.5.7-rc * Update meek to 0.11 @@ -10,6 +10,7 @@ Tor Browser 4.0-alpha-3 -- Sep 21 2014 * Bug 13047: Updater should not send Kernel and GTK version * Linux: * Bug 9150: Make RPATH unavailable on Tor binary. + * Bug 13031: Add full RELRO protection. Tor Browser Bundle 4.0-alpha-2 -- Sep 2 2014 * All Platforms

1 0

[tor-browser-bundle/master] Bug 13031: Adding full RELRO protection on Linux.
by gk＠torproject.org 22 Sep '14

22 Sep '14

commit 71f2ed613d2b2ce6fb40ef27f99fd140b1b86517 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 22 10:04:12 2014 +0000 Bug 13031: Adding full RELRO protection on Linux. Thanks to a patch by a cypherpunk we have now full RELRO protection when using gold as our linker. --- gitian/descriptors/linux/gitian-firefox.yml | 9 +++++++++ gitian/descriptors/linux/gitian-utils.yml | 6 +----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 0cd4b28..509f63a 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -65,6 +65,15 @@ script: | export PATH=$INSTDIR/python/bin:$PATH # unzip -d $INSTDIR binutils-linux$GBUILD_BITS-utils.zip + # Make sure gold is used with the hardening wrapper for full RELRO, see + # #13031. + cd $INSTDIR/binutils/bin + rm ld + cp /usr/bin/hardened-ld ./ + mv ld.gold ld.gold.real + ln -sf hardened-ld ld.gold + ln -sf ld.gold ld + cd ~/build export PATH=$INSTDIR/binutils/bin:$PATH mkdir -p $INSTDIR/Browser/ mkdir -p $INSTDIR/Debug/Browser/components diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index ea122db..074076e 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -60,11 +60,7 @@ script: | ./configure --prefix=$INSTDIR/binutils --disable-multilib --enable-gold make $MAKEOPTS make install - # Make sure gold is used and not ld. - cd $INSTDIR/binutils/bin - rm ld - ln -sf ld.gold ld - cd ~/build + cd .. # Building Libevent cd libevent

1 0

[tor-browser-bundle/master] No patch for bug 11200 when using tor 0.2.5.7-rc.
by gk＠torproject.org 18 Sep '14

18 Sep '14

commit 174db93d1c62bf7542757e3096150e46b1956615 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 18 10:49:58 2014 +0000 No patch for bug 11200 when using tor 0.2.5.7-rc. tor 0.2.5.7-rc already includes the fix for bug 11200 which breaks our build as we try to apply it, too. Thus, we remove it if building bundles with a tor 0.2.5.x from now on. --- gitian/descriptors/linux/gitian-tor.yml | 2 -- gitian/descriptors/mac/gitian-tor.yml | 2 -- gitian/descriptors/windows/gitian-tor.yml | 2 -- 3 files changed, 6 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 3678913..2dccff6 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -30,7 +30,6 @@ files: - "bug9665.patch" - "bug8402.patch" - "bug8402-master.patch" -- "bug11200-hang-0.2.5.patch" - "dzip.sh" - "openssl-linux32-utils.zip" - "openssl-linux64-utils.zip" @@ -86,7 +85,6 @@ script: | elif [ ${TOR_TAG::9} == "tor-0.2.5" ]; then git am ~/build/bug8402-master.patch - git am ~/build/bug11200-hang-0.2.5.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 88fb40f..ee8a556 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -27,7 +27,6 @@ files: - "bug9665.patch" - "bug8402.patch" - "bug8402-master.patch" -- "bug11200-hang-0.2.5.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -81,7 +80,6 @@ script: | elif [ ${TOR_TAG::9} == "tor-0.2.5" ]; then git am ~/build/bug8402-master.patch - git am ~/build/bug11200-hang-0.2.5.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index ad218f5..c326157 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -27,7 +27,6 @@ files: - "bug9665.patch" - "bug8402.patch" - "bug8402-master.patch" -- "bug11200-hang-0.2.5.patch" - "binutils.tar.bz2" - "dzip.sh" - "mingw-w64-win32-utils.zip" @@ -81,7 +80,6 @@ script: | elif [ ${TOR_TAG::9} == "tor-0.2.5" ]; then git am ~/build/bug8402-master.patch - git am ~/build/bug11200-hang-0.2.5.patch fi fi mkdir -p $OUTDIR/src

1 0

[tor-browser-bundle/master] Change the URL to the NoScript .xpi, too.
by gk＠torproject.org 17 Sep '14

17 Sep '14

commit 5d2f2409807c1d01a5a71867af2b2e800a7f26d3 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 17 11:25:57 2014 +0000 Change the URL to the NoScript .xpi, too. --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index d9b7f0a..1d3285d 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -102,7 +102,7 @@ TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} -NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE} +NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIPT_PACKAGE} HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI…

1 0

[tor-browser-bundle/master] Use latest NoScript for nightlies.
by gk＠torproject.org 17 Sep '14

17 Sep '14

commit 6998ff48dbc146b062760063ed822a09816dad01 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 17 10:23:03 2014 +0000 Use latest NoScript for nightlies. --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 4f483be..d9b7f0a 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -52,7 +52,7 @@ GO_VER=1.3 ## 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.6.8.36-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.41-fx+sm+fn.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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 @@ -80,7 +80,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=3c8ed31dbd67634debf333f957ba5c08bf3596408c9d09b5bf4da98499733af4 +NOSCRIPT_HASH=ac8b2febff44a437e00bd261570af9f7aba8cc2f49e69ffb631a0578af6facc1 HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0