- tbb-commits - lists.torproject.org

[torbutton/maint-1.9.5] Release preparations for 1.9.5.7
by gk＠torproject.org 07 Sep '16

07 Sep '16

commit 8fb4060133e6148a9f8f535204dd0f305c0a1997 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 7 06:13:55 2016 +0000 Release preparations for 1.9.5.7 --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 28cff54..93eddba 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.9.5.7 + * Bug 18589: Clear site security settings during New Identity + * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times + 1.9.5.6 * Bug 19417: Disable asmjs for now * Bug 19689: Use proper parent windows for plugin prompt diff --git a/src/install.rdf b/src/install.rdf index 9098991..0d1f843 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.5.6</em:version> + <em:version>1.9.5.7</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

[tor-browser/tor-browser-45.4.0esr-6.0-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 07 Sep '16

07 Sep '16

commit 11de35257e2b4ce656f71c0d5f08c339ab7f172d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 26 10:40:24 2016 -0400 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. When updating from an earlier version to Tor Browser 6.0 or later, old update info files are left behind on Linux and Windows. Remove them. This fixes bug 19725. --- toolkit/mozapps/update/nsUpdateService.js | 40 +++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js index 4495210..b9b91fc 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -1946,6 +1946,10 @@ UpdateService.prototype = { * notify the user of install success. */ _postUpdateProcessing: function AUS__postUpdateProcessing() { +#if defined(TOR_BROWSER_UPDATE) && !defined(XP_MACOSX) + this._removeOrphanedTorBrowserFiles(); +#endif + if (!this.canCheckForUpdates) { LOG("UpdateService:_postUpdateProcessing - unable to check for " + "updates... returning early"); @@ -2113,6 +2117,42 @@ UpdateService.prototype = { cleanUpMozUpdaterDirs(); }, +#if defined(TOR_BROWSER_UPDATE) && !defined(XP_MACOSX) + /** + * When updating from an earlier version to Tor Browser 6.0 or later, old + * update info files are left behind on Linux and Windows. Remove them. + */ + _removeOrphanedTorBrowserFiles: function AUS__removeOrphanedTorBrowserFiles() { + try { + let oldUpdateInfoDir = getAppBaseDir(); // aka the Browser directory. + +#ifdef XP_WIN + // On Windows, the updater files were stored under + // Browser/TorBrowser/Data/Browser/Caches/firefox/ + oldUpdateInfoDir.appendRelativePath( + "TorBrowser\\Data\\Browser\\Caches\\firefox"); +#endif + + // Remove the updates directory. + let updatesDir = oldUpdateInfoDir.clone(); + updatesDir.append("updates"); + if (updatesDir.exists() && updatesDir.isDirectory()) { + updatesDir.remove(true); + } + + // Remove files: active-update.xml and updates.xml + let filesToRemove = [ "active-update.xml", "updates.xml" ]; + filesToRemove.forEach(function(aFileName) { + let f = oldUpdateInfoDir.clone(); + f.append(aFileName); + if (f.exists()) { + f.remove(false); + } + }); + } catch (e) {} + }, +#endif + /** * Register an observer when the network comes online, so we can short-circuit * the app.update.interval when there isn't connectivity

1 0

[tor-browser-bundle/maint-6.0] Bump Go to version 1.4.3
by gk＠torproject.org 07 Sep '16

07 Sep '16

commit 28f1d91a74404d83597c74de580d63652bec7f95 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 7 06:05:06 2016 +0000 Bump Go to version 1.4.3 --- gitian/versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions b/gitian/versions index 03f1dfa..cb482cc 100755 --- a/gitian/versions +++ b/gitian/versions @@ -60,7 +60,7 @@ TWISTED_VER=13.2.0 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 -GO_VER=1.4.2 +GO_VER=1.4.3 NSIS_VER=2.51 ## File names for the source packages @@ -110,7 +110,7 @@ TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b +GO_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad

1 0

[tor-launcher/master] fixup! Bug 14272: Make Tor Launcher work with Unix Domain Socket option
by gk＠torproject.org 06 Sep '16

06 Sep '16

commit fa4e114a20067810af0c5cc6a57aa6e849386418 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 6 07:36:04 2016 +0000 fixup! Bug 14272: Make Tor Launcher work with Unix Domain Socket option Permissions for the Tor data directory are too permissive for control sockets. We adapt them (and those for creating files) to the ones used for Linux bundles by default. This fixes: #20076 and #20075 as FileUtils is not needed anymore (and hence can't be missing in tl-utils.jsm). --- src/components/tl-process.js | 2 -- src/modules/tl-util.jsm | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index c1bbdda..db074b4 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -16,8 +16,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil", "resource://torlauncher/modules/tl-util.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", "resource://torlauncher/modules/tl-logger.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "FileUtils", - "resource://gre/modules/FileUtils.jsm"); function TorProcessService() { diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 528b752..85b5fbe 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -513,9 +513,9 @@ let TorLauncherUtil = // Public try { if ("tordatadir" == aTorFileType) - f.create(f.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY); + f.create(f.DIRECTORY_TYPE, 0700); else - f.create(f.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE); + f.create(f.NORMAL_FILE_TYPE, 0600); } catch (e) {

1 0

[tor-browser-bundle/hardened-builds] Don't hardcode particular SF mirror
by gk＠torproject.org 02 Sep '16

02 Sep '16

commit cbf19c98632116c7ac197feb72856deb04b18142 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 2 07:21:07 2016 +0000 Don't hardcode particular SF mirror --- gitian/versions | 6 +++++- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index 22b52ff..46aad1b 100755 --- a/gitian/versions +++ b/gitian/versions @@ -84,6 +84,8 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO14_PACKAGE=go${GO14_VER}.src.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz +NSIS_PACKAGE=nsis-${NSIS_VER}-src.tar.bz2 +NSIS_DEBIAN_PACKAGE=nsis_${NSIS_VER}-1.debian.tar.xz STIXMATHFONT_PACKAGE=STIXv1.1.1-latex.zip NOTOEMOJIFONT_PACKAGE=NotoEmoji-Regular.ttf NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf @@ -143,7 +145,9 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} -STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} +NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIAN_PACKAGE} +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index fae60f8..964e529 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -155,7 +155,7 @@ GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… -STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index 92761a4..a686402 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -132,7 +132,7 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} -STIXMATHFONT_URL=http://iweb.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 1d216fa..27059d7 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -158,7 +158,7 @@ GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… -STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE}

1 0

[tor-browser-bundle/maint-6.0] Don't hard-code particular SF mirror
by gk＠torproject.org 02 Sep '16

02 Sep '16

commit 0d0c51f747667c7cdb54f27ef789b55fd45d0e66 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 2 07:14:33 2016 +0000 Don't hard-code particular SF mirror --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 67c114c..03f1dfa 100755 --- a/gitian/versions +++ b/gitian/versions @@ -143,7 +143,7 @@ PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… -STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE}

1 0

[tor-browser-bundle/master] Don't hard-code particular SF mirror
by gk＠torproject.org 02 Sep '16

02 Sep '16

commit 11a8d116c244b26c82cdfd040f3a35bf359f5450 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 2 07:09:54 2016 +0000 Don't hard-code particular SF mirror --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index c3fdb32..febeb06 100755 --- a/gitian/versions +++ b/gitian/versions @@ -148,7 +148,7 @@ GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… -STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 4be792f..acd15b3 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -148,7 +148,7 @@ GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… -STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index 89003ff..6e5485e 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -124,7 +124,7 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} -STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index f92a471..86f8b06 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -155,7 +155,7 @@ GO14_URL=https://golang.org/dl/${GO14_PACKAGE} GO_URL=https://golang.org/dl/${GO_PACKAGE} NSIS_URL=http://downloads.sourceforge.net/nsis/${NSIS_PACKAGE} NSIS_DEBIAN_URL=http://http.debian.net/debian/pool/main/n/nsis/${NSIS_DEBIA… -STIXMATHFONT_URL=http://heanet.dl.sourceforge.net/project/stixfonts/Current%20Release/${STIXMATHFONT_PACKAGE} +STIXMATHFONT_URL=http://downloads.sourceforge.net/stixfonts/${STIXMATHFONT_PACKAGE} NOTOEMOJIFONT_URL=https://github.com/googlei18n/noto-emoji/raw/2f1ffdd6fbbd… NOTOCJKBASE_URL=https://github.com/googlei18n/noto-cjk/raw/f36eda03dfa5582a… NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE}

1 0

[tor-browser/tor-browser-45.3.0esr-6.0-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 01 Sep '16

01 Sep '16

commit f800760546f5912d5aef5ca4e56b9e3fd62df8f9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 31 14:28:32 2016 -0400 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Add support for HTTPS Everywhere 5.2.2 and newer, which is no longer an unpacked extension. --- tools/update-packaging/make_full_update.sh | 3 +- tools/update-packaging/make_incremental_update.sh | 79 ++++++++++++++++++----- 2 files changed, 65 insertions(+), 17 deletions(-) diff --git a/tools/update-packaging/make_full_update.sh b/tools/update-packaging/make_full_update.sh index f0bd7f6..872221a 100755 --- a/tools/update-packaging/make_full_update.sh +++ b/tools/update-packaging/make_full_update.sh @@ -72,7 +72,8 @@ list_files files list_symlinks symlinks symlink_targets # TODO When TOR_BROWSER_DATA_OUTSIDE_APP_DIR is used on all platforms, -# we should remove the following lines: +# we should remove the following lines (which remove entire directories +# which, if present, contain old, unpacked copies of HTTPS Everywhere): # Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it # exists. The extension ID got changed with the version bump to 5.1.0. ext_path='TorBrowser/Data/Browser/profile.default/extensions' diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh index 15af172..dc9097e 100755 --- a/tools/update-packaging/make_incremental_update.sh +++ b/tools/update-packaging/make_incremental_update.sh @@ -91,6 +91,7 @@ fi # 770996 but in Tor Browser we do not need that fix. requested_forced_updates="" directories_to_remove="" +extra_files_to_remove="" while getopts "hqf:" flag do @@ -131,7 +132,8 @@ archivefiles="updatev2.manifest updatev3.manifest" # releases, add them to the "force updates" list. ext_path='TorBrowser/Data/Browser/profile.default/extensions' if [ -d "$newdir/$ext_path" ]; then - https_everywhere='https-everywhere-eff(a)eff.org' + https_everywhere_dir='https-everywhere-eff(a)eff.org' + https_everywhere_xpi='https-everywhere-eff(a)eff.org.xpi' noscript='{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi' # NoScript is a packed extension, so we simply compare the old and the new @@ -146,21 +148,57 @@ if [ -d "$newdir/$ext_path" ]; then requested_forced_updates="$requested_forced_updates $noscript_path" fi - # HTTPS Everywhere is an unpacked extension, so we need to determine if any of - # the unpacked files have changed. Since that is messy, we simply compare the - # old extension's install.rdf file to the new one. - https_everywhere_install_rdf="$ext_path/$https_everywhere/install.rdf" - diff "$olddir/$https_everywhere_install_rdf" \ - "$newdir/$https_everywhere_install_rdf" > /dev/null - rc=$? - if [ $rc -gt 1 -a -e "$olddir/$https_everywhere_install_rdf" ]; then - notice "Unexpected exit $rc from $https_everywhere_install_rdf diff command" - exit 2 - elif [ $rc -ge 1 ]; then - requested_forced_updates="$requested_forced_updates $ext_path/$https_everywhere/*" - # Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it - # exists. The extension ID got changed with the version bump to 5.1.0. - directories_to_remove="$directories_to_remove $ext_path/https-everywhere(a)eff.org $ext_path/$https_everywhere" + # As of HTTPS Everywhere 5.1.0, the extension ID gained "-eff". + # As of HTTPS Everywhere 5.2.2, the extension is packed (i.e., it remains + # an .xpi after it is installed in the browser profile). + force_https_update=0 + remove_unpacked_https_e_dirs=0 + unpacked_https_e_install_rdf="$ext_path/$https_everywhere_dir/install.rdf" + packed_https_e_path="$ext_path/$https_everywhere_xpi" + if [ -d "$newdir/$ext_path/$https_everywhere_dir" ]; then + # The new HTTPS-E extension is unpacked, and presumably the old one is + # too. We need to determine if any of the unpacked files have changed. + # Since that is messy, we simply compare the old install.rdf file to the + # new one. + diff "$olddir/$unpacked_https_e_install_rdf" \ + "$newdir/$unpacked_https_e_install_rdf" > /dev/null + rc=$? + if [ $rc -gt 1 -a -e "$olddir/$unpacked_https_e_install_rdf" ]; then + notice "Unexpected exit $rc from $unpacked_https_e_install_rdf diff command" + exit 2 + elif [ $rc -ge 1 ]; then + force_https_update=1 + remove_unpacked_https_e_dirs=1 + # In case we still ship an unpacked HTTPS-E extension but the user has + # updated to a packed one, arrange for the packed one to be removed. + extra_files_to_remove="$extra_files_to_remove $packed_https_e_path" + fi + elif [ -d "$olddir/$ext_path/$https_everywhere_dir" ]; then + # The old HTTPS-E extension is unpacked but the new one is packed. + force_https_update=1 + remove_unpacked_https_e_dirs=1 + else + # Both the old and new HTTPS-E extensions are packed. In this case we can + # simply compare the .xpi files to determine if the extension has changed. + diff -a "$olddir/$packed_https_e_path" "$newdir/$packed_https_e_path" > /dev/null + rc=$? + if [ $rc -gt 1 ]; then + notice "Unexpected exit $rc from $packed_https_e_path diff command" + exit 2 + elif [ $rc -eq 1 ]; then + force_https_update=1 + fi + fi + + if [ $force_https_update -ne 0 ]; then + requested_forced_updates="$requested_forced_updates $ext_path/$https_everywhere_dir/* $packed_https_e_path" + if [ "$remove_unpacked_https_e_dirs" -ne 0 ]; then + # The old version was unpacked, so remove the entire directory to ensure + # that the replace is "clean." Also, make sure we delete the pre 5.1.0 + # HTTPS Everywhere as well in case it exists (the extension ID got + # changed with the version bump to 5.1.0). + directories_to_remove="$directories_to_remove $ext_path/https-everywhere(a)eff.org $ext_path/$https_everywhere_dir" + fi fi fi # END TOR_BROWSER_DATA_OUTSIDE_APP_DIR removal @@ -376,6 +414,15 @@ notice "" notice "Adding file and directory remove instructions from file 'removed-files'" append_remove_instructions "$newdir" "$updatemanifestv2" "$updatemanifestv3" +# TODO When TOR_BROWSER_DATA_OUTSIDE_APP_DIR is used on all platforms, +# we should remove the following lines: +for f in $extra_files_to_remove; do + notice " remove \"$f\"" + echo "remove \"$f\"" >> "$updatemanifestv2" + echo "remove \"$f\"" >> "$updatemanifestv3" +done +# END TOR_BROWSER_DATA_OUTSIDE_APP_DIR removal + notice "" notice "Adding directory remove instructions for directories that no longer exist" num_olddirs=${#olddirs[*]}

1 0

[tor-browser/tor-browser-45.3.0esr-6.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 01 Sep '16

01 Sep '16

commit 082d1c5e03617458f366b597256597bbde079889 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 31 14:28:32 2016 -0400 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Add support for HTTPS Everywhere 5.2.2 and newer, which is no longer an unpacked extension. --- tools/update-packaging/make_full_update.sh | 3 +- tools/update-packaging/make_incremental_update.sh | 79 ++++++++++++++++++----- 2 files changed, 65 insertions(+), 17 deletions(-) diff --git a/tools/update-packaging/make_full_update.sh b/tools/update-packaging/make_full_update.sh index f0bd7f6..872221a 100755 --- a/tools/update-packaging/make_full_update.sh +++ b/tools/update-packaging/make_full_update.sh @@ -72,7 +72,8 @@ list_files files list_symlinks symlinks symlink_targets # TODO When TOR_BROWSER_DATA_OUTSIDE_APP_DIR is used on all platforms, -# we should remove the following lines: +# we should remove the following lines (which remove entire directories +# which, if present, contain old, unpacked copies of HTTPS Everywhere): # Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it # exists. The extension ID got changed with the version bump to 5.1.0. ext_path='TorBrowser/Data/Browser/profile.default/extensions' diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh index 15af172..dc9097e 100755 --- a/tools/update-packaging/make_incremental_update.sh +++ b/tools/update-packaging/make_incremental_update.sh @@ -91,6 +91,7 @@ fi # 770996 but in Tor Browser we do not need that fix. requested_forced_updates="" directories_to_remove="" +extra_files_to_remove="" while getopts "hqf:" flag do @@ -131,7 +132,8 @@ archivefiles="updatev2.manifest updatev3.manifest" # releases, add them to the "force updates" list. ext_path='TorBrowser/Data/Browser/profile.default/extensions' if [ -d "$newdir/$ext_path" ]; then - https_everywhere='https-everywhere-eff(a)eff.org' + https_everywhere_dir='https-everywhere-eff(a)eff.org' + https_everywhere_xpi='https-everywhere-eff(a)eff.org.xpi' noscript='{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi' # NoScript is a packed extension, so we simply compare the old and the new @@ -146,21 +148,57 @@ if [ -d "$newdir/$ext_path" ]; then requested_forced_updates="$requested_forced_updates $noscript_path" fi - # HTTPS Everywhere is an unpacked extension, so we need to determine if any of - # the unpacked files have changed. Since that is messy, we simply compare the - # old extension's install.rdf file to the new one. - https_everywhere_install_rdf="$ext_path/$https_everywhere/install.rdf" - diff "$olddir/$https_everywhere_install_rdf" \ - "$newdir/$https_everywhere_install_rdf" > /dev/null - rc=$? - if [ $rc -gt 1 -a -e "$olddir/$https_everywhere_install_rdf" ]; then - notice "Unexpected exit $rc from $https_everywhere_install_rdf diff command" - exit 2 - elif [ $rc -ge 1 ]; then - requested_forced_updates="$requested_forced_updates $ext_path/$https_everywhere/*" - # Make sure we delete the pre 5.1.0 HTTPS Everywhere as well in case it - # exists. The extension ID got changed with the version bump to 5.1.0. - directories_to_remove="$directories_to_remove $ext_path/https-everywhere(a)eff.org $ext_path/$https_everywhere" + # As of HTTPS Everywhere 5.1.0, the extension ID gained "-eff". + # As of HTTPS Everywhere 5.2.2, the extension is packed (i.e., it remains + # an .xpi after it is installed in the browser profile). + force_https_update=0 + remove_unpacked_https_e_dirs=0 + unpacked_https_e_install_rdf="$ext_path/$https_everywhere_dir/install.rdf" + packed_https_e_path="$ext_path/$https_everywhere_xpi" + if [ -d "$newdir/$ext_path/$https_everywhere_dir" ]; then + # The new HTTPS-E extension is unpacked, and presumably the old one is + # too. We need to determine if any of the unpacked files have changed. + # Since that is messy, we simply compare the old install.rdf file to the + # new one. + diff "$olddir/$unpacked_https_e_install_rdf" \ + "$newdir/$unpacked_https_e_install_rdf" > /dev/null + rc=$? + if [ $rc -gt 1 -a -e "$olddir/$unpacked_https_e_install_rdf" ]; then + notice "Unexpected exit $rc from $unpacked_https_e_install_rdf diff command" + exit 2 + elif [ $rc -ge 1 ]; then + force_https_update=1 + remove_unpacked_https_e_dirs=1 + # In case we still ship an unpacked HTTPS-E extension but the user has + # updated to a packed one, arrange for the packed one to be removed. + extra_files_to_remove="$extra_files_to_remove $packed_https_e_path" + fi + elif [ -d "$olddir/$ext_path/$https_everywhere_dir" ]; then + # The old HTTPS-E extension is unpacked but the new one is packed. + force_https_update=1 + remove_unpacked_https_e_dirs=1 + else + # Both the old and new HTTPS-E extensions are packed. In this case we can + # simply compare the .xpi files to determine if the extension has changed. + diff -a "$olddir/$packed_https_e_path" "$newdir/$packed_https_e_path" > /dev/null + rc=$? + if [ $rc -gt 1 ]; then + notice "Unexpected exit $rc from $packed_https_e_path diff command" + exit 2 + elif [ $rc -eq 1 ]; then + force_https_update=1 + fi + fi + + if [ $force_https_update -ne 0 ]; then + requested_forced_updates="$requested_forced_updates $ext_path/$https_everywhere_dir/* $packed_https_e_path" + if [ "$remove_unpacked_https_e_dirs" -ne 0 ]; then + # The old version was unpacked, so remove the entire directory to ensure + # that the replace is "clean." Also, make sure we delete the pre 5.1.0 + # HTTPS Everywhere as well in case it exists (the extension ID got + # changed with the version bump to 5.1.0). + directories_to_remove="$directories_to_remove $ext_path/https-everywhere(a)eff.org $ext_path/$https_everywhere_dir" + fi fi fi # END TOR_BROWSER_DATA_OUTSIDE_APP_DIR removal @@ -376,6 +414,15 @@ notice "" notice "Adding file and directory remove instructions from file 'removed-files'" append_remove_instructions "$newdir" "$updatemanifestv2" "$updatemanifestv3" +# TODO When TOR_BROWSER_DATA_OUTSIDE_APP_DIR is used on all platforms, +# we should remove the following lines: +for f in $extra_files_to_remove; do + notice " remove \"$f\"" + echo "remove \"$f\"" >> "$updatemanifestv2" + echo "remove \"$f\"" >> "$updatemanifestv3" +done +# END TOR_BROWSER_DATA_OUTSIDE_APP_DIR removal + notice "" notice "Adding directory remove instructions for directories that no longer exist" num_olddirs=${#olddirs[*]}

1 0

[tor-launcher/master] Fix typo
by gk＠torproject.org 01 Sep '16

01 Sep '16

commit 32ddac7015be571c336be686b4f901103d0d36f6 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 1 07:57:01 2016 +0000 Fix typo --- src/modules/tl-util.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 992ef5b..528b752 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -389,7 +389,7 @@ let TorLauncherUtil = // Public // Returns an nsIFile. // If aTorFileType is "control_socket", aCreate is ignored and there is - // no requirement that the socket exist. + // no requirement that the socket exists. // For all other file types, null is returned if the file does not exist // and it cannot be created (it will be created if aCreate is true). getTorFile: function(aTorFileType, aCreate)

1 0

[tor-launcher/master] Bug 14272: Make Tor Launcher work with Unix Domain Socket option
by gk＠torproject.org 01 Sep '16

01 Sep '16

commit 8871259c966755233b134a5ddb2b4926539d25c6 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 31 15:26:08 2016 -0400 Bug 14272: Make Tor Launcher work with Unix Domain Socket option On non-Windows platforms, use a Unix domain socket by default for the Tor control port. New preferences: extensions.torlauncher.control_port_use_socket (Boolean) extensions.torlauncher.control_socket_path (path string) New environment variable: TOR_CONTROL_SOCKET When starting tor, always include a ControlPort argument so that users can use environment variables to switch between the two control port types. Add a public TorGetControlSocketFile() function that Torbutton will use to retrieve the socket file (an nsIFile) when a Unix domain socket is in use. Moved the getTorFile() function to our utilities module. --- src/components/tl-process.js | 253 +++---------------------------------- src/components/tl-protocol.js | 100 ++++++++++++--- src/defaults/preferences/prefs.js | 14 ++- src/modules/tl-util.jsm | 257 +++++++++++++++++++++++++++++++++++++- 4 files changed, 370 insertions(+), 254 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 8e42feb..c1bbdda 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -31,8 +31,6 @@ TorProcessService.prototype = { kContractID : "@torproject.org/torlauncher-process-service;1", kServiceName : "Tor Launcher Process Service", - kThunderbirdID: "{3550f703-e582-4d05-9a08-453d09bdfdc6}", - kInstantbirdID: "{33cb9019-c295-46dd-be21-8c4936574bee}", kClassID: Components.ID("{FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1}"), kTorLauncherExtPath: "tor-launcher(a)torproject.org", // This could vary. @@ -308,11 +306,6 @@ TorProcessService.prototype = mProtocolSvc: null, mTorProcess: null, // nsIProcess mTorProcessStartTime: null, // JS Date.now() - // mIsUserDataOutsideOfAppDir is true when TorBrowser-Data is used. - // (cached; access via this._isUserDataOutsideOfAppDir) - mIsUserDataOutsideOfAppDir: undefined, - mAppDir: null, // nsIFile (cached; access via this._appDir) - mDataDir: null, // nsIFile (cached; access via this._dataDir) mControlConnTimer: null, mControlConnDelayMS: 0, mQuitSoon: false, // Quit was requested by the user; do so soon. @@ -333,11 +326,14 @@ TorProcessService.prototype = // Get the Tor data directory first so it is created before we try to // construct paths to files that will be inside it. - var dataDir = this._getTorFile("tordatadir", true); - var exeFile = this._getTorFile("tor", false); - var torrcFile = this._getTorFile("torrc", true); - var torrcDefaultsFile = this._getTorFile("torrc-defaults", false); + var dataDir = TorLauncherUtil.getTorFile("tordatadir", true); + var exeFile = TorLauncherUtil.getTorFile("tor", false); + var torrcFile = TorLauncherUtil.getTorFile("torrc", true); + var torrcDefaultsFile = + TorLauncherUtil.getTorFile("torrc-defaults", false); var hashedPassword = this.mProtocolSvc.TorGetPassword(true); + var controlSocketFile = this.mProtocolSvc.TorGetControlSocketFile(); + var controlPort = this.mProtocolSvc.TorGetControlPort(); var detailsKey; if (!exeFile) @@ -359,7 +355,6 @@ TorProcessService.prototype = return; } - // The geoip and geoip6 files are in the same directory as torrc-defaults. var geoipFile = torrcDefaultsFile.clone(); geoipFile.leafName = "geoip"; @@ -384,6 +379,19 @@ TorProcessService.prototype = args.push("HashedControlPassword"); args.push(hashedPassword); + // Include a ControlPort argument to support switching between + // a TCP port and a Unix domain socket. + let controlPortArg; + if (controlSocketFile) + controlPortArg = "unix:" + controlSocketFile.path; + else if (controlPort) + controlPortArg = "" + controlPort; + if (controlPortArg) + { + args.push("ControlPort"); + args.push(controlPortArg); + } + var pid = this._getpid(); if (0 != pid) { @@ -692,227 +700,6 @@ TorProcessService.prototype = return argsArray; }, - // Returns an nsIFile. - // If aCreate is true and the file doesn't exist, it is created. - _getTorFile: function(aTorFileType, aCreate) - { - if (!aTorFileType) - return null; - - let isRelativePath = true; - let isUserData = (aTorFileType != "tor") && - (aTorFileType != "torrc-defaults"); - let prefName = "extensions.torlauncher." + aTorFileType + "_path"; - let path = TorLauncherUtil.getCharPref(prefName); - if (path) - { - let re = (TorLauncherUtil.isWindows) ? /^[A-Za-z]:\\/ : /^\//; - isRelativePath = !re.test(path); - } - else - { - // Get default path. - if (this._isUserDataOutsideOfAppDir) - { - // This block is used for the TorBrowser-Data/ case. - if (TorLauncherUtil.isWindows) - { - if ("tor" == aTorFileType) - path = "TorBrowser\\Tor\\tor.exe"; - else if ("torrc-defaults" == aTorFileType) - path = "TorBrowser\\Tor\\torrc-defaults"; - else if ("torrc" == aTorFileType) - path = "Tor\\torrc"; - else if ("tordatadir" == aTorFileType) - path = "Tor"; - } - else if (TorLauncherUtil.isMac) - { - if ("tor" == aTorFileType) - path = "Contents/Resources/TorBrowser/Tor/tor"; - else if ("torrc-defaults" == aTorFileType) - path = "Contents/Resources/TorBrowser/Tor/torrc-defaults"; - else if ("torrc" == aTorFileType) - path = "Tor/torrc"; - else if ("tordatadir" == aTorFileType) - path = "Tor"; - } - else // Linux and others. - { - if ("tor" == aTorFileType) - path = "TorBrowser/Tor/tor"; - else if ("torrc-defaults" == aTorFileType) - path = "TorBrowser/Tor/torrc-defaults"; - else if ("torrc" == aTorFileType) - path = "Tor/torrc"; - else if ("tordatadir" == aTorFileType) - path = "Tor"; - } - } - else if (TorLauncherUtil.isWindows) - { - // This block is used for the non-TorBrowser-Data/ case. - if ("tor" == aTorFileType) - path = "Tor\\tor.exe"; - else if ("torrc-defaults" == aTorFileType) - path = "Data\\Tor\\torrc-defaults"; - else if ("torrc" == aTorFileType) - path = "Data\\Tor\\torrc"; - else if ("tordatadir" == aTorFileType) - path = "Data\\Tor"; - } - else // Linux, Mac OS and others. - { - // This block is also used for the non-TorBrowser-Data/ case. - if ("tor" == aTorFileType) - path = "Tor/tor"; - else if ("torrc-defaults" == aTorFileType) - path = "Data/Tor/torrc-defaults"; - else if ("torrc" == aTorFileType) - path = "Data/Tor/torrc"; - else if ("tordatadir" == aTorFileType) - path = "Data/Tor"; - } - } - - if (!path) - return null; - - try - { - let f; - if (isRelativePath) - { - // Turn 'path' into an absolute path. - if (this._isUserDataOutsideOfAppDir) - { - let baseDir = isUserData ? this._dataDir : this._appDir; - f = baseDir.clone(); - } - else - { - f = this._appDir.clone(); - f.append("TorBrowser"); - } - f.appendRelativePath(path); - } - else - { - f = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile); - f.initWithPath(path); - } - - if (!f.exists() && aCreate) - { - try - { - if ("tordatadir" == aTorFileType) - f.create(f.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY); - else - f.create(f.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE); - } - catch (e) - { - TorLauncherLogger.safelog(4, "unable to create " + f.path + ": ", e); - return null; - } - } - - if (f.exists()) - { - try { f.normalize(); } catch(e) {} - - return f; - } - - TorLauncherLogger.log(4, aTorFileType + " file not found: " + f.path); - } - catch(e) - { - TorLauncherLogger.safelog(4, "_getTorFile " + aTorFileType + - " failed for " + path + ": ", e); - } - - return null; // File not found or error (logged above). - }, // _getTorFile() - - get _isUserDataOutsideOfAppDir() - { - if (this.mIsUserDataOutsideOfAppDir == undefined) - { - // Determine if we are using a "side-by-side" data model by checking - // whether the user profile is outside of the app directory. - try - { - let ds = Cc["@mozilla.org/file/directory_service;1"] - .getService(Ci.nsIProperties); - let profDir = ds.get("ProfD", Ci.nsIFile); - this.mIsUserDataOutsideOfAppDir = !this._appDir.contains(profDir); - } - catch (e) - { - this.mIsUserDataOutsideOfAppDir = false; - } - } - - return this.mIsUserDataOutsideOfAppDir; - }, // get _isUserDataOutsideOfAppDir - - // Returns an nsIFile that points to the application directory. - // May throw. - get _appDir() - { - if (!this.mAppDir) - { - let topDir = Cc["@mozilla.org/file/directory_service;1"] - .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile); - let appInfo = Cc["@mozilla.org/xre/app-info;1"] - .getService(Ci.nsIXULAppInfo); - // On Linux and Windows, we want to return the Browser/ directory. - // Because topDir ("CurProcD") points to Browser/browser on those - // platforms, we need to go up one level. - // On Mac OS, we want to return the TorBrowser.app/ directory. - // Because topDir points to Contents/Resources/browser on Mac OS, - // we need to go up 3 levels. - let tbbBrowserDepth = (TorLauncherUtil.isMac) ? 3 : 1; - if ((appInfo.ID == this.kThunderbirdID) || - (appInfo.ID == this.kInstantbirdID)) - { - // On Thunderbird/Instantbird, the topDir is the root dir and not - // browser/, so we need to iterate one level less than Firefox. - --tbbBrowserDepth; - } - - while (tbbBrowserDepth > 0) - { - let didRemove = (topDir.leafName != "."); - topDir = topDir.parent; - if (didRemove) - tbbBrowserDepth--; - } - - this.mAppDir = topDir; - } - - return this.mAppDir; - }, // get _appDir - - // Returns an nsIFile that points to the TorBrowser-Data/ directory. - // This function is only used when this._isUserDataOutsideOfAppDir == true. - // May throw. - get _dataDir() - { - if (!this.mDataDir) - { - let ds = Cc["@mozilla.org/file/directory_service;1"] - .getService(Ci.nsIProperties); - let profDir = ds.get("ProfD", Ci.nsIFile); - this.mDataDir = profDir.parent.parent; - } - - return this.mDataDir; - }, // get _dataDir - _getpid: function() { // Use nsIXULRuntime.processID if it is available. diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index fdc2394..d394b53 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -1,4 +1,4 @@ -// Copyright (c) 2015, The Tor Project, Inc. +// Copyright (c) 2016, The Tor Project, Inc. // See LICENSE for licensing information. // TODO: Some code came from torbutton.js (pull in copyright and license?) // @@ -17,6 +17,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil", "resource://torlauncher/modules/tl-util.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", "resource://torlauncher/modules/tl-logger.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "FileUtils", + "resource://gre/modules/FileUtils.jsm"); function TorProtocolService() @@ -31,23 +33,44 @@ function TorProtocolService() try { - var env = Cc["@mozilla.org/process/environment;1"] + let isWindows = TorLauncherUtil.isWindows; + let env = Cc["@mozilla.org/process/environment;1"] .getService(Ci.nsIEnvironment); - - if (env.exists("TOR_CONTROL_HOST")) - this.mControlHost = env.get("TOR_CONTROL_HOST"); - else + // Determine how Tor Launcher will connect to the Tor control port. + // Environment variables get top priority followed by preferences. + if (!isWindows && env.exists("TOR_CONTROL_SOCKET")) { - this.mControlHost = TorLauncherUtil.getCharPref( - "extensions.torlauncher.control_host", "127.0.0.1"); + let socketPath = env.get("TOR_CONTROL_SOCKET"); + this.mControlSocketFile = new FileUtils.File(socketPath); } - - if (env.exists("TOR_CONTROL_PORT")) - this.mControlPort = parseInt(env.get("TOR_CONTROL_PORT"), 10); else { - this.mControlPort = TorLauncherUtil.getIntPref( + // Check for TCP host and port environment variables. + if (env.exists("TOR_CONTROL_HOST")) + this.mControlHost = env.get("TOR_CONTROL_HOST"); + if (env.exists("TOR_CONTROL_PORT")) + this.mControlPort = parseInt(env.get("TOR_CONTROL_PORT"), 10); + + let useSocket = !isWindows && TorLauncherUtil.getBoolPref( + "extensions.torlauncher.control_port_use_socket", true); + if (!this.mControlHost && !this.mControlPort && useSocket) + { + this.mControlSocketFile = TorLauncherUtil.getTorFile("control_socket", + false); + } + else + { + if (!this.mControlHost) + { + this.mControlHost = TorLauncherUtil.getCharPref( + "extensions.torlauncher.control_host", "127.0.0.1"); + } + if (!this.mControlPort) + { + this.mControlPort = TorLauncherUtil.getIntPref( "extensions.torlauncher.control_port", 9151); + } + } } // Populate mControlPassword so it is available when starting tor. @@ -141,6 +164,19 @@ TorProtocolService.prototype = kCmdStatusOK: 250, kCmdStatusEventNotification: 650, + TorGetControlSocketFile: function() + { + if (!this.mControlSocketFile) + return undefined; + + return this.mControlSocketFile.clone(); + }, + + TorGetControlPort: function() + { + return this.mControlPort; + }, + // Returns Tor password string or null if an error occurs. TorGetPassword: function(aPleaseHash) { @@ -512,6 +548,7 @@ TorProtocolService.prototype = mConsoleSvc: null, mControlPort: null, mControlHost: null, + mControlSocketFile: null, // An nsIFile if using a UNIX domain socket. mControlPassword: null, // JS string that contains hex-encoded password. mControlConnection: null, // This is cached and reused. mEventMonitorConnection: null, @@ -560,12 +597,43 @@ TorProtocolService.prototype = var conn; try { - var sts = Cc["@mozilla.org/network/socket-transport-service;1"] + let sts = Cc["@mozilla.org/network/socket-transport-service;1"] .getService(Ci.nsISocketTransportService); - TorLauncherLogger.log(2, "Opening control connection to " + + let socket; + if (this.mControlSocketFile) + { + let exists = this.mControlSocketFile.exists(); + if (!exists) + { + TorLauncherLogger.log(5, "Control port socket does not exist: " + + this.mControlSocketFile.path); + } + else + { + let isSpecial = this.mControlSocketFile.isSpecial(); + if (!isSpecial) + { + TorLauncherLogger.log(5, "Control port socket is not a socket: " + + this.mControlSocketFile.path); + } + else + { + TorLauncherLogger.log(2, "Opening control connection to socket " + + this.mControlSocketFile.path); + socket = sts.createUnixDomainTransport(this.mControlSocketFile); + } + } + } + else + { + TorLauncherLogger.log(2, "Opening control connection to " + this.mControlHost + ":" + this.mControlPort); - var socket = sts.createTransport(null, 0, this.mControlHost, - this.mControlPort, null); + socket = sts.createTransport(null, 0, this.mControlHost, + this.mControlPort, null); + } + + if (!socket) + return null; // Our event monitor connection is non-blocking and unbuffered (an // asyncWait() call is used so we only read data when we know that diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js index 2c0a95e..500fe2f 100644 --- a/src/defaults/preferences/prefs.js +++ b/src/defaults/preferences/prefs.js @@ -2,16 +2,24 @@ pref("intl.locale.matchOS", true); pref("extensions.torlauncher.prompt_for_locale", true); +pref("extensions.torlauncher.start_tor", true); +pref("extensions.torlauncher.prompt_at_startup", true); + pref("extensions.torlauncher.loglevel", 4); // 1=verbose, 2=debug, 3=info, 4=note, 5=warn pref("extensions.torlauncher.logmethod", 1); // 0=stdout, 1=errorconsole, 2=debuglog pref("extensions.torlauncher.max_tor_log_entries", 1000); +// By default, a Unix domain socket at a default location is used for +// the Tor control port. +// Change control_port_use_socket to false to use a TCP connection +// instead, as defined by control_host and control_port. +// Modify control_socket_path to override the default socket location. If a +// relative path is used, it is handled like torrc_path (see below). +pref("extensions.torlauncher.control_port_use_socket", true); +pref("extensions.torlauncher.control_socket_path", ""); pref("extensions.torlauncher.control_host", "127.0.0.1"); pref("extensions.torlauncher.control_port", 9151); -pref("extensions.torlauncher.start_tor", true); -pref("extensions.torlauncher.prompt_at_startup", true); - // The tor_path is relative to the application directory. On Linux and // Windows this is the Browser/ directory that contains the firefox // executables, and on Mac OS it is the TorBrowser.app directory. diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 7f93f39..992ef5b 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -1,4 +1,4 @@ -// Copyright (c) 2015, The Tor Project, Inc. +// Copyright (c) 2016, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -11,14 +11,19 @@ let EXPORTED_SYMBOLS = [ "TorLauncherUtil" ]; const Cc = Components.classes; const Ci = Components.interfaces; +const Cu = Components.utils; const kPropBundleURI = "chrome://torlauncher/locale/torlauncher.properties"; const kPropNamePrefix = "torlauncher."; +Cu.import("resource://gre/modules/XPCOMUtils.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", + "resource://torlauncher/modules/tl-logger.jsm"); + let TorLauncherUtil = // Public { get isMac() { - return ("Darwin" == TLUtilInternal._OS); + return TLUtilInternal._isMac; }, get isWindows() @@ -381,6 +386,163 @@ let TorLauncherUtil = // Public return undefined; }, + + // Returns an nsIFile. + // If aTorFileType is "control_socket", aCreate is ignored and there is + // no requirement that the socket exist. + // For all other file types, null is returned if the file does not exist + // and it cannot be created (it will be created if aCreate is true). + getTorFile: function(aTorFileType, aCreate) + { + if (!aTorFileType) + return null; + + let isRelativePath = true; + let isUserData = (aTorFileType != "tor") && + (aTorFileType != "torrc-defaults"); + let isControlSocket = ("control_socket" == aTorFileType); + let prefName = "extensions.torlauncher." + aTorFileType + "_path"; + let path = this.getCharPref(prefName); + if (path) + { + let re = (this.isWindows) ? /^[A-Za-z]:\\/ : /^\//; + isRelativePath = !re.test(path); + } + else + { + // Get default path. + if (TLUtilInternal._isUserDataOutsideOfAppDir) + { + // This block is used for the TorBrowser-Data/ case. + if (this.isWindows) + { + if ("tor" == aTorFileType) + path = "TorBrowser\\Tor\\tor.exe"; + else if ("torrc-defaults" == aTorFileType) + path = "TorBrowser\\Tor\\torrc-defaults"; + else if ("torrc" == aTorFileType) + path = "Tor\\torrc"; + else if ("tordatadir" == aTorFileType) + path = "Tor"; + } + else if (this.isMac) + { + if ("tor" == aTorFileType) + path = "Contents/Resources/TorBrowser/Tor/tor"; + else if ("torrc-defaults" == aTorFileType) + path = "Contents/Resources/TorBrowser/Tor/torrc-defaults"; + else if ("torrc" == aTorFileType) + path = "Tor/torrc"; + else if ("tordatadir" == aTorFileType) + path = "Tor"; + else if (isControlSocket) + path = "Tor/control.socket"; + } + else // Linux and others. + { + if ("tor" == aTorFileType) + path = "TorBrowser/Tor/tor"; + else if ("torrc-defaults" == aTorFileType) + path = "TorBrowser/Tor/torrc-defaults"; + else if ("torrc" == aTorFileType) + path = "Tor/torrc"; + else if ("tordatadir" == aTorFileType) + path = "Tor"; + else if (isControlSocket) + path = "Tor/control.socket"; + } + } + else if (this.isWindows) + { + // This block is used for the non-TorBrowser-Data/ case. + if ("tor" == aTorFileType) + path = "Tor\\tor.exe"; + else if ("torrc-defaults" == aTorFileType) + path = "Data\\Tor\\torrc-defaults"; + else if ("torrc" == aTorFileType) + path = "Data\\Tor\\torrc"; + else if ("tordatadir" == aTorFileType) + path = "Data\\Tor"; + } + else // Linux, Mac OS and others. + { + // This block is also used for the non-TorBrowser-Data/ case. + if ("tor" == aTorFileType) + path = "Tor/tor"; + else if ("torrc-defaults" == aTorFileType) + path = "Data/Tor/torrc-defaults"; + else if ("torrc" == aTorFileType) + path = "Data/Tor/torrc"; + else if ("tordatadir" == aTorFileType) + path = "Data/Tor"; + else if (isControlSocket) + path = "Data/Tor/control.socket"; + } + } + + if (!path) + return null; + + try + { + let f; + if (isRelativePath) + { + // Turn 'path' into an absolute path. + if (TLUtilInternal._isUserDataOutsideOfAppDir) + { + let baseDir = isUserData ? TLUtilInternal._dataDir + : TLUtilInternal._appDir; + f = baseDir.clone(); + } + else + { + f = TLUtilInternal._appDir.clone(); + f.append("TorBrowser"); + } + f.appendRelativePath(path); + } + else + { + f = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsIFile); + f.initWithPath(path); + } + + if (!f.exists() && !isControlSocket && aCreate) + { + try + { + if ("tordatadir" == aTorFileType) + f.create(f.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY); + else + f.create(f.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE); + } + catch (e) + { + TorLauncherLogger.safelog(4, "unable to create " + f.path + ": ", e); + return null; + } + } + + // If the file exists or the control socket was requested, normalize + // the path and return a file object. The control socket will be + // created by tor. + if (f.exists() || isControlSocket) + { + try { f.normalize(); } catch(e) {} + return f; + } + + TorLauncherLogger.log(4, aTorFileType + " file not found: " + f.path); + } + catch(e) + { + TorLauncherLogger.safelog(4, "getTorFile " + aTorFileType + + " failed for " + path + ": ", e); + } + + return null; // File not found or error (logged above). + }, // getTorFile() }; @@ -389,9 +551,17 @@ Object.freeze(TorLauncherUtil); let TLUtilInternal = // Private { + kThunderbirdID: "{3550f703-e582-4d05-9a08-453d09bdfdc6}", + kInstantbirdID: "{33cb9019-c295-46dd-be21-8c4936574bee}", + mPrefsSvc : null, mStringBundle : null, mOS : "", + // mIsUserDataOutsideOfAppDir is true when TorBrowser-Data is used. + mIsUserDataOutsideOfAppDir: undefined, // Boolean (cached; access via + // this._isUserDataOutsideOfAppDir) + mAppDir: null, // nsIFile (cached; access via this._appDir) + mDataDir: null, // nsIFile (cached; access via this._dataDir) _init: function() { @@ -421,6 +591,89 @@ let TLUtilInternal = // Private return this.mOS; }, + + get _isMac() + { + return ("Darwin" == this._OS); + }, + + get _isUserDataOutsideOfAppDir() + { + if (this.mIsUserDataOutsideOfAppDir == undefined) + { + // Determine if we are using a "side-by-side" data model by checking + // whether the user profile is outside of the app directory. + try + { + let ds = Cc["@mozilla.org/file/directory_service;1"] + .getService(Ci.nsIProperties); + let profDir = ds.get("ProfD", Ci.nsIFile); + this.mIsUserDataOutsideOfAppDir = !this._appDir.contains(profDir); + } + catch (e) + { + this.mIsUserDataOutsideOfAppDir = false; + } + } + + return this.mIsUserDataOutsideOfAppDir; + }, // get _isUserDataOutsideOfAppDir + + // Returns an nsIFile that points to the application directory. + // May throw. + get _appDir() + { + if (!this.mAppDir) + { + let topDir = Cc["@mozilla.org/file/directory_service;1"] + .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile); + let appInfo = Cc["@mozilla.org/xre/app-info;1"] + .getService(Ci.nsIXULAppInfo); + // On Linux and Windows, we want to return the Browser/ directory. + // Because topDir ("CurProcD") points to Browser/browser on those + // platforms, we need to go up one level. + // On Mac OS, we want to return the TorBrowser.app/ directory. + // Because topDir points to Contents/Resources/browser on Mac OS, + // we need to go up 3 levels. + let tbbBrowserDepth = (this._isMac) ? 3 : 1; + if ((appInfo.ID == this.kThunderbirdID) || + (appInfo.ID == this.kInstantbirdID)) + { + // On Thunderbird/Instantbird, the topDir is the root dir and not + // browser/, so we need to iterate one level less than Firefox. + --tbbBrowserDepth; + } + + while (tbbBrowserDepth > 0) + { + let didRemove = (topDir.leafName != "."); + topDir = topDir.parent; + if (didRemove) + tbbBrowserDepth--; + } + + this.mAppDir = topDir; + } + + return this.mAppDir; + }, // get _appDir + + // Returns an nsIFile that points to the TorBrowser-Data/ directory. + // This function is only used when this._isUserDataOutsideOfAppDir == true. + // May throw. + get _dataDir() + { + if (!this.mDataDir) + { + let ds = Cc["@mozilla.org/file/directory_service;1"] + .getService(Ci.nsIProperties); + let profDir = ds.get("ProfD", Ci.nsIFile); + this.mDataDir = profDir.parent.parent; + } + + return this.mDataDir; + }, // get _dataDir + };

1 0

[torbutton/master] fixup! Bug 15852: Remove/synchronize Torbutton SOCKS pref logic
by gk＠torproject.org 30 Aug '16

30 Aug '16

commit 1648da8461dfed9975ac83fdb03aa745b6c8d49b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 30 15:48:03 2016 -0400 fixup! Bug 15852: Remove/synchronize Torbutton SOCKS pref logic Restore previous behavior: do not reset the SOCKS-related preferences when the TOR_SOCKS_HOST and TOR_SOCKS_PORT environment variables are not set. --- src/components/startup-observer.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js index 467019e..f083482 100644 --- a/src/components/startup-observer.js +++ b/src/components/startup-observer.js @@ -73,16 +73,12 @@ StartupObserver.prototype = { this._prefs.setIntPref('network.proxy.type', 1); } this.logger.log(3, "Reset socks port to "+environ.get("TOR_SOCKS_PORT")); - } else { - this._prefs.setIntPref('network.proxy.socks_port', 9150); } if (environ.exists("TOR_SOCKS_HOST")) { if (this.is_tbb) { this._prefs.setCharPref('network.proxy.socks', environ.get("TOR_SOCKS_HOST")); } - } else { - this._prefs.setCharPref('network.proxy.socks', '127.0.0.1'); } if (environ.exists("TOR_TRANSPROXY")) {

1 0

[tor-browser/tor-browser-45.3.0esr-6.5-1] Bug 1211567 - Enable domain socket support for SOCKS; r=bagder
by gk＠torproject.org 30 Aug '16

30 Aug '16

commit cde73b2295b75898ca435ed9f78541eccf6c34cb Author: Liang-Heng Chen <xeonchen(a)mozilla.com> Date: Thu Jun 30 11:23:40 2016 +0800 Bug 1211567 - Enable domain socket support for SOCKS; r=bagder MozReview-Commit-ID: 9yMFckwPf6C --HG-- extra : rebase_source : 17f006f17f97f015403153879cd8b50e482cfc8c --- netwerk/base/nsProtocolProxyService.cpp | 22 +++++-- netwerk/base/nsProtocolProxyService.h | 5 +- netwerk/socket/nsSOCKSIOLayer.cpp | 101 ++++++++++++++++++++++++++------ 3 files changed, 104 insertions(+), 24 deletions(-) diff --git a/netwerk/base/nsProtocolProxyService.cpp b/netwerk/base/nsProtocolProxyService.cpp index 593d0af..5d8dc4b 100644 --- a/netwerk/base/nsProtocolProxyService.cpp +++ b/netwerk/base/nsProtocolProxyService.cpp @@ -398,6 +398,16 @@ proxy_GetBoolPref(nsIPrefBranch *aPrefBranch, aResult = temp; } +static inline bool +IsHostDomainSocket(const nsACString& aHost) +{ +#ifdef XP_UNIX + return Substring(aHost, 0, 5) == "file:"; +#else + return false; +#endif // XP_UNIX +} + //---------------------------------------------------------------------------- static const int32_t PROXYCONFIG_DIRECT4X = 3; @@ -623,7 +633,7 @@ nsProtocolProxyService::PrefsChanged(nsIPrefBranch *prefBranch, proxy_GetIntPref(prefBranch, PROXY_PREF("ftp_port"), mFTPProxyPort); if (!pref || !strcmp(pref, PROXY_PREF("socks"))) - proxy_GetStringPref(prefBranch, PROXY_PREF("socks"), mSOCKSProxyHost); + proxy_GetStringPref(prefBranch, PROXY_PREF("socks"), mSOCKSProxyTarget); if (!pref || !strcmp(pref, PROXY_PREF("socks_port"))) proxy_GetIntPref(prefBranch, PROXY_PREF("socks_port"), mSOCKSProxyPort); @@ -1871,8 +1881,9 @@ nsProtocolProxyService::Resolve_Internal(nsIChannel *channel, uint32_t proxyFlags = 0; if ((flags & RESOLVE_PREFER_SOCKS_PROXY) && - !mSOCKSProxyHost.IsEmpty() && mSOCKSProxyPort > 0) { - host = &mSOCKSProxyHost; + !mSOCKSProxyTarget.IsEmpty() && + (IsHostDomainSocket(mSOCKSProxyTarget) || mSOCKSProxyPort > 0)) { + host = &mSOCKSProxyTarget; if (mSOCKSProxyVersion == 4) type = kProxyType_SOCKS4; else @@ -1908,8 +1919,9 @@ nsProtocolProxyService::Resolve_Internal(nsIChannel *channel, type = kProxyType_HTTP; port = mFTPProxyPort; } - else if (!mSOCKSProxyHost.IsEmpty() && mSOCKSProxyPort > 0) { - host = &mSOCKSProxyHost; + else if (!mSOCKSProxyTarget.IsEmpty() && + (IsHostDomainSocket(mSOCKSProxyTarget) || mSOCKSProxyPort > 0)) { + host = &mSOCKSProxyTarget; if (mSOCKSProxyVersion == 4) type = kProxyType_SOCKS4; else diff --git a/netwerk/base/nsProtocolProxyService.h b/netwerk/base/nsProtocolProxyService.h index e9813c8..1e1ea7d 100644 --- a/netwerk/base/nsProtocolProxyService.h +++ b/netwerk/base/nsProtocolProxyService.h @@ -382,8 +382,9 @@ protected: nsCString mHTTPSProxyHost; int32_t mHTTPSProxyPort; - - nsCString mSOCKSProxyHost; + + // mSOCKSProxyTarget could be a host or a domain socket path. + nsCString mSOCKSProxyTarget; int32_t mSOCKSProxyPort; int32_t mSOCKSProxyVersion; bool mSOCKSProxyRemoteDNS; diff --git a/netwerk/socket/nsSOCKSIOLayer.cpp b/netwerk/socket/nsSOCKSIOLayer.cpp index 568c700..b26408d 100644 --- a/netwerk/socket/nsSOCKSIOLayer.cpp +++ b/netwerk/socket/nsSOCKSIOLayer.cpp @@ -19,8 +19,10 @@ #include "nsIDNSListener.h" #include "nsICancelable.h" #include "nsThreadUtils.h" +#include "nsIURL.h" #include "mozilla/Logging.h" #include "mozilla/net/DNS.h" +#include "mozilla/unused.h" using mozilla::LogLevel; using namespace mozilla::net; @@ -113,6 +115,54 @@ private: PRStatus ReadFromSocket(PRFileDesc *fd); PRStatus WriteToSocket(PRFileDesc *fd); + bool IsHostDomainSocket() + { +#ifdef XP_UNIX + nsAutoCString proxyHost; + mProxy->GetHost(proxyHost); + return Substring(proxyHost, 0, 5) == "file:"; +#else + return false; +#endif // XP_UNIX + } + + nsresult SetDomainSocketPath(const nsACString& aDomainSocketPath, + NetAddr* aProxyAddr) + { +#ifdef XP_UNIX + nsresult rv; + MOZ_ASSERT(aProxyAddr); + + nsCOMPtr<nsIURL> url = do_CreateInstance(NS_STANDARDURL_CONTRACTID, &rv); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + + if (NS_WARN_IF(NS_FAILED(rv = url->SetSpec(aDomainSocketPath)))) { + return rv; + } + + nsAutoCString path; + if (NS_WARN_IF(NS_FAILED(rv = url->GetPath(path)))) { + return rv; + } + + if (sizeof(aProxyAddr->local.path) <= path.Length()) { + NS_WARNING("domain socket path too long."); + return NS_ERROR_FAILURE; + } + + aProxyAddr->raw.family = AF_UNIX; + strcpy(aProxyAddr->local.path, path.get()); + + return NS_OK; +#else + mozilla::Unused << aProxyAddr; + mozilla::Unused << aDomainSocketPath; + return NS_ERROR_NOT_IMPLEMENTED; +#endif + } + private: State mState; uint8_t * mData; @@ -422,29 +472,40 @@ nsSOCKSSocketInfo::ConnectToProxy(PRFileDesc *fd) mVersion = 5; } + nsAutoCString proxyHost; + mProxy->GetHost(proxyHost); + int32_t proxyPort; mProxy->GetPort(&proxyPort); int32_t addresses = 0; do { - if (addresses++) - mDnsRec->ReportUnusable(proxyPort); - - rv = mDnsRec->GetNextAddr(proxyPort, &mInternalProxyAddr); - // No more addresses to try? If so, we'll need to bail - if (NS_FAILED(rv)) { - nsCString proxyHost; - mProxy->GetHost(proxyHost); - LOGERROR(("socks: unable to connect to SOCKS proxy, %s", - proxyHost.get())); - return PR_FAILURE; - } + if (IsHostDomainSocket()) { + rv = SetDomainSocketPath(proxyHost, &mInternalProxyAddr); + if (NS_FAILED(rv)) { + LOGERROR(("socks: unable to connect to SOCKS proxy, %s", + proxyHost.get())); + return PR_FAILURE; + } + } else { + if (addresses++) { + mDnsRec->ReportUnusable(proxyPort); + } + + rv = mDnsRec->GetNextAddr(proxyPort, &mInternalProxyAddr); + // No more addresses to try? If so, we'll need to bail + if (NS_FAILED(rv)) { + LOGERROR(("socks: unable to connect to SOCKS proxy, %s", + proxyHost.get())); + return PR_FAILURE; + } - if (MOZ_LOG_TEST(gSOCKSLog, LogLevel::Debug)) { - char buf[kIPv6CStrBufSize]; - NetAddrToString(&mInternalProxyAddr, buf, sizeof(buf)); - LOGDEBUG(("socks: trying proxy server, %s:%hu", - buf, ntohs(mInternalProxyAddr.inet.port))); + if (MOZ_LOG_TEST(gSOCKSLog, LogLevel::Debug)) { + char buf[kIPv6CStrBufSize]; + NetAddrToString(&mInternalProxyAddr, buf, sizeof(buf)); + LOGDEBUG(("socks: trying proxy server, %s:%hu", + buf, ntohs(mInternalProxyAddr.inet.port))); + } } NetAddr proxy = mInternalProxyAddr; @@ -973,6 +1034,12 @@ nsSOCKSSocketInfo::DoHandshake(PRFileDesc *fd, int16_t oflags) switch (mState) { case SOCKS_INITIAL: + if (IsHostDomainSocket()) { + mState = SOCKS_DNS_COMPLETE; + mLookupStatus = NS_OK; + return ConnectToProxy(fd); + } + return StartDNS(fd); case SOCKS_DNS_IN_PROGRESS: PR_SetError(PR_IN_PROGRESS_ERROR, 0);

1 0

[torbutton/maint-1.9.5] Bug 18589: Clear site security settings during New Identity
by gk＠torproject.org 29 Aug '16

29 Aug '16

commit 3c04ec4654270f2896db0efffc4bc72edc2e3018 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 26 11:30:19 2016 +0000 Bug 18589: Clear site security settings during New Identity We need to clear site security settings (like HSTS) explicitely now as they don't belong to the permissions manager anymore. --- src/chrome/content/torbutton.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 3256335..311c6f6 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1696,7 +1696,8 @@ function torbutton_new_identity() { * h. last open location url * i. clear content prefs * j. permissions - * k. IndexedDB and asmjscache storage + * k. site security settings (e.g. HSTS) + * l. IndexedDB and asmjscache storage * 3. Sends tor the NEWNYM signal to get a new circuit * 4. Opens a new window with the default homepage * 5. Closes this window @@ -1799,16 +1800,21 @@ function torbutton_do_new_identity() { m_tb_prefs.setIntPref("security.OCSP.enabled", 0); m_tb_prefs.setIntPref("security.OCSP.enabled", ocsp); - // This clears the STS cache and site permissions on Tor Browser + // This clears the site permissions on Tor Browser // XXX: Tie to some kind of disk-ok pref? try { Services.perms.removeAll(); } catch(e) { // Actually, this catch does not appear to be needed. Leaving it in for // safety though. - torbutton_log(3, "Can't clear STS/Permissions: Not Tor Browser: "+e); + torbutton_log(3, "Can't clear permissions: Not Tor Browser: "+e); } + // Clear site security settings + let sss = Cc["@mozilla.org/ssservice;1"]. + getService(Ci.nsISiteSecurityService); + sss.clearAll(); + // This clears the undo tab history. var tabs = m_tb_prefs.getIntPref("browser.sessionstore.max_tabs_undo"); m_tb_prefs.setIntPref("browser.sessionstore.max_tabs_undo", 0);

1 0

[torbutton/master] Bug 18589: Clear site security settings during New Identity
by gk＠torproject.org 29 Aug '16

29 Aug '16

commit 6dc853740b0e2be39f17b1a1857f2610de42548c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 26 11:30:19 2016 +0000 Bug 18589: Clear site security settings during New Identity We need to clear site security settings (like HSTS) explicitely now as they don't belong to the permissions manager anymore. --- src/chrome/content/torbutton.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index d7c42bd..e0fc931 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1114,7 +1114,8 @@ function torbutton_new_identity() { * h. last open location url * i. clear content prefs * j. permissions - * k. IndexedDB and asmjscache storage + * k. site security settings (e.g. HSTS) + * l. IndexedDB and asmjscache storage * 3. Sends tor the NEWNYM signal to get a new circuit * 4. Opens a new window with the default homepage * 5. Closes this window @@ -1215,16 +1216,21 @@ function torbutton_do_new_identity() { m_tb_prefs.setIntPref("security.OCSP.enabled", 0); m_tb_prefs.setIntPref("security.OCSP.enabled", ocsp); - // This clears the STS cache and site permissions on Tor Browser + // This clears the site permissions on Tor Browser // XXX: Tie to some kind of disk-ok pref? try { Services.perms.removeAll(); } catch(e) { // Actually, this catch does not appear to be needed. Leaving it in for // safety though. - torbutton_log(3, "Can't clear STS/Permissions: Not Tor Browser: "+e); + torbutton_log(3, "Can't clear permissions: Not Tor Browser: "+e); } + // Clear site security settings + let sss = Cc["@mozilla.org/ssservice;1"]. + getService(Ci.nsISiteSecurityService); + sss.clearAll(); + // This clears the undo tab history. var tabs = m_tb_prefs.getIntPref("browser.sessionstore.max_tabs_undo"); m_tb_prefs.setIntPref("browser.sessionstore.max_tabs_undo", 0);

1 0

[torbutton/master] Bug 15852: Remove/synchronize Torbutton SOCKS pref logic
by gk＠torproject.org 26 Aug '16

26 Aug '16

commit 1b41636c9351b46bbcb2094a65c65a4407b60a37 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 25 15:40:30 2016 -0400 Bug 15852: Remove/synchronize Torbutton SOCKS pref logic Remove the remains of the Torbutton settings panel (which was hidden by the fix for bug 14630). Remove the status bar panel (the status bar was removed in Firefox 4). Remove the outdated "Disable Torbutton to change these settings" message from the Firefox proxy settings dialog. Change the behavior of the "Restore Defaults" button in the Privacy and Security Settings window to no longer reset the browser's proxy preferences. Our general philosophy is that if Torbutton does not provide a GUI for changing a preference, Torbutton should not modify the preference. The exceptions are that Torbutton still supports the TOR_SOCKS_PORT and TOR_TRANSPROXY environment variables. Remove a lot of toggle logic, including extensions.torbutton.tor_enabled and related preferences. Remove the dual cookie jar support since Tor can no longer be turned off. Rename torbutton_close_on_toggle() to torbutton_close_tabs_on_new_identity(). Remove torbutton_check_socks_remote_dns() since SOCKS remote DNS is supported by all modern versions of Firefox. Remove torbutton_has_good_socks() since it was testing for Firefox 5 or newer. Remove unused Firefox version check variables, unused functions, and commented out code. --- src/chrome/content/pref-connection-info.xul | 24 - src/chrome/content/pref-connection.xul | 24 +- src/chrome/content/preferences.js | 354 +----------- src/chrome/content/preferences.xul | 127 ----- src/chrome/content/torbutton.js | 799 ++------------------------- src/chrome/content/torbutton.xul | 8 - src/chrome/content/torbutton_tb.xul | 14 +- src/chrome/content/torbutton_util.js | 159 ------ src/chrome/content/torcookie.js | 1 - src/chrome/locale/af/torbutton.dtd | 20 - src/chrome/locale/af/torbutton.properties | 8 - src/chrome/locale/ak/torbutton.dtd | 20 - src/chrome/locale/ak/torbutton.properties | 8 - src/chrome/locale/am/torbutton.dtd | 20 - src/chrome/locale/am/torbutton.properties | 8 - src/chrome/locale/ar/torbutton.dtd | 20 - src/chrome/locale/ar/torbutton.properties | 8 - src/chrome/locale/arn/torbutton.dtd | 20 - src/chrome/locale/arn/torbutton.properties | 8 - src/chrome/locale/ast/torbutton.dtd | 20 - src/chrome/locale/ast/torbutton.properties | 8 - src/chrome/locale/az/torbutton.dtd | 20 - src/chrome/locale/az/torbutton.properties | 8 - src/chrome/locale/be/torbutton.dtd | 20 - src/chrome/locale/be/torbutton.properties | 8 - src/chrome/locale/bg/torbutton.dtd | 20 - src/chrome/locale/bg/torbutton.properties | 8 - src/chrome/locale/bms/torbutton.dtd | 20 - src/chrome/locale/bms/torbutton.properties | 5 - src/chrome/locale/bn-IN/torbutton.dtd | 20 - src/chrome/locale/bn-IN/torbutton.properties | 8 - src/chrome/locale/bn/torbutton.dtd | 20 - src/chrome/locale/bn/torbutton.properties | 8 - src/chrome/locale/bo/torbutton.dtd | 20 - src/chrome/locale/bo/torbutton.properties | 8 - src/chrome/locale/br/torbutton.dtd | 20 - src/chrome/locale/br/torbutton.properties | 8 - src/chrome/locale/bs/torbutton.dtd | 20 - src/chrome/locale/bs/torbutton.properties | 8 - src/chrome/locale/ca/torbutton.dtd | 20 - src/chrome/locale/ca/torbutton.properties | 8 - src/chrome/locale/cs/torbutton.dtd | 20 - src/chrome/locale/cs/torbutton.properties | 8 - src/chrome/locale/csb/torbutton.dtd | 20 - src/chrome/locale/csb/torbutton.properties | 8 - src/chrome/locale/cy/torbutton.dtd | 20 - src/chrome/locale/cy/torbutton.properties | 8 - src/chrome/locale/da/torbutton.dtd | 20 - src/chrome/locale/da/torbutton.properties | 8 - src/chrome/locale/de/torbutton.dtd | 20 - src/chrome/locale/de/torbutton.properties | 8 - src/chrome/locale/dz/torbutton.dtd | 20 - src/chrome/locale/dz/torbutton.properties | 8 - src/chrome/locale/el/torbutton.dtd | 20 - src/chrome/locale/el/torbutton.properties | 8 - src/chrome/locale/en/torbutton.dtd | 20 - src/chrome/locale/en/torbutton.properties | 8 - src/chrome/locale/eo/torbutton.dtd | 20 - src/chrome/locale/eo/torbutton.properties | 8 - src/chrome/locale/es/torbutton.dtd | 20 - src/chrome/locale/es/torbutton.properties | 8 - src/chrome/locale/et/torbutton.dtd | 20 - src/chrome/locale/et/torbutton.properties | 8 - src/chrome/locale/eu/torbutton.dtd | 20 - src/chrome/locale/eu/torbutton.properties | 8 - src/chrome/locale/fa/torbutton.dtd | 20 - src/chrome/locale/fa/torbutton.properties | 8 - src/chrome/locale/fi/torbutton.dtd | 20 - src/chrome/locale/fi/torbutton.properties | 8 - src/chrome/locale/fil/torbutton.dtd | 20 - src/chrome/locale/fil/torbutton.properties | 8 - src/chrome/locale/fo/torbutton.dtd | 20 - src/chrome/locale/fo/torbutton.properties | 8 - src/chrome/locale/fr/torbutton.dtd | 20 - src/chrome/locale/fr/torbutton.properties | 8 - src/chrome/locale/fur/torbutton.dtd | 20 - src/chrome/locale/fur/torbutton.properties | 8 - src/chrome/locale/fy/torbutton.dtd | 20 - src/chrome/locale/fy/torbutton.properties | 8 - src/chrome/locale/ga/torbutton.dtd | 20 - src/chrome/locale/ga/torbutton.properties | 8 - src/chrome/locale/gl/torbutton.dtd | 20 - src/chrome/locale/gl/torbutton.properties | 8 - src/chrome/locale/gu/torbutton.dtd | 20 - src/chrome/locale/gu/torbutton.properties | 8 - src/chrome/locale/gun/torbutton.dtd | 20 - src/chrome/locale/gun/torbutton.properties | 8 - src/chrome/locale/ha/torbutton.dtd | 20 - src/chrome/locale/ha/torbutton.properties | 8 - src/chrome/locale/he/torbutton.dtd | 20 - src/chrome/locale/he/torbutton.properties | 8 - src/chrome/locale/hi/torbutton.dtd | 20 - src/chrome/locale/hi/torbutton.properties | 8 - src/chrome/locale/hr/torbutton.dtd | 20 - src/chrome/locale/hr/torbutton.properties | 8 - src/chrome/locale/ht/torbutton.dtd | 20 - src/chrome/locale/ht/torbutton.properties | 8 - src/chrome/locale/hu/torbutton.dtd | 20 - src/chrome/locale/hu/torbutton.properties | 8 - src/chrome/locale/hy/torbutton.dtd | 20 - src/chrome/locale/hy/torbutton.properties | 8 - src/chrome/locale/id/torbutton.dtd | 20 - src/chrome/locale/id/torbutton.properties | 8 - src/chrome/locale/is/torbutton.dtd | 20 - src/chrome/locale/is/torbutton.properties | 8 - src/chrome/locale/it/torbutton.dtd | 20 - src/chrome/locale/it/torbutton.properties | 8 - src/chrome/locale/ja/torbutton.dtd | 20 - src/chrome/locale/ja/torbutton.properties | 8 - src/chrome/locale/jv/torbutton.dtd | 20 - src/chrome/locale/jv/torbutton.properties | 8 - src/chrome/locale/ka/torbutton.dtd | 20 - src/chrome/locale/ka/torbutton.properties | 8 - src/chrome/locale/km/torbutton.dtd | 20 - src/chrome/locale/km/torbutton.properties | 8 - src/chrome/locale/kn/torbutton.dtd | 20 - src/chrome/locale/kn/torbutton.properties | 8 - src/chrome/locale/ko/torbutton.dtd | 20 - src/chrome/locale/ko/torbutton.properties | 8 - src/chrome/locale/ku/torbutton.dtd | 20 - src/chrome/locale/ku/torbutton.properties | 8 - src/chrome/locale/kw/torbutton.dtd | 20 - src/chrome/locale/kw/torbutton.properties | 8 - src/chrome/locale/ky/torbutton.dtd | 20 - src/chrome/locale/ky/torbutton.properties | 8 - src/chrome/locale/lb/torbutton.dtd | 20 - src/chrome/locale/lb/torbutton.properties | 8 - src/chrome/locale/lg/torbutton.dtd | 20 - src/chrome/locale/lg/torbutton.properties | 5 - src/chrome/locale/ln/torbutton.dtd | 20 - src/chrome/locale/ln/torbutton.properties | 8 - src/chrome/locale/lo/torbutton.dtd | 20 - src/chrome/locale/lo/torbutton.properties | 8 - src/chrome/locale/lt/torbutton.dtd | 20 - src/chrome/locale/lt/torbutton.properties | 8 - src/chrome/locale/lv/torbutton.dtd | 20 - src/chrome/locale/lv/torbutton.properties | 8 - src/chrome/locale/mg/torbutton.dtd | 20 - src/chrome/locale/mg/torbutton.properties | 8 - src/chrome/locale/mi/torbutton.dtd | 20 - src/chrome/locale/mi/torbutton.properties | 8 - src/chrome/locale/mk/torbutton.dtd | 20 - src/chrome/locale/mk/torbutton.properties | 8 - src/chrome/locale/ml/torbutton.dtd | 20 - src/chrome/locale/ml/torbutton.properties | 8 - src/chrome/locale/mn/torbutton.dtd | 20 - src/chrome/locale/mn/torbutton.properties | 8 - src/chrome/locale/mr/torbutton.dtd | 20 - src/chrome/locale/mr/torbutton.properties | 8 - src/chrome/locale/ms/torbutton.dtd | 20 - src/chrome/locale/ms/torbutton.properties | 8 - src/chrome/locale/mt/torbutton.dtd | 20 - src/chrome/locale/mt/torbutton.properties | 8 - src/chrome/locale/my/torbutton.dtd | 20 - src/chrome/locale/my/torbutton.properties | 8 - src/chrome/locale/nah/torbutton.dtd | 20 - src/chrome/locale/nah/torbutton.properties | 8 - src/chrome/locale/nap/torbutton.dtd | 20 - src/chrome/locale/nap/torbutton.properties | 8 - src/chrome/locale/nb/torbutton.dtd | 20 - src/chrome/locale/nb/torbutton.properties | 8 - src/chrome/locale/ne/torbutton.dtd | 20 - src/chrome/locale/ne/torbutton.properties | 8 - src/chrome/locale/nl/torbutton.dtd | 20 - src/chrome/locale/nl/torbutton.properties | 8 - src/chrome/locale/nn/torbutton.dtd | 20 - src/chrome/locale/nn/torbutton.properties | 8 - src/chrome/locale/nso/torbutton.dtd | 20 - src/chrome/locale/nso/torbutton.properties | 8 - src/chrome/locale/oc/torbutton.dtd | 20 - src/chrome/locale/oc/torbutton.properties | 8 - src/chrome/locale/or/torbutton.dtd | 20 - src/chrome/locale/or/torbutton.properties | 8 - src/chrome/locale/pa/torbutton.dtd | 20 - src/chrome/locale/pa/torbutton.properties | 8 - src/chrome/locale/pap/torbutton.dtd | 20 - src/chrome/locale/pap/torbutton.properties | 8 - src/chrome/locale/pl/torbutton.dtd | 20 - src/chrome/locale/pl/torbutton.properties | 8 - src/chrome/locale/pms/torbutton.dtd | 20 - src/chrome/locale/pms/torbutton.properties | 8 - src/chrome/locale/ps/torbutton.dtd | 20 - src/chrome/locale/ps/torbutton.properties | 8 - src/chrome/locale/pt-BR/torbutton.dtd | 20 - src/chrome/locale/pt-BR/torbutton.properties | 8 - src/chrome/locale/pt/torbutton.dtd | 20 - src/chrome/locale/pt/torbutton.properties | 8 - src/chrome/locale/ro/torbutton.dtd | 20 - src/chrome/locale/ro/torbutton.properties | 8 - src/chrome/locale/ru/torbutton.dtd | 20 - src/chrome/locale/ru/torbutton.properties | 8 - src/chrome/locale/sco/torbutton.dtd | 20 - src/chrome/locale/sco/torbutton.properties | 8 - src/chrome/locale/sk/torbutton.dtd | 20 - src/chrome/locale/sk/torbutton.properties | 8 - src/chrome/locale/sl/torbutton.dtd | 20 - src/chrome/locale/sl/torbutton.properties | 8 - src/chrome/locale/so/torbutton.dtd | 20 - src/chrome/locale/so/torbutton.properties | 8 - src/chrome/locale/son/torbutton.dtd | 20 - src/chrome/locale/son/torbutton.properties | 8 - src/chrome/locale/sq/torbutton.dtd | 20 - src/chrome/locale/sq/torbutton.properties | 8 - src/chrome/locale/sr/torbutton.dtd | 20 - src/chrome/locale/sr/torbutton.properties | 8 - src/chrome/locale/st/torbutton.dtd | 20 - src/chrome/locale/st/torbutton.properties | 8 - src/chrome/locale/su/torbutton.dtd | 20 - src/chrome/locale/su/torbutton.properties | 8 - src/chrome/locale/sv/torbutton.dtd | 20 - src/chrome/locale/sv/torbutton.properties | 8 - src/chrome/locale/sw/torbutton.dtd | 20 - src/chrome/locale/sw/torbutton.properties | 8 - src/chrome/locale/ta/torbutton.dtd | 20 - src/chrome/locale/ta/torbutton.properties | 8 - src/chrome/locale/te/torbutton.dtd | 20 - src/chrome/locale/te/torbutton.properties | 8 - src/chrome/locale/tg/torbutton.dtd | 20 - src/chrome/locale/tg/torbutton.properties | 8 - src/chrome/locale/th/torbutton.dtd | 20 - src/chrome/locale/th/torbutton.properties | 8 - src/chrome/locale/ti/torbutton.dtd | 20 - src/chrome/locale/ti/torbutton.properties | 8 - src/chrome/locale/tk/torbutton.dtd | 20 - src/chrome/locale/tk/torbutton.properties | 8 - src/chrome/locale/tr/torbutton.dtd | 20 - src/chrome/locale/tr/torbutton.properties | 8 - src/chrome/locale/uk/torbutton.dtd | 20 - src/chrome/locale/uk/torbutton.properties | 8 - src/chrome/locale/ur/torbutton.dtd | 20 - src/chrome/locale/ur/torbutton.properties | 8 - src/chrome/locale/ve/torbutton.dtd | 20 - src/chrome/locale/ve/torbutton.properties | 8 - src/chrome/locale/vi/torbutton.dtd | 20 - src/chrome/locale/vi/torbutton.properties | 8 - src/chrome/locale/wa/torbutton.dtd | 20 - src/chrome/locale/wa/torbutton.properties | 8 - src/chrome/locale/wo/torbutton.dtd | 20 - src/chrome/locale/wo/torbutton.properties | 8 - src/chrome/locale/zh-CN/torbutton.dtd | 20 - src/chrome/locale/zh-CN/torbutton.properties | 8 - src/chrome/locale/zh-HK/torbutton.dtd | 20 - src/chrome/locale/zh-HK/torbutton.properties | 8 - src/chrome/locale/zh-TW/torbutton.dtd | 20 - src/chrome/locale/zh-TW/torbutton.properties | 8 - src/chrome/locale/zu/torbutton.dtd | 20 - src/chrome/locale/zu/torbutton.properties | 8 - src/chrome/skin/p.png | Bin 916 -> 0 bytes src/chrome/skin/poff.png | Bin 970 -> 0 bytes src/chrome/skin/punknown.png | Bin 1000 -> 0 bytes src/chrome/skin/torbutton.css | 31 -- src/components/cookie-jar-selector.js | 24 +- src/components/external-app-blocker.js | 9 +- src/components/startup-observer.js | 100 +--- src/defaults/preferences/preferences.js | 58 +- 255 files changed, 64 insertions(+), 4994 deletions(-) diff --git a/src/chrome/content/pref-connection-info.xul b/src/chrome/content/pref-connection-info.xul deleted file mode 100644 index 0968ec5..0000000 --- a/src/chrome/content/pref-connection-info.xul +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> - -<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> - -<dialog id="torbutton-pref-connection-more-info" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:html="http://www.w3.org/1999/xhtml" - title="&torbutton.pref_connection_more_info.title;" - maxwidth="500" - buttons="accept" - persist="screenX screenY" - onload="sizeToContent();"> - - <stringbundleset id="extensionsSet"> - <stringbundle id="extensionsStrings" src="chrome://mozapps/locale/extensions/extensions.properties"/> - </stringbundleset> - <vbox flex="1"> - <description> - &torbutton.pref_connection_more_info.text; - </description> - </vbox> - -</dialog> diff --git a/src/chrome/content/pref-connection.xul b/src/chrome/content/pref-connection.xul index b00a5aa..4d5fb61 100644 --- a/src/chrome/content/pref-connection.xul +++ b/src/chrome/content/pref-connection.xul @@ -1,30 +1,10 @@ <?xml version="1.0"?> + + <!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> <overlay id="torbutton-prefs-notice" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - <script type="application/x-javascript" src="chrome://torbutton/content/torbutton.js" /> - <script language="JavaScript"> - // onload handler - try{window.addEventListener("load", torbutton_browser_proxy_prefs_init, false);}catch(e){} - </script> - - <stringbundleset id="extensionsSet"> - <stringbundle id="extensionsStrings" src="chrome://mozapps/locale/extensions/extensions.properties"/> - </stringbundleset> - - <radiogroup id="networkProxyType"> - <label id="torbutton-pref-connection-notice" position="1"> - &torbutton.pref_connection.notice; - </label> - <label id="torbutton-pref-connection-more-info" position="2" - class="url" - style="color: blue; text-decoration: underline;" - onclick="window.openDialog('chrome://torbutton/content/pref-connection-info.xul','torbutton-pref-connection-more-info','centerscreen,chrome,modal=yes,dialog=yes');"> - &torbutton.pref_connection.more_info; - </label> - </radiogroup> - </overlay> diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 1ac89da..fb5aafd 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -1,186 +1,18 @@ // Bug 1506 P1: Most of this code needs to go away. See also Bug 3100. // PREFERences dialog functions -// torbutton_prefs_set_field_attributes() -- initialize dialog fields // torbutton_prefs_init() -- on dialog load // torbutton_prefs_save() -- on dialog save -var tor_enabled = false; const Cc = Components.classes, Ci = Components.interfaces; -function torbutton_prefs_set_field_attributes(doc) -{ - torbutton_log(2, "called prefs_set_field_attributes()"); - var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.'); - var o_customprefs = torbutton_get_prefbranch('extensions.torbutton.custom.'); - - // Privoxy is always recommended for Firefoxes not supporting socks_remote_dns - if (doc.getElementById('torbutton_transparentTor').selected) { - doc.getElementById('torbutton_settingsMethod').value = 'transparent'; - } else if (!torbutton_check_socks_remote_dns()) { - doc.getElementById('torbutton_usePrivoxy').setAttribute("disabled", true); - } else { - doc.getElementById('torbutton_usePrivoxy').setAttribute("disabled", doc.getElementById('torbutton_settingsMethod').value != 'recommended'); - } - - if (doc.getElementById('torbutton_settingsMethod').value == 'recommended') { - var proxy_port; - var proxy_host; - if (torbutton_has_good_socks()) { - doc.getElementById('torbutton_usePrivoxy').checked = false; - doc.getElementById('torbutton_usePrivoxy').setAttribute("disabled", true); - proxy_host = ''; - proxy_port = 0; - } else { - if (doc.getElementById('torbutton_usePrivoxy').checked) { - proxy_host = '127.0.0.1'; - proxy_port = 8118; - } else { - proxy_host = ''; - proxy_port = 0; - } - } - - torbutton_log(2, "using recommended settings"); - if (!torbutton_check_socks_remote_dns()) { - doc.getElementById('torbutton_httpProxy').value = proxy_host; - doc.getElementById('torbutton_httpPort').value = proxy_port; - doc.getElementById('torbutton_httpsProxy').value = proxy_host; - doc.getElementById('torbutton_httpsPort').value = proxy_port; - doc.getElementById('torbutton_ftpProxy').value = proxy_host; - doc.getElementById('torbutton_ftpPort').value = proxy_port; - doc.getElementById('torbutton_gopherProxy').value = proxy_host; - doc.getElementById('torbutton_gopherPort').value = proxy_port; - } else { - doc.getElementById('torbutton_httpProxy').value = proxy_host; - doc.getElementById('torbutton_httpPort').value = proxy_port; - doc.getElementById('torbutton_httpsProxy').value = proxy_host; - doc.getElementById('torbutton_httpsPort').value = proxy_port; - - doc.getElementById('torbutton_ftpProxy').value = ''; - doc.getElementById('torbutton_ftpPort').value = 0; - doc.getElementById('torbutton_gopherProxy').value = ''; - doc.getElementById('torbutton_gopherPort').value = 0; - } - - var environ = Components.classes["@mozilla.org/process/environment;1"] - .getService(Components.interfaces.nsIEnvironment); - - if (environ.exists("TOR_SOCKS_PORT")) { - doc.getElementById('torbutton_socksPort').value = parseInt(environ.get("TOR_SOCKS_PORT")); - } else { - doc.getElementById('torbutton_socksPort').value = 9150; - } - - if (environ.exists("TOR_SOCKS_HOST")) { - doc.getElementById('torbutton_socksHost').value = environ.get("TOR_SOCKS_HOST"); - } else { - doc.getElementById('torbutton_socksHost').value = '127.0.0.1'; - } - - doc.getElementById('torbutton_httpProxy').disabled = true; - doc.getElementById('torbutton_httpPort').disabled = true; - doc.getElementById('torbutton_httpsProxy').disabled = true; - doc.getElementById('torbutton_httpsPort').disabled = true; - doc.getElementById('torbutton_ftpProxy').disabled = true; - doc.getElementById('torbutton_ftpPort').disabled = true; - doc.getElementById('torbutton_gopherProxy').disabled = true; - doc.getElementById('torbutton_gopherPort').disabled = true; - doc.getElementById('torbutton_socksHost').disabled = true; - doc.getElementById('torbutton_socksPort').disabled = true; - doc.getElementById('torbutton_socksGroup').disabled = true; - doc.getElementById('torbutton_noProxiesOn').disabled = true; - } else if (doc.getElementById('torbutton_settingsMethod').value == 'transparent') { - // Mr. Larry was so lazy when he wrote the rest of this code - torbutton_log(2, "not using recommended settings"); - torbutton_log(2, "using transparent settings"); - doc.getElementById('torbutton_usePrivoxy').setAttribute("disabled", true); - doc.getElementById('torbutton_httpProxy').disabled = true; - doc.getElementById('torbutton_httpPort').disabled = true; - doc.getElementById('torbutton_httpsProxy').disabled = true; - doc.getElementById('torbutton_httpsPort').disabled = true; - doc.getElementById('torbutton_ftpProxy').disabled = true; - doc.getElementById('torbutton_ftpPort').disabled = true; - doc.getElementById('torbutton_gopherProxy').disabled = true; - doc.getElementById('torbutton_gopherPort').disabled = true; - doc.getElementById('torbutton_socksHost').disabled = true; - doc.getElementById('torbutton_socksPort').disabled = true; - doc.getElementById('torbutton_socksGroup').disabled = true; - doc.getElementById('torbutton_noProxiesOn').disabled = true; - } else { - torbutton_log(2, "using transparent settings"); - doc.getElementById('torbutton_httpProxy').disabled = false; - doc.getElementById('torbutton_httpPort').disabled = false; - doc.getElementById('torbutton_httpsProxy').disabled = false; - doc.getElementById('torbutton_httpsPort').disabled = false; - doc.getElementById('torbutton_ftpProxy').disabled = false; - doc.getElementById('torbutton_ftpPort').disabled = false; - doc.getElementById('torbutton_gopherProxy').disabled = false; - doc.getElementById('torbutton_gopherPort').disabled = false; - doc.getElementById('torbutton_socksHost').disabled = false; - doc.getElementById('torbutton_socksPort').disabled = false; - doc.getElementById('torbutton_socksGroup').disabled = false; - doc.getElementById('torbutton_noProxiesOn').disabled = false; - /* Do not reset these on every document update.. - doc.getElementById('torbutton_httpProxy').value = o_customprefs.getCharPref('http_proxy'); - doc.getElementById('torbutton_httpPort').value = o_customprefs.getIntPref('http_port'); - doc.getElementById('torbutton_httpsProxy').value = o_customprefs.getCharPref('https_proxy'); - doc.getElementById('torbutton_httpsPort').value = o_customprefs.getIntPref('https_port'); - doc.getElementById('torbutton_ftpProxy').value = o_customprefs.getCharPref('ftp_proxy'); - doc.getElementById('torbutton_ftpPort').value = o_customprefs.getIntPref('ftp_port'); - doc.getElementById('torbutton_gopherProxy').value = o_customprefs.getCharPref('gopher_proxy'); - doc.getElementById('torbutton_gopherPort').value = o_customprefs.getIntPref('gopher_port'); - doc.getElementById('torbutton_socksHost').value = o_customprefs.getCharPref('socks_host'); - doc.getElementById('torbutton_socksPort').value = o_customprefs.getIntPref('socks_port'); - */ - } -} function torbutton_prefs_init(doc) { - var checkbox_displayStatusPanel = doc.getElementById('torbutton_displayStatusPanel'); -// return; - torbutton_log(2, "called prefs_init()"); sizeToContent(); - // remember if tor settings were enabled when the window was opened - tor_enabled = torbutton_check_status(); - var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.'); - // doc.getElementById('torbutton_panelStyle').value = o_torprefs.getCharPref('panel_style'); - var settings_method = doc.getElementById('torbutton_settingsMethod'); - var settings_method_pref = o_torprefs.getCharPref('settings_method'); - if (settings_method_pref == 'recommended') - settings_method.selectedItem = doc.getElementById('torbutton_useRecommendedSettings'); - else if (settings_method_pref == 'custom') - settings_method.selectedItem = doc.getElementById('torbutton_useCustomSettings'); - // doc.getElementById('torbutton_settingsMethod').value = o_torprefs.getCharPref('settings_method'); - doc.getElementById('torbutton_usePrivoxy').checked = o_torprefs.getBoolPref('use_privoxy'); - doc.getElementById('torbutton_httpProxy').value = o_torprefs.getCharPref('http_proxy'); - doc.getElementById('torbutton_httpPort').value = o_torprefs.getIntPref('http_port'); - doc.getElementById('torbutton_httpsProxy').value = o_torprefs.getCharPref('https_proxy'); - doc.getElementById('torbutton_httpsPort').value = o_torprefs.getIntPref('https_port'); - doc.getElementById('torbutton_ftpProxy').value = o_torprefs.getCharPref('ftp_proxy'); - doc.getElementById('torbutton_ftpPort').value = o_torprefs.getIntPref('ftp_port'); - doc.getElementById('torbutton_gopherProxy').value = o_torprefs.getCharPref('gopher_proxy'); - doc.getElementById('torbutton_gopherPort').value = o_torprefs.getIntPref('gopher_port'); - doc.getElementById('torbutton_socksHost').value = o_torprefs.getCharPref('socks_host'); - doc.getElementById('torbutton_socksPort').value = o_torprefs.getIntPref('socks_port'); - if(o_torprefs.getIntPref('socks_version') == 4) { - doc.getElementById('torbutton_socksGroup').selectedItem = - doc.getElementById('torbutton_socksv4'); - } else { - doc.getElementById('torbutton_socksGroup').selectedItem = - doc.getElementById('torbutton_socksv5'); - } - doc.getElementById('torbutton_noProxiesOn').value = o_torprefs.getCharPref('no_proxies_on'); - - // Transparent Torification magic - if (o_torprefs.getBoolPref('saved.transparentTor')) { - doc.getElementById('torbutton_settingsMethod').selectedItem = doc.getElementById('torbutton_transparentTor'); - } - // Privacy and security settings doc.getElementById('torbutton_blockDisk').checked = o_torprefs.getBoolPref('block_disk'); doc.getElementById('torbutton_resistFingerprinting').checked = o_torprefs.getBoolPref('resist_fingerprinting'); @@ -204,8 +36,6 @@ function torbutton_prefs_init(doc) { sec_slider.valueChanged = function(which, newValue, userChanged) { torbutton_set_slider_text(doc, false); } - - torbutton_prefs_set_field_attributes(doc); } function torbutton_prefs_save(doc) { @@ -215,83 +45,6 @@ function torbutton_prefs_save(doc) { doc.documentElement.getButton("accept").disabled = true; torbutton_log(2, "called prefs_save()"); var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.'); - var o_customprefs = torbutton_get_prefbranch('extensions.torbutton.custom.'); - - var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] - .getService(Components.interfaces.nsIWindowMediator); - var enumerator = wm.getEnumerator("navigator:browser"); - while(enumerator.hasMoreElements()) { - var win = enumerator.getNext(); - if(win != window && win.m_tb_is_main_window) { - torbutton_log(3, "Found main window for popup hack."); - win.torbutton_unique_pref_observer.did_toggle_warning = false; - } - } - - o_torprefs.setCharPref('settings_method', doc.getElementById('torbutton_settingsMethod').value); - o_torprefs.setBoolPref('use_privoxy', doc.getElementById('torbutton_usePrivoxy').checked); - o_torprefs.setCharPref('http_proxy', doc.getElementById('torbutton_httpProxy').value); - o_torprefs.setIntPref('http_port', doc.getElementById('torbutton_httpPort').value); - o_torprefs.setCharPref('https_proxy', doc.getElementById('torbutton_httpsProxy').value); - o_torprefs.setIntPref('https_port', doc.getElementById('torbutton_httpsPort').value); - o_torprefs.setCharPref('ftp_proxy', doc.getElementById('torbutton_ftpProxy').value); - o_torprefs.setIntPref('ftp_port', doc.getElementById('torbutton_ftpPort').value); - o_torprefs.setCharPref('gopher_proxy', doc.getElementById('torbutton_gopherProxy').value); - o_torprefs.setIntPref('gopher_port', doc.getElementById('torbutton_gopherPort').value); - o_torprefs.setCharPref('socks_host', doc.getElementById('torbutton_socksHost').value); - o_torprefs.setIntPref('socks_port', doc.getElementById('torbutton_socksPort').value); - - if(doc.getElementById('torbutton_socksGroup').selectedItem == - doc.getElementById('torbutton_socksv4')) { - o_torprefs.setIntPref('socks_version', 4); - } else if(doc.getElementById('torbutton_socksGroup').selectedItem == - doc.getElementById('torbutton_socksv5')) { - o_torprefs.setIntPref('socks_version', 5); - } - - o_torprefs.setCharPref('no_proxies_on', doc.getElementById('torbutton_noProxiesOn').value); - - o_torprefs.setBoolPref('saved.transparentTor', doc.getElementById('torbutton_transparentTor').selected); - if (o_torprefs.getBoolPref('saved.transparentTor')) { - var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] - .getService(Components.interfaces.nsIWindowMediator); - var chrome = wm.getMostRecentWindow("navigator:browser"); - var ret = chrome.torbutton_test_settings(); - if (ret != 4) { - var warning = chrome.torbutton_get_property_string("torbutton.popup.test.failure"); - window.alert(warning); - } else { - o_torprefs.setBoolPref('tor_enabled', true); - // In theory this is where we unlock some things that are now "safe" - // Unleash Flash on Tor users - // Ignore any proxy settings that the user has set - // etc etc etc - pde will be very happy - } - } - - - if (doc.getElementById('torbutton_settingsMethod').value == 'custom') { - // XXX: Is this even needed anymore? We don't read the - // custom prefs at all it seems.. - o_customprefs.setCharPref('http_proxy', doc.getElementById('torbutton_httpProxy').value); - o_customprefs.setIntPref('http_port', doc.getElementById('torbutton_httpPort').value); - o_customprefs.setCharPref('https_proxy', doc.getElementById('torbutton_httpsProxy').value); - o_customprefs.setIntPref('https_port', doc.getElementById('torbutton_httpsPort').value); - o_customprefs.setCharPref('ftp_proxy', doc.getElementById('torbutton_ftpProxy').value); - o_customprefs.setIntPref('ftp_port', doc.getElementById('torbutton_ftpPort').value); - o_customprefs.setCharPref('gopher_proxy', doc.getElementById('torbutton_gopherProxy').value); - o_customprefs.setIntPref('gopher_port', doc.getElementById('torbutton_gopherPort').value); - o_customprefs.setCharPref('socks_host', doc.getElementById('torbutton_socksHost').value); - o_customprefs.setIntPref('socks_port', doc.getElementById('torbutton_socksPort').value); - - if(doc.getElementById('torbutton_socksGroup').selectedItem == - doc.getElementById('torbutton_socksv4')) { - o_customprefs.setIntPref('socks_version', 4); - } else if(doc.getElementById('torbutton_socksGroup').selectedItem == - doc.getElementById('torbutton_socksv5')) { - o_customprefs.setIntPref('socks_version', 5); - } - } // Privacy and Security Settings o_torprefs.setBoolPref('block_disk', doc.getElementById('torbutton_blockDisk').checked); @@ -317,92 +70,28 @@ function torbutton_prefs_save(doc) { o_torprefs.setIntPref('security_slider', doc.getElementById('torbutton_sec_slider').value); - // if tor settings were initially active, update the active settings to reflect any changes - if (tor_enabled) torbutton_activate_tor_settings(); // If we have non-custom Security Slider settings update them now. if (!o_torprefs.getBoolPref('security_custom')) { + let wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] + .getService(Components.interfaces.nsIWindowMediator); + let win = wm.getMostRecentWindow("navigator:browser"); win.torbutton_update_security_slider(); } } -function torbutton_prefs_test_settings() { - - // Reset Tor state to disabled. - var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] - .getService(Components.interfaces.nsIWindowMediator); - var chrome = wm.getMostRecentWindow("navigator:browser"); - - if(chrome.m_tb_ff3) { - // FIXME: This is kind of ghetto.. can we make a progress - // bar or a window that updates itself? - var warning = chrome.torbutton_get_property_string("torbutton.popup.test.ff3_notice"); - window.alert(warning); - } - var ret = chrome.torbutton_test_settings(); - // Strange errors are not worth translating. Our english users will - // tell us they happen and we will (presumably) make them not happen. - if(ret < 0) { - ret = -ret; - window.alert("Tor proxy test: HTTP error for check.torproject.org: "+ret); - return; - } - - switch(ret) { - case 0: - window.alert("Tor proxy test: Internal error"); - break; - case 1: - window.alert("Tor proxy test: Result not mimetype text/xml"); - break; - case 3: // Can't seem to happen - window.alert("Tor proxy test: Can't find result target!"); - break; - case 2: - window.alert("Tor proxy test: No TorCheckResult id found (response not valid XHTML)"); - break; - case 4: - var warning = chrome.torbutton_get_property_string("torbutton.popup.test.success"); - window.alert(warning); - break; - case 5: - var warning = chrome.torbutton_get_property_string("torbutton.popup.test.failure"); - window.alert(warning); - break; - case 6: - window.alert("Tor proxy test: TorDNSEL failure. Results unknown."); - break; - case 7: - window.alert("Tor proxy test: check.torproject.org returned bad result"); - break; - case 8: - var warning = chrome.torbutton_get_property_string("torbutton.popup.test.no_http_proxy"); - window.alert(warning); - break; - } -} - function torbutton_prefs_reset_defaults() { var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.'); - var o_proxyprefs = torbutton_get_prefbranch('network.proxy.'); var tmpcnt = new Object(); var children; var i; - var was_enabled = false; var loglevel = o_torprefs.getIntPref("loglevel"); var logmthd = o_torprefs.getIntPref("logmethod"); torbutton_log(3, "Starting Pref reset"); - // 0. Disable tor - // 1. Clear proxy settings - // 2. Restore saved prefs - // 3. Clear torbutton settings - // 4. Enable tor if was previously enabled - - // Reset Tor state to disabled. - var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] - .getService(Components.interfaces.nsIWindowMediator); - var chrome = wm.getMostRecentWindow("navigator:browser"); + // 1. Clear torbutton settings + // 2. Clear browser proxy settings + // 3. Reset Security Slider settings // XXX Warning: The only reason this works is because of Firefox's // threading model. As soon as a pref is changed, all observers @@ -410,13 +99,7 @@ function torbutton_prefs_reset_defaults() { // security state is driven by proxy pref observers, this // causes everything to be reset in a linear order. If firefox // ever makes pref observers asynchonous, this will all break. - if(o_torprefs.getBoolPref("tor_enabled")) { - chrome.torbutton_disable_tor(); - was_enabled = true; - } - torbutton_log(3, "Tor disabled for pref reset"); - children = o_torprefs.getChildList("" , tmpcnt); for(i = 0; i < children.length; i++) { if(o_torprefs.prefHasUserValue(children[i])) @@ -427,12 +110,6 @@ function torbutton_prefs_reset_defaults() { o_torprefs.setIntPref("loglevel", loglevel); o_torprefs.setIntPref("logmethod", logmthd); - children = o_proxyprefs.getChildList("" , tmpcnt); - for(i = 0; i < children.length; i++) { - if(o_proxyprefs.prefHasUserValue(children[i])) - o_proxyprefs.clearUserPref(children[i]); - } - torbutton_log(3, "Resetting browser prefs"); // Reset browser prefs that torbutton touches just in case @@ -442,24 +119,13 @@ function torbutton_prefs_reset_defaults() { // It's the non-technical ones we should make it easy for torbutton_reset_browser_prefs(); - chrome.torbutton_init_prefs(); - torbutton_log(3, "Prefs reset"); - - if(was_enabled) { - // Hack for torbrowser/others where tor proxies are the same - // as non-tor. - if(chrome.torbutton_check_status()) { - torbutton_log(4, "Tor still enabled after reset. Attempting to restore sanity"); - chrome.torbutton_set_status(); - } else { - chrome.torbutton_enable_tor(true); - } - } - // Resetting the Security Slider preferences + var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] + .getService(Components.interfaces.nsIWindowMediator); + var win = wm.getMostRecentWindow("navigator:browser"); o_torprefs.setBoolPref('security_custom', false); o_torprefs.setIntPref('security_slider', 4); - chrome.torbutton_update_security_slider(); + win.torbutton_update_security_slider(); torbutton_log(4, "Preferences reset to defaults"); torbutton_prefs_init(window.document); diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 60a214b..507efd0 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -17,129 +17,6 @@ <script type="application/x-javascript" src="torbutton_util.js"/> <script type="application/x-javascript" src="preferences.js"/> - <tabbox> - <tabs> - <tab hidden="true" label="&torbutton.prefs.privacy_security_settings;"/> - <tab hidden="true" label="&torbutton.prefs.tor_settings;"/> - </tabs> - <tabpanels> - <tabpanel hidden="true"> - <vbox> - <radiogroup id="torbutton_settingsMethod"> - <radio value="recommended" id="torbutton_useRecommendedSettings" - label="&torbutton.prefs.recommended_settings;" - oncommand="torbutton_prefs_set_field_attributes(document)"/> - <checkbox class="indent" id="torbutton_usePrivoxy" - label="&torbutton.prefs.use_polipo;" - oncommand="torbutton_prefs_set_field_attributes(document)"/> - <radio value="custom" id="torbutton_useCustomSettings" - label="&torbutton.prefs.custom_settings;" - oncommand="torbutton_prefs_set_field_attributes(document)"/> - <grid class="indent" flex="1"> - <columns> - <column/> - <column flex="1"/> - </columns> - <rows> - <row align="center"> - <hbox align="center" pack="end"> - <label value="&torbutton.prefs.proxy.host.http;" control="torbutton_httpProxy"/> - </hbox> - <hbox align="center"> - <textbox id="torbutton_httpProxy" preftype="string" flex="1"/> - <label value="&torbutton.prefs.proxy.port;" control="torbutton_httpPort"/> - <textbox id="torbutton_httpPort" size="5"/> - </hbox> - </row> - <row align="center"> - <hbox align="center" pack="end"> - <label value="&torbutton.prefs.proxy.host.https;" control="torbutton_httpsProxy"/> - </hbox> - <hbox align="center"> - <textbox id="torbutton_httpsProxy" preftype="string" flex="1"/> - <label value="&torbutton.prefs.proxy.port;" control="torbutton_httpsPort"/> - <textbox id="torbutton_httpsPort" size="5"/> - </hbox> - </row> - <row align="center"> - <hbox align="center" pack="end"> - <label value="&torbutton.prefs.proxy.host.ftp;" control="torbutton_ftpProxy"/> - </hbox> - <hbox align="center"> - <textbox id="torbutton_ftpProxy" preftype="string" flex="1"/> - <label value="&torbutton.prefs.proxy.port;" control="torbutton_ftpPort"/> - <textbox id="torbutton_ftpPort" size="5"/> - </hbox> - </row> - <row align="center"> - <hbox align="center" pack="end"> - <label value="&torbutton.prefs.proxy.host.gopher;" control="torbutton_gopherProxy"/> - </hbox> - <hbox align="center"> - <textbox id="torbutton_gopherProxy" preftype="string" flex="1"/> - <label value="&torbutton.prefs.proxy.port;" control="torbutton_gopherPort"/> - <textbox id="torbutton_gopherPort" size="5"/> - </hbox> - </row> - <row align="center"> - <hbox align="center" pack="end"> - <label value="&torbutton.prefs.proxy.host.socks;" control="torbutton_socksHost"/> - </hbox> - <hbox align="center"> - <textbox id="torbutton_socksHost" flex="1"/> - <label value="&torbutton.prefs.proxy.port;" control="torbutton_socksPort"/> - <textbox id="torbutton_socksPort" size="5"/> - </hbox> - </row> - <row align="center"> - <hbox align="center" pack="end"> - <spacer flex="1"/> - </hbox> - <radiogroup align="center" orient="horizontal" id="torbutton_socksGroup"> - <radio id="torbutton_socksv4" - label="&torbutton.prefs.socks_vfour;"/> - <radio id="torbutton_socksv5" - label="&torbutton.prefs.socks_vfive;"/> - </radiogroup> - </row> - <row align="center"> - <hbox align="center" pack="end"> - <label value="&torbutton.prefs.no_proxies_on;" control="torbutton_noProxiesOn"/> - </hbox> - <hbox align="center"> - <textbox id="torbutton_noProxiesOn"/> - <spacer/> - </hbox> - </row> - <row align="right"> - <hbox align="center" pack="end"> - <spacer flex="1"/> - </hbox> - <hbox align="center" pack="end"> - <label class="indent" value="&torbutton.prefs.no_proxy_warning;"/> - </hbox> - </row> - </rows> - </grid> - -  - - <radio id="torbutton_transparentTor" - label="&torbutton.prefs.transparentTor;" - oncommand="torbutton_prefs_set_field_attributes(document)"/> - - </radiogroup> - - <hbox> - <spacer flex="1"/> - <button id="torbutton_testSettings" - label="&torbutton.prefs.test_settings;" - oncommand="torbutton_prefs_test_settings()"/> - </hbox> - </vbox> - </tabpanel> - <tabpanel hidden="false"> <vbox> <groupbox> <caption label="&torbutton.prefs.priv_caption;"/> @@ -306,10 +183,6 @@ </hbox> </groupbox> </vbox> - </tabpanel> - - </tabpanels> - </tabbox> <tooltip id="high_preview"> <html:b>&torbutton.prefs.sec_gen_desc;</html:b> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 81f5a23..d7c42bd 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -29,12 +29,6 @@ var m_tb_confirming_plugins = false; var m_tb_window_height = window.outerHeight; var m_tb_window_width = window.outerWidth; -var m_tb_ff3 = false; -var m_tb_ff35 = false; -var m_tb_ff36 = false; -var m_tb_ff4 = false; -var m_tb_ff15 = false; -var m_tb_ff10_8 = false; var m_tb_tbb = false; var m_tb_control_port = null; @@ -72,24 +66,6 @@ var torbutton_window_pref_observer = { if (topic != "nsPref:changed") return; switch (data) { - // These two need to be per-window: - case "extensions.torbutton.display_panel": - torbutton_set_panel_view(); - break; - case "extensions.torbutton.panel_style": - torbutton_set_panel_style(); - break; - - // FIXME: Maybe make a intermediate state with a yellow - // icon? - case "extensions.torbutton.settings_applied": - var mode = m_tb_prefs.getBoolPref("extensions.torbutton.settings_applied"); - torbutton_update_toolbutton(mode); - torbutton_update_statusbar(mode); - - // Update all open about:tor pages. - torbutton_update_all_abouttor_pages(undefined, undefined); - break; case k_tb_browser_update_needed_pref: torbutton_notify_if_update_needed(); break; @@ -99,8 +75,7 @@ var torbutton_window_pref_observer = // Bug 1506 P2: This object keeps Firefox prefs in sync with Torbutton prefs. // It probably could stand some simplification (See #3100). It also belongs -// in a component, not the XUL overlay. There also are a lot of toggle-triggering -// prefs here.. +// in a component, not the XUL overlay. var torbutton_unique_pref_observer = { register: function() @@ -108,10 +83,8 @@ var torbutton_unique_pref_observer = this.forced_ua = false; var pref_service = Components.classes["@mozilla.org/preferences-service;1"] .getService(Components.interfaces.nsIPrefBranchInternal); - this.did_toggle_warning = false; this._branch = pref_service.QueryInterface(Components.interfaces.nsIPrefBranchInternal); this._branch.addObserver("extensions.torbutton", this, false); - this._branch.addObserver("network.proxy", this, false); this._branch.addObserver("network.cookie", this, false); this._branch.addObserver("network.jar", this, false); this._branch.addObserver("browser.privatebrowsing.autostart", this, false); @@ -132,7 +105,6 @@ var torbutton_unique_pref_observer = { if (!this._branch) return; this._branch.removeObserver("extensions.torbutton", this); - this._branch.removeObserver("network.proxy", this); this._branch.removeObserver("network.cookie", this); this._branch.removeObserver("network.jar", this); this._branch.removeObserver("browser.privatebrowsing.autostart", this); @@ -181,24 +153,6 @@ var torbutton_unique_pref_observer = if (topic != "nsPref:changed") return; switch (data) { - case "network.proxy.http": - case "network.proxy.http_port": - case "network.proxy.ssl": - case "network.proxy.ssl_port": - case "network.proxy.ftp": - case "network.proxy.ftp_port": - case "network.proxy.gopher": - case "network.proxy.gopher_port": - case "network.proxy.socks": - case "network.proxy.socks_port": - case "network.proxy.socks_version": - case "network.proxy.share_proxy_settings": - case "network.proxy.socks_remote_dns": - case "network.proxy.type": - torbutton_log(1, "Got update message, setting status"); - torbutton_set_status(); - break; - case "browser.privatebrowsing.autostart": var mode = m_tb_prefs.getBoolPref("browser.privatebrowsing.autostart"); var ourmode = m_tb_prefs.getBoolPref("extensions.torbutton.block_disk"); @@ -293,8 +247,7 @@ var torbutton_tor_check_observer = { { if (topic == k_tb_tor_check_failed_topic) { // Update toolbar icon and tooltip. - var mode = m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled"); - torbutton_update_toolbutton(mode); + torbutton_update_toolbutton(); // Update all open about:tor pages. If the user does not have an // about:tor page open in the front most window, open one. @@ -310,123 +263,11 @@ var torbutton_tor_check_observer = { } }; -// Bug 1506 P1 -function torbutton_set_panel_view() { - var o_statuspanel = false; - var o_prefbranch = false; - - o_statuspanel = torbutton_get_statuspanel(); - o_prefbranch = torbutton_get_prefbranch('extensions.torbutton.'); - if (!o_statuspanel || !o_prefbranch) return; - - // Firefox 4 has no toolbar panel - var display_panel = o_prefbranch.getBoolPref('display_panel') - && !m_tb_ff4; - torbutton_log(2, 'setting panel visibility'); - o_statuspanel.setAttribute('collapsed', !display_panel); -} - -// Bug 1506 P1 -function torbutton_set_panel_style() { - var o_statuspanel = false; - var o_prefbranch = false; - - o_statuspanel = torbutton_get_statuspanel(); - o_prefbranch = torbutton_get_prefbranch('extensions.torbutton.'); - if (!o_statuspanel || !o_prefbranch) return; - - var panel_style = o_prefbranch.getCharPref('panel_style'); - torbutton_log(2, 'setting panel style: ' + panel_style); - o_statuspanel.setAttribute('class','statusbarpanel-' + panel_style); -} - -// Bug 1506 P0: Die toggle, die! -function torbutton_toggle(force) { - torbutton_log(5, "Somehow we received a toggle request. Refusing to honor it. (force="+force+")"); -} - -// Bug 1506 P0: Die toggle, die! -function torbutton_set_status() { - var state = false; - if (torbutton_check_status()) { - state = true; - try { - torbutton_update_status(true); - } catch(e) { - torbutton_log(5,'Error applying tor settings: '+e); - var wm = Cc["@mozilla.org/appshell/window-mediator;1"] - .getService(Components.interfaces.nsIWindowMediator); - var chrome = wm.getMostRecentWindow("navigator:browser"); - var warning1 = torbutton_get_property_string("torbutton.popup.pref_error"); - - if (e.result == 0x80520015 || e.result == 0x80520013) { // NS_ERROR_FILE_ACCESS_DENIED/NS_ERROR_FILE_READ_ONLY - var warning2 = torbutton_get_property_string("torbutton.popup.permission_denied"); - chrome.alert(warning1+"\n\n"+warning2); - } else if (e.result == 0x80520010) { // NS_ERROR_FILE_NO_DEVICE_SPACE - var o_stringbundle = torbutton_get_stringbundle(); - var warning2 = torbutton_get_property_string("torbutton.popup.device_full"); - chrome.alert(warning1+"\n\n"+warning2); - } else { - // This should never happen.. - chrome.alert(warning1+"\n\n"+e); - } - // Setting these prefs should avoid ininite recursion - // because torbutton_update_status should return immediately - // on the next call. - m_tb_prefs.setBoolPref("extensions.torbutton.tor_enabled", false); - m_tb_prefs.setBoolPref("extensions.torbutton.proxies_applied", false); - m_tb_prefs.setBoolPref("extensions.torbutton.settings_applied", false); - torbutton_disable_tor(); - } - } else { - state = false; - try { - torbutton_update_status(false); - } catch(e) { - torbutton_log(5,'Error applying nontor settings: '+e); - - var wm = Cc["@mozilla.org/appshell/window-mediator;1"] - .getService(Components.interfaces.nsIWindowMediator); - var chrome = wm.getMostRecentWindow("navigator:browser"); - var warning1 = torbutton_get_property_string("torbutton.popup.pref_error"); - - if (e.result == 0x80520015 || e.result == 0x80520013) { // NS_ERROR_FILE_ACCESS_DENIED/NS_ERROR_FILE_READ_ONLY - var warning2 = torbutton_get_property_string("torbutton.popup.permission_denied"); - chrome.alert(warning1+"\n\n"+warning2); - } else if (e.result == 0x80520010) { // NS_ERROR_FILE_NO_DEVICE_SPACE - var warning2 = torbutton_get_property_string("torbutton.popup.device_full"); - chrome.alert(warning1+"\n\n"+warning2); - } else { - // This should never happen.. - chrome.alert(warning1+"\n\n"+e); - } - // Setting these prefs should avoid infinite recursion - // because torbutton_update_status should return immediately - // on the next call. - m_tb_prefs.setBoolPref("extensions.torbutton.tor_enabled", true); - m_tb_prefs.setBoolPref("extensions.torbutton.proxies_applied", true); - m_tb_prefs.setBoolPref("extensions.torbutton.settings_applied", true); - torbutton_enable_tor(true); - } - } -} - -// Bug 1506 P0: Die toggle die function torbutton_init_toolbutton() { try { torbutton_log(3, "Initializing the Torbutton button."); - // Prevent the FF4 status bar from making our menu invisible... - /* Not needed - var o_toolbutton = torbutton_get_toolbutton(); - if (o_toolbutton) { - var context = document.getElementById('torbutton-context-menu'); - context.style.visibility = "visible"; - context.hidden = false; - torbutton_log(3, "Set new context menu."); - } - */ - torbutton_update_toolbutton(torbutton_check_status()); + torbutton_update_toolbutton(); } catch(e) { torbutton_log(4, "Error Initializing Torbutton button: "+e); } @@ -446,49 +287,7 @@ function torbutton_init() { m_tb_prefs = Components.classes["@mozilla.org/preferences-service;1"] .getService(Components.interfaces.nsIPrefBranch); - // Determine if we are firefox 3 or not. - var appInfo = Components.classes["@mozilla.org/xre/app-info;1"] - .getService(Components.interfaces.nsIXULAppInfo); - var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"] - .getService(Components.interfaces.nsIVersionComparator); - - if(versionChecker.compare(appInfo.version, "15.0a1") >= 0) { - m_tb_ff15 = true; - } else { - m_tb_ff15 = false; - } - - if(versionChecker.compare(appInfo.version, "10.0.8") >= 0 - && versionChecker.compare(appInfo.version, "11.0a1") < 0) { - m_tb_ff10_8 = true; - } else { - m_tb_ff10_8 = false; - } - - if(versionChecker.compare(appInfo.version, "4.0a1") >= 0) { - m_tb_ff4 = true; - } else { - m_tb_ff4 = false; - } - - if(versionChecker.compare(appInfo.version, "3.0a1") >= 0) { - m_tb_ff3 = true; - } else { - m_tb_ff3 = false; - } - - if(versionChecker.compare(appInfo.version, "3.5a1") >= 0) { - m_tb_ff35 = true; - } else { - m_tb_ff35 = false; - } - - if(versionChecker.compare(appInfo.version, "3.6a1") >= 0) { - m_tb_ff36 = true; - } else { - m_tb_ff36 = false; - } - + // Determine if we are running inside Tor Browser. var cur_version; try { cur_version = m_tb_prefs.getCharPref("torbrowser.version"); @@ -564,8 +363,6 @@ function torbutton_init() { torbutton_on_abouttor_load(aEvent.target); }, false, true); - // initialize preferences before we start our prefs observer - torbutton_init_prefs(); // Set some important security prefs according to the chosen security level // if there are no custom settings to respect. if (!m_tb_prefs.getBoolPref("extensions.torbutton.security_custom")) { @@ -589,9 +386,6 @@ function torbutton_init() { } } - // set panel style from preferences - torbutton_set_panel_style(); - // listen for our toolbar button being added so we can initialize it torbutton_init_toolbutton(); @@ -632,12 +426,7 @@ function torbutton_init() { } } - torbutton_set_panel_view(); - torbutton_log(1, 'setting torbutton status from proxy prefs'); - torbutton_set_status(); - var mode = m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled"); - torbutton_update_toolbutton(mode); - torbutton_update_statusbar(mode); + torbutton_update_toolbutton(); torbutton_notify_if_update_needed(); torbutton_update_sync_ui(); @@ -764,76 +553,6 @@ function torbutton_inform_about_tbb() { m_tb_prefs.setBoolPref("extensions.torbutton.prompt_torbrowser", !checkbox.value); } -// Bug 1506 P0: Our prefs should be handled by Tor Browser. Even if they're -// not, they should be vastly simplified from this. See also #3100. -// -// this function duplicates a lot of code in preferences.js for deciding our -// recommended settings. figure out a way to eliminate the redundancy. -// TODO: Move it to torbutton_util.js? -function torbutton_init_prefs() { - var torprefs = false; - var proxy_port; - var proxy_host; - torbutton_log(2, "called init_prefs()"); - torprefs = torbutton_get_prefbranch('extensions.torbutton.'); - - if (torprefs.getCharPref('settings_method') == 'recommended') { - torbutton_log(2, "using recommended settings"); - if (torbutton_has_good_socks()) { - proxy_host = ''; - proxy_port = 0; - } else { - // Privoxy is always recommended for Firefoxes not supporting socks_remote_dns - if (!torbutton_check_socks_remote_dns()) - torprefs.setBoolPref('use_privoxy', true); - - if (torprefs.getBoolPref('use_privoxy')) { - proxy_host = '127.0.0.1'; - proxy_port = 8118; - } else { - proxy_host = ''; - proxy_port = 0; - } - } - - if (torbutton_check_socks_remote_dns()) { - torprefs.setCharPref('http_proxy', proxy_host); - torprefs.setCharPref('https_proxy', proxy_host); - torprefs.setCharPref('ftp_proxy', ''); - torprefs.setIntPref('http_port', proxy_port); - torprefs.setIntPref('https_port', proxy_port); - torprefs.setIntPref('ftp_port', 0); - if (!m_tb_ff4) { - torprefs.setCharPref('gopher_proxy', ''); - torprefs.setIntPref('gopher_port', 0); - } - } else { - torprefs.setCharPref('http_proxy', proxy_host); - torprefs.setCharPref('https_proxy', proxy_host); - torprefs.setCharPref('ftp_proxy', proxy_host); - if (!m_tb_ff4) { - torprefs.setCharPref('gopher_proxy', proxy_host); - torprefs.setIntPref('gopher_port', proxy_port); - } - torprefs.setIntPref('http_port', proxy_port); - torprefs.setIntPref('https_port', proxy_port); - torprefs.setIntPref('ftp_port', proxy_port); - } - } - - torbutton_log(1, 'http_port='+torprefs.getIntPref('http_port')); -} - -// Bug 1506 P2: It might be nice to let people move the button around, I guess? -function torbutton_get_button_from_toolbox() { - var toolbox = document.getElementById("navigator-toolbox"); - for (var child = toolbox.palette.firstChild; child; child = child.nextSibling) - if (child.id == "torbutton-button") - return child; - torbutton_log(3, "Could not find toolbox button, trying in window DOM"); - return torbutton_get_toolbutton(); -} - // Bug 1506 P2: It might be nice to let people move the button around, I guess? function torbutton_get_toolbutton() { var o_toolbutton = false; @@ -852,19 +571,6 @@ function torbutton_get_toolbutton() { return o_toolbutton; } -function torbutton_get_statuspanel() { - var o_statuspanel = false; - - torbutton_log(1, 'init_statuspanel(): looking for statusbar element'); - if (document.getElementById("torbutton-panel")) { - o_statuspanel = document.getElementById("torbutton-panel"); - } else { - torbutton_log(5, 'ERROR (init): failed to find torbutton-panel'); - } - - return o_statuspanel; -} - function torbutton_update_is_needed() { var updateNeeded = false; try { @@ -1121,95 +827,6 @@ function torbutton_is_abouttor_doc(aDoc) { return (aDoc && /^about:tor$/i.test(aDoc.documentURI.toLowerCase())); } -// Bug 1506 P0: Toggle. Kill kill kill. -function torbutton_save_nontor_settings() -{ - var liveprefs = false; - var savprefs = false; - - liveprefs = torbutton_get_prefbranch('network.proxy.'); - savprefs = torbutton_get_prefbranch('extensions.torbutton.saved.'); - if (!liveprefs || !savprefs) { - torbutton_log(4, 'Prefbranch error'); - return; - } - - torbutton_log(2, 'saving nontor settings'); - savprefs.setIntPref('type', liveprefs.getIntPref('type')); - savprefs.setCharPref('http_proxy', liveprefs.getCharPref('http')); - savprefs.setIntPref('http_port', liveprefs.getIntPref('http_port')); - savprefs.setCharPref('https_proxy', liveprefs.getCharPref('ssl')); - savprefs.setIntPref('https_port', liveprefs.getIntPref('ssl_port')); - savprefs.setCharPref('ftp_proxy', liveprefs.getCharPref('ftp')); - torbutton_log(1, 'half-way'); - savprefs.setIntPref('ftp_port', liveprefs.getIntPref('ftp_port')); - savprefs.setCharPref('socks_host', liveprefs.getCharPref('socks')); - savprefs.setIntPref('socks_port', liveprefs.getIntPref('socks_port')); - savprefs.setIntPref('socks_version', liveprefs.getIntPref('socks_version')); - savprefs.setCharPref('no_proxies_on', liveprefs.getCharPref('no_proxies_on')); - if (!m_tb_ff4) { - savprefs.setCharPref('gopher_proxy', liveprefs.getCharPref('gopher')); - savprefs.setIntPref('gopher_port', liveprefs.getIntPref('gopher_port')); - } - try { // ff-0.9 doesn't have share_proxy_settings - savprefs.setBoolPref('share_proxy_settings', liveprefs.getBoolPref('share_proxy_settings')); - } catch(e) {} - - torbutton_log(1, 'almost there'); - if (torbutton_check_socks_remote_dns()) - savprefs.setBoolPref('socks_remote_dns', liveprefs.getBoolPref('socks_remote_dns')); - torbutton_log(2, 'Non-tor settings saved'); -} - -// Bug 1506 P0: Toggle. Kill kill kill. -function torbutton_restore_nontor_settings() -{ - var liveprefs = false; - var savprefs = false; - - liveprefs = torbutton_get_prefbranch('network.proxy.'); - savprefs = torbutton_get_prefbranch('extensions.torbutton.saved.'); - if (!liveprefs || !savprefs) { - torbutton_log(4, 'Prefbranch error'); - return; - } - - torbutton_log(2, 'restoring nontor settings'); - - m_tb_prefs.setBoolPref("extensions.torbutton.tor_enabled", false); - liveprefs.setIntPref('type', savprefs.getIntPref('type')); - liveprefs.setCharPref('http', savprefs.getCharPref('http_proxy')); - liveprefs.setIntPref('http_port', savprefs.getIntPref('http_port')); - liveprefs.setCharPref('ssl', savprefs.getCharPref('https_proxy')); - liveprefs.setIntPref('ssl_port', savprefs.getIntPref('https_port')); - liveprefs.setCharPref('ftp', savprefs.getCharPref('ftp_proxy')); - torbutton_log(1, 'half-way there'); - liveprefs.setIntPref('ftp_port', savprefs.getIntPref('ftp_port')); - if (!m_tb_ff4) { - liveprefs.setCharPref('gopher', savprefs.getCharPref('gopher_proxy')); - liveprefs.setIntPref('gopher_port', savprefs.getIntPref('gopher_port')); - } - liveprefs.setCharPref('socks', savprefs.getCharPref('socks_host')); - liveprefs.setIntPref('socks_port', savprefs.getIntPref('socks_port')); - liveprefs.setIntPref('socks_version', savprefs.getIntPref('socks_version')); - liveprefs.setCharPref('no_proxies_on',savprefs.getCharPref('no_proxies_on')); - try { // ff-0.9 doesn't have share_proxy_settings - liveprefs.setBoolPref('share_proxy_settings', savprefs.getBoolPref('share_proxy_settings')); - } catch(e) {} - - torbutton_log(1, 'almost there'); - if (torbutton_check_socks_remote_dns()) - liveprefs.setBoolPref('socks_remote_dns', savprefs.getBoolPref('socks_remote_dns')); - - // This is needed for torbrowser and other cases where the - // proxy prefs are actually the same.. - if(torbutton_check_status()) { - m_tb_prefs.setBoolPref("extensions.torbutton.tor_enabled", true); - } - - torbutton_log(2, 'settings restored'); -} - // Bug 1506 P4: Checking for Tor Browser updates is pretty important, // probably even as a fallback if we ever do get a working updater. function torbutton_do_async_versioncheck() { @@ -1233,7 +850,7 @@ function torbutton_do_async_versioncheck() { m_tb_prefs.setCharPref(k_tb_last_update_check_pref, now); torbutton_log(3, "Checking version with socks port: " - +m_tb_prefs.getIntPref("extensions.torbutton.socks_port")); + +m_tb_prefs.getIntPref("network.proxy.socks_port")); try { var req = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"] .createInstance(Components.interfaces.nsIXMLHttpRequest); @@ -1287,224 +904,30 @@ function torbutton_do_async_versioncheck() { } -// Bug 1506 P0: Deprecated by the async version. -function torbutton_check_version() { - torbutton_log(3, "Checking version"); - try { - var req = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"] - .createInstance(Components.interfaces.nsIXMLHttpRequest); - //var req = new XMLHttpRequest(); Blocked by content policy - var url = m_tb_prefs.getCharPref("extensions.torbutton.versioncheck_url"); - req.open('GET', url, false); - req.overrideMimeType("text/json"); - req.send(null); - } catch(e) { - if(e.result == 0x80004005) { // NS_ERROR_FAILURE - torbutton_log(5, "Version check failed! Is tor running?"); - return -1; - } - torbutton_log(5, "Version check failed! Tor internal error: "+e); - return -1; - } - if(req.status == 200) { - if(!req.responseText) { - torbutton_log(5, "Version check failed! No JSON present!"); - return -1; - } - try { - var version_list = JSON.parse(req.responseText); - // torbrowser.version may not exist.. - var my_version = m_tb_prefs.getCharPref("torbrowser.version"); - for (var v in version_list) { - if (version_list[v] == my_version) { - return 1; - } - } - return 0; - } catch(e) { - torbutton_log(5, "Version check failed! JSON parsing error: "+e); - return -1; - } - } else if (req.status == 404) { - // We're going to assume 404 means the service is not implemented yet. - torbutton_log(3, "Version check failed. Versions file is 404."); - return -1; - } - torbutton_log(5, "Version check failed! Web server error: "+req.status); - return -1; -} - -// Bug 1506 P2: Probably a good idea to have some way to test everything, -// but will need to be decoupled from the toggle logic :/ -function torbutton_test_settings() { - var wasEnabled = true; - if(!torbutton_check_status()) { - wasEnabled = false; - torbutton_enable_tor(true); - } - - torbutton_log(3, "Testing Tor settings"); - - m_tb_prefs.setBoolPref("extensions.torbutton.test_failed", true); - try { - var checkSvc = Cc["@torproject.org/torbutton-torCheckService;1"] - .getService(Ci.nsISupports).wrappedJSObject; - var req = checkSvc.createCheckRequest(false); - req.send(null); - } catch(e) { - // FIXME: This happens if this function is called from a browser - // window with tor disabled because the content policy will block us. - // Right now the check works because we get called from the - // preference window. Sort of makes automatic testing a bit trickier.. - if(!wasEnabled) torbutton_disable_tor(); - if(e.result == 0x80004005) { // NS_ERROR_FAILURE - torbutton_log(5, - "Test failed! HTTP proxy down or request blocked!"); - return 8; - } - torbutton_log(5, "Test failed! Tor internal error: "+e); - return 0; - } - - var ret = checkSvc.parseCheckResponse(req); - if (ret == 4) - m_tb_prefs.setBoolPref("extensions.torbutton.test_failed", false); - if(!wasEnabled) torbutton_disable_tor(); - torbutton_log(3, "Done testing Tor settings. Result: "+ret); - return ret; -} - -// Bug 1506 P0: Toggle must die. -function torbutton_disable_tor() -{ - torbutton_log(3, 'called disable_tor()'); - torbutton_restore_nontor_settings(); -} - -// Bug 1506 P0: Toggle must die. -function torbutton_enable_tor(force) -{ - torbutton_log(3, 'called enable_tor()'); - - if(!force && m_tb_prefs.getBoolPref("extensions.torbutton.test_failed")) { - var warning = torbutton_get_property_string("torbutton.popup.test.confirm_toggle"); - var wm = Cc["@mozilla.org/appshell/window-mediator;1"] - .getService(Components.interfaces.nsIWindowMediator); - var chrome = wm.getMostRecentWindow("navigator:browser"); - if(!chrome.confirm(warning)) { - return; - } - } - - torbutton_save_nontor_settings(); - torbutton_activate_tor_settings(); -} - -// Bug 1506 P0: Toggle must die. -function torbutton_update_toolbutton(mode) +function torbutton_update_toolbutton() { - var o_toolbutton = torbutton_get_toolbutton(); + let o_toolbutton = torbutton_get_toolbutton(); if (!o_toolbutton) return; - var tooltip = ""; - if (mode && torbutton_tor_check_ok()) { - tooltip = torbutton_get_property_string("torbutton.panel.label.enabled"); - o_toolbutton.setAttribute('tbstatus', 'on'); - o_toolbutton.setAttribute('tooltiptext', tooltip); - } else { - tooltip = torbutton_get_property_string("torbutton.panel.label.disabled"); - o_toolbutton.setAttribute('tbstatus', 'off'); - o_toolbutton.setAttribute('tooltiptext', tooltip); - } -} + let isOK = torbutton_tor_check_ok(); + let tbstatus = isOK ? "on" : "off"; + o_toolbutton.setAttribute("tbstatus", tbstatus); -// Bug 1506 P0: Toggle must die. -function torbutton_update_statusbar(mode) -{ - var o_statuspanel = torbutton_get_statuspanel(); - if (!window.statusbar.visible) return; - var label = ""; - var tooltip = ""; - - if (mode && torbutton_tor_check_ok()) { - label = torbutton_get_property_string("torbutton.panel.label.enabled"); - tooltip = torbutton_get_property_string("torbutton.panel.tooltip.enabled"); - o_statuspanel.style.color = "#390"; - o_statuspanel.setAttribute('label', label); - o_statuspanel.setAttribute('tooltiptext', tooltip); - o_statuspanel.setAttribute('tbstatus', 'on'); - } else { - label = torbutton_get_property_string("torbutton.panel.label.disabled"); - tooltip = torbutton_get_property_string("torbutton.panel.tooltip.disabled"); - o_statuspanel.style.color = "#F00"; - o_statuspanel.setAttribute('label', label); - o_statuspanel.setAttribute('tooltiptext', tooltip); - o_statuspanel.setAttribute('tbstatus', 'off'); - } + let tooltipKey = isOK ? "torbutton.panel.label.enabled" + : "torbutton.panel.label.disabled"; + o_toolbutton.setAttribute("tooltiptext", + torbutton_get_property_string(tooltipKey)); } // Bug 1506 P4: Timezone spoofing is pretty important -function torbutton_set_timezone(mode, startup) { +function torbutton_set_timezone() { /* Windows doesn't call tzset() automatically.. Linux and MacOS * both do though.. FF3.5 now calls _tzset() for us on windows. */ - // FIXME: Test: - // 1. odd timezones like IST and IST+13:30 - // 2. negative offsets - // 3. Windows-style spaced names + torbutton_log(3, "Setting timezone to UTC"); var environ = Components.classes["@mozilla.org/process/environment;1"] .getService(Components.interfaces.nsIEnvironment); - - torbutton_log(3, "Setting timezone at "+startup+" for mode "+mode); - - // For TZ info, see: - // http://www-01.ibm.com/support/docview.wss?rs=0&uid=swg21150296 - // and - // http://msdn.microsoft.com/en-us/library/90s5c885.aspx - if(startup) { - // Save Date() string to pref - var d = new Date(); - var offset = d.getTimezoneOffset(); - var offStr = ""; - if(d.getTimezoneOffset() < 0) { - offset = -offset; - offStr = "-"; - } else { - offStr = "+"; - } - - if(Math.floor(offset/60) < 10) { - offStr += "0"; - } - offStr += Math.floor(offset/60)+":"; - if((offset%60) < 10) { - offStr += "0"; - } - offStr += (offset%60); - - // Regex match for 3 letter code - var re = new RegExp('\$(\\S+)\$', "gm"); - var match = re.exec(d.toString()); - // Parse parens. If parseable, use. Otherwise set TZ="" - var set = "" - if(match) { - set = match[1]+offStr; - } else { - torbutton_log(3, "Skipping timezone storage"); - } - m_tb_prefs.setCharPref("extensions.torbutton.tz_string", set); - } - - if(mode) { - torbutton_log(2, "Setting timezone to UTC"); - environ.set("TZ", "UTC"); - } else { - // 1. If startup TZ string, reset. - torbutton_log(2, "Unsetting timezone."); - // FIXME: Tears.. This will not update during daylight switch for linux+mac users - // Windows users will be fine though, because tz_string should be empty for them - environ.set("TZ", m_tb_prefs.getCharPref("extensions.torbutton.tz_string")); - } + environ.set("TZ", "UTC"); } // Bug 1506 P3: Support code for language+uagent spoofing @@ -1709,14 +1132,12 @@ function torbutton_do_new_identity() { m_tb_prefs.setBoolPref("browser.zoom.siteSpecific", !m_tb_prefs.getBoolPref("browser.zoom.siteSpecific")); - if(m_tb_ff35) { - try { - if(m_tb_prefs.prefHasUserValue("geo.wifi.access_token")) { - m_tb_prefs.clearUserPref("geo.wifi.access_token"); - } - } catch(e) { - torbutton_log(3, "Exception on wifi token clear: "+e); + try { + if(m_tb_prefs.prefHasUserValue("geo.wifi.access_token")) { + m_tb_prefs.clearUserPref("geo.wifi.access_token"); } + } catch(e) { + torbutton_log(3, "Exception on wifi token clear: "+e); } try { @@ -1729,7 +1150,7 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Closing tabs and clearing searchbox"); - torbutton_close_on_toggle(true, true); + torbutton_close_tabs_on_new_identity(); // Bug #10800: Trying to clear search/find can cause exceptions // in unknown cases. Just log for now. @@ -2067,10 +1488,11 @@ function torbutton_do_tor_check() // If we have a tor control port and transparent torification is off, // perform a check via the control port. const kEnvSkipControlPortTest = "TOR_SKIP_CONTROLPORTTEST"; + const kEnvUseTransparentProxy = "TOR_TRANSPROXY"; var env = Cc["@mozilla.org/process/environment;1"] .getService(Ci.nsIEnvironment); if (m_tb_control_port && - !m_tb_prefs.getBoolPref("extensions.torbutton.saved.transparentTor") && + !env.exists(kEnvUseTransparentProxy) && !env.exists(kEnvSkipControlPortTest) && m_tb_prefs.getBoolPref("extensions.torbutton.local_tor_check")) { if (torbutton_local_tor_check()) @@ -2078,8 +1500,7 @@ function torbutton_do_tor_check() else { // The check failed. Update toolbar icon and tooltip. checkSvc.statusOfTorCheck = checkSvc.kCheckFailed; - var mode = m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled"); - torbutton_update_toolbutton(mode); + torbutton_update_toolbutton(); } } else { @@ -2558,54 +1979,11 @@ function torbutton_security_slider_custom_check(mode) { } } -// Bug 1506 P0: This code is a toggle-relic. -// -// It basically just enforces the three Torbutton prefs -// so that the Torbutton state and button UI is consistent -function torbutton_update_status(mode) { - var o_toolbutton = false; - var o_statuspanel = false; - var o_stringbundle = false; - var sPrefix; - var label; - var tooltip; - - var torprefs = torbutton_get_prefbranch('extensions.torbutton.'); - var changed = (torprefs.getBoolPref('proxies_applied') != mode); - - torbutton_log(2, 'called update_status: '+mode+","+changed); - - if (!changed) return; - - torprefs.setBoolPref('proxies_applied', mode); - if(torprefs.getBoolPref("tor_enabled") != mode) { - torbutton_log(3, 'Got external update for: '+mode); - torprefs.setBoolPref("tor_enabled", mode); - } - - m_tb_prefs.setBoolPref("extensions.torbutton.settings_applied", mode); - - // Force prefs to be synced to disk - var prefService = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - prefService.savePrefFile(null); - - torbutton_log(3, "Settings applied for mode: "+mode); -} - -// Bug 1506 P4: Despite the name, it is used on new identity -function torbutton_close_on_toggle(mode, newnym) { - var close_tor = m_tb_prefs.getBoolPref("extensions.torbutton.close_tor"); - var close_nontor = m_tb_prefs.getBoolPref("extensions.torbutton.close_nontor"); +function torbutton_close_tabs_on_new_identity() { var close_newnym = m_tb_prefs.getBoolPref("extensions.torbutton.close_newnym"); - - if (newnym) { - if (!close_newnym) { - torbutton_log(3, "Not closing tabs"); - } - } else if((mode && !close_nontor) || (!mode && !close_tor)) { - torbutton_log(3, "Not closing tabs"); - return; + if (!close_newnym) { + torbutton_log(3, "Not closing tabs"); + return; } // TODO: muck around with browser.tabs.warnOnClose.. maybe.. @@ -2713,36 +2091,6 @@ function torbutton_gecko_compare(aVersion) { return versionComparator.compare(aVersion, geckoVersion); } -// Bug 1506 P0: Code to attempt to grey out browser proxy prefs. Doesn't -// actually seem to work? -function torbutton_browser_proxy_prefs_init() -{ - var _elementIDs = ["networkProxyType", - "networkProxyFTP", "networkProxyFTP_Port", - "networkProxyGopher", "networkProxyGopher_Port", - "networkProxyHTTP", "networkProxyHTTP_Port", - "networkProxySOCKS", "networkProxySOCKS_Port", - "networkProxySOCKSVersion", - "networkProxySOCKSVersion4", "networkProxySOCKSVersion5", - "networkProxySSL", "networkProxySSL_Port", - "networkProxyNone", "networkProxyAutoconfigURL", "shareAllProxies"]; - - torbutton_log(2, 'called torbutton_browser_proxy_prefs_init()'); - if (!torbutton_check_status()) - { - document.getElementById('torbutton-pref-connection-notice').hidden = true; - document.getElementById('torbutton-pref-connection-more-info').hidden = true; - } - else - { - document.getElementById('networkProxyType').disabled = true; - for (var i = 0; i < _elementIDs.length; i++) - document.getElementById(_elementIDs[i]).setAttribute( "disabled", "true" ); - } - - // window.sizeToContent(); -} - // -------------- HISTORY & COOKIES --------------------- // Bug 1506 P4: Used by New Identity if cookie protections are @@ -2755,38 +2103,6 @@ function torbutton_clear_cookies() { cm.removeAll(); } -// Bug 1506 P0: Toggle-only. Kill it. -function torbutton_jar_cookies(mode) { - var selector = - Components.classes["@torproject.org/cookie-jar-selector;1"] - .getService(Components.interfaces.nsISupports) - .wrappedJSObject; - - /* - if(m_tb_ff3) { - var o_stringbundle = torbutton_get_stringbundle(); - var warning = torbutton_get_property_string("torbutton.popup.ff3.cookie_warning"); - window.alert(warning); - return; - }*/ - var protectcookies = m_tb_prefs.getBoolPref('extensions.torbutton.cookie_protections'); - if(mode) { - if (protectcookies) - selector.clearUnprotectedCookies("nontor"); - selector.saveCookies("nontor"); - selector.clearCookies(); - if(m_tb_prefs.getBoolPref('extensions.torbutton.dual_cookie_jars')) - selector.loadCookies("tor", false); - } else { - if (protectcookies) - selector.clearUnprotectedCookies("tor"); - if(m_tb_prefs.getBoolPref('extensions.torbutton.dual_cookie_jars')) - selector.saveCookies("tor"); - selector.clearCookies(); - selector.loadCookies("nontor", false); - } -} - // -------------- JS/PLUGIN HANDLING CODE --------------------- // Bug 1506 P3: Defense in depth. Disables JS and events for New Identity. function torbutton_disable_browser_js(browser) { @@ -2877,44 +2193,6 @@ function torbutton_disable_all_js() { } } -// Bug 1506 P2: We may want to replace this with a XUl solution. -// See #6096. -function torbutton_reload_homepage() { - var homepage = m_tb_prefs.getComplexValue("browser.startup.homepage", - Components.interfaces.nsIPrefLocalizedString).data; - - torbutton_log(3, "Reloading homepage: "+homepage); - try { - gBrowser.loadURI(homepage, null, null); - } catch(e) { - torbutton_log(4, "Failure reloading homepage "+homepage+": "+e); - } -} - -// Bug 1506 P0: Toggle, kill it. -function torbutton_restore_cookies(tor_enabled) -{ - var selector = - Components.classes["@torproject.org/cookie-jar-selector;1"] - .getService(Components.interfaces.nsISupports) - .wrappedJSObject; - torbutton_log(4, "Restoring cookie status"); - selector.clearCookies(); - - if(tor_enabled) { - if(m_tb_prefs.getBoolPref('extensions.torbutton.dual_cookie_jars')) { - torbutton_log(4, "Loading tor jar after crash"); - selector.loadCookies("tor", false); - } - } else { - if(m_tb_prefs.getBoolPref('extensions.torbutton.dual_cookie_jars') - || m_tb_prefs.getBoolPref('extensions.torbutton.cookie_jars')) { - torbutton_log(4, "Loading non-tor jar after crash"); - selector.loadCookies("nontor", false); - } - } -} - // Bug 1506 P1: This function just cleans up prefs that got set badly in previous releases function torbutton_fixup_old_prefs() { @@ -2976,7 +2254,7 @@ function torbutton_do_startup() torbutton_do_main_window_startup(); // Bug 1506: Still want to do this - torbutton_set_timezone(true, true); + torbutton_set_timezone(); // For charsets torbutton_update_fingerprinting_prefs(); @@ -3005,22 +2283,14 @@ function torbutton_do_startup() } } -// Bug 1506 P0: Has some tagging code (can be removed) +// Bug 1506 P0: Perform version check when a new tab is opened. function torbutton_new_tab(event) { // listening for new tabs torbutton_log(3, "New tab"); - var tor_tag = !m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled"); - var no_plugins = m_tb_prefs.getBoolPref("extensions.torbutton.no_tor_plugins"); - // Changed in FF4... - //var browser = event.currentTarget; - var browser = gBrowser.getBrowserForTab(event.target); - /* Perform the version check on new tab, module timer */ - if (!tor_tag) { // tor is enabled... - torbutton_do_async_versioncheck(); - } + torbutton_do_async_versioncheck(); } // Bug 1506 P3: Used to decide if we should resize the window. @@ -3077,7 +2347,6 @@ function torbutton_new_window(event) .getService(Ci.nsIWebProgress); if (m_tb_prefs.getBoolPref("extensions.torbutton.resize_new_windows") - && m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled") && torbutton_is_windowed(window)) { progress.addProgressListener(torbutton_resizelistener, Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT); diff --git a/src/chrome/content/torbutton.xul b/src/chrome/content/torbutton.xul index df86370..2f6e72e 100644 --- a/src/chrome/content/torbutton.xul +++ b/src/chrome/content/torbutton.xul @@ -38,14 +38,6 @@ context="torbutton-context-menu"/> </toolbarpalette> - <statusbar id="status-bar"> - <statusbarpanel id="torbutton-panel" - insertbefore="statusbar-updates" - menu="torbutton-context-menu" - context="torbutton-context-menu" /> - - </statusbar> -  <keyset> <key id="torbutton-new-identity-key" modifiers="accel shift" key="U" oncommand="torbutton_new_identity()"/> diff --git a/src/chrome/content/torbutton_tb.xul b/src/chrome/content/torbutton_tb.xul index c240248..450ffb3 100644 --- a/src/chrome/content/torbutton_tb.xul +++ b/src/chrome/content/torbutton_tb.xul @@ -23,8 +23,7 @@ class="toolbarbutton-1" label="Torbutton" tooltiptext="&torbutton.button.tooltip;" - context="torbutton-context-menu" - oncommand="torbutton_toggle(false);" /> + context="torbutton-context-menu" /> </toolbarpalette> <toolbarpalette id="MsgComposeToolbarPalette"> @@ -33,16 +32,7 @@ class="toolbarbutton-1" label="Torbutton" tooltiptext="&torbutton.button.tooltip;" - context="torbutton-context-menu" - oncommand="torbutton_toggle(false);" /> + context="torbutton-context-menu" /> </toolbarpalette> - <statusbar id="status-bar"> - <statusbarpanel id="torbutton-panel" - insertbefore="statusbar-updates" - context="torbutton-context-menu" - onclick="if (event.button == 0) torbutton_toggle(false)"/> - - <menupopup id="torbutton-context-menu"/> - </statusbar> </overlay> diff --git a/src/chrome/content/torbutton_util.js b/src/chrome/content/torbutton_util.js index e7b0197..1558ced 100644 --- a/src/chrome/content/torbutton_util.js +++ b/src/chrome/content/torbutton_util.js @@ -6,28 +6,8 @@ var m_tb_torlog = Components.classes["@torproject.org/torbutton-logger;1"] .getService(Components.interfaces.nsISupports).wrappedJSObject; -// This is sort of hacky and random.. -var appInfo = Components.classes["@mozilla.org/xre/app-info;1"] - .getService(Components.interfaces.nsIXULAppInfo); -var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"] - .getService(Components.interfaces.nsIVersionComparator); -var m_tb_ff5 = false; -var m_tb_ff4 = false; - var m_tb_string_bundle = torbutton_get_stringbundle(); -if(versionChecker.compare(appInfo.version, "4.0a1") >= 0) { - m_tb_ff4 = true; -} else { - m_tb_ff4 = false; -} -if(versionChecker.compare(appInfo.version, "5.0a1") >= 0) { - m_tb_ff5 = true; -} else { - m_tb_ff5 = false; -} - - // Bug 1506 P0: Use the log service directly function torbutton_eclog(nLevel, sMsg) { m_tb_torlog.eclog(nLevel, sMsg); @@ -96,145 +76,6 @@ function torbutton_reset_browser_prefs() { } } -// check if the socks_remote_dns preference exists -function torbutton_check_socks_remote_dns() -{ - var o_prefbranch = false; - - o_prefbranch = torbutton_get_prefbranch("network.proxy."); - // check if this version of Firefox has the socks_remote_dns option - try { - o_prefbranch.getBoolPref('socks_remote_dns'); - torbutton_log(2, "socks_remote_dns is available"); - return true; - } catch (rErr) { - // no such preference - torbutton_log(4, "socks_remote_dns is unavailable"); - return false; - } -} - -function torbutton_has_good_socks() { - if(m_tb_ff5) { - return true; - } - - // TBB will set this pref if it has the SOCKS timeout patch applied - var environ = Components.classes["@mozilla.org/process/environment;1"] - .getService(Components.interfaces.nsIEnvironment); - - if (environ.exists("TOR_SOCKS_PORT")) - return true; - - return false; -} - -function torbutton_check_status() { - var liveprefs = false; - var torprefs = false; - var remote_dns = true; - torbutton_log(1, "Check status"); - - liveprefs = torbutton_get_prefbranch('network.proxy.'); - torprefs = torbutton_get_prefbranch('extensions.torbutton.'); - - if (!torprefs) { - torbutton_log(5, "Failed to get torprefs!"); - return false; - } - - if (!liveprefs) { - torbutton_log(5, "Failed to get lifeprefs!"); - return false; - } - - if (torprefs.getBoolPref("use_nontor_proxy")) { - return true; - } - - if (torbutton_check_socks_remote_dns()) - remote_dns = liveprefs.getBoolPref("socks_remote_dns"); - else - remote_dns = true; - - var proxy_type = 1; - if (torprefs.getCharPref('settings_method') == 'transparent') { - remote_dns = true; // Hack. Transparent has remote_dns disabled - proxy_type = 0; - } - - return ( - (liveprefs.getIntPref("type") == proxy_type) && - torbutton_log(1, "Type is true") && - (liveprefs.getCharPref("http") == torprefs.getCharPref('http_proxy')) && - torbutton_log(1, "Http proxy") && - (liveprefs.getIntPref("http_port") == torprefs.getIntPref('http_port')) && - torbutton_log(1, "Http port") && - (liveprefs.getCharPref("ssl") == torprefs.getCharPref('https_proxy')) && - torbutton_log(1, "ssl proxy") && - (liveprefs.getIntPref("ssl_port") == torprefs.getIntPref('https_port')) && - torbutton_log(1, "ssl port") && - (liveprefs.getCharPref("ftp") == torprefs.getCharPref('ftp_proxy')) && - torbutton_log(1, "ftp proxy") && - (liveprefs.getIntPref("ftp_port") == torprefs.getIntPref('ftp_port')) && - torbutton_log(1, "ftp port") && - (liveprefs.getCharPref("socks") == torprefs.getCharPref('socks_host')) && - torbutton_log(1, "socks proxy") && - (liveprefs.getIntPref("socks_port") == torprefs.getIntPref('socks_port')) && - torbutton_log(1, "socks port") && - (liveprefs.getIntPref("socks_version") == torprefs.getIntPref('socks_version')) && - torbutton_log(1, "socks version") && - (liveprefs.getBoolPref("share_proxy_settings") == false) && - torbutton_log(1, "share proxy settins") && - (remote_dns == true) - && torbutton_log(1, "remote_dns")); -} - -function torbutton_activate_tor_settings() -{ - var liveprefs = false; - var torprefs = false; - - liveprefs = torbutton_get_prefbranch('network.proxy.'); - torprefs = torbutton_get_prefbranch('extensions.torbutton.'); - if (!liveprefs || !torprefs) { - torbutton_log(4, 'Prefbranch error'); - return; - } - - torbutton_log(2, 'Activate tor settings'); - torprefs.setBoolPref("tor_enabled", true); - liveprefs.setCharPref('http', torprefs.getCharPref('http_proxy')); - liveprefs.setIntPref('http_port', torprefs.getIntPref('http_port')); - liveprefs.setCharPref('ssl', torprefs.getCharPref('https_proxy')); - liveprefs.setIntPref('ssl_port', torprefs.getIntPref('https_port')); - liveprefs.setCharPref('ftp', torprefs.getCharPref('ftp_proxy')); - liveprefs.setIntPref('ftp_port', torprefs.getIntPref('ftp_port')); - torbutton_log(1, 'Half-way there'); - if (!m_tb_ff4) { - liveprefs.setCharPref('gopher', torprefs.getCharPref('gopher_proxy')); - liveprefs.setIntPref('gopher_port', torprefs.getIntPref('gopher_port')); - } - liveprefs.setCharPref('socks', torprefs.getCharPref('socks_host')); - liveprefs.setIntPref('socks_port', torprefs.getIntPref('socks_port')); - liveprefs.setIntPref('socks_version', torprefs.getIntPref('socks_version')); - liveprefs.setCharPref('no_proxies_on', torprefs.getCharPref('no_proxies_on')); - liveprefs.setBoolPref('share_proxy_settings', false); - - if (torprefs.getCharPref('settings_method') == 'transparent') { - liveprefs.setIntPref('type', 0); - if (torbutton_check_socks_remote_dns()) { - liveprefs.setBoolPref('socks_remote_dns', false); - } - } else { - liveprefs.setIntPref('type', 1); - if (torbutton_check_socks_remote_dns()) { - liveprefs.setBoolPref('socks_remote_dns', true); - } - } - torbutton_log(2, 'Done activating tor settings'); -} - // load localization strings function torbutton_get_stringbundle() { diff --git a/src/chrome/content/torcookie.js b/src/chrome/content/torcookie.js index 9420994..0a3dace 100644 --- a/src/chrome/content/torcookie.js +++ b/src/chrome/content/torcookie.js @@ -59,7 +59,6 @@ function initDialog() { selector = Components.classes["@torproject.org/cookie-jar-selector;1"] .getService(Components.interfaces.nsISupports) .wrappedJSObject; - var tor_enabled = prefs.getBoolPref("extensions.torbutton.tor_enabled"); //init cookie manager cookiemanager = Components.classes["@mozilla.org/cookiemanager;1"].getService(); cookiemanager = cookiemanager.QueryInterface(Components.interfaces.nsICookieManager); diff --git a/src/chrome/locale/af/torbutton.dtd b/src/chrome/locale/af/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/af/torbutton.dtd +++ b/src/chrome/locale/af/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/af/torbutton.properties b/src/chrome/locale/af/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/af/torbutton.properties +++ b/src/chrome/locale/af/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/ak/torbutton.dtd b/src/chrome/locale/ak/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/ak/torbutton.dtd +++ b/src/chrome/locale/ak/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/ak/torbutton.properties b/src/chrome/locale/ak/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/ak/torbutton.properties +++ b/src/chrome/locale/ak/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/am/torbutton.dtd b/src/chrome/locale/am/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/am/torbutton.dtd +++ b/src/chrome/locale/am/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/am/torbutton.properties b/src/chrome/locale/am/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/am/torbutton.properties +++ b/src/chrome/locale/am/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd index 43601b2..0da10fd 100644 --- a/src/chrome/locale/ar/torbutton.dtd +++ b/src/chrome/locale/ar/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØšØ±ÙÙØ³Ù"> -<!ENTITY torbutton.prefs.recommended_settings "Ø§Ø³ØªØ®Ø¯Ù Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØšØ±ÙÙØ³Ù Ø§ÙÙØØšÙØ°Ø© ÙÙØ°Ù Ø§ÙÙØ³Ø®Ø© ÙÙ ÙØ§ÙØ±ÙÙØ³"> -<!ENTITY torbutton.prefs.use_polipo "Ø§Ø³ØªØ®Ø¯Ù Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Ø§Ø³ØªØ®Ø¯Ù Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØšØ±ÙÙØ³Ù ÙØ®ØµØµØ©"> -<!ENTITY torbutton.prefs.proxy.host.http "ØšØ±ÙÙØ³Ù HTTP:"> -<!ENTITY torbutton.prefs.proxy.host.https "ØšØ±ÙÙØ³Ù SSL:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "ØšØ±ÙÙØ³Ù FTP:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "ØšØ±ÙÙØ³Ù Gopher:"> -<!ENTITY torbutton.prefs.proxy.host.socks "ØšØ±ÙÙØ³Ù SOCKS:"> -<!ENTITY torbutton.prefs.proxy.port "Ø§ÙØšÙØ§ØšØ©:"> -<!ENTITY torbutton.pref_connection.notice "Ø¹Ø·ÙÙ Ø²Ø± ØªÙØ± ÙØªØºÙÙØ± ÙØ°Ù Ø§ÙØ¥Ø¹Ø¯Ø§Ø¯Ø§Øª."> -<!ENTITY torbutton.pref_connection.more_info "ÙØ²ÙØ¯ ÙÙ Ø§ÙÙØ¹ÙÙÙØ§Øª"> -<!ENTITY torbutton.pref_connection_more_info.title "Ø§ÙØªØ¹ÙÙÙØ§Øª"> -<!ENTITY torbutton.pref_connection_more_info.text "Ø²Ø± ØªÙØ± ÙÙØ¹ÙÙ ØØ§ÙÙÙØ§. Ø¥Ø°Ø§ ÙÙØª ØªØ±ÙØ¯ ØªØºÙÙØ± Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØšØ±ÙÙØ³Ù ØºÙØ± Ø§ÙÙØªØ¹ÙÙØ© ØšØªÙØ±Ø ÙØ¶ÙØ§Ù Ø¹Ø·Ù Ø²Ø± ØªÙØ± Ø£ÙÙØ§Ù Ø«Ù Ø¹Ø¯ Ø¥ÙÙ ÙÙØ§. Ø¥Ù ÙÙØª ØªØ±ÙØ¯ ØªØ¹Ø¯ÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø²Ø± ØªÙØ± ÙØ§Ø³ØªØ®Ø¯Ù ÙØ§ÙØ°Ø© ØªÙØ¶ÙÙØ§Øª Ø²Ø± ØªÙØ±."> <!ENTITY torbutton.context_menu.new_identity "ÙÙÙØ© Ø¬Ø¯ÙØ¯Ø©"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Ø¯Ø§ØŠØ±Ø© ØªÙØ± Ø¬Ø¯ÙØ¯Ø© ÙÙØ°Ø§ Ø§ÙÙÙÙØ¹"> @@ -27,11 +13,6 @@ <!ENTITY torbutton.button.tooltip "Ø§ÙÙØ± ÙØšØ¯Ø¡ Ø²Ø± ØªÙØ±"> <!ENTITY torbutton.prefs.privacy_security_settings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ£ÙØ§Ù ÙØ§ÙØ®ØµÙØµÙÙØ©"> <!ENTITY torbutton.prefs.restore_defaults "Ø§Ø³ØªØ¹Ø§Ø¯Ø© Ø§ÙØ§ÙØªØ±Ø§Ø¶ÙØ§Øª"> -<!ENTITY torbutton.prefs.test_settings "ÙØØµ Ø§ÙØ¥Ø¹Ø¯Ø§Ø¯Ø§Øª"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "ÙØ§ ÙØ³ÙØ· Ù:"> -<!ENTITY torbutton.prefs.no_proxy_warning "ØªØØ°ÙØ±: ØªØ¬ÙØš Ø§Ø³ØªØ®Ø¯Ø§Ù Ø£Ù ÙÙ Ø£Ø³ÙØ§Ø¡ Ø§ÙÙØ¶ÙÙ Ø§ÙÙØ°ÙÙØ±Ø© Ø£Ø¹ÙØ§Ù"> <!ENTITY torbutton.cookiedialog.title "Ø¥Ø¯Ø§Ø±Ø© Ø¥Ø¹Ø¯Ø§Ø¯Øª Ø§ÙØÙØ§ÙØ© ÙÙÙÙØ§Øª ØªØ¹Ø±ÙÙ Ø§ÙØ§Ø±ØªØšØ§Ø·"> <!ENTITY torbutton.cookiedialog.lockCol "ÙØÙÙØ©"> <!ENTITY torbutton.cookiedialog.domainCol "Ø§Ø³ØªØ¶Ø§ÙØ©"> @@ -43,7 +24,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Ø¥Ø²Ø§ÙØ© Ø§ÙÙÙ ÙÙÙ Ø§Ø³ØªÙØ± ÙÙ Ø§ÙØÙØ§ÙØ©"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Ø§ØÙ ÙÙÙØ§Øª ØªØ¹Ø±ÙÙ Ø§ÙØ§Ø±ØªØšØ§Ø· Ø§ÙØ¬Ø¯ÙØ¯Ø©"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ÙØ§ ØªØÙ ÙÙÙØ§Øª ØªØ¹Ø±ÙÙ Ø§ÙØ§Ø±ØªØšØ§Ø· Ø§ÙØ¬Ø¯ÙØ¯Ø©"> -<!ENTITY torbutton.prefs.transparentTor "ØŽÙØ§ÙÙØ© ØªÙØ±ÙÙÙÙØŽÙ (ØªØØªØ§Ø¬ ÙÙØ¬Ù ØªÙØ± Ø£Ù ØªØ±Ø§ÙØ³ØšÙÙØ³Ù ÙØ®ØµØµ)"> <!ENTITY torbutton.prefs.priv_caption "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ®ØµÙØµÙØ©"> <!ENTITY torbutton.prefs.block_disk "ÙØ§ ØªØ³Ø¬Ù Ø³Ø¬Ù Ø§ÙØªØµÙØ Ø£Ù ØšÙØ§ÙØ§Øª Ø§ÙÙÙØ§ÙØ¹ Ø§ÙØ£ÙÙØªØ±ÙÙÙØ© (ØªÙØ¹ÙÙ Ø§ÙØªØµÙØ Ø§ÙØ®ØµÙØµÙ)"> <!ENTITY torbutton.prefs.restrict_thirdparty "ØªÙÙÙØ¯ Ø§ÙÙCookies Ø§ÙØ®Ø§ØµØ© ØšØ§ÙØ·Ø±Ù Ø§ÙØ«Ø§ÙØ« Ù ØšÙØ§ÙØ§Øª Ø§ÙØªØªØšØ¹ Ø§ÙØ£Ø®Ø±Ù."> diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties index 5fa8bb1..fd7e4b4 100644 --- a/src/chrome/locale/ar/torbutton.properties +++ b/src/chrome/locale/ar/torbutton.properties @@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Ø§ÙÙØ± ÙØªØ¹Ø·ÙÙ ØªÙØ± torbutton.panel.label.disabled = ØªÙØ± ÙØ¹Ø·ÙÙ torbutton.panel.label.enabled = ØªÙØ± ÙÙØ¹ÙÙ extensions.torbutton(a)torproject.org.description = Ø²Ø± ØªÙØ± ÙÙÙØ± Ø²Ø± ÙØªØ¹Ø¯ÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØªÙØ± ÙØ§ÙØ¶Ø§Ù ÙÙØ³Ø ØšÙØ§ÙØ§Øª Ø§ÙØªØµÙØ Ø§ÙØ®Ø§ØµØ© ØšÙ ØšØ³Ø±Ø¹Ø© ÙØšØ³ÙÙÙØ©. -torbutton.popup.test.success = ØªÙÙ Ø§Ø®ØªØšØ§Ø± ØšØ±ÙÙØ³Ù ØªÙØ± ØšÙØ¬Ø§Ø! -torbutton.popup.test.failure = ÙØŽÙØª Ø¹ÙÙÙØ© Ø§Ø®ØªØšØ§Ø± ØšØ±ÙÙØ³Ù ØªÙØ±! ØªØ£ÙØ¯ ÙÙ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØšØ±ÙÙØ³Ù Ø§ÙØ®Ø§Øµ ØšÙ ÙØ¥Ø¹Ø¯Ø§Ø¯Ø§Øª Polipo . -torbutton.popup.test.confirm_toggle = ÙØŽÙ Ø¢Ø®Ø± Ø§Ø®ØªØšØ§Ø± ÙØšØ±ÙÙØ³Ù ØªÙØ± ÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù ØªÙØ±.\n\nÙÙ Ø£ÙØª ÙØªØ£ÙØ¯ ÙÙ Ø£ÙÙ ØªØ±ÙØ¯ ØªÙØ¹ÙÙÙ Ø¹ÙÙ Ø£Ù ØØ§ÙØ\n\nÙÙØ§ØØžØ©: Ø¥Ù ÙÙØª ÙØ¯ Ø¹Ø§ÙØ¬Øª Ø§ÙÙØŽÙÙØ©Ø ÙÙÙÙÙ Ø¥Ø¹Ø§Ø¯Ø© Ø¥Ø¬Ø±Ø§Ø¡ Ø§ÙÙØØµ ÙÙ ÙØ§ÙØ°Ø© Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØšØ±ÙÙØ³Ù ÙØ²Ø± ØªÙØ± ØØªÙ ÙØ®ØªÙÙ ÙØ°Ø§ Ø§ÙØªÙØšÙÙ. -torbutton.popup.test.ff3_notice = Ø§Ø¶ØºØ· "ÙÙØ§ÙÙ" ÙØ§Ø®ØªØšØ§Ø± Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØšØ±ÙÙØ³Ù ØªÙØ±. ÙØ°Ø§ Ø§ÙØ§Ø®ØªØšØ§Ø± Ø³ÙØªÙ ÙÙ Ø§ÙØ®ÙÙÙØ©. ÙØ±Ø¬Ù Ø§ÙØ§ÙØªØžØ§Ø±. torbutton.popup.external.title = ÙÙ ØªØ±ÙØ¯ ØªÙØ²ÙÙ ÙÙÙØ§Ù ÙÙ ÙÙØ¹ Ø§ÙÙØµÙØ© Ø§ÙØ®Ø§Ø±Ø¬ÙØ©Ø torbutton.popup.external.app = ÙØ§ ÙÙÙÙ ÙÙØªØµÙÙØ ØªÙØ± Ø¹Ø±Ø¶ ÙØ°Ù Ø§ÙÙÙÙ, ÙØ¬Øš Ø¹ÙÙÙ Ø£Ù ØªÙØªØÙ ØšØ§Ø³ØªØ¹ÙØ§Ù ØªØ·ØšÙÙ Ø£Ø®Ø±.\n\n torbutton.popup.external.note = ØšØ¹Ø¶ Ø§ÙØ£ÙÙØ§Ø¹ ÙÙ Ø§ÙÙÙÙØ§Øª ÙØ¯ ØªØ¹ÙÙ Ø¹ÙÙ Ø¥Ø¹Ø·Ø§Ø¡ ØšØ¹Ø¶ Ø§ÙØªØ·ØšÙÙØ§Øª Ø§ÙØ¥ÙÙØ§ÙÙÙØ© ÙÙØ§ØªØµØ§Ù ØšØ§ÙØ¥ÙØªØ±ÙØª Ø¯ÙÙ Ø§Ø³ØªØ¹ÙØ§Ù ØªÙØ±.\n\n @@ -22,12 +18,8 @@ torbutton.popup.external.suggest = ÙØ³ÙØ§ÙØªÙ, ÙØ¬Øš Ø¹ÙÙÙ ÙØªØ Ø§ÙÙ torbutton.popup.launch = ØªØÙÙÙ Ø§ÙÙÙÙ torbutton.popup.cancel = Ø¥ÙØºØ§Ø¡ torbutton.popup.dontask = Ø£ÙØ²Ù Ø§ÙÙÙÙØ§Øª ØšØŽÙÙÙ Ø£ÙØªÙÙØ§ØªÙÙÙÙ ÙÙ Ø§ÙØ£Ù ÙØµØ§Ø¹Ø¯Ø§Ù -torbutton.popup.test.no_http_proxy = ÙØØµ ØšØ±ÙÙØ³Ù ØªÙØ±: ÙØ§ ÙÙÙÙ Ø§ÙÙØµÙÙ Ø¥ÙÙ ØšØ±ÙÙØ³Ù HTTP Ø§ÙÙØÙÙ. ÙÙ ÙØ¹ÙÙ Polipo ØšØŽÙÙ ØµØÙØØ torbutton.popup.prompted_language = ØØªÙ ÙÙÙØÙ Ø²Ø± ØªÙØ± ÙØ²ÙØ¯Ø§Ù ÙÙ Ø§ÙØ®ØµÙØµÙØ©Ø ÙØ³ØªØ·ÙØ¹ Ø²Ø± ØªÙØ± Ø·ÙØš Ø§ÙÙØ³Ø® Ø§ÙØ¥ÙØ¬ÙÙØ²ÙØ© ÙÙ ØµÙØØ§Øª Ø§ÙØ§ÙØªØ±ÙØª. ÙÙØ¯ ÙÙØªØ¬ Ø¹Ù Ø°ÙÙ Ø¹Ø±Ø¶ Ø§ÙØµÙØØ§Øª Ø§ÙØªÙ ØªÙØ¶Ù ÙØ±Ø§Ø¡ØªÙØ§ ØšÙØºØªÙ Ø§ÙØ£Ù ØšØ§ÙÙØºØ© Ø§ÙØ¥ÙØ¬ÙÙØ²ÙØ©.\n\nÙÙ ØªØ±ÙØ¯ Ø·ÙØš ØµÙØØ§Øª Ø§ÙÙØš ØšØ§ÙÙØºØ© Ø§ÙØ¥ÙØ¬ÙÙØ²ÙØ© ÙØ®ØµÙØµÙØ© Ø§ÙØ¶ÙØ torbutton.popup.no_newnym = ÙØ§ ÙÙÙÙ ÙØ²Ø± ØªÙØ± Ø£Ù ÙØ¹Ø·ÙÙ ÙÙÙØ© Ø¬Ø¯ÙØ¯Ø© ØšØŽÙÙ Ø¢ÙÙØ ÙÙØ°Ø§ ÙØ§Ù Ø²Ø± ØªÙØ± ÙØ§ ÙØ³ØªØ·ÙØ¹ Ø§ÙÙØµÙÙ Ø¥ÙÙ ÙÙÙØ° Ø§ÙØªØÙÙ Ø§ÙØ®Ø§Øµ ØšØªÙØ±.\n\nÙÙ ØªØ³ØªØ®Ø¯Ù ØØ²ÙØ© ÙØªØµÙØ ØªÙØ± ØØ§ÙÙØ§ÙØ -torbutton.popup.pref_error = ÙØ§ ÙÙÙÙ ÙØ²Ø± ØªÙØ± ØªØØ¯ÙØ« Ø§ÙØªÙØ¶ÙÙØ§Øª ÙÙ ÙØ¬ÙØ¯ ÙØªØµÙØ ØªÙØ±. -torbutton.popup.permission_denied = ÙØ±Ø¬Ù Ø£Ù ØªÙÙÙ ØšØªØºÙÙØ± Ø§ÙØµÙØ§ØÙØ§Øª ÙÙØ¬ÙØ¯ ÙØªØµÙØ ØªÙØ± Ø£Ù ÙÙ ØšÙÙÙÙ Ø¥ÙÙ ÙÙØ§Ù Ø¢Ø®Ø±. -torbutton.popup.device_full = ÙØšØ¯Ù Ø£Ù Ø§ÙÙØ±Øµ Ø§ÙØµÙØš ÙÙØªÙØŠ. ÙØ±Ø¬Ù ØªÙØ±ÙØº ÙØ³Ø§ØØ© Ø£ÙØ«Ø± Ø£Ù ÙÙ ØšÙÙÙ ÙØªØµÙØ ØªÙØ± Ø¥ÙÙ ÙØØ¯Ø© ØªØ®Ø²ÙÙ Ø£Ø®Ø±Ù. torbutton.title.prompt_torbrowser = ÙØ¹ÙÙÙØ§Øª ÙØ§ÙØ© Ø¹Ù ØªÙØ± torbutton.popup.prompt_torbrowser = ÙÙØ¯ ØªØºÙØ±Øª Ø·Ø±ÙÙØ© Ø¹ÙÙ Ø²Ø± ØªÙØ± Ø§ÙØ§Ù: ÙØ§ ÙÙÙÙÙ Ø¥ÙÙØ§ÙÙ Ø§ÙØ§Ù \n\nÙÙÙØ§ ØšÙØ°Ø§ Ø§ÙØªØºÙÙØ± ÙØ§ÙÙ Ø§ØµØšØ ÙÙ ØºÙØ± Ø§ÙØ¢ÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù Ø²Ø± ØªÙØ± ÙÙ Ø§ÙÙØªØµÙØ Ø§ÙØ°Ù ÙØ³ØªØ®Ø¯Ù ÙÙ Ø§ÙØªØµÙØ Ø®Ø§Ø±Ø¬ ØªÙØ±. ÙØ§Ù ÙÙØ§Ù Ø§ÙØ¹Ø¯ÙØ¯ ÙÙ Ø§ÙØ¹ÙÙ Ù Ø§ÙØªÙ ÙÙ ÙÙÙÙ ÙÙ Ø§ÙÙÙÙÙ ÙØ¹Ø§ÙØ¬ØªÙØ§ ØšØ§Ù Ø·Ø±ÙÙØ© Ø§Ø®Ø±Ù.\n\nØ¥Ø°Ø§ Ø§Ø±Ø¯Øª Ø§ÙØ§Ø³ØªÙØ±Ø§Ø± ÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù ÙØ§ÙØ±ÙÙÙØ³ ØªÙÙÙØ¯ÙØ§ÙØ ÙØªÙØ¬Øš Ø¹ÙÙÙ Ø¥Ø²Ø§ÙØ© Ø²Ø± ØªÙØ± Ù ØªØÙÙÙ ØØ²ÙØ© ÙØªØµÙØ ØªÙØ±. ÙÙØ§ Ø§Ù Ø®ØµØ§ØŠØµ Ø§ÙØ®ØµÙØµÙØ© ÙÙØªØµÙØ ØªÙØ± ØªØªÙÙÙ Ø¹ÙÙ ØªÙÙ Ø§ÙØªÙ ÙÙ ÙØªØµÙØ ÙØ§ÙØ±ÙÙÙØ³ Ø§ÙØªÙÙÙØ¯ÙØ ØØªÙ ÙÙ ØªÙ Ø§Ø³ØªØ®Ø¯Ø§Ù ÙØªØµÙØ ÙØ§ÙØ±ÙÙÙØ³ ÙØ¹ Ø²Ø± ØªÙØ±.\n\nÙØ¥Ø²Ø§ÙØ© Ø²Ø± ØªÙØ±Ø Ø§Ø°ÙØš Ø¥ÙÙ Ø£Ø¯ÙØ§Øª->Ø¥Ø¶Ø§ÙØ§Øª->ÙØÙÙØ§Øª Ø Ø«Ù Ø¥Ø¶ØºØ· Ø¹ÙÙ Ø²Ø± Ø¥Ø²Ø§ÙØ© Ø§ÙØ°Ù ØšØ¬Ø§ÙØš Ø ²Ø± ØªÙØ±. torbutton.popup.short_torbrowser = ÙØ¹ÙÙÙØ§Øª ÙØ§ÙØ© Ø¹Ù Ø²Ø± ØªÙØ± \n\nØªÙ ØªÙÙÙÙ Ø²Ø± ØªÙØ± ÙÙØ¹ÙÙ ØšØ§Ø³ØªÙØ±Ø§Ø± Ø§ÙØ§Ù\n\nØ§Ø¶ØºØ· Ø¹ÙÙ Ø²Ø± ØªÙØ± ÙÙÙØ²ÙØ¯ ÙÙ Ø§ÙÙØ¹ÙÙÙØ§Øª diff --git a/src/chrome/locale/arn/torbutton.dtd b/src/chrome/locale/arn/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/arn/torbutton.dtd +++ b/src/chrome/locale/arn/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/arn/torbutton.properties b/src/chrome/locale/arn/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/arn/torbutton.properties +++ b/src/chrome/locale/arn/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/ast/torbutton.dtd b/src/chrome/locale/ast/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/ast/torbutton.dtd +++ b/src/chrome/locale/ast/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/ast/torbutton.properties b/src/chrome/locale/ast/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/ast/torbutton.properties +++ b/src/chrome/locale/ast/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/az/torbutton.dtd b/src/chrome/locale/az/torbutton.dtd index be32e17..68a3f88 100644 --- a/src/chrome/locale/az/torbutton.dtd +++ b/src/chrome/locale/az/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proksi qurÄularÄ±"> -<!ENTITY torbutton.prefs.recommended_settings " Firefox -un versiyasÄ± ÃŒÃ§ÃŒn uyÄun proksi qurÄularÄ±ndan istifadÉ et"> -<!ENTITY torbutton.prefs.use_polipo "Polipo-nu istifadÉ et"> -<!ENTITY torbutton.prefs.custom_settings "Proksinin fÉrdi qurÄusundan istifadÉ et"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proksi:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proksi:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proksi:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proksi:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Bu qurÄularÄ± dÉyiÅmÉk ÃŒÃ§ÃŒn TordÃŒymÉsini sÃ¶ndÃŒr."> -<!ENTITY torbutton.pref_connection.more_info "Daha Ã§ox mÉlumat"> -<!ENTITY torbutton.pref_connection_more_info.title "KÃ¶mÉk"> -<!ENTITY torbutton.pref_connection_more_info.text "TordÃŒymÉsi hal hazÄ±rda yanÄ±lÄ±dÄ±r. ÆgÉr Tordan baÅqa qurÄularÄ± dÉyiÅmÉk istÉyirsÉnsÉ zÉhmÉt olmasa TordÃŒymÉsini sÃ¶ndÃŒrÃŒn vÉ bura qayÄ±dÄ±n. ÆgÉr Tor qurÄularÄ±nÄ± dÉyiÅmÉk istÉyirsÉnsÉ zÉhmÉt olmasa TordÃŒymÉsi seÃ§imlÉri pÉncÉrÉsindÉn istifadÉ edin."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "SeÃ§imlÉr..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "TordÃŒymÉsini baÅlatmaq ÃŒÃ§ÃŒn kliklÉyin"> <!ENTITY torbutton.prefs.restore_defaults "VarsayÄ±lanlarÄ± yenidÉn yÃŒklÉ"> -<!ENTITY torbutton.prefs.test_settings "Test qurÄularÄ±"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Bunun ÃŒÃ§ÃŒn ProksilÉr yoxdu"> -<!ENTITY torbutton.prefs.no_proxy_warning "XÉbÉrdarlÄ±q : YuxarÄ±da istÉnilÉn hostnames-dÉn istifadÉ etmÉkdÉn boyun qaÃ§Ä±rÄ±n"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/az/torbutton.properties b/src/chrome/locale/az/torbutton.properties index 06ffc8a..7cb3271 100644 --- a/src/chrome/locale/az/torbutton.properties +++ b/src/chrome/locale/az/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Toru sÃ¶ndÃŒrmÉk ÃŒÃ§ÃŒn kliklÉ torbutton.panel.label.disabled = Tor sÃ¶nÃŒlÃŒdÃŒr torbutton.panel.label.enabled = Tor yanÄ±lÄ±dÄ±r extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proksi testi mÃŒvÉffÉqiyyÉtlidir! -torbutton.popup.test.failure = Tor proksi testi sÉhvdir! Proksinizi vÉ Polipo qurÄunuzu yoxlayÄ±n. -torbutton.popup.test.confirm_toggle = Tor proksi testi Tordan istifadÉyÉ mÃŒvÉffÉq olmadÄ±.\n\nSiz hÉr halda imkan vermÉk istÉyirsiniz?\n\nQeyd: ÆgÉr siz problemi meÉyyÉnlÉÅdirmiÅsinizsÉ, bu xÉbÉrdarlÄ±ÄÄ± lÉÄv etmÉk ÃŒÃ§ÃŒn TordÃŒymÉsi Proksi ÃstÃŒnlÃŒklÉri pÉncÉrÉsindÉ testi tÉkrar iÅÉ sala bilÉrsiniz. -torbutton.popup.test.ff3_notice = Tor proksi qurÄularÄ±nÄ± test etmÉk ÃŒÃ§ÃŒn Ok kliklÉ. Bu test arxaplanda baÅ verÉcÉk. EhtiyatlÄ± olun. torbutton.popup.external.title = Xarici mÉzmun yÃŒklÉnsin? torbutton.popup.external.app = Ä°darÉ etmÉk ÃŒÃ§ÃŒn xarici tÉtbiqÉ ehtiyac duyulur:\n\n torbutton.popup.external.note = \n\nQEYD: Xarici tÉtbiqlÉr Tor ÃŒÃ§ÃŒn uyÄun olmaya bilÉr vÉ bu sizi ifÅa edÉ bilÉr!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = BuraxÄ±lÄ±Å ÉrizÉsi torbutton.popup.cancel = LÉÄv et torbutton.popup.dontask = Bundan sonra ÉrizÉlÉri iÅÉ salÄ±n -torbutton.popup.test.no_http_proxy = Tor proksi testi: Yerli HTTP Proksisi ÉlÃ§ÉtmazdÄ±r. Polipo uyÄun ÅÉkildÉ davam edir? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/be/torbutton.dtd b/src/chrome/locale/be/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/be/torbutton.dtd +++ b/src/chrome/locale/be/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/be/torbutton.properties b/src/chrome/locale/be/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/be/torbutton.properties +++ b/src/chrome/locale/be/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/bg/torbutton.dtd b/src/chrome/locale/bg/torbutton.dtd index 6bee2cd..1c6f284 100644 --- a/src/chrome/locale/bg/torbutton.dtd +++ b/src/chrome/locale/bg/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "ÐÑÐŸÐºÑÐž ÐœÐ°ÑÑÑÐŸÐ¹ÐºÐž"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "ÐÐŸÑÑ:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "ÐÐŸÐŒÐŸÑ"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "ÐÐŸÐ²Ð° ÑÐ°ÐŒÐŸÐ»ÐžÑÐœÐŸÑÑ"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "ÐÑÐ·ÑÑÐ°ÐœÐŸÐ²Ðž ÑÑÐ°ÐœÐŽÐ°ÑÑÐœÐžÑÐµ"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/bg/torbutton.properties b/src/chrome/locale/bg/torbutton.properties index 3c69881..6fab40e 100644 --- a/src/chrome/locale/bg/torbutton.properties +++ b/src/chrome/locale/bg/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = ÐÑÐºÐ°Ð· torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/bms/torbutton.dtd b/src/chrome/locale/bms/torbutton.dtd index 4a79cda..110938d 100644 --- a/src/chrome/locale/bms/torbutton.dtd +++ b/src/chrome/locale/bms/torbutton.dtd @@ -1,28 +1,9 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy ááºááá¹áááááºáá¹ááºá¬áž"> -<!ENTITY torbutton.prefs.recommended_settings "á¡áŸáá¶á»áá³ á±áá¬áá¹áá¶á±áá¬ proxy ááºááá¹áááááºáá¹ááºá¬ážááá¯ ááááá Firefox version ááŒáá¹ á¡áá¶á¯ážá»áá³ááá¹"> -<!ENTITY torbutton.prefs.use_polipo "Polipo ááá¯ á¡áá¶á¯ážá»áá³ááá¹"> -<!ENTITY torbutton.prefs.custom_settings "proxy ááºááá¹áááááºáá¹ááºá¬ážááá¯ áááá¹áŸááá³áá¹á»áá³á»ááá¹á á¡áá¶á¯ážá»áá³ááá¹"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP áá±áá¬á·áá® :"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL áá±áá¬á·áá® :"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP áá±áá¬á·áá® :"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher áá±áá¬á·áá®"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host :"> -<!ENTITY torbutton.prefs.proxy.port "Port :"> -<!ENTITY torbutton.pref_connection.notice "ááá¹ážááºááá¹áááááºáá¹ááºá¬ážááá¯ á±á»áá¬áá¹ážáá²ááá¹á¡ááŒáá¹ Torbutton áá¯á áááá¹áá¬ážááá¹"> -<!ENTITY torbutton.pref_connection.more_info "ááá¯áá¯áá»ááá¹á·áá¶á¯á±áá¬ áááá¹ážá¡ááºáá¹á¡ááá¹ááºá¬ážááá¯á"> -<!ENTITY torbutton.pref_connection_more_info.title "áá°áá®ááááá°ááá¹"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton áá¯á ááá¹ááœáááŒáá¹ á¡áá¶á¯ážá»áá³áá¯ááá¹áá«ááá¹á Tor Proxy ááá¯áá¹á±áá¬ ááºááá¹áááááºáá¹ááºá¬ážááá¯ á±á»áá¬áá¹ážáá² á¡áá¶á¯ážá»áá³áá¯ááá¹ááá¹á¡ááŒáá¹ Torbutton áá¯á á¡áá¶á¯ážáá»áá³ááá¯áá¹á±á¡á¬áá¹ áááá¹á ááá¯á±ááá¬ááá¯á á»ááá¹áá¬áá«á Tor ááºááá¹áááááºáá¹ááºá¬ážááá¯ á±á»áá¬áá¹ážáá²ááá¯áá«á Torbutton á¥á®ážáá¬ážá±áážáááá¹á»áááºáá¹ááºá¬ážááá¯ ááá¯ á¡áá¶á¯ážá»áá³áá«á"> <!ENTITY torbutton.context_menu.preferences "á¥á®ážáá¬ážá±ááž áááá¹á»áááááºá¬áž"> <!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Torbutton áááá¹ááá¹ áááá¹áá¯áá¹áá«"> <!ENTITY torbutton.prefs.restore_defaults "áá°áá¡á±á»áá¡á±áááá¯á á»ááá¹ááá¹ ááá·á¹ááŒáá¹ážááá¹"> -<!ENTITY torbutton.prefs.test_settings "ááºááá¹áááááááºá¬ážááá¯ ááá¹ážááá¹ááá¹"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "ááá¹ážááá¯áá¡ááŒáá¹ proxy áááœááá«:"> -<!ENTITY torbutton.prefs.no_proxy_warning "áááá±áážááºáá¹: á¡ááá¹á±áá¬á¹á»ááá« hostname ááºá¬ážá¡áá¶á¯ážáá»áá³ááá¹"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -34,4 +15,3 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> diff --git a/src/chrome/locale/bms/torbutton.properties b/src/chrome/locale/bms/torbutton.properties index ff02845..14517d0 100644 --- a/src/chrome/locale/bms/torbutton.properties +++ b/src/chrome/locale/bms/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Tor á¡áá¶á¯ážá»áá³ááŒáá¹á· torbutton.panel.label.disabled = Tor á¡áá¶á¯ážáá»áá³áá¯ááá¹áá« torbutton.panel.label.enabled = Tor á¡áá¶á¯ážá»áá³áá¯ááá¹áá«ááá¹á extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Tor proxy áá¯á Firefox ááŒáá¹ á¡ááŒáá¹ááá° á¡áá¶á¯ážá»áá³ááŒáá¹á· á»áá³ááá¹/ áá»áá³ááá¹ Torbutton ááœ ááá¯áá¹ááá¹áá¯áá¯á ááá¹á·ááŒáá¹ážáá¬ážáá«ááá¹ -torbutton.popup.test.success = Tor proxy ááá¹ážááá¹áá á±á¡á¬áá¹á»ááá¹áá«ááá¹ ! -torbutton.popup.test.failure = Tor proxy ááá¹ážááá¹áá áá±á¡á¬áá¹á»ááá¹áá« ! ááá¹á proxy ááœáá¹á· Privoxy ááºááá¹áááááááºá¬ážááá¯ ááá¹á±áážáá«á -torbutton.popup.test.confirm_toggle = á±áá¬áá¹áá¶á¯ážááá¹ážááá¹áá¬ážá±áá¬ Proxy Test ááœ Tor ááá¯ááááá¹ááá¯áá¹áá«á \n\nTor ááá¯ enable áá¯áá¹ááá¹á±áááºá¬áá«ááá¬ážá\n\náááá»áá³ááá¹-á»ááá¹ááá¹ááœá³ááºá¬ážááá¯á»áá³áá¯áá¹á»áá®ážáá«áá Torbutton Proxy Preferences window ááœ á€áááá±áážááºáá¹ááá¯ áááá¹ááá¹ááá¯á¹áá¹áá«ááá¹á -torbutton.popup.test.ff3_notice = Tor proxy ááºááá¹áááááááºá¬ážáá¯á ááá¹ážááá¹ááá¹ OK áá¯á áááá¹ááœááá¹áá«á ááá¹ážááá¹ááááá¹ á±áá¬áá¹ááŒáá¹ááŒáá¹ á»áá³áá¯áá¹áá«ááá¹á á±ááºážáá°ážá»áá³á ááá¹ážáá¶á±áá¬áá¹á·áá¯ááá¹ážá±áážáá«ááá¹á torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,4 +10,3 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? diff --git a/src/chrome/locale/bn-IN/torbutton.dtd b/src/chrome/locale/bn-IN/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/bn-IN/torbutton.dtd +++ b/src/chrome/locale/bn-IN/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/bn-IN/torbutton.properties b/src/chrome/locale/bn-IN/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/bn-IN/torbutton.properties +++ b/src/chrome/locale/bn-IN/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/bn/torbutton.dtd b/src/chrome/locale/bn/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/bn/torbutton.dtd +++ b/src/chrome/locale/bn/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/bn/torbutton.properties b/src/chrome/locale/bn/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/bn/torbutton.properties +++ b/src/chrome/locale/bn/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/bo/torbutton.dtd b/src/chrome/locale/bo/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/bo/torbutton.dtd +++ b/src/chrome/locale/bo/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/bo/torbutton.properties b/src/chrome/locale/bo/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/bo/torbutton.properties +++ b/src/chrome/locale/bo/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/br/torbutton.dtd b/src/chrome/locale/br/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/br/torbutton.dtd +++ b/src/chrome/locale/br/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/br/torbutton.properties b/src/chrome/locale/br/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/br/torbutton.properties +++ b/src/chrome/locale/br/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/bs/torbutton.dtd b/src/chrome/locale/bs/torbutton.dtd index b7d0233..ee65693 100644 --- a/src/chrome/locale/bs/torbutton.dtd +++ b/src/chrome/locale/bs/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proksi postavke"> -<!ENTITY torbutton.prefs.recommended_settings "Koristi preporuÄene opcije proksija za moju verziju Firefoxa"> -<!ENTITY torbutton.prefs.use_polipo "Koristi Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Koristi standardne proksi postavke"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP proksi:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proksi:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proksi:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proksi:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "OnemoguÄi Torbutton za promjenu ovih postavki."> -<!ENTITY torbutton.pref_connection.more_info "ViÅ¡e Informacija"> -<!ENTITY torbutton.pref_connection_more_info.title "PomoÄ"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Prioriteti..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Klikni za pokretanje Torbutton-a"> <!ENTITY torbutton.prefs.restore_defaults "Vrati poÄetno"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/bs/torbutton.properties b/src/chrome/locale/bs/torbutton.properties index bcd8db7..21d05ed 100644 --- a/src/chrome/locale/bs/torbutton.properties +++ b/src/chrome/locale/bs/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = OtkaÅŸi torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd index 0b11775..37c705f 100644 --- a/src/chrome/locale/ca/torbutton.dtd +++ b/src/chrome/locale/ca/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "ConfiguraciÃ³ del proxy"> -<!ENTITY torbutton.prefs.recommended_settings "Utilitza la configuraciÃ³ recomanada de proxy per a la meva versiÃ³ de Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Utilitza Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Utilitza una configuraciÃ³ del proxy personalitzada"> -<!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:"> -<!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:"> -<!ENTITY torbutton.prefs.proxy.host.socks "AmfitriÃ³ SOCKS:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "No permetis que Torbutton canvii aquesta configuraciÃ³."> -<!ENTITY torbutton.pref_connection.more_info "MÃ©s informaciÃ³"> -<!ENTITY torbutton.pref_connection_more_info.title "Ajuda"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton estÃ activat. Si voleu canviar la configuraciÃ³ del vostre proxy quan no funciona Tor, desactiveu Torbutton i torneu aquÃ. Si voleu canviar la configuraciÃ³ de Tor, utilitzeu la finestra de preferÃšncies de Torbutton."> <!ENTITY torbutton.context_menu.new_identity "Nova identitat"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "PreferÃšncies..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Feu clic per a iniciar Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Reestableix predeterminats"> -<!ENTITY torbutton.prefs.test_settings "Test de configuraciÃ³"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No hi ha Proxys per a:"> -<!ENTITY torbutton.prefs.no_proxy_warning "Alerta: eviteu utilitzar cap dels noms de l'equip d'aquÃ sobre."> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/ca/torbutton.properties b/src/chrome/locale/ca/torbutton.properties index 742fac5..232359a 100644 --- a/src/chrome/locale/ca/torbutton.properties +++ b/src/chrome/locale/ca/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Feu clic per a desactivar Tor torbutton.panel.label.disabled = Tor estÃ desactivat torbutton.panel.label.enabled = Tor estÃ activat extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Prova del proxy Tor realitzada amb Ãšxit. -torbutton.popup.test.failure = La prova del proxy Tor ha fallat. Reviseu les preferÃšncies de Polipo i del vostre proxy. -torbutton.popup.test.confirm_toggle = La prova mÃ©s recent del proxy Tor no s'ha pogut connectar a Tor.\n\nSegur que voleu activar-lo igualment?\n\nNota: si ja s'ha solucionat el problema, podeu repetir la prova a la finestra de PreferÃšncies de Proxy Torbutton per a eleminar aquest avÃs. -torbutton.popup.test.ff3_notice = Feu clic a "D'acord" per a provar les preferÃšncies del proxy Tor. Aquesta prova es realitzarÃ en segon terme. Tingueu paciÃšncia. torbutton.popup.external.title = Voleu carregar els continguts externs? torbutton.popup.external.app = Es necessita una aplicaciÃ³ externa per a manejar:\n\n torbutton.popup.external.note = \n\nAvÃs: les aplicacions externes no estan adaptades a Tor per defecte i podrien revelar la vostra identitat.\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nSi aquest arxiu no Ã©s de fiar, haurieu o b torbutton.popup.launch = Inicia l'aplicaciÃ³ torbutton.popup.cancel = CancelÂ·la torbutton.popup.dontask = Inicia les aplicacions automÃ ticament -torbutton.popup.test.no_http_proxy = Prova de proxy Tor: no es pot assolir el Proxy HTTP local. Comproveu si Polipo funciona correctament. torbutton.popup.prompted_language = Per donar-vos mÃ©s privacitat, Torbutton pot demanar la versiÃ³ en anglÃšs de les pÃ gines web. AixÃ² pot provocar que pÃ gines web que preferiu veure a la vostra llengua nativa siguin mostrades en anglÃšs.\n\nDesitjeu demanar les pÃ gines web en anglÃšs per una major privacitat? torbutton.popup.no_newnym = Torbutton no pot adjudicar-vos de forma segura una nova identitat. No disposa d'accÃ©s al Tor Control Port.\n\nEsteu usant Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton no pot actualitzar les preferÃšncies al directori de perfil del Tor Browser. -torbutton.popup.permission_denied = Siusplau, o bÃ© re-inicieu els permisos del directori Tor Browser o copieu-lo a una nova ubicaciÃ³. -torbutton.popup.device_full = Sembla que el disc Ã©s ple. Siusplau allibereu espai o moveu Tor Browser a un nou dispositiu. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd index 0d4498f..eb7dc36 100644 --- a/src/chrome/locale/cs/torbutton.dtd +++ b/src/chrome/locale/cs/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "NastavenÃ Proxy"> -<!ENTITY torbutton.prefs.recommended_settings "PouÅŸÃt doporuÄenÃ¡ nastavenÃ proxy pro mou verzi Firefoxu"> -<!ENTITY torbutton.prefs.use_polipo "PouÅŸitÃ Polipo"> -<!ENTITY torbutton.prefs.custom_settings "PouÅŸÃt vlastnÃ nastavenÃ proxy"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "ZakÃ¡zat aplikaci Torbutton toto nastavenÃ mÄnit."> -<!ENTITY torbutton.pref_connection.more_info "VÃce informacÃ"> -<!ENTITY torbutton.pref_connection_more_info.title "NÃ¡povÄda"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton je momentÃ¡lnÄ zapnutÃœ. Pokud chcete zmÄnit vaÅ¡e non-Tor proxy nastavenÃ, vypnÄte prosÃm Torbutton a vraÅ¥te se. Pokud chcete zmÄnit vaÅ¡e Tor nastavenÃ, pouÅŸijte prosÃm okno nastavenÃ Torbutton"> <!ENTITY torbutton.context_menu.new_identity "Nova identita"> <!ENTITY torbutton.context_menu.new_identity_key "S"> <!ENTITY torbutton.context_menu.preferences "NastavenÃ..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "KliknÄte pro inicializaci Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "PÅ¯vodnÃ nastavenÃ"> -<!ENTITY torbutton.prefs.test_settings "Test nastavenÃ"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/cs/torbutton.properties b/src/chrome/locale/cs/torbutton.properties index 819dea7..c53d446 100644 --- a/src/chrome/locale/cs/torbutton.properties +++ b/src/chrome/locale/cs/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Klikni pro zakÃ¡zÃ¡nÃ Tor torbutton.panel.label.disabled = Tor Zapnut torbutton.panel.label.enabled = Tor Vypnut extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Test Tor proxy byl ÃºspÄÅ¡nÃœ! -torbutton.popup.test.failure = Test Tor proxy SELHAL! Zkontrolujte svÃ© nastavenÃ proxy a Polipo. -torbutton.popup.test.confirm_toggle = PoslednÃmu proxy testu se nepodaÅilo pouÅŸÃt Tor.\n\nChcete ho pÅesto zapnout?\n\nPoznÃ¡mka: Pokud jste problÃ©m opravili, mÅ¯ÅŸete znovu rozbÄhnout test v oknÄ NastavenÃ Torbutton Proxy; pokud bude ÃºspÄÅ¡nÃœ, tato zprÃ¡va se jiÅŸ nebude zobrazovat. -torbutton.popup.test.ff3_notice = KliknÄte OK k otestovÃ¡nÃ Tor proxy nastavenÃ. Tento test probÄhne na pozadÃ. ProsÃme o strpenÃ. torbutton.popup.external.title = NaÄÃst vnÄjÅ¡Ã obsah? torbutton.popup.external.app = Je potÅeba vnÄjÅ¡Ã aplikace k jednÃ¡nÃ s: \n torbutton.popup.external.note = \nPOZNÃMKA: VnÄjÅ¡Ã aplikace NEJSOU Torem zabezpeÄenÃ© a mohou odkrÃœt VaÅ¡e informace!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nPokud tomuto souboru nevÄÅÃte, mÅ¯ÅŸete torbutton.popup.launch = Spustit aplikaci torbutton.popup.cancel = ZruÅ¡it torbutton.popup.dontask = OdteÄ vÅŸdy spouÅ¡tÄt aplikace -torbutton.popup.test.no_http_proxy = Tor proxy test: MÃstnÃ HTTP proxy je nedosaÅŸitelnÃ¡. Funguje Polipo sprÃ¡vnÄ? torbutton.popup.prompted_language = K poskytnutÃ vÄtÅ¡Ãho soukromÃ, Torbutton mÅ¯ÅŸe poÅŸadovat anglickou verzi internetovÃœch strÃ¡nek. StrÃ¡nky kterÃ© chcete ÄÃst ve svÃ©m jazyce se mohou zobrazit namÃsto toho v angliÄtinÄ.\n\nChtÄli byste poÅŸadovat anglicky psanÃ© strÃ¡nky pro vÄtÅ¡Ã soukromÃ? torbutton.popup.no_newnym = Torbutton nemÅ¯ÅŸe bezpeÄnÄ poskytnout novou identitu. NemÃ¡ pÅÃstup k pÅÃstupovÃ©mu portu Tor.\n\nMÃ¡te spuÅ¡tÄn Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/csb/torbutton.dtd b/src/chrome/locale/csb/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/csb/torbutton.dtd +++ b/src/chrome/locale/csb/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/csb/torbutton.properties b/src/chrome/locale/csb/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/csb/torbutton.properties +++ b/src/chrome/locale/csb/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/cy/torbutton.dtd b/src/chrome/locale/cy/torbutton.dtd index 4d6d577..c46b25d 100644 --- a/src/chrome/locale/cy/torbutton.dtd +++ b/src/chrome/locale/cy/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Gosodiadau Procsi"> -<!ENTITY torbutton.prefs.recommended_settings "Defnyddiwch y gosodiadau procsi a argymhellir ar gyfer fy fersiwn o Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Defnyddiwch Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Defnyddiwch gosodiadau procsi addasiedig"> -<!ENTITY torbutton.prefs.proxy.host.http "Procsi HTTP:"> -<!ENTITY torbutton.prefs.proxy.host.https "Procsi SSL:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "Procsi FTP:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Procsi Gopher:"> -<!ENTITY torbutton.prefs.proxy.host.socks "Gwesteiwr SOCKS:"> -<!ENTITY torbutton.prefs.proxy.port "Porth"> -<!ENTITY torbutton.pref_connection.notice "Analluoga Torbutton i newid y gosodiadau yma."> -<!ENTITY torbutton.pref_connection.more_info "Mwy o gwybodaeth"> -<!ENTITY torbutton.pref_connection_more_info.title "ÐÐŸÐ¿ÐŸÐŒÐŸÐ³Ð°"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Dewisiadau"> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Cliciwch i ymgychwyn Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS V5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/cy/torbutton.properties b/src/chrome/locale/cy/torbutton.properties index 6d43ba5..436f924 100644 --- a/src/chrome/locale/cy/torbutton.properties +++ b/src/chrome/locale/cy/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Cliciwch i analluogu Tor torbutton.panel.label.disabled = Tor Anabl torbutton.panel.label.enabled = Tor Galluog extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Prawf procsi Tor llwyddiannus! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Canslo torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd index 7a8d28a..a697bd7 100644 --- a/src/chrome/locale/da/torbutton.dtd +++ b/src/chrome/locale/da/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy-indstillinger"> -<!ENTITY torbutton.prefs.recommended_settings "Brug de anbefalede proxyindstillinger til min version af Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Brug Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Brug brugerdefinerede proxyindstillinger"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Deaktiver Torbutton for at ÃŠndre disse indstillinger."> -<!ENTITY torbutton.pref_connection.more_info "Mere Information"> -<!ENTITY torbutton.pref_connection_more_info.title "HjÃŠlp"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton er i Ãžjeblikket aktiveret. Hvis du vil ÃŠndre dine ikke-Tor proxyindstillinger, skal du deaktivere Torbutton og vende tilbage hertil. Hvis du vil ÃŠndre dine Tor indstillinger, kan du benytte Torbuttons Indstillingsvindue."> <!ENTITY torbutton.context_menu.new_identity "Ny identitet"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Indstillinger..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Klik for at starte Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Gendan Standarder"> -<!ENTITY torbutton.prefs.test_settings "Test Indstillinger"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Ingen Proxies for:"> -<!ENTITY torbutton.prefs.no_proxy_warning "Advarsel: UndgÃ¥ at bruge enhver vÃŠrtsnavne ovenfor"> <!ENTITY torbutton.cookiedialog.title "HÃ¥ndtÃ©r Cookie-beskyttelser"> <!ENTITY torbutton.cookiedialog.lockCol "Beskyttet"> <!ENTITY torbutton.cookiedialog.domainCol "VÃŠrt"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Fjern alle pÃ¥nÃŠr beskyttede"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Beskyt nye cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beskyt ikke nye cookies"> -<!ENTITY torbutton.prefs.transparentTor "Gennemsigtig Torifikation (KrÃŠver tilpasset transproxy eller Tor-router)"> <!ENTITY torbutton.prefs.block_disk "Undlad at registrere historik for browsing eller data for websteder (aktiverer tilstanden Privat browsing)"> <!ENTITY torbutton.prefs.restrict_thirdparty "BegrÃŠns tredjeparts-cookies og andre registreringsdata"> <!ENTITY torbutton.prefs.block_plugins "SlÃ¥ browser-udvidelser fra (sÃ¥som Flash)"> diff --git a/src/chrome/locale/da/torbutton.properties b/src/chrome/locale/da/torbutton.properties index 166d346..49846ab 100644 --- a/src/chrome/locale/da/torbutton.properties +++ b/src/chrome/locale/da/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Klik for at deaktivere Tor torbutton.panel.label.disabled = Tor Deaktiveret torbutton.panel.label.enabled = Tor Aktiveret extensions.torbutton(a)torproject.org.description = Torbutton tilbyder en knap, der konfigurerer Tor-indstillinger, samt hurtigt og nemt fjerner private data browsing-data. -torbutton.popup.test.success = Tor proxy test lykkedes! -torbutton.popup.test.failure = Tor proxy test MISLYKKEDES! Kontroller dine proxy og Privoxy indstillinger. -torbutton.popup.test.confirm_toggle = Den seneste Tor-proxy-test mislykkedes i brug af Tor.\n\nEr du sikker pÃ¥ at du vil aktivere alligevel?\n\nBemÃŠrk: Hvis du har rettet dette problem, sÃ¥ kan du igen kÃžre testen i\nindstillinger for Torbutton Proxy-vinduet for at fjerne denne advarsel. -torbutton.popup.test.ff3_notice = Klik pÃ¥ OK for at teste Tor proxyindstillinger. Denne test vil kÃžre i baggrunden. VÃŠr venligst tÃ¥lmodig. torbutton.popup.external.title = IndlÃŠs eksternt indhold? torbutton.popup.external.app = Et ekstern program krÃŠves for at hÃ¥ndtere:\n\n torbutton.popup.external.note = \n\nBEMÃRK: Eksterne programmer er IKKE Tor-sikre som standard og kan demaskere dig!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nHvis der ikke stoles pÃ¥ denne fil, sÃ¥ bÃž torbutton.popup.launch = Start program torbutton.popup.cancel = AnnullÃ©r torbutton.popup.dontask = Start altid programmer fremover -torbutton.popup.test.no_http_proxy = Tor-proxy-test: Lokal HTTP-proxy kan ikke nÃ¥s. KÃžrer Polipo korrekt? torbutton.popup.prompted_language = For at yde stÃžrre privatliv, sÃ¥ kan Torbutton forespÃžrge den engelsk sprogversion af websiderne. Dette kan betyde at websider som du foretrÃŠkker at lÃŠse pÃ¥ dit modersmÃ¥l vises pÃ¥ engelsk i stedet for.\n\nVil du gerne forespÃžrge engelske websider for Ãžget privatliv? torbutton.popup.no_newnym = Torbutton kan ikke med sikkerhed give dig en ny identitet. Den har ikke adgang til kontrolporten for Tor.\n\nKÃžrer du Tor Browser-bundet? -torbutton.popup.pref_error = Torbutton kan ikke opdatere prÃŠferencer i profil-kataloget for Tor Browser. -torbutton.popup.permission_denied = Nulstil venligst rettighederne for Tor Browser-kataloget eller kopiÃ©r det til en ny placering. -torbutton.popup.device_full = Disken ser ud til at vÃŠre fuld. FrigÃžr venligst plads eller flyt Tor Browser til en ny enhed. torbutton.title.prompt_torbrowser = Vigtig Torbutton-information torbutton.popup.prompt_torbrowser = Torbutton fungerer anderledes end fÃžr: du kan ikke lÃŠngere slÃ¥ den fra.\n\nDu foretog denne ÃŠndring, da det ikke er sikkert at anvende Torbutton i en browser, der ogsÃ¥ anvendes til non-Tor-browsing. Der var for mange fejl deri, som vi ikke kunne rette pÃ¥ andre mÃ¥der.\n\nHvis du Ãžnsker at anvende Firefox pÃ¥ normal vis, sÃ¥ bÃžr du afinstallere Torbutton og hente Tor Browser Bundle. Indstillingerne for privatliv i Tor Browser overgÃ¥r ogsÃ¥ de normale i Firefox, selv nÃ¥r Firefox anvende med Torbutton.\n\nFor at fjerne Torbutton, sÃ¥ gÃ¥ til Funktioner->TilfÃžjelser->Udvidelser og klik dernÃŠst Fjern-knappen ved siden af Torbutton. torbutton.popup.short_torbrowser = Vigtig Torbutton-information!\n\nTorbutton er nu altid slÃ¥et til.\n\nKlik pÃ¥ Torbutton for mere information. diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index 5e4b0e3..c711ed2 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxyserver-Einstellungen"> -<!ENTITY torbutton.prefs.recommended_settings "Benutze die empfohlenen Proxyserver-Einstellungen fÃŒr meine Firefox-Version"> -<!ENTITY torbutton.prefs.use_polipo "Polipo verwenden"> -<!ENTITY torbutton.prefs.custom_settings "Individuelle Vermittlungsservereinstellungen verwenden"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP-Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL-Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP-Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher-Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS-Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Torbutton deaktivieren, um diese Einstellungen zu Ã€ndern."> -<!ENTITY torbutton.pref_connection.more_info "Mehr Informationen"> -<!ENTITY torbutton.pref_connection_more_info.title "Hilfe"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutten ist momentan aktiv. Wenn Sie die Vermittlungsservereinstellungen fÃŒr den Betrieb ohne Tor Ã€ndern mÃ¶chten, bitte zuerst Torbutton deaktivieren. Zum Ãndern der Tor-Einstellungen bitte das Fenster Â»Torbutton-EinstellungenÂ« verwenden."> <!ENTITY torbutton.context_menu.new_identity "Neue IdentitÃ€t"> <!ENTITY torbutton.context_menu.new_identity_key "N"> <!ENTITY torbutton.context_menu.new_circuit "Neuer Kanal fÃŒr diese Seite"> @@ -27,11 +13,6 @@ <!ENTITY torbutton.button.tooltip "Klicken, um Torbutton zu aktivieren"> <!ENTITY torbutton.prefs.privacy_security_settings "PrivatsphÃ€re- und Sicherheits-Einstellungen"> <!ENTITY torbutton.prefs.restore_defaults "Vorgabeeinstellungen wiederherstellen"> -<!ENTITY torbutton.prefs.test_settings "Einstellungen testen"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Keine Vermittlungsserver (Proxies) fÃŒr: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Achtung: Vermeiden Sie es, oben irgendwelche Rechnernamen zu verwenden"> <!ENTITY torbutton.cookiedialog.title "Cookie-Schutz verwalten"> <!ENTITY torbutton.cookiedialog.lockCol "GeschÃŒtzt"> <!ENTITY torbutton.cookiedialog.domainCol "Rechner"> @@ -43,7 +24,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Alle, auÃer die geschÃŒtzten Cookies entfernen"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Neue Cookies schÃŒtzen"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Neue Cookies nicht schÃŒtzen"> -<!ENTITY torbutton.prefs.transparentTor "Transparente-Torification (Erfordert eigenen Transproxy oder Tor-Router)"> <!ENTITY torbutton.prefs.priv_caption "PrivatsphÃ€ren-Einstellungen"> <!ENTITY torbutton.prefs.block_disk "Browser-Verlauf und Internetdaten nicht speichern (aktiviert den privaten Browser-Modus)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Profildateien (Cookies) von Drittanbietern und andere Ãberwachungsdaten einschrÃ€nken"> diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties index 57222a7..c6cdcfe 100644 --- a/src/chrome/locale/de/torbutton.properties +++ b/src/chrome/locale/de/torbutton.properties @@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren torbutton.panel.label.disabled = Tor ist deaktiviert torbutton.panel.label.enabled = Tor ist aktiviert extensions.torbutton(a)torproject.org.description = Torbutton gibt ihnen die MÃ¶glichkeit, Einstellungen von Tor schnell und einfach zu verÃ€ndern und einfach die Internetdaten zu lÃ¶schen. -torbutton.popup.test.success = Test des Tor-Vermittlungsservers erfolgreich! -torbutton.popup.test.failure = Test des Tor-Vermittlungsservers FEHLGESCHLAGEN! Bitte ÃŒberprÃŒfen Sie Ihre Vermittlungsserver-(Proxy) und Polipo-Einstellungen. -torbutton.popup.test.confirm_toggle = Der letzte Tor-Vermittlungsservertest konnte Tor nicht benutzen.\n\nSind Sie sicher, dass Sie diesen trotzdem aktivieren mÃ¶chten?\n\nAnmerkung: Falls Sie das Problem gelÃ¶st haben, kÃ¶nnen Sie den Test im Einstellungsfenster vom Torbutton-Vermittlungsserver wiederholen, um diese Warnung zu lÃ¶schen. -torbutton.popup.test.ff3_notice = Bitte OK klicken, um die Vermittlungsservereinstellungen zu testen. Dieser Test arbeitet im Hintergrund. Bitte warten Sie einen Augenblick. torbutton.popup.external.title = Einen externen Dateitypen herunterladen torbutton.popup.external.app = Tor-Browser kann diese Datei nicht anzeigen. Sie mÃŒssen es mit einer anderen Anwendung Ã¶ffnen.\n\n torbutton.popup.external.note = Einige Dateitypen kÃ¶nnen Anwendungen dazu fÃŒhren, dass sie sich mit dem Internet ohne Tor verbinden.\n\n @@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Um sicher zu sein, sollten Sie heruntergelade torbutton.popup.launch = Datei herunterladen torbutton.popup.cancel = Abbrechen torbutton.popup.dontask = Von jetzt an Dateien immer automatisch herunterladen -torbutton.popup.test.no_http_proxy = Tor-Vermittlungsservertest: Lokaler HTTP-Vermittlungsserver ist unerreichbar. LÃ€uft Polipo korrekt? torbutton.popup.prompted_language = Um Ihre PrivatsphÃ€re zu erhÃ¶hen, kann Torbutton die jeweilige englische Version einer Webseite anfordern. Dies kann zur Folge haben, dass Webseiten, die sie lieber in Ihrer Muttersprache lesen wÃŒrden, nun in Englisch dargestellt werden. \n\nSollen nun - zur ErhÃ¶hung Ihrer PrivatsphÃ€re - Webseiten in Englisch geladen werden? torbutton.popup.no_newnym = Torbutton kann Ihnen keine neue IdentitÃ€t geben, da es keinen Zugriff auf den Tor-Steueranschluss hat.\n\nBenutzen Sie das Tor-Browser-Paket? -torbutton.popup.pref_error = Torbutton kann die Einstellungen von Tor-Browser im Profilordner nicht aktualisieren. -torbutton.popup.permission_denied = Bitte entweder die Berechtigungen des Tor-Browser-Ordners zurÃŒcksetzen, oder es an einen neuen Ort kopieren. -torbutton.popup.device_full = Es scheint als wÃŒrde das Medium voll sein. Bitte machen Sie etwas Platz frei, oder bewegen sie den Tor-Browser auf ein neues GerÃ€t. torbutton.title.prompt_torbrowser = Wichtige Torbutton-Information torbutton.popup.prompt_torbrowser = Torbutton funktioniert jetzt anders als vorher: es kann nicht mehr abgeschaltet werden.\n\nWir haben diese Ãnderung vorgenommen, da es nicht sicher ist, Torbutton auch in einem Browser zu benutzen, der auch fÃŒr den Betrieb ohne Tor gedacht ist. Es gab zu viele Fehler, die wir sonst nicht hÃ€tten beheben kÃ¶nnen.\n\nWenn Sie Firefox weiterhin normal benutzen mÃ¶chten, sollten Sie Torbutton deinstallieren, und das Tor-Browser-Paket herunterladen. Die PrivatsphÃ€reeinstellungen des Tor-Browsers sind auÃerdem denen des normalen Firefox ÃŒberlegen, selbst wenn Firefox mit Torbutton benutzt wird.\n\nUm Torbutton zu entfernen, gehen Sie einfach auf Extras->Add-ons->Erweiterungen und klicken Sie auf Entfernen neben dem Torbutton. torbutton.popup.short_torbrowser = Wichtige Torbutton-Information!\n\nTorbutton ist jetzt immer aktiviert.\n\nBitte auf den Torbutton klicken, um mehr Informationen zu erhalten. diff --git a/src/chrome/locale/dz/torbutton.dtd b/src/chrome/locale/dz/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/dz/torbutton.dtd +++ b/src/chrome/locale/dz/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/dz/torbutton.properties b/src/chrome/locale/dz/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/dz/torbutton.properties +++ b/src/chrome/locale/dz/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd index 4472c2f..2a896a1 100644 --- a/src/chrome/locale/el/torbutton.dtd +++ b/src/chrome/locale/el/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Î¡ÏÎžÎŒÎ¯ÏÎµÎ¹Ï ÎŽÎ¹Î±ÎŒÎµÏÎ¿Î»Î±Î²Î·ÏÎ®"> -<!ENTITY torbutton.prefs.recommended_settings "Î§ÏÎ®ÏÎ· ÏÏÎœ ÏÏÎ¿ÏÎµÎ¹ÎœÏÎŒÎµÎœÏÎœ ÏÏÎžÎŒÎ¯ÏÎµÏÎœ Î³Î¹Î± ÏÎ·Îœ ÏÏÎÏÎ¿ÏÏÎ± ÎÎºÎŽÎ¿ÏÎ· ÏÎ¿Ï Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Î§ÏÎ®ÏÎ· Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Î§ÏÎ®ÏÎ· ÏÏÎ¿ÏÎ±ÏÎŒÎ¿ÏÎŒÎÎœÏÎœ ÏÏÎžÎŒÎ¯ÏÎµÏÎœ ÎŽÎ¹Î±ÎŒÎµÏÎ¿Î»Î±Î²Î·ÏÎ®"> -<!ENTITY torbutton.prefs.proxy.host.http "ÎÎ¹Î±ÎŒÎµÏÎ¿Î»Î±Î²Î·ÏÎ®Ï HTTP :"> -<!ENTITY torbutton.prefs.proxy.host.https "ÎÎ¹Î±ÎŒÎµÏÎ¿Î»Î±Î²Î·ÏÎ®Ï SSL :"> -<!ENTITY torbutton.prefs.proxy.host.ftp "ÎÎ¹Î±ÎŒÎµÏÎ¿Î»Î±Î²Î·ÏÎ®Ï FTP :"> -<!ENTITY torbutton.prefs.proxy.host.gopher "ÎÎ¹Î±ÎŒÎµÏÎ¿Î»Î±Î²Î·ÏÎ®Ï Gopher :"> -<!ENTITY torbutton.prefs.proxy.host.socks "ÎÎµÎœÏÏÎ¹ÎºÏÏ ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ®Ï SOCKS :"> -<!ENTITY torbutton.prefs.proxy.port "ÎÏÏÎ± :"> -<!ENTITY torbutton.pref_connection.notice "ÎÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÏÎµ ÏÎ¿ Torbutton Î³Î¹Î± ÎœÎ± Î±Î»Î»Î¬ÎŸÎµÏÎµ Î±ÏÏÎÏ ÏÎ¹Ï ÏÏÎžÎŒÎ¯ÏÎµÎ¹Ï."> -<!ENTITY torbutton.pref_connection.more_info "Î ÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ"> -<!ENTITY torbutton.pref_connection_more_info.title "ÎÎ¿Î®ÎžÎµÎ¹Î±"> -<!ENTITY torbutton.pref_connection_more_info.text "Î€Î¿ Torbutton ÎµÎ¯ÎœÎ±Î¹ ÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎ¿.ÎÎœ ÎžÎÎ»ÎµÏÎµ ÎœÎ± Î±Î»Î»Î¬ÎŸÎµÏÎµ ÏÎ¹Ï ÏÏÎžÎŒÎ¯ÏÎµÎ¹Ï ÎŽÎ¹Î±ÎŒÎµÏÎ¿Î»Î±Î²Î·ÏÎ®, ÎµÎºÏÏÏ ÏÎ¿Ï Tor, Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÏÎµ ÏÎ¿ Torbutton ÎºÎ±Î¹ ÎµÏÎ¹ÏÏÏÎÏÏÎµ ÎµÎŽÏ. ÎÎœ ÎžÎÎ»ÎµÏÎµ ÎœÎ± Î±Î»Î»Î¬ÎŸÎµÏÎµ ÏÎ¹Ï ÏÏÎžÎŒÎ¯ÏÎµÎ¹Ï Î³Î¹Î± ÏÎ¿Îœ ÎŽÎ¹Î±ÎŒÎµÏÎ¿Î»Î±Î²Î·ÏÎ® Tor, ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î®ÏÏÎµ ÏÎ¿ ÏÎ±ÏÎ¬ÎžÏÏÎ¿ ÎµÏÎ¹Î»Î¿Î³ÏÎœ ÏÎ¿Ï Torbutton"> <!ENTITY torbutton.context_menu.new_identity "ÎÎÎ± Î€Î±ÏÏÏÏÎ·ÏÎ±"> <!ENTITY torbutton.context_menu.new_identity_key "Î€"> <!ENTITY torbutton.context_menu.preferences "ÎÏÎ¹Î»Î¿Î³ÎÏ..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "ÎÎ¬ÎœÏÎµ ÎºÎ»Î¹Îº Î³Î¹Î± ÎœÎ± ÎµÎºÎºÎ¯ÎœÎ·ÏÎ· ÏÎ¿Ï Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "ÎÏÎ¿ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· Î±ÏÏÎ¹ÎºÏÎœ ÏÏÎžÎŒÎ¯ÏÎµÏÎœ"> -<!ENTITY torbutton.prefs.test_settings "ÎÎ»ÎµÎ³ÏÎ¿Ï ÏÏÎžÎŒÎ¯ÏÎµÏÎœ"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "ÎÎµÎœ ÏÏÎ¬ÏÏÎ¿ÏÎœ ÏÎ»Î·ÏÎµÎŸÎ¿ÏÏÎ¹Î¿Î¹ ÎŽÎ¹Î±ÎºÎ¿ÎŒÎ¹ÏÏÎÏ proxy Î³Î¹Î±:"> -<!ENTITY torbutton.prefs.no_proxy_warning "ÎÎ¹ÎŽÎ¿ÏÎ¿Î¯Î·ÏÎ·: ÎÏÎ¿ÏÏÎ³ÎµÏÎµ ÏÎ·Îœ ÏÏÎ®ÏÎ· hostnames ÏÎ¹Î¿ ÏÎ¬ÎœÏ"> <!ENTITY torbutton.cookiedialog.title "ÎÎ¹Î±ÏÎµÎ¯ÏÎ¹ÏÎ· Î ÏÎ¿ÏÏÎ±ÏÎ¯Î±Ï Cookie"> <!ENTITY torbutton.cookiedialog.lockCol "Î ÏÎ¿ÏÏÎ±ÏÎµÏÎŒÎÎœÎ±"> <!ENTITY torbutton.cookiedialog.domainCol "ÎÎ¹ÎºÎ¿ÎŽÎµÏÏÏÏÎ·Ï"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "ÎÏÎ±Î¯ÏÎµÏÎ· ÎÎ»ÏÎœ ÎÎºÏÏÏ Î±ÏÏ ÏÏÎœ Î ÏÎ¿ÏÏÎ±ÏÎµÏÎŒÎÎœÏÎœ"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Î ÏÎ¿ÏÏÎ±ÏÎ¯Î± ÎÎÏÎœ Cookie"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ÎÎ± ÎÎ· Î³Î¯ÎœÎµÏÎ±Î¹ Î ÏÎ¿ÏÏÎ±ÏÎ¯Î± ÎÎÏÎœ Cookie"> -<!ENTITY torbutton.prefs.transparentTor "ÎÎ¹Î±ÏÎ±ÎœÎ®Ï Torification (ÎÏÎ±Î¹ÏÎµÎ¯ ÏÏÎ¿ÏÎ±ÏÎŒÎ¿ÏÎŒÎÎœÎ¿ proxy Î® Tor ÎŽÏÎ¿ÎŒÎ¿Î»Î¿Î³Î·ÏÎ®)"> <!ENTITY torbutton.prefs.block_disk "ÎÎ±ÎŒÎŒÎ¹Î± ÎºÎ±ÏÎ±Î³ÏÎ±ÏÎ· ÏÎ¿Ï Î¹ÏÏÎ¿ÏÎ¹ÎºÏÏ ÏÎµÏÎ¹Î®Î³Î·ÏÎ·Ï Î® ÎŽÎµÎŽÎ¿ÎŒÎÎœÏÎœ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎ±Ï (ÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÏÎ· ÏÎ·Ï ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï Î¹ÎŽÎ¹ÏÏÎ¹ÎºÎ®Ï ÏÎµÏÎ¹Î®Î³Î·ÏÎ·Ï) "> <!ENTITY torbutton.prefs.restrict_thirdparty "Î ÎµÏÎ¹Î¿ÏÎ¹ÏÎŒÎ¿Ï ÏÏÎœ cookies ÏÏÎ¹ÏÏÎœ ÎºÎ±Î¹ Î±Î»Î»ÏÎœ ÎŽÎµÎŽÎ¿ÎŒÎµÎœÏÎœ ÏÎ±ÏÎ±ÎºÎ¿Î»Î¿ÏÎžÎ·ÏÎ·Ï"> <!ENTITY torbutton.prefs.block_plugins "ÎÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ· ÏÏÎ¿ÏÎžÎÏÏÎœ ÏÎµÏÎ¹Î·Î³Î·ÏÎ® (ÏÎ± ÏÎ¿ Flash)"> diff --git a/src/chrome/locale/el/torbutton.properties b/src/chrome/locale/el/torbutton.properties index b8aab49..3c68094 100644 --- a/src/chrome/locale/el/torbutton.properties +++ b/src/chrome/locale/el/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = ÎÎ¬ÎœÏÎµ ÎºÎ»Î¹Îº Î³Î¹Î± ÎœÎ± Î±ÏÎµÎœÎµÏÎ³ torbutton.panel.label.disabled = Î€Î¿ Tor ÎµÎ¯ÎœÎ±Î¹ Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎ¿ torbutton.panel.label.enabled = Î€Î¿ Tor ÎµÎ¯ÎœÎ±Î¹ ÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎ¿ extensions.torbutton(a)torproject.org.description = Î€Î¿ Torbutton ÏÏÎ¿ÏÏÎÏÎµÎ¹ ÎÎœÎ± ÎºÎ¿ÏÎŒÏÎ¯ Î³Î¹Î± ÏÎ· ÏÏÎžÎŒÎ¹ÏÎ· ÏÏÎœ ÏÎ±ÏÎ±ÎŒÎÏÏÏÎœ ÏÎ¿Ï Tor ÎºÎ±Î¹ Î³Î¹Î± ÏÎ· Î³ÏÎ®Î³Î¿ÏÎ· ÎºÎ±Î¹ ÎµÏÎºÎ¿Î»Î· ÎµÎºÎºÎ±ÎžÎ¬ÏÎ¹ÏÎ· ÏÏÎœ ÏÏÎ¿ÏÏÏÎ¹ÎºÏÎœ ÏÏÎ¿Î¹ÏÎµÎ¯ÏÎœ ÏÎµÏÎ¹Î®Î³Î·ÏÎ·Ï. -torbutton.popup.test.success = ÎÏÎ¹ÏÏÏÎ®Ï ÎÎ»ÎµÎ³ÏÎ¿Ï ÏÎ¿Ï Tor ÏÎ»Î·ÏÎµÎŸÎ¿ÏÏÎ¹Î¿Ï/proxy. -torbutton.popup.test.failure = Î ÎÎ»ÎµÎ³ÏÎ¿Ï ÏÎ¿Ï proxy ÎÎ ÎÎ€Î¥Î§Î! ÎÎ»ÎÎ³ÎŸÏÎµ ÏÎ¹Ï ÏÏÎžÎŒÎ¯ÏÎµÎ¹Ï ÏÎ±Ï Î³Î¹Î± ÏÎ¿Îœ proxy ÎºÎ±Î¹ ÏÎ¿ Polipo. -torbutton.popup.test.confirm_toggle = Î ÏÎ¹Î¿ ÏÏÏÏÏÎ±ÏÎ· ÎŽÎ¿ÎºÎ¹ÎŒÎ® Tor Î±ÏÎÏÏÏÎµ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î®ÏÎµÎ¹ ÏÎ¿ Tor.\n\nÎÎ¯ÏÏÎµ Î²ÎÎ²Î±Î¹Î¿Î¹ ÏÏÎ¹ ÎžÎÎ»ÎµÏÎµ ÎœÎ± ÏÎ¿ ÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ;\n\nÎ£Î·ÎŒÎµÎ¯ÏÏÎ·: ÎÎœ ÎŽÎ¹Î¿ÏÎžÏÏÎ±ÏÎµ ÏÎ¿ ÏÏÏÎ²Î»Î·ÎŒÎ± ÎŒÏÎ¿ÏÎµÎ¯ÏÎµ ÎœÎ± ÎµÎºÏÎµÎ»ÎÏÎµÏÎµ ÎºÎ±Î¹ ÏÎ¬Î»Î¹ ÏÎ·Îœ ÎŽÎ¿ÎºÎ¹ÎŒÎ® ÎŒÎÏÎ± Î±ÏÏ ÏÎ¹Ï Î ÏÎ¿ÏÎ¹ÎŒÎ®ÏÎµÎ¹Ï Proxy ÏÎ¿Ï Torbutton Î³Î¹Î± ÎœÎ± ÎµÎŸÎ¿ÏÎŽÎµÏÎµÏÏÏÎµÏÎµ Î±ÏÏÎ® ÏÎ·Îœ ÏÏÎ¿ÎµÎ¹ÎŽÎ¿ÏÎ¿Î¯Î·ÏÎ·. -torbutton.popup.test.ff3_notice = Î Î±ÏÎ®ÏÏÎµ ÎÎ Î³Î¹Î± ÎœÎ± ÎŽÎ¿ÎºÎ¹ÎŒÎ¬ÏÎµÏÎµ ÏÎ¹Ï ÏÏÎžÎŒÎ¯ÏÎµÎ¹Ï ÏÎ¿Ï Tor proxy. Î ÎŽÎ¿ÎºÎ¹ÎŒÎ® ÎžÎ± Î³Î¯ÎœÎµÎ¹ ÏÏÎ¿ ÏÎ±ÏÎ±ÏÎºÎ®ÎœÎ¹Î¿. Î¥ÏÎ¿ÎŒÎ¿ÎœÎ®, ÏÎ±ÏÎ±ÎºÎ±Î»Ï! torbutton.popup.external.title = ÎÎ± ÏÎ¿ÏÏÏÎžÎµÎ¯ ÎµÎŸÏÏÎµÏÎ¹ÎºÏ ÏÎµÏÎ¹ÎµÏÏÎŒÎµÎœÎ¿; torbutton.popup.external.app = ÎÎ¹Î± ÎµÎŸÏÏÎµÏÎ¹ÎºÎ® ÎµÏÎ±ÏÎŒÎ¿Î³Î® ÎµÎ¯ÎœÎ±Î¹ Î±ÏÎ±ÏÎ±Î¯ÏÎ·ÏÎ· Î³Î¹Î± ÏÎ¿Îœ ÏÏÏÏÏ ÏÎµÎ¹ÏÎ¹ÏÎŒÏ:\n\n torbutton.popup.external.note = \n\nÎ£ÎÎÎÎÎ©Î£Î: ÎÎ¹ ÎµÎŸÏÏÎµÏÎ¹ÎºÎÏ ÎµÏÎ±ÏÎŒÎ¿Î³ÎÏ ÎÎÎ ÎµÎ¯ÎœÎ±Î¹ ÎµÎŸÎ¿ÏÎ¹ÏÎŒÎ¿Ï Î±ÏÏÎ±Î»Î®Ï Î³Î¹Î± ÏÎ¿ Tor ÎºÎ±Î¹ ÎŒÏÎ¿ÏÎ¿ÏÎœ ÎœÎ± ÏÎ±Ï Î±ÏÎ¿ÎºÎ±Î»ÏÏÎ¿ÏÎœ!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nÎÎœ ÏÎ¿ Î±ÏÏÎµÎ¯Î¿ Î±ÏÏÏ ÎŽÎµÎœ ÎµÎ¯ torbutton.popup.launch = ÎÎºÏÎÎ»ÎµÏÎ· ÎµÏÎ±ÏÎŒÎ¿Î³Î®Ï torbutton.popup.cancel = ÎÎºÏÏÎ¿Îœ torbutton.popup.dontask = ÎÏÏ ÏÏÏÎ± ÎºÎ±Î¹ ÏÏÎ¿ ÎµÎŸÎ®Ï ÎœÎ± ÎµÎºÏÎµÎ»Î¿ÏÎœÏÎ±Î¹ ÏÎ¬ÎœÏÎ¿ÏÎµ ÎµÏÎ±ÏÎŒÎ¿Î³ÎÏ -torbutton.popup.test.no_http_proxy = ÎÎ¿ÎºÎ¹ÎŒÎ® Tor proxy: Î ÏÎ¿ÏÎ¹ÎºÏÏ HTTP Proxy ÎµÎ¯ÎœÎ±Î¹ Î±ÏÏÏÏÎ¹ÏÎ¿Ï. ÎÎºÏÎµÎ»ÎµÎ¯ÏÎ±Î¹ ÏÏÏÏÎ¬ ÏÎ¿ Polipo; torbutton.popup.prompted_language = ÎÎ¹Î± ÏÎ·Îœ ÎµÎœÎ¯ÏÏÏÏÎ· ÏÎ¿Ï Î±ÏÎ¿ÏÏÎ®ÏÎ¿Ï ÏÎ±Ï ÏÎ¿ Torbutton ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± Î¶Î·ÏÎ®ÏÎµÎ¹ ÏÎ·Îœ ÎÎºÎŽÎ¿ÏÎ· ÏÎ·Ï Î±Î³Î³Î»Î¹ÎºÎ®Ï Î³Î»ÏÏÏÎ±Ï Î³Î¹Î± ÏÎ¹Ï Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎµÏ. ÎÏÏÏ ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± ÎÏÎµÎ¹ ÏÎ±Îœ Î±ÏÎ¿ÏÎÎ»ÎµÏÎŒÎ±, Î¿Î¹ Î¹ÏÏÎ¿ÏÎµÎ»Î¯ÎŽÎµÏ ÏÎ¿Ï ÎµÏÎ¹Î»ÎÎŸÎ±ÏÎµ ÎœÎ± ÎµÎŒÏÎ±ÎœÎ¯Î¶Î¿ÎœÏÎ±Î¹ ÏÏÎ·Îœ ÎµÎžÎœÎ¹ÎºÎ® ÏÎ±Ï Î³Î»ÏÏÎ±, ÎœÎ± ÏÏÎ¿Î²Î¬Î»Î¿ÎœÏÎ±Î¹ Î±ÎœÏ' Î±ÏÏÎ®Ï ÏÏÎ·Îœ ÎÎ³Î³Î»Î¹ÎºÎ®.\n\nÎÎÎ»ÎµÏÎµ ÎœÎ± Î±Î¹ÏÎ¿ÏÎœÏÎ±Î¹ ÏÎµÎ»Î¯ÎŽÎµÏ Î³ÏÎ±ÎŒÎŒÎÎœÎµÏ ÏÏÎ± ÎÎ³Î³Î»Î¹ÎºÎ¬, Î³Î¹Î± ÏÎ·Îœ Î²ÎµÎ»ÏÎ¯ÏÏÎ· ÏÎ¿Ï Î±ÏÎ¿ÏÏÎ®ÏÎ¿Ï; torbutton.popup.no_newnym = Î€Î¿ Torbutton ÎŽÎµÎœ ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± ÏÎ±Ï ÎŽÏÏÎµÎ¹ ÎŒÎ¹Î± Î±ÏÏÎ±Î»Î® ÎœÎÎ± ÏÎ±ÏÏÏÏÎ·ÏÎ±, ÎŽÎ¹ÏÏÎ¹ ÎŽÎµÎœ ÎÏÎµÎ¹ ÏÏÏÏÎ²Î±ÏÎ· ÏÏÎ¿ Tor Control Port:\n\nÎ§ÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ ÏÎ¿ Î Î±ÎºÎÏÎ¿ ÎŠÏÎ»Î»Î¿ÎŒÎµÏÏÎ·ÏÎ® Tor; -torbutton.popup.pref_error = Î€Î¿ Torbutton ÎŽÎµÎœ ÎŒÏÎ¿ÏÎµÎ¯ ÎœÎ± ÎµÎœÎ·ÎŒÎµÏÏÏÎµÎ¹ ÏÎ¹Ï ÏÏÎ¿ÏÎ¹ÎŒÎ®ÏÎµÎ¹Ï ÏÏÎ¿Îœ ÎºÎ±ÏÎ¬Î»Î¿Î³Î¿ ÏÎ¿Ï ÏÏÎ¿ÏÎ¯Î» ÏÎ±ÏÏÎ¿Ï ÎŠÏÎ»Î»Î¿ÎŒÎµÏÏÎ·ÏÎ® Tor. -torbutton.popup.permission_denied = Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎŒÎµ ÎµÎ¯ÏÎµ ÎœÎ± ÎµÏÎ±ÎœÎ±ÏÎÏÎµÏÎµ ÏÎ¹Ï Î¬ÎŽÎµÎ¹ÎµÏ ÏÎ¿Ï ÎºÎ±ÏÎ±Î»ÏÎ³Î¿Ï ÎŠÏÎ»Î»Î¿ÎŒÎµÏÏÎ·ÏÎ® Tor ÎµÎ¯ÏÎµ ÎœÎ± ÏÎ¿Îœ Î±ÎœÏÎ¹Î³ÏÎ¬ÏÎµÏÎµ ÏÎµ ÎŒÎ¹Î± ÎœÎÎ± ÏÎ¿ÏÎ¿ÎžÎµÏÎ¯Î±. -torbutton.popup.device_full = Î ÎŽÎ¯ÏÎºÎ¿Ï ÏÎ±Î¯ÎœÎµÏÎ±Î¹ ÏÏÎ¹ ÎµÎ¯ÎœÎ±Î¹ Î³ÎµÎŒÎ¬ÏÎ¿Ï. Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎŒÎµ ÎµÎ»ÎµÏÎžÎµÏÏÏÏÎµ ÏÏÏÎ¿ ÏÏÎ¿Îœ ÎŽÎ¯ÏÎºÎ¿ Î® ÎŒÎµÏÎ±ÎºÎ¹ÎœÎ®ÏÏÎµ ÏÎ¿Îœ ÎŠÏÎ»Î»Î¿ÎŒÎµÏÏÎ·ÏÎ® Tor ÏÎµ ÎºÎ¬ÏÎ¿Î¹Î¿Îœ Î¬Î»Î»Î¿ ÎŽÎ¯ÏÎºÎ¿. torbutton.title.prompt_torbrowser = Î£Î·ÎŒÎ±ÎœÏÎ¹ÎºÎÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ Î³Î¹Î± ÏÎ¿ Torbutton torbutton.popup.prompt_torbrowser = Î€Î¿ Torbutton Î»ÎµÎ¹ÏÎ¿ÏÏÎ³ÎµÎ¯ ÎŽÎ¹Î±ÏÎ¿ÏÎµÏÎ¹ÎºÎ¬, ÏÏÏÎ±: ÎŽÎµÎœ ÎŒÏÎ¿ÏÎµÎ¯ÏÎµ ÏÎ»ÎÎ¿Îœ ÎœÎ± ÏÎ¿ Î±ÏÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ\n\nÎ ÏÎ¿Î²Î®ÎºÎ±ÎŒÎµ ÏÎµ Î±ÏÏÎ® ÏÎ·Îœ Î±Î»Î»Î±Î³Î® ÎŽÎ¹ÏÏÎ¹, ÎŽÎµÎœ ÎµÎ¯ÎœÎ±Î¹ Î±ÏÏÎ±Î»ÎÏ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎ±Î¹ ÏÎ¿ Torbutton ÎŒÎÏÎ± Î±ÏÏ ÎÎœÎ± ÏÎµÏÎ¹Î·Î³Î·ÏÎ® Î¹ÏÏÎ¿Ï Î¿ Î¿ÏÎ¿Î¯Î¿Ï ÏÏÎ·ÏÎ¹ÎŒÎµÏÎµÎ¹ ÎºÎ±Î¹ Î³Î¹Î± ÎµÏÎ³Î±ÏÎ¯ÎµÏ ÏÏÏÎ¯Ï ÏÎ·Îœ ÏÏÎ®ÏÎ· Tor. ÎÎŒÏÎ±ÎœÎ¯Î¶Î¿ÎœÏÎ±Îœ ÎŽÎ¹Î¬ÏÎ¿ÏÎ± ÏÏÎ¬Î»ÎŒÎ±ÏÎ±-bugs ÏÎ± Î¿ÏÎ¿Î¯Î± ÎŽÎµÎœ ÎŒÏÎ¿ÏÎ¿ÏÏÎ±ÎŒÎµ ÎœÎ± ÎŽÎ¹Î¿ÏÎžÏÏÎ¿ÏÎŒÎµ.\n\nÎÎœ ÎžÎÎ»ÎµÏÎµ ÎœÎ± ÎµÎŸÎ±ÎºÎ¿Î»Î¿ÏÎžÎ®ÏÎµÏÎµ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎµ ÏÎ¿Îœ Firefox ÎºÎ±ÎœÎ¿ÎœÎ¹ÎºÎ¬, ÎžÎ± ÏÏÎÏÎµÎ¹ ÎœÎ± ÎµÎ³ÎºÎ±ÏÎ±ÏÏÎ®ÏÎµÏÎµ ÏÎ¿ Torbutton ÎºÎ±Î¹ ÎœÎ± ÎºÎ¬ÎœÎµÏÎµ Î»Î®ÏÎ· ÏÎ¿Ï Î Î±ÎºÎÏÎ¿Ï ÎŠÏÎ»Î»Î¿ÎŒÎµÏÏÎ·ÏÎ® Tor. ÎÎ¹ Î¹ÎŽÎ¹ÏÏÎ·ÏÎµÏ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ±Ï ÏÎ¿Ï Î ÎµÏÎ¹Î·Î³Î·ÏÎ® Tor ÎµÎ¯ÎœÎ±Î¹ Î±ÎœÏ ÏÎµÏÎµÏ Î±ÏÏ ÎµÎºÎµÎ¯ÎœÎµÏ ÏÎ¿Ï Î±ÏÎ»Î¿Ï Firefox, Î±ÎºÏÎŒÎ· ÎºÎ±Î¹ ÏÏÎ·Îœ ÏÎµÏÎ¯ÏÏÏÏÎ· ÏÎ¿Ï Î¿ Firefox ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ÏÎ±Î¹ ÎŒÎ±Î¶Î¯ ÎŒÎµ ÏÎ¿ Torbutton.\n\nÎÎ¹Î± ÎœÎ± Î±ÏÎ¿ÎŒÎ±ÎºÏÏÎœÎµÏÎµ ÏÎ¿ Torbutton, ÏÎ·Î³Î±Î¯ÎœÎµÏÎµ ÎÏÎ³Î±Î»ÎµÎ¯Î±->Î ÏÏÏÎžÎµÏÎ±->Extensions ÎºÎ±Î¹ ÏÎ±ÏÎ®ÏÏÎµ ÏÎ¿ ÏÎ»Î®ÎºÏÏÎ¿ ÎÏÎ¿ÎŒÎ¬ÎºÏÏÎœÏÎ· ÏÎ¿Ï Î²ÏÎ¯ÏÎºÎµÏÎ±Î¹ ÎŽÎ¯ÏÎ»Î± Î±ÏÏ ÏÎ¿ Torbutton. torbutton.popup.short_torbrowser = Î£Î·ÎŒÎ±ÎœÏÎ¹ÎºÎ® Î Î»Î·ÏÎ¿ÏÎ¿ÏÎ¯Î± Î³Î¹Î± ÏÎ¿ Torbutton\n\nÎ€Î¿ Torbutton ÎµÎ¯ÎœÎ±Î¹ ÏÏÏÎ± ÏÏÎœÎµÏÏÏ ÎµÎœÎµÏÎ³Î¿ÏÎ¿Î¹Î·ÎŒÎÎœÎ¿.\n\nÎÎ¹Î± ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ, ÎºÎ¬ÎœÎµÏÎµ ÎºÎ»Î¹Îº ÏÏÎ¿ Torbutton. diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 12364fc..0720208 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site"> @@ -27,11 +13,6 @@ <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -43,7 +24,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.priv_caption "Privacy Settings"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index 935cce1..2391e69 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Download an external file type? torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n @@ -22,12 +18,8 @@ torbutton.popup.external.suggest = To be safe, you should only open downloaded f torbutton.popup.launch = Download file torbutton.popup.cancel = Cancel torbutton.popup.dontask = Automatically download files from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/eo/torbutton.dtd b/src/chrome/locale/eo/torbutton.dtd index f4bd994..4bbc98f 100644 --- a/src/chrome/locale/eo/torbutton.dtd +++ b/src/chrome/locale/eo/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Retperantâagordoj"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Uzi Polipoân"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTPâperanto:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSLâperanto:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTPâperanto:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopherâperanto:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Pordo:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Helpo"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "Nova idento"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "AgordojâŠ"> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "RestaÅri defaÅltojn"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/eo/torbutton.properties b/src/chrome/locale/eo/torbutton.properties index 643fce1..951abd1 100644 --- a/src/chrome/locale/eo/torbutton.properties +++ b/src/chrome/locale/eo/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Rezigni torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd index 31e2aca..40c1270 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "ConfiguraciÃ³n del proxy"> -<!ENTITY torbutton.prefs.recommended_settings "Usar la configuraciÃ³n para proxy recomendada para mi versiÃ³n de Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Usar Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Usar configuraciÃ³n de proxy personalizada"> -<!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:"> -<!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:"> -<!ENTITY torbutton.prefs.proxy.host.socks "Servidor SOCKS:"> -<!ENTITY torbutton.prefs.proxy.port "Puerto:"> -<!ENTITY torbutton.pref_connection.notice "Desactive Torbutton para cambiar estas preferencias."> -<!ENTITY torbutton.pref_connection.more_info "MÃ¡s informaciÃ³n"> -<!ENTITY torbutton.pref_connection_more_info.title "Ayuda"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton estÃ¡ activo. Si desea cambiar la configuraciÃ³n para proxy de su navegaciÃ³n sin Tor, desactive Torbutton y regrese aquÃ. Si desea cambiar su configuraciÃ³n para Tor, use la ventana de preferencias de Torbutton."> <!ENTITY torbutton.context_menu.new_identity "Nueva identidad (nueva instancia y conexiones de Tor)"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Nuevo circuito Tor para este sitio"> @@ -27,11 +13,6 @@ <!ENTITY torbutton.button.tooltip "Haga clic para inicializar Torbutton"> <!ENTITY torbutton.prefs.privacy_security_settings "Preferencias de Privacidad y Seguridad"> <!ENTITY torbutton.prefs.restore_defaults "Restablecer valores predeterminados "> -<!ENTITY torbutton.prefs.test_settings "Probar configuraciÃ³n"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Sin proxies para: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Advertencia: Evite usar los nombres de servidor (host) citados arriba"> <!ENTITY torbutton.cookiedialog.title "Administrar protecciones de cookie"> <!ENTITY torbutton.cookiedialog.lockCol "Protegidas"> <!ENTITY torbutton.cookiedialog.domainCol "Servidor (host)"> @@ -43,7 +24,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Eliminar todas excepto las protegidas"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger las nuevas cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No proteger las nuevas cookies"> -<!ENTITY torbutton.prefs.transparentTor "TorificaciÃ³n transparente (requiere un transproxy personalizado o un router Tor)"> <!ENTITY torbutton.prefs.priv_caption "ParÃ¡metros de privacidad"> <!ENTITY torbutton.prefs.block_disk "No registrar historial de navegaciÃ³n o datos del sitio web (habilita Modo de NavegaciÃ³n Privada)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceros y otros datos de seguimiento"> diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties index 50c78d5..0689cb8 100644 --- a/src/chrome/locale/es/torbutton.properties +++ b/src/chrome/locale/es/torbutton.properties @@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Haga clic para deshabilitar Tor torbutton.panel.label.disabled = Tor deshabilitado torbutton.panel.label.enabled = Tor habilitado extensions.torbutton(a)torproject.org.description = Torbutton proporciona un botÃ³n para configurar las preferencias de Tor y limpiar rÃ¡pida y fÃ¡cilmente los datos de navegaciÃ³n privada. -torbutton.popup.test.success = Â¡La prueba con "proxy" Tor finalizÃ³ con Ã©xito! -torbutton.popup.test.failure = Â¡La prueba con "proxy" Tor FALLÃ! Revise su configuraciÃ³n para proxy y Polipo. -torbutton.popup.test.confirm_toggle = La prueba mÃ¡s reciente con "proxy" Tor fallÃ³ al usar Tor.\n\nÂ¿EstÃ¡ seguro de que quiere habilitarlo de todos modos?\n\nNota: Si ha solucionado el problema, puede volver a ejecutar la prueba en la ventana de Preferencias para proxy de Torbutton para eliminar esta advertencia. -torbutton.popup.test.ff3_notice = Haga clic en Aceptar para probar las preferencias para "proxy" Tor. Esta prueba se harÃ¡ en segundo plano. Por favor, tenga paciencia. torbutton.popup.external.title = Â¿Descargar un tipo de fichero externo? torbutton.popup.external.app = El Navegador Tor no puede mostrar este fichero. TendrÃ¡ que abrirlo con otra aplicaciÃ³n.\n\n torbutton.popup.external.note = Algunos tipos de ficheros pueden hacer que ciertas aplicaciones se conecten a Internet sin usar Tor.\n\n @@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Para estar seguro, deberÃa abrir Ãºnicamente torbutton.popup.launch = Descargar fichero torbutton.popup.cancel = Cancelar torbutton.popup.dontask = Descargar ficheros automÃ¡ticamente a partir de ahora -torbutton.popup.test.no_http_proxy = Prueba con "proxy" Tor: El proxy HTTP local es inalcanzable. Â¿EstÃ¡ Polipo funcionando correctamente? torbutton.popup.prompted_language = Para darle mayor privacidad, Torbutton puede solicitar la versiÃ³n en inglÃ©s de las pÃ¡ginas web. Esto podrÃa causar que pÃ¡ginas que prefiera leer en su idioma nativo se muestren en inglÃ©s en su lugar. \n \nÂ¿Le gustarÃa solicitar pÃ¡ginas web en inglÃ©s para mejor privacidad? torbutton.popup.no_newnym = Torbutton no puede darle una nueva identidad (instancia de Tor) de forma segura. No tiene acceso al puerto de control de Tor (ControlPort)\n\nÂ¿EstÃ¡ ejecutando el Paquete de Navegador Tor? -torbutton.popup.pref_error = Torbutton no puede actualizar las preferencias en la carpeta de perfiles del Navegador Tor. -torbutton.popup.permission_denied = Permiso denegado: reinicie los permisos de la carpeta del Navegador Tor o bien cÃ³pielo a una nueva ubicaciÃ³n. -torbutton.popup.device_full = El disco parece estar lleno. Libere espacio o mueva el Navegador Tor a un nuevo dispositivo. torbutton.title.prompt_torbrowser = InformaciÃ³n importante sobre Torbutton torbutton.popup.prompt_torbrowser = Torbutton ahora funciona de manera diferente: ya no lo podrÃ¡ apagar mÃ¡s. \n \nHicimos este cambio porque no es seguro utilizar Torbutton en un navegador que tambiÃ©n se utilice para navegar sin Tor. Hubo tantos fallos con esto que no pudimos arreglarlo de otro modo. \n \nSi quiere seguir usando Firefox normalmente, deberÃa desinstalar Torbutton y descargar el Paquete de Navegador Tor. Las propiedades de privacidad del Navegador Tor son superiores a las de un Firefox normal, incluso cuando se usa Firefox con Torbutton. \n \nPara eliminar Torbutton. vaya a Herramientas->Complementos->Extensiones y haga clic en el botÃ³n Eliminar prÃ³ximo a Torbutton. torbutton.popup.short_torbrowser = Â¡InformaciÃ³n importante sobre Torbutton! \n \nTorbutton ahora estÃ¡ siempre encendido. \n \nHaga clic en (el botÃ³n de) Torbutton para mÃ¡s informaciÃ³n. diff --git a/src/chrome/locale/et/torbutton.dtd b/src/chrome/locale/et/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/et/torbutton.dtd +++ b/src/chrome/locale/et/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/et/torbutton.properties b/src/chrome/locale/et/torbutton.properties index 4c1518a..6e71612 100644 --- a/src/chrome/locale/et/torbutton.properties +++ b/src/chrome/locale/et/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Vajuta, et deaktiveerida Tor torbutton.panel.label.disabled = Tor on mitteaktiivne torbutton.panel.label.enabled = Tor on aktiivne extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor vaheserveri kontroll Ãµnnestus! -torbutton.popup.test.failure = Tor vaheserveri kontroll ebaÃµnnestus! Kontrolli oma vaheserveri ja Polipo seadeid. -torbutton.popup.test.confirm_toggle = Viimasel Tori vaheserveri kontrollimisel ei Ãµnnestunud Tori kasutada.\n\nKas sa oled kindel, et tahad Tori ikkagi aktiveerida?\n\nTeade: kui sa oled probleemi parandanud, siis sa saad kontrolli uuesti kÃ€ima panna Torbuttoni vaheserveri eelistuste aknas, et sellest hoiatusest lahti saada. -torbutton.popup.test.ff3_notice = Vajuta OK, et kontrollida Tori vaheserveri seadeid. See kontroll jookseb taustal. Palun ole kannatlik. torbutton.popup.external.title = Lae vÃ€list sisu? torbutton.popup.external.app = VÃ€list rakendust on vaja, et kÃ€sitseda:\n\n torbutton.popup.external.note = \n\nTeadaanne: vÃ€lised rakendused ei ole vaikimisi Toriga koos kasutades turvalised ning vÃµivad sind paljastada.\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = KÃ€ivita rakendus torbutton.popup.cancel = Katkesta torbutton.popup.dontask = Alati kÃ€ivita rakendusi edaspidi -torbutton.popup.test.no_http_proxy = Tor vaheserveri kontroll: kohalik HTTP vaheserver kÃ€ttesaamatu. Kas Polipo jookseb korralikult? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd index a8b1aa2..6ee2509 100644 --- a/src/chrome/locale/eu/torbutton.dtd +++ b/src/chrome/locale/eu/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Ezarpenak"> -<!ENTITY torbutton.prefs.recommended_settings "Erabili nire Firefox bertsiorako proxy ezarpen gomendatuak"> -<!ENTITY torbutton.prefs.use_polipo "Erabili Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Erabili proxy ezarpen pertsonalizatuak"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxya:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxya:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxya:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxya:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Ostalaria:"> -<!ENTITY torbutton.prefs.proxy.port "Portua:"> -<!ENTITY torbutton.pref_connection.notice "Torbutton ezgaitu ezarpen hauek aldatzeko"> -<!ENTITY torbutton.pref_connection.more_info "Informazio gehiago"> -<!ENTITY torbutton.pref_connection_more_info.title "Laguntza"> -<!ENTITY torbutton.pref_connection_more_info.text "Une honetan Torbutton gaituta dago. Zure ez-Tor proxy ezarpenak aldatu nahi badituzu, mesedez ezgaitu Torbutton eta hona bueltatu. Zure Tor ezarpenak aldatu nahi badituzu, mesedez erabili Torbutton ezarpen leihoa."> <!ENTITY torbutton.context_menu.new_identity "Nortasun berria"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Tor zirkuitu berria gune honetarako"> @@ -27,11 +13,6 @@ <!ENTITY torbutton.button.tooltip "Sakatu Torbutton abiarazteko"> <!ENTITY torbutton.prefs.privacy_security_settings "Pribatutasun eta segurtasun ezarpenak"> <!ENTITY torbutton.prefs.restore_defaults "Lehenetsiak berrezarri"> -<!ENTITY torbutton.prefs.test_settings "Ezarpenak frogatu"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Proxyrik ez hauentzako:"> -<!ENTITY torbutton.prefs.no_proxy_warning "Kontuz: Ez erabili ostalari-izenik gainean"> <!ENTITY torbutton.cookiedialog.title "Cookie Babesak kudeatu"> <!ENTITY torbutton.cookiedialog.lockCol "Babestuta"> <!ENTITY torbutton.cookiedialog.domainCol "Ostalaria"> @@ -43,7 +24,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Denak kendu babestutakoak izan ezik"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Cookie berriak babestu"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ez babestu cookie berririk"> -<!ENTITY torbutton.prefs.transparentTor "Torifikazio Gardena (transproxy pertsonalizatua edo Tor routerra behar du)"> <!ENTITY torbutton.prefs.priv_caption "Pribatutasun ezarpenak"> <!ENTITY torbutton.prefs.block_disk "Ez grabatu nabigatze historia edo webgune datuak (Nabigatze pribatu modua gaitzen du)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Hirugarrenen cookie-ak eta beste jarraipen datuak murriztu"> diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties index 8c886e1..fcc3b15 100644 --- a/src/chrome/locale/eu/torbutton.properties +++ b/src/chrome/locale/eu/torbutton.properties @@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Sakatu Tor ezgaitzeko torbutton.panel.label.disabled = Tor Ezgaitua torbutton.panel.label.enabled = Tor Gaitua extensions.torbutton(a)torproject.org.description = Torbuttonek Tor ezarpenak konfiguratzeko eta nabigatze pribatuko datuak azkar eta erraz garbitzeko botoi bat hornitzen du -torbutton.popup.test.success = Tor proxy froga arrakastatsua! -torbutton.popup.test.failure = Tor proxy frogak HUTS EGIN DU! Egiaztatu zure proxy eta Polipo ezarpenak. -torbutton.popup.test.confirm_toggle = Azken Tor proxy frogak huts egin du Tor erabiltzerakoan.\n\nZiur al zaude hala ere gaitu nahi duzulaz?\n\nOharra: Arazoa konpondu baduzu, froga berriz exekuta dezakezu Torbutton Proxy Ezarpenak leihoan abisu hau ezabatzeko. -torbutton.popup.test.ff3_notice = Sakatu Ados Tor proxy ezarpenak frogatzeko. Froga hau atzeko planoan gertatuko da. Mesedez pazientzia izan. torbutton.popup.external.title = Kanpoko fitxategi mota bat desargatu? torbutton.popup.external.app = Tor Nabigatzailea ezin du fitxategi hau bistaratu. Irekitzeko beste aplikazio bat behar izango duzu.\n\n torbutton.popup.external.note = Fitxategi mota batzuk Tor erabili gabe aplikaziok Internetera konektatzea sor ditzake.\n\n @@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Arriskutik kanpo egoteko, zuk deskargatutako torbutton.popup.launch = Fitxategia deskargatu torbutton.popup.cancel = Utzi torbutton.popup.dontask = Hemendik aurrera fitxategiak automatikoki deskargatu -torbutton.popup.test.no_http_proxy = Tor proxy froga: Ezin da HTTP Proxy lokalera iritsi. Polipo zuzen exekutatzen ari da? torbutton.popup.prompted_language = Pribatutasun gehiago emateko, Torbuttonek webguneen Ingelerazko bertsioa eska dezake. Honek zure ama hizkuntzan irakurtzea nahiago izan ditzakezun orriak Ingeleraz agertzea ekar dezake.\n\nNahiko al zenuke webguneen Ingelerazko hizkuntza eskatu pribatutasun hobeagoa izateko? torbutton.popup.no_newnym = Torbuttonek ezin dizu modu seguruan nortasun berri bat eman. Ez du Tor Kontrol Portura nola sartzerik.\n\nTor Browser Bundle exekutatzen ari al zara? -torbutton.popup.pref_error = Torbuttonek ezin ditu Tor Browser profilaren direktorioan hobespenak eguneratu. -torbutton.popup.permission_denied = Mesedez berrezarri Tor Browser direktorioaren baimenak edo kopia ezazu beste kokaleku batera. -torbutton.popup.device_full = Diska beteta dago, antza. Mesedez egizu lekua edo mugitu Tor Nabigatzailea gailu berri batera. torbutton.title.prompt_torbrowser = Torbutton informazio garratzitsua torbutton.popup.prompt_torbrowser = Torbuttonek ezberdin egiten du lan orain: ezin da gehiago itzali.\n\nTor kanpoko nabigatzea ere egiteko erabiltzen den nabigatzaile batean Torbutton erabiltzea segurura ez delako aldaketa hau egin dugu. Beste era batean konpondu ezin genituen akats asko zeuden.\n\nFirefox modu arruntean erabiltzen jarraitu nahi baduzu, Torbutton kendu beharko zenuke eta Tor Browser Bundlea deskargatu. Tor Browserren pribatutasun ezaugarriak Firefox arruntarenak baino hobeak dia, baita Firefox Torbuttonekin erabiltzen bada ere.\n\nTorbutton kentzeko, joan hona Tresnak->Gehigarriak->Hedapenak eta Torbuttonen ondoan dagoen Kendu botoian sakatu. torbutton.popup.short_torbrowser = Torbutton informazio garrantzitsua!\n\nTorbutton orain beti gaituta dago.\n\nSakatu Torbuttonen informazio gehiago lortzeko. diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index f8a5ae7..a60c04d 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "ØªÙØžÙÙØ§Øª ÙŸØ±Ø§Ú©Ø³Û"> -<!ENTITY torbutton.prefs.recommended_settings "ØšÚ©Ø§Ø±ØšØ±Ø¯Ù ØªÙØžÙÙØ§Øª ÙŸØ±Ø§Ú©Ø³Û ØªÙØµÙÙ ØŽØ¯Ù ØšØ±Ø§Û ÙØ³Ø®Ù ÙØ§ÙØ±ÙØ§Ú©Ø³ ÙÙ"> -<!ENTITY torbutton.prefs.use_polipo "Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² ÙŸÙÙÙÙŸÙ (Polipo)"> -<!ENTITY torbutton.prefs.custom_settings "ØšÚ©Ø§Ø±ØšØ±Ø¯Ù ØªÙØžÙÙØ§Øª Ø³ÙØ§Ø±ØŽÛ ØšØ±Ø§Û ÙŸØ±Ø§Ú©Ø³Û"> -<!ENTITY torbutton.prefs.proxy.host.http "ÙŸØ±Ø§Ú©Ø³Û HTTP:"> -<!ENTITY torbutton.prefs.proxy.host.https "ÙŸØ±Ø§Ú©Ø³Û SSL:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "ÙŸØ±Ø§Ú©Ø³Û FTP:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "ÙŸØ±Ø§Ú©Ø³Û Gopher:"> -<!ENTITY torbutton.prefs.proxy.host.socks "ÙÙØ²ØšØ§Ù SOCKS:"> -<!ENTITY torbutton.prefs.proxy.port "Ø¯Ø±Ú¯Ø§Ù (Port):"> -<!ENTITY torbutton.pref_connection.notice "ØºÙØ±ÙØ¹Ø§Ù Ú©Ø±Ø¯Ù Ø¯Ú©ÙÙ ØªÙØ± Ø¬ÙØª ØªØºÙÙØ± Ø¯Ø±Ø§ÙÙ ØªÙØžÙÙØ§Øª."> -<!ENTITY torbutton.pref_connection.more_info "Ø§Ø·ÙØ§Ø¹Ø§Øª ØšÙØŽØªØ±"> -<!ENTITY torbutton.pref_connection_more_info.title "Ø±Ø§ÙÙÙØ§"> -<!ENTITY torbutton.pref_connection_more_info.text "Ø¯Ú©ÙÙ ØªÙØ±ÙÙ Ø§Ú©ÙÙÙ ÙØ¹Ø§Ù ØŽØ¯Ù Ø§Ø³Øª.Ø§Ú¯Ø± ÙÛâØ®ÙØ§ÙÙØ¯ ØªÙØžÙÙØ§Øª ÙŸØ±Ø§Ú©Ø³Û ØºÙØ±ÙØ±ØªØšØ· ØšØ§ ØªÙØ± Ø±Ø§ ØªØºÙÙØ± Ø¯ÙÙØ¯Ø ÙØ·ÙØ§ Ø¯Ú©ÙÙ ØªÙØ± Ø±Ø§ ØºÙØ±ÙØ¹Ø§Ù Ú©ÙÙØ¯ Ù Ø¯ÙØšØ§Ø±Ù ØšÙ Ø§ÙÙØ¬Ø§ ØšØ§Ø²Ú¯Ø±Ø¯ÙØ¯. Ø§Ú¯Ø± ÙÙØ®ÙØ§ÙÙØ¯ ØªÙØžÙÙØ§Øª ØªÙØ± Ø±Ø§ ØªØºÙÙØ± Ø¯ÙÙØ¯Ø Ø§Ø² ÙŸÙØ¬Ø±Ù ØªÙØžÙÙØ§Øª Ø¯Ú©ÙÙ ØªÙØ± Ø§Ø³ØªÙØ§Ø¯Ù Ú©ÙÙØ¯."> <!ENTITY torbutton.context_menu.new_identity "ÙÙÛØª Ø¬Ø¯ÛØ¯"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "ØŽØšÚ©Ù Ø¬Ø¯ÛØ¯ Tor ØšØ±Ø§Û Ø§ÛÙ Ø³Ø§ÛØª"> @@ -27,11 +13,6 @@ <!ENTITY torbutton.button.tooltip "Ø¬ÙØª ØŽØ±ÙØ¹ Ø¯ÙÙÙ ØªÙØ±Ú©ÙÙÚ© Ú©ÙÙØ¯"> <!ENTITY torbutton.prefs.privacy_security_settings "ØÙØž ØØ±ÛÙ Ø®ØµÙØµÛ Ù ØªÙØžÛÙØ§Øª Ø§ÙÙÛØªÛ"> <!ENTITY torbutton.prefs.restore_defaults "ØšØ§Ø²Ú¯Ø±Ø¯Ø§ÙØ¯Ù ØªÙØžÛÙØ§Øª ØšÙ ØØ§ÙØª ÙŸÛØŽâÙØ±Ø¶"> -<!ENTITY torbutton.prefs.test_settings "ØªÙØžÛÙØ§Øª Ø¢Ø²ÙÙØ¯Ù "> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCK v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Ø¹Ø¯Ù Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² ÙŸØ±Ø§Ú©Ø³Û ØšØ±Ø§Û:"> -<!ENTITY torbutton.prefs.no_proxy_warning "ÙØŽØ¯Ø§Ø±: Ø§Ø² ØšÙ Ú©Ø§Ø± ØšØ±Ø¯Ù ÙØ± Ú¯ÙÙÙ ÙØ§Ù ÙÙØ²ØšØ§Ù (hostname) Ø¯Ø± ØšØ§ÙØ§ ØšÙŸØ±ÙÙØ²ÙØ¯"> <!ENTITY torbutton.cookiedialog.title "ÙØ¯ÙØ±ÙØª ØÙØ§ØžØª Ú©ÙÙÚÚ©âÙØ§"> <!ENTITY torbutton.cookiedialog.lockCol "ØÙØ§ØžØª ØŽØ¯Ù"> <!ENTITY torbutton.cookiedialog.domainCol "ÙÙØ²ØšØ§Ù"> @@ -43,7 +24,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "ØØ°Ù ØªÙØ§Ù Ú©ÙÙÚÚ©âÙØ§Û ØÙØ§ØžØª ÙØŽØ¯Ù"> <!ENTITY torbutton.cookiedialog.saveAllCookies "ØÙØ§ØžØª Ø§Ø² Ú©ÙÙÚÚ©âÙØ§Û Ø¬Ø¯ÙØ¯"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ø¹Ø¯Ù ØÙØ§ØžØª Ø§Ø² Ú©ÙÙÚÚ©âÙØ§Û Ø¬Ø¯ÙØ¯"> -<!ENTITY torbutton.prefs.transparentTor "Ø³Ø§Ø²Ú¯Ø§Ø±Ø³Ø§Ø²Û ØšØ§ ØªÙØ± ØšÙ ØµÙØ±Øª ØŽÙØ§Ù (ÙÙØ§Ø² ØšÙ Ø±ÙÙØ§Øš ØªÙØ± ÙØ§ Tor router Ù ÙØ§ transproxy Ø³ÙØ§Ø±ØŽÛ Ø¯Ø§Ø±Ø¯)"> <!ENTITY torbutton.prefs.priv_caption "ØªÙØžÛÙØ§Øª ØØ±ÛÙ Ø®ØµÙØµÛ"> <!ENTITY torbutton.prefs.block_disk "Ø«ØšØªâÙÙØ±Ø¯Ù ØªØ§Ø±ÙØ®ÚÙ ÙØ§ Ø¯Ø§Ø¯ÙâÙØ§Ù ÙØšâÚ¯Ø§Ù (Ú¯ØŽØª Ù Ú¯Ø°Ø§Ø± âØ®ØµÙØµÙ ÙØ¹Ø§Ù ÙÙâÙÙØ¯)"> <!ENTITY torbutton.prefs.restrict_thirdparty "ÙØØ¯ÙØ¯âÙØ±Ø¯Ù ÙÙÙÙâÙØ§Ù Ø·Ø±Ù Ø³ÙÙ Ù Ø¯Ø§Ø¯ÙâÙØ§Ù ÙŸÙÚ¯Ø±Ø¯Ù Ø¯ÙÚ¯Ø±"> diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties index f094569..9f77531 100644 --- a/src/chrome/locale/fa/torbutton.properties +++ b/src/chrome/locale/fa/torbutton.properties @@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = ØšØ±Ø§Û ØºÙØ±ÙØ¹Ø§Ù Ú©Ø±Ø¯Ù ØªÙØ± Ú©ÙÙ torbutton.panel.label.disabled = ØªÙØ±ØºÙØ±ÙØ¹Ø§Ù ØŽØ¯ torbutton.panel.label.enabled = ØªÙØ± ÙØ¹Ø§Ù ØŽØ¯ extensions.torbutton(a)torproject.org.description = Torbutton Ø¯Ú©ÙÙ Ø§Û Ø±Ø§ ØšØ±Ø§Û ØŽÙØ§ ÙØ±Ø§ÙÙ ÙÛÙÙØ§ÛØ¯ ØªØ§ ØªÙØžÛÙØ§Øª "ØªØ±" Ø±Ø§ ÙŸÛÚ©Ø±ØšÙØ¯Û Ú©Ø±Ø¯Ù Ù ØšØªÙØ§ÙÛØ¯ ØšÙ Ø±Ø§ØØªÛ Ù Ø³Ø±Ø¹ØªØ Ø¯Ø§Ø¯Ù ÙØ§Û Ø®ØµÙØµÛ ÙØ±ÙØ±Ú¯Ø±ØªØ§Ù Ø±Ø§ ÙŸØ§Ú© Ú©ÙÛØ¯. -torbutton.popup.test.success = ØªÙØ±ØšØ§ ÙÙÙÙÙØª Ø¢Ø²ÙØ§ÙØŽ Ø±Ø§ Ø³ÙŸØ±Û Ú©Ø±Ø¯! -torbutton.popup.test.failure = Ø¢Ø²ÙØ§ÙØŽ ØªÙØ± ÙÙÙÙÙØª Ø¢ÙÙØ² ÙØšÙØ¯! ØªÙØžÙÙØ§Øª ÙŸØ±Ø§Ú©Ø³Û Ù ÙŸÙÙÙÙŸÙ Ø±Ø§ ØšØ±Ø±Ø³Û Ú©ÙÙØ¯. -torbutton.popup.test.confirm_toggle = Ø¢Ø®ÙØ±Ù ØªØºÙÙØ±Ø§Øª Ø§ÙØ¬Ø§Ù ØŽØ¯Ù Ø¯Ø± ØªÙØ± ÙŸØ±Ø§Ú©Ø³Û ÙÙÙÙÙØª Ø¢ÙÙØ² ÙØšÙØ¯.\n\nØ¢ÙØ§ ÙØ·ÙØŠÙ ÙØ³ØªÙØ¯ Ú©Ù ÙÙØ®ÙØ§ÙÙØ¯ Ø¯Ø± ÙØ± ØµÙØ±Øª Ø¢ÙÙØ§ Ø±Ø§ ÙØ¹Ø§Ù Ú©ÙÙØ¯Ø\n\nÙÚ©ØªÙ: Ø§Ú¯Ø±ÙØŽÚ©ÙØ§Øª ÙÙØ¬ÙØ¯ Ø±Ø§ ØÙ Ú©Ø±Ø¯ÙØ¯Ø ÙÙØªÙØ§ÙÙØ¯ Ø¯ÙØšØ§Ø±Ù Ø¢Ø²ÙÙÙ ØšØ±Ø±Ø³Û Ø±Ø§ Ø¯Ø± ÙŸÙØ¬Ø±Ù ØªÙØžÙÙØ§Øª ÙŸØ±Ø§Ú©Ø³Û Ø¯Ú©ÙÙ ØªÙØ±Ø§ÙØ¬Ø§Ù Ø¯ÙÙØ¯ ØªØ§ Ø¯ÙÚ¯Ø± Ø§ÙÙ Ø§Ø®Ø·Ø§Ø± Ø±Ø§ Ø¯Ø±ÙØ§ÙØª ÙÚ©ÙÙØ¯. -torbutton.popup.test.ff3_notice = ØšØ± Ø±ÙÛ OK Ú©ÙÙÚ© Ú©ÙÙØ¯ ØªØ§ ØªÙØžÙÙØ§Øª ÙŸØ±Ø§Ú©Ø³Û ØªÙØ± Ø¢Ø²ÙØ§ÙØŽ ØŽÙØ¯. Ø§ÙÙ Ø¢Ø²ÙØ§ÙØŽ Ø¯Ø± ÙŸØ³ Ø¶ÙÙÙÙ Ø§ØªÙØ§Ù ÙÙ Ø§ÙØªØ¯. ÙØ·ÙØ§ ØµØšÙØ± ØšØ§ØŽÙØ¯. torbutton.popup.external.title = ÙÛØ®ÙØ§ÙÛØ¯ ÛÚ© ÙØ§ÛÙ ÙÙØ¹ ØšÛØ±ÙÙÛ Ø¯Ø§ÙÙÙØ¯ ØŽÙØ¯Ø torbutton.popup.external.app = ÙØ±ÙØ±Ú¯Ø± ÙÙÛØªÙØ§ÙØ¯ Ø§ÛÙ ÙØ§ÛÙ Ø±Ø§ ÙÙØ§ÛØŽ Ø¯ÙØ¯Ø ÙØ§Ø²Ù Ø§Ø³Øª ØªØ§ ØšØ§ ØšØ±ÙØ§ÙÙ Ø¯ÛÚ¯Ø±Û Ø¢Ù Ø±Ø§ ØšØ§Ø² Ú©ÙÛØ¯.\n torbutton.popup.external.note = ØšØ±Ø®Û Ø§Ø² Ø§ÙÙØ§Ø¹ ÙØ§ÛÙÙØ§Ø ØšØ§Ø¹Ø« ÙÛØŽÙÙØ¯ Ú©Ù ØšØ±ÙØ§ÙÙ ÙØ§ ØšØ¯ÙÙ Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² "ØªØ±" ØšÙ Ø§ÛÙØªØ±ÙØª ÙØªØµÙ ØŽÙÙØ¯.\n @@ -22,12 +18,8 @@ torbutton.popup.external.suggest = ØšØ±Ø§Û Ø§ÛÙÙ ÙØ§ÙØ¯ÙØ ØšØ§ÛØ¯ ÙÙ torbutton.popup.launch = Ø¯Ø§ÙÙÙØ¯ ÙØ§ÛÙ torbutton.popup.cancel = ÙØºÙ torbutton.popup.dontask = Ø§Ø² Ø§ÛÙ ÙŸØ³Ø ÙØ§ÛÙÙØ§ ØšÙ Ø·ÙØ± Ø®ÙØ¯Ú©Ø§Ø± Ø¯Ø§ÙÙÙØ¯ ØŽÙØ¯. -torbutton.popup.test.no_http_proxy = Ø¢Ø²ÙÙÙ ÙŸØ±Ø§Ú©Ø³Û ØªÙØ±: ÙŸØ±Ø§Ú©Ø³Û HTTP ÙØÙÛ ÙØ§ØšÙ Ø¯Ø³ØªØ±Ø³Û ÙÛØ³Øª. Ø¢ÛØ§ ÙŸÙÙÛÙŸÙ ØšÙ Ø¯Ø±Ø³ØªÛ Ø§Ø¬Ø±Ø§ ØŽØ¯Ù Ø§Ø³ØªØ torbutton.popup.prompted_language = ØšØ±Ø§Û ØÙØ§ØžØª ØšÙØŽØªØ± Ø§Ø² ØØ±ÙÙ Ø®ØµÙØµÛ ØŽÙØ§Ø Ø¯Ú©ÙÙ ØªÙØ± ÙÛâØªÙØ§ÙØ¯ ÙØ³Ø®Ù Ø§ÙÚ¯ÙÙØ³Û ØµÙØØ§Øª ÙØš Ø±Ø§ Ø¯Ø±Ø®ÙØ§Ø³Øª Ú©ÙØ¯. Ø§ÙÙ ÙÙØ¶ÙØ¹ ÙÙÚ©Ù Ø§Ø³Øª ØšØ§Ø¹Ø« ØŽÙØ¯ ØµÙØÙâÙØ§ÛÛ Ø±Ø§ Ú©Ù ØªØ±Ø¬ÛØ ÙÛØ¯ÙÛØ¯ ØšÙ Ø²ØšØ§Ù ÙØ§Ø¯Ø±Û Ø®ÙØ¯ ØšØ®ÙØ§ÙÙØ¯Ø Ø¯Ø± Ø¹ÙØ¶ ØšÙ Ø§ÙÚ¯ÙÙØ³Û ÙÙØ§ÙØŽ Ø¯Ø§Ø¯Ù ØŽÙÙØ¯.\n\nØ¢ÙØ§ ØšØ§ Ø§ÙÙ ÙØ¬ÙØ¯ ÙÛâØ®ÙØ§ÙÙØ¯ ØšØ±Ø§Û ØÙØ§ØžØª ØšÙØŽØªØ± Ø§Ø² ØØ±ÙÙ Ø®ØµÙØµÛ Ø¯Ø±Ø®ÙØ§Ø³Øª ÙØ³Ø®Ù Ø§ÙÚ¯ÙÙØ³Û ØµÙØØ§Øª Ø±Ø§ ØšØ¯ÙÙØ¯Ø torbutton.popup.no_newnym = Torbutton ÙÙÛ ØªÙØ§ÙØ¯ ØšÙ ØŽÙØ§ ÛÚ© ØŽÙØ§Ø³Ù Ø¬Ø¯ÛØ¯ Ø§ÙÙ ØšØ¯ÙØ¯. Ø¯Ø³ØªØ±Ø³Û ØšÙ ÙŸÙØ±Øª Ú©ÙØªØ±Ù ÙÛØ¯Ø§ÙÛØ§ Ø§ÙÚ©Ø§Ù ÙŸØ°ÛØ± ÙÛØ³Øª.\n\n Ø¢ÛØ§ ØŽÙØ§ Ø¯Ø± ØØ§Ù Ø§Ø¬Ø±Ø§ ØšØ³ØªÙ ÙØ±Ù Ø§ÙØ²Ø§Ø±Û ÙØ±ÙØ±Ú¯Ø± ØªÙØ± ÙØ³ØªÛØ¯Ø -torbutton.popup.pref_error = Torbutton ÙÙÛ ØªÙØ§ÙÛØ¯ ØªÙØžÛÙØ§Øª Ø±Ø§ Ø¯Ø± Ø¯Ø§ÛØ±Ú©ØªÙØ±Û ÙØŽØ®ØµØ§Øª ÙØ±ÙØ±Ú¯Ø± Tor Ø±Ø§ ØšÙ Ø±ÙØ² Ø±Ø³Ø§ÙÛ Ú©ÙØ¯ -torbutton.popup.permission_denied = ÙØ·ÙØ§ ÛÚ©Û Ø§Ø² Ø¯Ù ØªÙØžÛÙ ÙØ¬Ø¯Ø¯ ÙØ¬ÙØ² Ø¯Ø§ÛØ±Ú©ØªÙØ±Û ÙØ±ÙØ±Ú¯Ø± Tor Ù ÛØ§ Ú©ÙŸÛ Ø¢Ù Ø±Ø§ ØšÙ ÛÚ© ÙÚ©Ø§Ù Ø¬Ø¯ÛØ¯. -torbutton.popup.device_full = Ø¯ÛØ³Ú© ØšÙ ÙØžØ± ÙÛ Ø±Ø³Ø¯ ÙŸØ± ØŽØ¯Ù Ø§Ø³Øª. ÙØ·ÙØ§ ÙÙØ¯Ø§Ø±Û ÙØ¶Ø§ Ø®Ø§ÙÛ Ú©ÙÛØ¯ ÛØ§ ØªÙØ± Ø±Ø§ ØšÙ ÙÚ©Ø§Ù Ø¬Ø¯ÛØ¯Û Ø§ÙØªÙØ§Ù Ø¯ÙÛØ¯. torbutton.title.prompt_torbrowser = Ø§Ø·ÙØ§Ø¹Ø§Øª ÙÙÙ Torbutton torbutton.popup.prompt_torbrowser = Ø§Ú©ÙÙÙ Torbutton ØšØ·ÙØ± ÙØªÙØ§ÙØªÛ Ú©Ø§Ø± ÙÛâÚ©ÙØ¯ - Ø¯ÛÚ¯Ø± ÙÙÛâØªÙØ§ÙÛØ¯ Ø¢Ùâ Ø±Ø§ Ø®Ø§ÙÙØŽ Ú©ÙÛØ¯.\n\nØ§ÛÙ ØªØºÛØ±Ø§Øª ØšÙ Ø§ÛÙ Ø¯ÙÛÙ Ø§Ø¹ÙØ§Ù ØŽØ¯Ù Ø§Ø³Øª Ú©Ù Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² Torbutton Ø¯Ø± ÙØ±ÙØ±Ú¯Ø±Û Ú©Ù ØšØ±Ø§Û ÙØ±ÙØ±Ú¯Ø±Û ØšØ¯ÙÙ ØªØ± ÙÛØ² Ø§Ø³ØªÙØ§Ø¯Ù ÙÛØŽÙØ¯Ø Ø§ÛÙÙ ÙÛØ³Øª. ÙÙØµÙØ§Û ÙØ±Ù Ø§ÙØ²Ø§Ø±Û Ø¢ÙÙØ¯Ø± Ø²ÛØ§Ø¯ ØšÙØ¯ Ú©Ù ØšÙ Ø±ÙØŽ Ø¯ÛÚ¯Ø±Û ÙÙÛØªÙØ§ÙØ³ØªÛÙ Ø¢Ù Ø±Ø§ ØÙ Ú©ÙÛÙ.\n\nØ§Ú¯Ø± ÙÛØ®ÙØ§ÙÛØ¯ ØšÙ Ø·ÙØ± Ø¹Ø§Ø¯Û ØšÙ Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² ÙØ§ÛØ±ÙØ§Ú©Ø³ Ø§Ø¯Ø§ÙÙ Ø¯ÙÛØ¯Ø ØšØ§ÛØ¯ ÙØ±Ù Ø§ÙØ²Ø§Ø± Torbutton Ø±Ø§ ØØ°Ù Ú©Ø±Ø¯Ù Ù Tor Browser Bundle (ØšØ³ØªÙ ÙØ±ÙØ±Ú¯Ø± ØªØ±) Ø±Ø§ Ø¯Ø§ÙÙÙØ¯ Ú©ÙÛØ¯. ÙÛÚÚ¯ÛÙØ§Û Ø®ØµÙØµÛ ØšÙØ¯Ù ØªØ±Ø ØšÙ Ø¢ÙÙØ§ÛÛ Ú©Ù Ø¯Ø± ÙØ§ÛØ±ÙØ§Ú©Ø³ Ø§Ø³ØªØ ØšØ±ØªØ±Û Ø¯Ø§Ø±Ø¯Ø ØØªÛ ÙÙÚ¯Ø§ÙÛ Ú©Ù ÙØ§ÛØ±ÙØ§Ú©Ø³ ØšØ§ Torbutton Ø§Ø³ØªÙØ§Ø¯Ù ØŽÙØ¯.\n\nØšØ±Ø§Û ØØ°Ù TorbuttonØ ØšØ±ÙÛØ¯ ØšÙ Ø§ØšØ²Ø§Ø±ÙØ§ ( ÛØ§ tools Ø§Ú¯Ø± Ø§Ø² ÙØ³Ø®Ù Ø§ÙÚ¯ÙÛØ³Û ÙØ§ÛØ±ÙØ§Ú©Ø³ Ø§Ø³ØªÙØ§Ø¯Ù ÙÛÚ©ÙÛØ¯)Ø Ø§ÙØ²ÙÙÙ ÙØ§ (Addons)Ø ØšØ±ÙØ§ÙÙ ÙØ§Û Ú¯Ø³ØªØ±ØŽ ÛØ§ÙØªÙ (Extensions ) Ù Ø³ÙŸØ³ Ø¯Ú©ÙÙ Remove Ú©Ù Ø¯Ø± Ú©ÙØ§Ø± Torbutton Ø§Ø³Øª Ø±Ø§ ØšØ²ÙÛØ¯. torbutton.popup.short_torbrowser = Ø§Ø·ÙØ§Ø¹ÙØª ÙÙÙ Torbutton!\n\nTorbutton ÙÙÛØŽÙ ÙØ¹Ø§Ù ØšØ§ØŽØ¯!\n\nØšØ±Ø§Û Ø§Ø·ÙØ§Ø¹Ø§Øª ØšÛØŽØªØ± Ø±ÙÛ Torbutton Ú©ÙÛÚ© ÙÙØ§ÛÛØ¯. diff --git a/src/chrome/locale/fi/torbutton.dtd b/src/chrome/locale/fi/torbutton.dtd index f3686e2..bb3356a 100644 --- a/src/chrome/locale/fi/torbutton.dtd +++ b/src/chrome/locale/fi/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "VÃ€lityspalvelin Asetukset"> -<!ENTITY torbutton.prefs.recommended_settings "KÃ€ytÃ€ suositeltuja vÃ€lityspalvelin asetuksia minun Firefox versiolleni."> -<!ENTITY torbutton.prefs.use_polipo "KÃ€ytÃ€ Polipoa"> -<!ENTITY torbutton.prefs.custom_settings "Aseta vÃ€lityspalvelinasetukset kÃ€sin"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP-vÃ€lityspalvelin:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL-vÃ€lityspalvelin:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP-vÃ€lityspalvelin:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher-vÃ€lityspalvelin:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS-palvelin:"> -<!ENTITY torbutton.prefs.proxy.port "Portti:"> -<!ENTITY torbutton.pref_connection.notice "Poista Torbutton kÃ€ytÃ¶stÃ€ muuttaaksesi asetuksia."> -<!ENTITY torbutton.pref_connection.more_info "LisÃ€Ã€ tietoja"> -<!ENTITY torbutton.pref_connection_more_info.title "Apua"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton on tÃ€llÃ€hetkellÃ€ kÃ€ytÃ¶ssÃ€. Jos haluat muuttaa vÃ€lityspalvelinasetuksia joita kÃ€ytÃ€t silloin kun Torbutton ei ole kÃ€ytÃ¶ssÃ€, ota ensin Torbutton pois pÃ€Ã€ltÃ€ (Tor Disabled) ja palaa sitten tÃ€nne. Jos haluat muuttaa Tor asetuksia, kÃ€ytÃ€ Torbutton asetukset ikkunaa."> <!ENTITY torbutton.context_menu.new_identity "Uusi identiteetti"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Asetukset..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "E"> <!ENTITY torbutton.button.tooltip "Klikkaa Torbutton aktiiviseksi"> <!ENTITY torbutton.prefs.restore_defaults "Palauta Oletukset"> -<!ENTITY torbutton.prefs.test_settings "Testaa Asetukset"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Ei vÃ€lityspalvelimia osoitteille:"> -<!ENTITY torbutton.prefs.no_proxy_warning "Varoitus: VÃ€ltÃ€ yllÃ€ olevia osoitteita"> <!ENTITY torbutton.cookiedialog.title "Hallitse evÃ€steiden suojauksia"> <!ENTITY torbutton.cookiedialog.lockCol "Suojaus"> <!ENTITY torbutton.cookiedialog.domainCol "Palvelin"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Poista kaikki paitsi suojatut"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Suojaa uudet evÃ€steet"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ÃlÃ€ suojaa uusia evÃ€steitÃ€"> -<!ENTITY torbutton.prefs.transparentTor "KÃ€ytÃ€ Toria lÃ€pinÃ€kyvÃ€sti (edellyttÃ€Ã€ mukautetun transproxyn tai Tor-reitittimen kÃ€yttÃ¶Ã€)"> <!ENTITY torbutton.prefs.block_disk "ÃlÃ€ sÃ€ilytÃ€ selaushistoriaa tai verkkosivuston tietoa (kÃ€ynnistÃ€Ã€ yksityisen selauksen)"> <!ENTITY torbutton.prefs.restrict_thirdparty "EstÃ€ kolmannen osapuolen evÃ€steet ja muut seurantatiedot"> <!ENTITY torbutton.prefs.block_plugins "Poista liitÃ€nnÃ€iset (Flash yms.) kÃ€ytÃ¶stÃ€"> diff --git a/src/chrome/locale/fi/torbutton.properties b/src/chrome/locale/fi/torbutton.properties index 4c11024..279f6d0 100644 --- a/src/chrome/locale/fi/torbutton.properties +++ b/src/chrome/locale/fi/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Poista Tor kÃ€ytÃ¶stÃ€ napsauttamalla. torbutton.panel.label.disabled = Tor pois kÃ€ytÃ¶stÃ€. torbutton.panel.label.enabled = Tor kÃ€ytÃ¶ssÃ€. extensions.torbutton(a)torproject.org.description = Torbuttonin lisÃ€Ã€ painikkeen, jolla voi muokata Torin asetuksia sekÃ€ poistaa nopeasti ja helposti selaustiedot. -torbutton.popup.test.success = Tor-vÃ€lityspalvelimen testaus onnistui! -torbutton.popup.test.failure = Tor-vÃ€lityspalvelimen testaus EPÃONNISTUI! Tarkista vÃ€lityspalvelimen ja Polipon asetukset. -torbutton.popup.test.confirm_toggle = Viimeisin suoritettu Tor vÃ€lityspalvelintesti epÃ€onnistui.\n\nHaluatko siitÃ€ huolimatta kÃ€Ã€ntÃ€Ã€ Torin pÃ€Ã€lle?\n\nHuom: Jos olet korjannut ongelman, voit ajaa testin uudestaan kÃ€yttÃ€mÃ€llÃ€ Torbutton Proxy Preferences ikkunaa, niin et enÃ€Ã€ saa tÃ€tÃ€ varoitusta uudestaan. -torbutton.popup.test.ff3_notice = Klikkaa OK testataksesi Tor vÃ€lityspalvelinasetukset. Testi tapahtuu taustalla, odota rauhassa, ilmoitus annetaan kuin testi on valmis. torbutton.popup.external.title = Ladataanko ulkopuolinen sisÃ€ltÃ¶? torbutton.popup.external.app = Tarvitaan ulkoinen sovellus:\n\n torbutton.popup.external.note = \nHUOM: Ulkoiset sovellukset eivÃ€t lÃ€htÃ¶kohtaisesti ole Tor turvallisia ja saattavat paljastaa identiteettisi!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nJos et luota tÃ€hÃ€n tiedostoon, on parasta torbutton.popup.launch = KÃ€ynnistÃ€ sovellus torbutton.popup.cancel = Peruuta torbutton.popup.dontask = Jatkossa kÃ€ynnistÃ€ aina sovellukset -torbutton.popup.test.no_http_proxy = Tor vÃ€lityspalvelintesti: Paikallista HTTP vÃ€lityspalvelinta ei lÃ¶ydy. Onko polipo kÃ€ynnissÃ€? torbutton.popup.prompted_language = Yksityisyytesi lisÃ€Ã€miseksi Torbutton voi pyytÃ€Ã€ webbisivuista englanninkielisen version. TÃ€mÃ€ saattaa aiheuttaa sen, ettÃ€ webbisivut, jotka luet mieluiten Ã€idinkielellÃ€si, nÃ€ytetÃ€Ã€n englanniksi.\n\nHaluatko pyytÃ€Ã€ webbisivut englanniksi yksityisyyden lisÃ€Ã€miseksi? torbutton.popup.no_newnym = Torbutton ei voi taata sinulle turvallisesti uutta identiteettiÃ€. SillÃ€ ei ole pÃ€Ã€syÃ€ Tor-hallintaporttiin.\n\nOnko Tor Browser Bundle kÃ€ytÃ¶ssÃ€? -torbutton.popup.pref_error = Torbutton ei voi pÃ€ivittÃ€Ã€ asetuksia Tor Browserin profiilihakemistossa. -torbutton.popup.permission_denied = Aseta Tor Browserin hakemiston kÃ€yttÃ¶oikeudet uusiksi tai kopioi se uuteen sijaintiin. -torbutton.popup.device_full = Levy nÃ€yttÃ€isi olevan tÃ€ysi. Vapauta tilaa tai siirrÃ€ Tor Browser uudelle laitteelle. torbutton.title.prompt_torbrowser = TÃ€rkeÃ€Ã€ tietoa Torbuttonista torbutton.popup.prompt_torbrowser = Torbutton toimii nykyÃ€Ã€n toisin kuin ennen: et voi enÃ€Ã€ poistaa sitÃ€ kÃ€ytÃ¶stÃ€.\n\nMuutimme toimintatapaa, sillÃ€ Torbuttonin kÃ€yttÃ¶ ei ole turvallista sellaisessa selaimessa, jota on kÃ€ytetty ilman Toria. Oli liikaa ohjelmavirheitÃ€, joita emme pystyneet korjaamaan millÃ€Ã€n muulla tavalla.\n\nJos haluat kÃ€yttÃ€Ã€ Firefoxia tavanomaisesti, poista Torbutton ja asenna Tor Browser Bundle. Tor Browserin yksityisyysominaisuudet ovat ylivoimaisia verrattuna tavanomaiseen Firefoxiin, vaikka siinÃ€ kÃ€ytettÃ€isiinkin Torbuttonia.\n\nTorbutton poistetaan valitsemalla TyÃ¶kalut -> LisÃ€osat -> Laajennukset ja napsauttamalla Torbuttonin vieressÃ€ olevaa Poista-painiketta. torbutton.popup.short_torbrowser = TÃ€rkeÃ€Ã€ tietoa Torbuttonista!\n\nTorbutton on nykyÃ€Ã€n aina kÃ€ytÃ¶ssÃ€.\n\nLisÃ€tietoa saat napsauttamalla Torbuttonia. diff --git a/src/chrome/locale/fil/torbutton.dtd b/src/chrome/locale/fil/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/fil/torbutton.dtd +++ b/src/chrome/locale/fil/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/fil/torbutton.properties b/src/chrome/locale/fil/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/fil/torbutton.properties +++ b/src/chrome/locale/fil/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/fo/torbutton.dtd b/src/chrome/locale/fo/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/fo/torbutton.dtd +++ b/src/chrome/locale/fo/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/fo/torbutton.properties b/src/chrome/locale/fo/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/fo/torbutton.properties +++ b/src/chrome/locale/fo/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index b08a854..53bfb12 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "ParamÃštres du proxy"> -<!ENTITY torbutton.prefs.recommended_settings "Utiliser les paramÃštres du proxy recommandÃ©s pour ma version de Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Utiliser Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Utiliser des paramÃštres de proxy personnalisÃ©s"> -<!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP :"> -<!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL :"> -<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP :"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher :"> -<!ENTITY torbutton.prefs.proxy.host.socks "HÃŽte SOCKS :"> -<!ENTITY torbutton.prefs.proxy.port "Port :"> -<!ENTITY torbutton.pref_connection.notice "DÃ©sactiver Torbutton pour modifier ces paramÃštres."> -<!ENTITY torbutton.pref_connection.more_info "Plus d'informations"> -<!ENTITY torbutton.pref_connection_more_info.title "Aide"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton est actuellement activÃ©. Si vous souhaitez modifier vos paramÃštres proxy non-Tor, veuillez dÃ©sactiver Torbutton et revenir Ã cette fenÃªtre. Si vous souhaitez modifier vos paramÃštres Tor, veuillez utiliser la fenÃªtre des prÃ©fÃ©rences Torbutton."> <!ENTITY torbutton.context_menu.new_identity "Nouvelle identitÃ©"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Nouveau circuit Tor pour ce site"> @@ -27,11 +13,6 @@ <!ENTITY torbutton.button.tooltip "Cliquez pour lancer Torbutton"> <!ENTITY torbutton.prefs.privacy_security_settings "ParamÃštres de confidentialitÃ© et de sÃ©curitÃ©"> <!ENTITY torbutton.prefs.restore_defaults "Valeurs par dÃ©faut"> -<!ENTITY torbutton.prefs.test_settings "Tester les paramÃštres"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Pas de Proxy pour: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Attention: Ãvitez d'utiliser les noms d'hÃŽtes ci-dessus"> <!ENTITY torbutton.cookiedialog.title "GÃ©rer les protections de cookies"> <!ENTITY torbutton.cookiedialog.lockCol "ProtÃ©gÃ©"> <!ENTITY torbutton.cookiedialog.domainCol "HÃŽte"> @@ -43,7 +24,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Supprimer tous les cookies non protÃ©gÃ©s"> <!ENTITY torbutton.cookiedialog.saveAllCookies "ProtÃ©ger les nouveaux cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne pas protÃ©ger les nouveaux cookies"> -<!ENTITY torbutton.prefs.transparentTor "Torification transparente (requiert un transproxy spÃ©cialisÃ© ou un routeur Tor)"> <!ENTITY torbutton.prefs.priv_caption "ParamÃštres de vie privÃ©e"> <!ENTITY torbutton.prefs.block_disk "Ne pas sauvegarder l'historique de navigation et les donnÃ©es des sites webs (active le Mode de Navigation PrivÃ©e)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les cookies tiers ainsi que les autres donnÃ©es de traÃ§age"> diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index 5e5a808..1568a3c 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Cliquer pour dÃ©sactiver Tor torbutton.panel.label.disabled = Tor Inactif torbutton.panel.label.enabled = Tor Actif extensions.torbutton(a)torproject.org.description = Torbutton fournit un bouton pour configurer les paramÃštres de Tor et nettoie rapidement et facilement les donnÃ©es de navigation privÃ©e. -torbutton.popup.test.success = Test du proxy Tor rÃ©ussi ! -torbutton.popup.test.failure = ÃCHEC du test du proxy Tor ! VÃ©rifiez les configurations du proxy et de Polipo. -torbutton.popup.test.confirm_toggle = Le dernier test de proxy Tor a Ã©chouÃ©.\n\nEtes-vous sÃ»r de vouloir tout de mÃªme continuer?\n\nNote: Si vous avez reglÃ© le problÃšme, vous pouvez relancer le test dans la fenÃªtre des PrÃ©fÃ©rences du Proxy Torbutton afin de supprimer cet avertissement. -torbutton.popup.test.ff3_notice = Cliquez sur OK pour tester vos paramÃštres de proxy Tor. Ce test s'effectuera en tÃ¢che de fond. Merci de votre patience. torbutton.popup.external.title = TÃ©lÃ©charger un type de fichier externe torbutton.popup.external.app = Le Navigateur Tor ne peut pas afficher ce fichier. Il est necessaire de l'ouvrir avec une autre application. torbutton.popup.external.note = Certains types de fichiers peuvent causer des connexions Ã l'Internet sans passer par Tor pour certaines applications @@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Pour Ãªtre en sÃ©curitÃ©, vous ne devriez ouv torbutton.popup.launch = TÃ©lÃ©charger le fichier torbutton.popup.cancel = Annuler torbutton.popup.dontask = TÃ©lÃ©charger automatiquement Ã partir de maintenant -torbutton.popup.test.no_http_proxy = Test du proxy Tor : le proxy HTTP local est injoignable. Est-ce que Polipo fonctionne correctement ? torbutton.popup.prompted_language = Pour renforcer votre anonymat, Torbutton peut demander une version anglaise de la page Web. Les pages que vous prÃ©fÃ©rez lire dans votre langue prÃ©fÃ©rÃ©e pourraient alors s'afficher en anglais.\n\nVoulez-vous demander des pages Web en anglais afin d'amÃ©liorer votre anonymat ? torbutton.popup.no_newnym = Torbutton ne peut pas dÃ©livrer une nouvelle identitÃ© de maniÃšre sÃ©curitaire. Il n'a pas accÃšs au port de contrÃŽle de Tor.\n\nUtilisez-vous le paquet du Navigateur Tor ? -torbutton.popup.pref_error = Torbutton ne peut pas mettre Ã jour les prÃ©fÃ©rences dans le rÃ©pertoire du profil du Navigateur Tor. -torbutton.popup.permission_denied = Merci de rÃ©initialiser les permissions du rÃ©pertoire du Navigateur Tor ou de le copier dans un nouvel emplacement. -torbutton.popup.device_full = Le disque semble Ãªtre plein. Merci de libÃ©rer de la place ou dÃ©placer le Navigateur Tor vers un nouveau pÃ©riphÃ©rique. torbutton.title.prompt_torbrowser = Information importante concernant Torbutton torbutton.popup.prompt_torbrowser = Torbutton Fonctionne diffÃ©remment maintenant : vous ne pouvez plus le dÃ©sactiver.\n\nNous avons effectuÃ© ce changement car il n'est pas sÃ©curitaire d'utiliser Torbutton dans un navigateur qui est Ã©galement utiliser pour une navigation sans Tor. Trop de bogues ne pouvaient Ãªtre rÃ©glÃ©s autrement.\n\nSi vous voulez continuer Ã utiliser Firefox normalement, vous devriez dÃ©sinstaller Torbutton et tÃ©lÃ©charger le paquet du naviguateur Tor. Les propriÃ©tÃ©s de confidentialitÃ© du navigateur Tor sont aussi supÃ©rieures Ã celles de Firefox, mÃªme s'il est utilisÃ© avec Torbutton.\n\nPour enlever Torbutton, allez dans Outils->Modules complÃ©mentaires->Extensions et cliquer sur Supprimer Ã cotÃ© de Torbutton. torbutton.popup.short_torbrowser = Information importante concernant Torbutton!\n\nTorbutton est dorÃ©navant toujours activÃ©.\n\nCliquer sur Torbutton pour plus d'informations. diff --git a/src/chrome/locale/fur/torbutton.dtd b/src/chrome/locale/fur/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/fur/torbutton.dtd +++ b/src/chrome/locale/fur/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/fur/torbutton.properties b/src/chrome/locale/fur/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/fur/torbutton.properties +++ b/src/chrome/locale/fur/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/fy/torbutton.dtd b/src/chrome/locale/fy/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/fy/torbutton.dtd +++ b/src/chrome/locale/fy/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/fy/torbutton.properties b/src/chrome/locale/fy/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/fy/torbutton.properties +++ b/src/chrome/locale/fy/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/ga/torbutton.dtd b/src/chrome/locale/ga/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/ga/torbutton.dtd +++ b/src/chrome/locale/ga/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/ga/torbutton.properties b/src/chrome/locale/ga/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/ga/torbutton.properties +++ b/src/chrome/locale/ga/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/gl/torbutton.dtd b/src/chrome/locale/gl/torbutton.dtd index 6b251a9..8f22cc2 100644 --- a/src/chrome/locale/gl/torbutton.dtd +++ b/src/chrome/locale/gl/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Axustes do proxy"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Porto:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Axuda"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "Nova identidade"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restabelecer valores predeterminados"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/gl/torbutton.properties b/src/chrome/locale/gl/torbutton.properties index c3abbac..a6023da 100644 --- a/src/chrome/locale/gl/torbutton.properties +++ b/src/chrome/locale/gl/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancelar torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/gu/torbutton.dtd b/src/chrome/locale/gu/torbutton.dtd index 92958cb..8b95427 100644 --- a/src/chrome/locale/gu/torbutton.dtd +++ b/src/chrome/locale/gu/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "àªªà«àª°à«àªà«àªžà« àªà«àª àªµàª£à«àª"> -<!ENTITY torbutton.prefs.recommended_settings "àª®àªŸàª°à« àª«àªŸàª¯àª°àª«à«àªà«àªž àªàªµà«àª€à«àª€àª¿ àª®àªŸàªà« àªžà«àªàªµà«àª² àªªà«àª°à«àªà«àªžà« àªà«àª àªµàª£à«àª àªµàªŸàªªàª°à«"> -<!ENTITY torbutton.prefs.use_polipo "àªªà«àª²àª¿àªªà« àªµàªŸàªªàª°à«"> -<!ENTITY torbutton.prefs.custom_settings "àªªà«àª€àªŸàªšà« àªªà«àª°à«àªà«àªžà« àªà«àª àªµàª£à«àª àªµàªŸàªªàª°à«"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP àªªà«àª°à«àªà«àªžà«:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL àªªà«àª°à«àªà«àªžà«:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP àªªà«àª°à«àªà«àªžà«:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher àªªà«àª°à«àªà«àªžà«:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS àª¯àªàª®àªŸàªš:"> -<!ENTITY torbutton.prefs.proxy.port "àªªà«àª°à«àª:"> -<!ENTITY torbutton.pref_connection.notice "àª àªà«àª àªµàª£à«àª àª¬àªŠàª²àªµàªŸ àª®àªŸàªà« àªà«àª°àª¬àªàªš àªšàª¿àª·à«àªà«àª°àª¿àª¯ àªàª°à«."> -<!ENTITY torbutton.pref_connection.more_info "àªµàª§à« àª®àªŸàª¹àª¿àª€à«"> -<!ENTITY torbutton.pref_connection_more_info.title "àª®àªŠàªŠ"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "àªªà«àª°àªŸàª¥àª®àª¿àªàª€àªŸàª..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "àªà«àª°àª¬àªàªš àª¶àª°à« àªàª°àªµàªŸ àªà«àª²àª¿àª àªàª°à«"> <!ENTITY torbutton.prefs.restore_defaults "àª®à«àª³àªà«àª€ àªªàªŸàªà«àª àª²àªŸàªµà«"> -<!ENTITY torbutton.prefs.test_settings "àªàªàªŸàªžàª£à« àªà«àª àªµàª£à«àª"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "àª àª®àªŸàªà« àªªà«àª°à«àªà«àªžà« àªšàª¹à«:"> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/gu/torbutton.properties b/src/chrome/locale/gu/torbutton.properties index 38489f9..fcc5d85 100644 --- a/src/chrome/locale/gu/torbutton.properties +++ b/src/chrome/locale/gu/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = àªà«àª° àªšàª¿àª·à«àªà«àª°àª¿àª¯ àªàª° torbutton.panel.label.disabled = àªà«àª° àªšàª¿àª·à«àªà«àª°àª¿àª¯ torbutton.panel.label.enabled = àªà«àª° àªžàªà«àª°àª¿àª¯ extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = àªà«àª° àªªà«àª°à«àªà«àªžà« àªàªàªŸàªžàª£à« àªžàª«àª³! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = àªàªŸàª°à«àª¯àªà«àª°àª® àª¶àª°à« àªàª°à« torbutton.popup.cancel = àª°àªŠà« àªàª°à« torbutton.popup.dontask = àª¹àªµà« àªªàªà« àª¹àªàª®à«àª¶àªŸ àªàªŸàª°à«àª¯àªà«àª°àª® àª¶àª°à« àªàª°à« -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/gun/torbutton.dtd b/src/chrome/locale/gun/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/gun/torbutton.dtd +++ b/src/chrome/locale/gun/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/gun/torbutton.properties b/src/chrome/locale/gun/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/gun/torbutton.properties +++ b/src/chrome/locale/gun/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/ha/torbutton.dtd b/src/chrome/locale/ha/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/ha/torbutton.dtd +++ b/src/chrome/locale/ha/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/ha/torbutton.properties b/src/chrome/locale/ha/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/ha/torbutton.properties +++ b/src/chrome/locale/ha/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd index 1255385..e0fd7c8 100644 --- a/src/chrome/locale/he/torbutton.dtd +++ b/src/chrome/locale/he/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "××××š××ª ×€×š××§×¡×"> -<!ENTITY torbutton.prefs.recommended_settings '××©×ª××© ×××××š××ª ×€×š××§×¡× ×××××Š××ª ×¢×××š ××š×¡×ª ×"×€×××š×€××§×¡" ×©××'> -<!ENTITY torbutton.prefs.use_polipo "××©×ª××© ××€××××€×"> -<!ENTITY torbutton.prefs.custom_settings "××©×ª××© ×××××š××ª ×€×š××§×¡× ×××××š××ª ××š××©"> -<!ENTITY torbutton.prefs.proxy.host.http "×€×š××§×¡× HTTP:"> -<!ENTITY torbutton.prefs.proxy.host.https "×€×š××§×¡× SSL:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "×€×š××§×¡× FTP:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "×××š× SOCKS:"> -<!ENTITY torbutton.prefs.proxy.port "×€××š×:"> -<!ENTITY torbutton.pref_connection.notice "××©××ª ××ª Torbutton ×¢× ×× ×ª ××©× ××ª ××××š××ª ×××"> -<!ENTITY torbutton.pref_connection.more_info "××××¢ × ××¡×£"> -<!ENTITY torbutton.pref_connection_more_info.title "×¢××š×"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton ×€××¢× ××¢×ª. ×× ××š×Š×× × ××©× ××ª ××ª ××××š××ª ××€×š××§×¡× ×©××× × ×©× Tor, ×× × ××©××ª ××ª Torbutton ×××××š ×× ×. ×× ××š×Š×× × ××©× ××ª ××ª ××××š××ª Tor, ×× × ××©×ª××© ××××× ×××××š××ª ×©× Torbutton."> <!ENTITY torbutton.context_menu.new_identity "××××ª ×××©×"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "××××š××ª"> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "×××¥ ×××× ×××ª×× ××ª Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "×××š× ×××š××š×ª ××××"> -<!ENTITY torbutton.prefs.test_settings "××× ××××š××ª"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "××× ×€×š××§×¡×× ×¢×××š:"> -<!ENTITY torbutton.prefs.no_proxy_warning "××××š×: ×××× ×¢ ××©××××© ××©×××ª ×××š××× ××¢××"> <!ENTITY torbutton.cookiedialog.title "× ×× ××× ××ª ×§××§××"> <!ENTITY torbutton.cookiedialog.lockCol "××××"> <!ENTITY torbutton.cookiedialog.domainCol "×××š×"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "×××§ ××ª ×× ××§××§×× ××× ×××× ××"> <!ENTITY torbutton.cookiedialog.saveAllCookies "××× ×¢× ×§××§×× ×××©××"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "×× ×ª×× ×¢× ×§××§×× ×××©××"> -<!ENTITY torbutton.prefs.transparentTor "××€×¢××ª ×××š ××Š××š× ×××ª× × ×š×××ª (×××š×© transproxy ×× Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "××©××ª ×ª××¡×€××ª ××€××€× (×××× Flash)"> diff --git a/src/chrome/locale/he/torbutton.properties b/src/chrome/locale/he/torbutton.properties index f079f06..e4074c3 100644 --- a/src/chrome/locale/he/torbutton.properties +++ b/src/chrome/locale/he/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = ×××¥ ×××××× Tor torbutton.panel.label.disabled = Tor ××××× torbutton.panel.label.enabled = Tor ×€××¢× extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = ××××§×ª ××€×š××§×¡× ×©× Tor ×¢××š× ×××Š×××! -torbutton.popup.test.failure = ××××§×ª ××€×š××§×¡× ×©× Tor × ××©××! ××××§ ××ª ××××š××ª ××€×š××§×¡× ×-Polipo. -torbutton.popup.test.confirm_toggle = ××××§×ª ××€×š××§×¡× ××××š×× × × ××©×× ××©××××© ×-Tor.\n\n××× ××ª× ×××× ×©××š×Š×× × ××××©×× ××× ××§×š×?\n\n××¢×š×: ×× ×ª××§× ×ª ××ª ×××¢×××, ××ª× ×××× ×××××š ×¢× ×××××§× ××ª×€×š×× ××××š××ª ××€×š××§×¡× ×©× Torbutton ××× ×××× ××××¢× ××. -torbutton.popup.test.ff3_notice = ×××¥ ×××©××š ××× ×××××§ ××ª ××××š××ª ××€×š××§×¡× ×©× Tor. ××××§× ×× ×ª×ª××Š×¢ ××š×§×¢. ×× × ×××ª× ××¡××× ××ª. torbutton.popup.external.title = ×××¢×× ×ª××× ×××Š×× ×? torbutton.popup.external.app = ×ª××× × ×××Š×× ××ª × ×××Š× ××× ×××€× ×:\n torbutton.popup.external.note = \n\n×©×× ××: ×ª××× ××ª ×××Š×× ×××ª ××× × ××××××ª ××¢×©××××ª ××€×××¢ ××€×š××××ª ×©××!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \n×× ×§×××¥ ×× ××× × ××××, ×¢× torbutton.popup.launch = ××€×¢× ×ª××× × torbutton.popup.cancel = ××××× torbutton.popup.dontask = ×ª××× ××€×¢× ××ª ××ª××× × ××¢×ª× ××××× -torbutton.popup.test.no_http_proxy = ××××§×ª ×€×š××§×¡× ×©× Tor: ×€×š××§×¡× HTTP ××§××× ××× × ××××. ××× Polipo ×€××¢× ××š×××? torbutton.popup.prompted_language = ×¢× ×× ×ª ×××××ª ××€×š××××ª ×××××š×ª, Torbutton ×××× ×××§×© ××ª ×××š×¡× ××× ××××ª ×©× ××ª×š× ××× ××š× ×. ×× ×¢×©×× ×××š×× ××× ×©××ª×š×× ××××× ××ª× ×š××× ×××Š×× ××× ××××ª.\n\n××× ××š×Š×× × ×××§×© ××Š×€××ª ×××ª×š×× ××× ××××ª ××Š××š× ×€×š××××ª ×××××š×ª? torbutton.popup.no_newnym = Torbutton ××× × ××¡××× ××¡×€×§ ×× ××××ª ×××©× ×××××××. ××× ×××©× ×× Tor Control Port.\n\n××× ××ª× ××€×¢×× ××ª -torbutton.popup.pref_error = Torbutton ××× × ×××× ××¢××× ××ª ×××¢××€××ª ××ª××§××ª ××€×š××€××. -torbutton.popup.permission_denied = ×× × ×§××¢ ××š×©×××ª ×××©××ª ××ª××§××× ×× × ××Š× ××€××€× Tor ×× ××¢×ª×§ ×××ª× ××××§×× ×××©. -torbutton.popup.device_full = ××××¡×§ × ×š×× ××× ×©×× ×××¡×× ×€× ××. ×× × ×€× × ××§×× ×× ××¢××š ××ª ××€××€× Tor ××××§×× ×××©. torbutton.title.prompt_torbrowser = ××××¢ Torbutton ××©×× torbutton.popup.prompt_torbrowser = Torbutton ×¢××©×× ×¢××× ×××š×ª: ××-××€×©×š ×××××ª ×××ª× ×××ª×š. ×¢×©×× × ××ª ××©×× ×× ××× ×× ×× ×× ×××× ×××©×ª××© ×-Torbutton ×××€××€× ×©××ª××©×× ×× ×× ×š×§ ×-Tor. ××× ×××ª×š ×××× ××××× ×©×× ××××× × ××ª×§× ××©×× ××š× ×××š×ª. ×× ××š×Š×× ×× ××××©×× ××©××××© ×š××× ××€×××š×€××§×¡, ×¢×××× ×××¡××š ××ª Torbutton ×××××š×× ××ª Tor Browser Bundle. ×××€××× × ××€×š××××ª ×©× Tor Browser ××¢×××× ××××€××× × ××€×š××××ª ××š××××× ×©× ×€×××š×€××§×¡, ××€××× ×× ×€×××š×€××§×¡ ××©××××© ××× ×¢× Torbutton. ×××¡×š×ª Torbutton, ××©× ×××××â×ª××¡×€××ªâ××š××××ª ××× ×××Š× ×¢× ××€×ª××š ×××¡×š× ××× ×-Torbutton. torbutton.popup.short_torbrowser = ××××¢ ××©×× ×¢× Torbutton!\nTorbutton ×¢××©×× ×€××¢× ×ª×××.\n×××Š× ×¢× ×-Torbutton ×××××¢ × ××¡×£. diff --git a/src/chrome/locale/hi/torbutton.dtd b/src/chrome/locale/hi/torbutton.dtd index 56f12ac..eb4fea9 100644 --- a/src/chrome/locale/hi/torbutton.dtd +++ b/src/chrome/locale/hi/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "à€ªà¥à€°à¥à€à¥à€žà¥ à€žà¥à€à¥à€à€"> -<!ENTITY torbutton.prefs.recommended_settings "à€®à¥à€°à¥ à¥à€Ÿà€¯à€° à¥à€Ÿà€à¥à€ž à€à€¥à€š à€à¥ à€²à€¿à€¯à¥ à€žà¥à€à€Ÿà€¯à¥ à€ªà¥à€°à¥à€à¥à€žà¥ à€žà¥à€à€¿à€à€ à€à€ªà€¯à¥à€ à€à€°à¥ "> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "à€µà¥à€¯à€µà€Ÿà€¹à€Ÿà€°à€¿à€ à€ªà¥à€°à¥à€à¥à€žà¥ à€žà¥à€à€¿à€à€ à€à€Ÿ à€à€ªà€¯à¥à€ à€à€°à¥"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP à€ªà¥à€°à¥à€à¥à€žà¥:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL à€ªà¥à€°à¥à€à¥à€žà¥:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP à€ªà¥à€°à¥à€à¥à€žà¥:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "à€à¥à¥à€° à€ªà¥à€°à¥à€à¥à€žà¥ "> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS à€à€€à€¿à€¥à¥à€¯ :"> -<!ENTITY torbutton.prefs.proxy.port "à€ªà¥à€°à¥à€/à€Šà¥à€µà€Ÿà€° :"> -<!ENTITY torbutton.pref_connection.notice "à€à€š à€žà¥à€à€¿à€à€ à€à¥ à€¬à€Šà€²à€šà¥ à€à¥ à€²à€¿à€¯à¥ à€à¥à€° à€¬à€à€š à€à¥ à€à€žà€®à€°à¥à€¥ à€à€°à¥ "> -<!ENTITY torbutton.pref_connection.more_info "à€à€§à€¿à€ à€à€Ÿà€šà€à€Ÿà€°à¥ à€à¥ à€²à€¿à€ "> -<!ENTITY torbutton.pref_connection_more_info.title "à€žà€¹à€Ÿà€¯à€€à€Ÿ"> -<!ENTITY torbutton.pref_connection_more_info.text "à€à¥à€° à€¬à€à€š à€à€à¥ à€žà€®à€°à¥à€¥à€à¥à€€ à€¹à¥ à¥€ à€à€à€° à€à€ª à€à€ªà€šà¥ à€à€šà¥à€¯ (à€à¥à€° à€à¥ à€à€²à€Ÿà€µà€Ÿ) à€ªà¥à€°à¥à€à¥à€žà¥ à€žà¥à€à€¿à€à€ à€à¥ à€¬à€Šà€²à€šà€Ÿ à€à€Ÿà€¹à€€à¥ à€¹à¥ à€€à¥ à€à¥à€° à€à¥ à€à€žà€®à€°à¥à€¥ à€à€°à€à¥ à€à€§à€° à€ªà¥à€°à€€à€¿à€à€®à€š à€à€°à¥ à¥€ à€à€à€° à€à€ª à€à€ªà€šà¥ à€à¥à€° à€žà¥à€à€¿à€à€ à€à¥ à€¬à€Šà€²à€šà€Ÿ à€à€Ÿà€¹à€€à¥ à€¹à¥ à€€à¥ à€à¥à€ªà€¿à€¯à€Ÿ à€à¥à€° à€¬à€à€š à€à¥ à€ªà¥à€°à€¿à¥à€°à¥à€šà¥à€ž à€à€¿à¥à€à¥ à€à€Ÿ à€à€ªà€¯à¥à€ à€à€°à¥ à¥€"> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "à€ªà¥à€°à€¿à¥à€°à¥à€šà¥à€žà€ž ..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "à€à¥à€° à€¬à€à€š à€à¥ à€à€°à€à€à€¿à€€ à€à€°à€šà¥ à€à¥ à€²à€¿à€¯à¥ à€à¥à€²à€¿à€ à€à€°à¥"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/hi/torbutton.properties b/src/chrome/locale/hi/torbutton.properties index 249ae86..1b28643 100644 --- a/src/chrome/locale/hi/torbutton.properties +++ b/src/chrome/locale/hi/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = à€°à€Šà¥à€Š à€à€°à¥à€ torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/hr/torbutton.dtd b/src/chrome/locale/hr/torbutton.dtd index 4e5df23..1a47a21 100644 --- a/src/chrome/locale/hr/torbutton.dtd +++ b/src/chrome/locale/hr/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy postavke"> -<!ENTITY torbutton.prefs.recommended_settings "Koristi preporuÄene proxy postavke za moju inaÄicu Firefoxa"> -<!ENTITY torbutton.prefs.use_polipo "Koristi Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Koristi prilagoÄene proxy postavke"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS domaÄin:"> -<!ENTITY torbutton.prefs.proxy.port "PrikljuÄak:"> -<!ENTITY torbutton.pref_connection.notice "OnemoguÄite Torbutton da biste promijenili ove postavke."> -<!ENTITY torbutton.pref_connection.more_info "ViÅ¡e informacija"> -<!ENTITY torbutton.pref_connection_more_info.title "PomoÄ"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton je trenutno omoguÄen. Ukoliko ÅŸelite promijeniti VaÅ¡e ne-Tor proxy postavke, molimo Vas da onemoguÄite Torbutton i vratite se ovdje. Ukoliko ÅŸelite promijeniti VaÅ¡e Tor postavke, molimo Vas, koristite prozor Torbutton postavki."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Postavke..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "Z"> <!ENTITY torbutton.button.tooltip "Kliknite za pokretanje Torbuttona"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/hr/torbutton.properties b/src/chrome/locale/hr/torbutton.properties index 2b77fee..8f6808d 100644 --- a/src/chrome/locale/hr/torbutton.properties +++ b/src/chrome/locale/hr/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Kliknite da biste onemoguÄili Tor torbutton.panel.label.disabled = Tor onemoguÄen torbutton.panel.label.enabled = Tor omoguÄen extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/ht/torbutton.dtd b/src/chrome/locale/ht/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/ht/torbutton.dtd +++ b/src/chrome/locale/ht/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/ht/torbutton.properties b/src/chrome/locale/ht/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/ht/torbutton.properties +++ b/src/chrome/locale/ht/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd index 34d59a9..a0ca551 100644 --- a/src/chrome/locale/hu/torbutton.dtd +++ b/src/chrome/locale/hu/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy beÃ¡llÃtÃ¡sok"> -<!ENTITY torbutton.prefs.recommended_settings "Az ajÃ¡nlott proxy beÃ¡llÃtÃ¡sok hasznÃ¡lata a Firefox verziÃ³mhoz"> -<!ENTITY torbutton.prefs.use_polipo "Polipo hasznÃ¡lata"> -<!ENTITY torbutton.prefs.custom_settings "EgyÃ©ni proxy beÃ¡llÃtÃ¡sok hasznÃ¡lata"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Ã¡llomÃ¡snÃ©v:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Tiltsa le a Torbutton-t ezen beÃ¡llÃtÃ¡sok megvÃ¡ltoztatÃ¡sÃ¡hoz"> -<!ENTITY torbutton.pref_connection.more_info "TovÃ¡bbi informÃ¡ciÃ³k"> -<!ENTITY torbutton.pref_connection_more_info.title "SÃºgÃ³"> -<!ENTITY torbutton.pref_connection_more_info.text "A Torbutton jelenleg engedÃ©lyezett. Ha szeretnÃ© megvÃ¡ltoztatni a Tor nÃ©lkÃŒli proxy beÃ¡llÃtÃ¡sokat, kapcsolja ki Torbutton-t Ã©s tÃ©rjen vissza ide. Ha szeretnÃ© megvÃ¡ltoztatni a Tor beÃ¡llÃtÃ¡sait, hasznÃ¡lja inkÃ¡bb a Torbutton BeÃ¡llÃtÃ¡sok ablakÃ¡t."> <!ENTITY torbutton.context_menu.new_identity "Ãj szemÃ©lyazonossÃ¡g"> <!ENTITY torbutton.context_menu.new_identity_key "S"> <!ENTITY torbutton.context_menu.preferences "BeÃ¡llÃtÃ¡sok..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "S"> <!ENTITY torbutton.button.tooltip "Kattintson a Torbutton inicializÃ¡lÃ¡sÃ¡hoz"> <!ENTITY torbutton.prefs.restore_defaults "AlapÃ©rtÃ©kek visszaÃ¡llÃtÃ¡sa"> -<!ENTITY torbutton.prefs.test_settings "BeÃ¡llÃtÃ¡sok tesztelÃ©se"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Nincs proxy ehhez:"> -<!ENTITY torbutton.prefs.no_proxy_warning "Figyelem: Ne hasznÃ¡lja a lentebb lÃ¡thatÃ³ hostneveket"> <!ENTITY torbutton.cookiedialog.title "SÃŒti vÃ©delem kezelÃ©se"> <!ENTITY torbutton.cookiedialog.lockCol "VÃ©dett"> <!ENTITY torbutton.cookiedialog.domainCol "ÃllomÃ¡s"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "A vÃ©dett kivÃ©telÃ©vel az Ã¶sszes tÃ¶rlÃ©se"> <!ENTITY torbutton.cookiedialog.saveAllCookies "VÃ©dje az Ãºj sÃŒtiket"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne vÃ©dje az Ãºj sÃŒtiket"> -<!ENTITY torbutton.prefs.transparentTor "ÃtlÃ¡tszÃ³ Tor-osÃtÃ¡s (Egyedi transproxy-t vagy Tor routert igÃ©nyel)"> <!ENTITY torbutton.prefs.block_disk "Ne rÃ¶gzÃtsen bÃ¶ngÃ©szÅ elÅzmÃ©nyeket, vagy weboldal adatot (engedÃ©lyezi a PrivÃ¡t bÃ¶ngÃ©szÅ mÃ³dot)"> <!ENTITY torbutton.prefs.restrict_thirdparty "A harmadik fÃ©ltÅl szÃ¡rmazÃ³ sÃŒtik Ã©s nyomkÃ¶vetÃ©si adatok korlÃ¡tozÃ¡sa"> <!ENTITY torbutton.prefs.block_plugins "BÃ¶ngÃ©szÅ kiegÃ©szÃtÅk kikapcsolÃ¡sa (mint pl. a Flash)"> diff --git a/src/chrome/locale/hu/torbutton.properties b/src/chrome/locale/hu/torbutton.properties index fc68af6..722f45e 100644 --- a/src/chrome/locale/hu/torbutton.properties +++ b/src/chrome/locale/hu/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Kattintson rÃ¡ a Tor kikapcsolÃ¡sÃ¡hoz torbutton.panel.label.disabled = Tor kikapcsolva torbutton.panel.label.enabled = Tor bekapcsolva extensions.torbutton(a)torproject.org.description = A Torbutton egy gombot biztosÃt a Tor beÃ¡llÃtÃ¡sok mÃ³dosÃtÃ¡sÃ¡hoz Ã©s a gyors Ã©s kÃ¶nnyÅ± takarÃtÃ¡sÃ¡hoz a privÃ¡t bÃ¶ngÃ©szÃ©si adatoknak. -torbutton.popup.test.success = A Tor proxy teszt sikeres! -torbutton.popup.test.failure = Tor proxy teszt SIKERTELEN! EllenÅrizze a proxy Ã©s a Polipo beÃ¡llÃtÃ¡sokat. -torbutton.popup.test.confirm_toggle = A legutÃ³bbi Tor proxy teszt nem tudta a Tor-t hasznÃ¡lni.\n\nBiztos benne, hogy mindenkÃ©ppen engedÃ©lyezi?\n\nMegjegyzÃ©s: Ha kijavÃtott a problÃ©mÃ¡t, akkor Ãºjra futtathatja a tesztet a Torbutton Proxy beÃ¡llÃtÃ¡sok ablakban, hogy megszÃŒntesse ezt a figyelmeztetÃ©st. -torbutton.popup.test.ff3_notice = Kattintson az OK gombra, a Tor proxy beÃ¡llÃtÃ¡sok tesztelÃ©sÃ©hez. Ez a teszt a hÃ¡ttÃ©rben tÃ¶rtÃ©nik. KÃ©rjÃŒk, legyen tÃŒrelmes. torbutton.popup.external.title = KÃŒlsÅ tartalom betÃ¶ltÃ©se? torbutton.popup.external.app = Egy kÃŒlsÅ alkalmazÃ¡s szÃŒksÃ©ges a kezelÃ©shez:\n torbutton.popup.external.note = \nMEGJEGYZÃS: A kÃŒlsÅ alkalmazÃ¡sok alaphelyzetben NEM biztonsÃ¡gosak Ã©s felfedhetik kilÃ©tÃ©t.\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nHa ez a fÃ¡jl nem megbÃzhatÃ³, akkor jobb, torbutton.popup.launch = AlkalmazÃ¡s indÃtÃ¡sa torbutton.popup.cancel = MÃ©gse torbutton.popup.dontask = Mindig indÃtsa az alkalmazÃ¡sokat mostantÃ³l -torbutton.popup.test.no_http_proxy = Tor proxy teszt: A helyi HTTP Proxy elÃ©rhetetlen. A Polipo megfelelÅen mÅ±kÃ¶dik? torbutton.popup.prompted_language = A mÃ©g tÃ¶bb adatvÃ©delem Ã©rdekÃ©ben a Torbutton kÃ©rheti a weboldaltÃ³l, hogy angol nyelvÅ± oldalt szolgÃ¡ljon ki. Ez azt jelenti, hogy a sajÃ¡t nyelve helyet az oldal angolul jelenhet meg.\n\nSzeretnÃ© kÃ©rni a magasabb biztonsÃ¡g Ã©rdekÃ©ben az angol nyelvÅ± oldalak lekÃ©rÃ©sÃ©t? torbutton.popup.no_newnym = A Torbutton nem tud biztonsÃ¡gosan Ãj szemÃ©lyazonossÃ¡got adni. Nincs hozzÃ¡fÃ©rÃ©se a Tor vezÃ©rlÅ porthoz.\n\nNem a Tor bÃ¶ngÃ©szÅ csomagot hasznÃ¡lja? -torbutton.popup.pref_error = A Torbutton nem tudja frissÃteni a beÃ¡llÃtÃ¡sokat a Tor bÃ¶ngÃ©szÅ profil kÃ¶nyvtÃ¡rÃ¡ban. -torbutton.popup.permission_denied = KÃ©rjÃŒk, vagy Ã¡llÃtsa vissza a jogosultsÃ¡gokat a Tor Browser kÃ¶nyvtÃ¡rhoz, vagy mÃ¡solja azt egy Ãºj helyre. -torbutton.popup.device_full = Ãgy tÅ±nik, hogy a lemez megtelt. KÃ©rjÃŒk, szabadÃtson fel helyet, vagy helyezze Ã¡t a Tor Browser-t egy mÃ¡sik hÃ¡ttÃ©rtÃ¡rolÃ³ra. torbutton.title.prompt_torbrowser = Fontos Torbutton informÃ¡ciÃ³ torbutton.popup.prompt_torbrowser = A Torbutton most mÃ¡r mÃ¡skÃ©pp mÅ±kÃ¶dik: nem kapcsolhatÃ³ ki tÃ¶bbÃ©.\n\nAzÃ©rt hoztok ezt a dÃ¶ntÃ©st, mert nem biztonsÃ¡gos egy olyan bÃ¶ngÃ©szÅbÅl Torbuttont hasznÃ¡lni, amely Tor hasznÃ¡latÃ¡n kÃvÃŒli is bÃ¶ngÃ©szÃ©sre hasznÃ¡lt. TÃºl soh hiba tÃ¶rtÃ©nhet, amit mÃ¡skÃ©pp nem tudunk javÃtani.\n\nHa szeretnÃ© a Firefox-ot normÃ¡lisan hasznÃ¡lni, akkor a Torbutton-t el kell tÃ¡volÃtania, Ã©s helyette letÃ¶lteni a Tor BÃ¶ngÃ©szÅ Csomagot. Az adatvÃ©delmi beÃ¡llÃtÃ¡sai a Tor BÃ¶ngÃ©szÅnek tovÃ¡bbÃ¡ magasabbak, mint a normÃ¡lis Firefox-nak, mÃ©g akkor is, ha a Firefox Torbutton-nal kerÃŒlt egyÃŒtt felhasznÃ¡lÃ¡sra.\n\nA Torbutton eltÃ¡volÃtÃ¡sÃ¡hoz navigÃ¡ljon az EszkÃ¶zÃ¶k>KiegÃ©szÃtÅk>KiterjesztÃ©sek menÃŒpontba., majd nyomja meg az EltÃ¡volÃtÃ¡s gombot a Torbutton mellett. torbutton.popup.short_torbrowser = Fontos Torbutton informÃ¡ciÃ³!\n\na Torbutton most mÃ¡r mindig engedÃ©lyezett.\n\nKattintson a Torbutton-ra tovÃ¡bbi informÃ¡ciÃ³kÃ©rt. diff --git a/src/chrome/locale/hy/torbutton.dtd b/src/chrome/locale/hy/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/hy/torbutton.dtd +++ b/src/chrome/locale/hy/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/hy/torbutton.properties b/src/chrome/locale/hy/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/hy/torbutton.properties +++ b/src/chrome/locale/hy/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd index 9153999..25ea8cc 100644 --- a/src/chrome/locale/id/torbutton.dtd +++ b/src/chrome/locale/id/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Pengaturan proxy"> -<!ENTITY torbutton.prefs.recommended_settings "Gunakan pengaturan proxy yang disarankan untuk versi Firefox saya"> -<!ENTITY torbutton.prefs.use_polipo "Gunakan Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Gunakan pengaturan proxy yang disesuaikan"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Nonaktifkan Torbutton mengubah pengaturan ini."> -<!ENTITY torbutton.pref_connection.more_info "Informasi lebih lanjut"> -<!ENTITY torbutton.pref_connection_more_info.title "Bantuan"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton sedang aktif. Apabila Anda ingin mengubah pengaturan proxy selain proxy Tor, Silahkan nonaktifkan Torbutton dan kembali ke sini. Apabila Anda ingin mengubah pengaturan Tor, silahkan gunakan jendela preferensi Torbutton."> <!ENTITY torbutton.context_menu.new_identity "Identitas Baru"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferensi..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Klik untuk mengaktifkan Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Kembalikan ke asal"> -<!ENTITY torbutton.prefs.test_settings "Uji pengaturan"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS V4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS V5"> -<!ENTITY torbutton.prefs.no_proxies_on "Jangan gunakan proxy untuk: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Peringatan: Hindari penggunaan hostname di atas"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/id/torbutton.properties b/src/chrome/locale/id/torbutton.properties index abaacb5..ed812e8 100644 --- a/src/chrome/locale/id/torbutton.properties +++ b/src/chrome/locale/id/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Klik untuk menonaktifkan Tor torbutton.panel.label.disabled = Tor dinonaktifkan torbutton.panel.label.enabled = Tor diaktifkan extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Pengujian proxy Tor berhasil! -torbutton.popup.test.failure = Pengujian proxy Tor GAGAL! Periksa pengaturan proxy dan polipo Anda. -torbutton.popup.test.confirm_toggle = Pengujian proxy Tor terakhir gagal menggunakan Tor.\n\nApakah Anda yakin untuk tetap mengaktifkannya?\n\nCatatan: Apabila Anda telah memperbaiki masalahnya, Anda dapat melakukan pengujian ulang pada jendela Preferensi Proxy Tor untuk menghapus peringatan ini. -torbutton.popup.test.ff3_notice = Klik OK untuk menguji pengaturan proxy Tor. Pengujian ini akan berjalan pada latar belakang. Mohon bersabar. torbutton.popup.external.title = Muat konten eksternal? torbutton.popup.external.app = Sebuah aplikasi eksternal butuh untuk ditangani:\n\n torbutton.popup.external.note = \n\nCATATAN: secara default, aplikasi eksternal tidaklah aman untuk Tor dan dapat membuka penyamaran Anda!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Luncurkan aplikasi. torbutton.popup.cancel = Batal torbutton.popup.dontask = Selalu luncurkan aplikasi mulai dari sekarang -torbutton.popup.test.no_http_proxy = Pengujian proxy Tor: Proxy HTTP lokal tidak dapat dijangkau. Apakah Polipo berjalan sebagaimana mestinya? torbutton.popup.prompted_language = Untuk memberikan Anda kerahasiaan yang lebih, Torbutton akan meminta versi bahasa Inggris dari halaman web. Ini mungkin menyebabkan halaman web yang Anda ingin baca dalam bahasa asli Anda akan ditampilkan dalam bahasa Inggris. â â Apakah anda mau meminta halaman web bahasa Inggris untuk kerahasiaan yang lebih baik? torbutton.popup.no_newnym = Torbution tidak dapat memberikan Anda identitas baru secara aman. Torbutton tidak memiliki akses terhadap Tor Control Port. ââ Apakah Anda sedang menjalankan paket browser Tor? -torbutton.popup.pref_error = Torbutton tidak dapat memperbarui preferensi di dalam petunjuk profil browser Tor. -torbutton.popup.permission_denied = Silahkan reset izin petunjuk dari browser Tor atau copy ke lokasi baru -torbutton.popup.device_full = Disk tampaknya sudah penuh. Harap kosongkan tempat atau pindahkan browser Tor ke alat baru. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd index 63d0f78..b830af0 100644 --- a/src/chrome/locale/is/torbutton.dtd +++ b/src/chrome/locale/is/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "HjÃ¡lp"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "NÃœtt auÃ°kenni"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/is/torbutton.properties b/src/chrome/locale/is/torbutton.properties index 1e3e110..701209b 100644 --- a/src/chrome/locale/is/torbutton.properties +++ b/src/chrome/locale/is/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = HÃŠtta viÃ° torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index 75e3d36..2ebeeff 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Configurazione del proxy"> -<!ENTITY torbutton.prefs.recommended_settings "Usa le impostazioni proxy consigliate per questa versione di Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Usa Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Usa impostazioni proxy personalizzate"> -<!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:"> -<!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:"> -<!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:"> -<!ENTITY torbutton.prefs.proxy.port "Porta:"> -<!ENTITY torbutton.pref_connection.notice "Disattiva Torbutton per modificare queste impostazioni"> -<!ENTITY torbutton.pref_connection.more_info "Ulteriori informazioni"> -<!ENTITY torbutton.pref_connection_more_info.title "Aiuto"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton Ãš attualmente attivo. Se vuoi cambiare la configurazione del proxy quando non usi Tor, disabilita Torbutton e torna qui. Se vuoi modificare la configurazione quando usi Tor, usa la finestra delle preferenze di Torbutton."> <!ENTITY torbutton.context_menu.new_identity "Nuova identitÃ "> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Nuovo Circuito Tor per questo Sito"> @@ -27,11 +13,6 @@ <!ENTITY torbutton.button.tooltip "Fai clic per inizializzare Torbutton"> <!ENTITY torbutton.prefs.privacy_security_settings "Impostazioni di Privacy e Sicurezza"> <!ENTITY torbutton.prefs.restore_defaults "Reimposta i valori di default"> -<!ENTITY torbutton.prefs.test_settings "Fai un test delle impostazioni"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Nessun proxy per:"> -<!ENTITY torbutton.prefs.no_proxy_warning "Attenzione: Evitare di usare uno degli hostnames di cui sopra"> <!ENTITY torbutton.cookiedialog.title "Gestisci protezione Cookies"> <!ENTITY torbutton.cookiedialog.lockCol "Protetto"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -43,7 +24,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Rimuovi tutti tranne quelli protetti"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteggi i nuovi cookie"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Non proteggere i nuovi cookie"> -<!ENTITY torbutton.prefs.transparentTor "Torificazione trasparente (richiede un transproxy personalizzato o un tor router)"> <!ENTITY torbutton.prefs.priv_caption "Impostazioni Privacy"> <!ENTITY torbutton.prefs.block_disk "Non registrare la cronologia di navigazione o i dati dei siti (attiva la Navigazione Anonima)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Limita i cookie di terze parti e altri dati di tracciamento"> diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties index ef1dd41..d83c43a 100644 --- a/src/chrome/locale/it/torbutton.properties +++ b/src/chrome/locale/it/torbutton.properties @@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Fai clic per disattivare Tor torbutton.panel.label.disabled = Tor disattivato torbutton.panel.label.enabled = Tor attivato extensions.torbutton(a)torproject.org.description = Torbutton fornisce un pulsante per configurare le impostazioni di Tor e rimuovere velocemente e facilmente i dati di navigazione privati. -torbutton.popup.test.success = Il test del proxy Tor ha avuto successo! -torbutton.popup.test.failure = Il test del proxy Tor Ãš FALLITO! Verifica la configurazione del proxy e di Polipo. -torbutton.popup.test.confirm_toggle = Il test piÃ¹ recente di un proxy Tor ha fallito nell'usare Tor.\n\nSei sicuro di volerlo abilitare comunque?\n\nNota: Se hai risolto il problema, puoi riavviare il test nella finestra Preferenze Proxy Torbutton per eliminare questo avviso. -torbutton.popup.test.ff3_notice = Fai clic su OK per testare le impostazioni del proxy Tor. Questo test avverrÃ in background. Sii paziente. torbutton.popup.external.title = Si desidera scaricare un tipo di file esterno? torbutton.popup.external.app = Tor Browser non Ãš in grado di aprire questo file. SarÃ necessario usare un'altra applicazione per aprirlo.\n\n torbutton.popup.external.note = Alcuni tipi di file possono far sÃ¬ che le applicazioni si connettano a Internet senza usare Tor.\n\n @@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Per essere totalmente sicuri, si dovrebbe apr torbutton.popup.launch = Scaricare il file torbutton.popup.cancel = Annulla torbutton.popup.dontask = Scaricare automaticamente i file d'ora in poi -torbutton.popup.test.no_http_proxy = Test Tor proxy: Proxy HTTP locale non Ãš raggiungibile. Polipo Ãš in funzione correttamente? torbutton.popup.prompted_language = Per aumentare la tua privacy, Torbutton puÃ² richiedere la versione inglese delle pagine web. PerciÃ² alcune pagine che preferiresti leggere nella tua lingua potrebbero essere visualizzate in inglese.\n\nPreferisci richiedere le pagine web in inglese per una maggiore privacy? torbutton.popup.no_newnym = Torbutton non puÃ² assegnarti una nuova identitÃ in modo sicuro, poichÃ© non ha accesso alla porta di controllo di Tor.\n\nStai usando Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton non puÃ² aggiornare le preferenze nella cartella profilo del Tor Browser. -torbutton.popup.permission_denied = Si prega di reimpostare i permessi della cartella Tor Browser oppure di spostarla altrove. -torbutton.popup.device_full = Sembra che il disco sia pieno. Liberare spazio o spostare Tor Browser in un altro dispositivo. torbutton.title.prompt_torbrowser = Informazioni importanti su Torbutton torbutton.popup.prompt_torbrowser = Torbutton ora funziona in modo diverso: non Ãš piÃ¹ possibile disabilitarlo.\n\nQuesto cambiamento Ãš stato apportato poichÃ© risulta poco sicuro utilizzare Torbutton in un browser utilizzato anche senza di esso. Ci sono alcuni problemi critici che non Ãš possibile risolvere in un modo diverso da questo.\n\nSe si desidera utilizzare Firefox normalmente (senza, quindi, Torbutton) Ãš necessario disinstallare manualmente Torbutton ed installare Tor Browser Bundle. Le impostazioni per la privacy, inoltre, sono superiori su Tor Browser rispetto ad una normale installazione di Firefox, anche quando quest'ultimo Ãš utilizzato con Torbutton.\n\nPer rimuovere Torbutton, andare in Strumenti -> Componenti aggiuntivi -> Estensioni e fare clic sul pulsante Disinstalla vicino a Torbutton. torbutton.popup.short_torbrowser = Informazioni importanti su Torbutton!\n\nTorbutton ora Ãš sempre abilitato.\n\nFai clic su Torbutton per ulteriori informazioni. diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index c58bd68..ad2d2ea 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "ãããã·èšå®"> -<!ENTITY torbutton.prefs.recommended_settings "Firefoxã®ãããã·èšå®ãäœ¿ã"> -<!ENTITY torbutton.prefs.use_polipo "Polipoãäœ¿ã"> -<!ENTITY torbutton.prefs.custom_settings "ã«ã¹ã¿ã èšå®ã®ãããã·ãäœ¿ã"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTPãããã·"> -<!ENTITY torbutton.prefs.proxy.host.https "SSLãããã·"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTPãããã·"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopherãããã·"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKSãã¹ã"> -<!ENTITY torbutton.prefs.proxy.port "ããŒã"> -<!ENTITY torbutton.pref_connection.notice "ãããã®èšå®ãå€æŽããã«ã¯Torbuttonããªãã«ããŠãã ãã"> -<!ENTITY torbutton.pref_connection.more_info "è©³çŽ°æå ±"> -<!ENTITY torbutton.pref_connection_more_info.title "ãã«ã"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbuttonã¯çŸåšãªã³ã«ãªã£ãŠããŸãããããéTorã®èšå®ãå€æŽããå Žåã¯ããŸãTorbuttonããªãã«ããŠãã ãããTorã®èšå®ãå€æŽããå Žåã«ã¯Torbuttonèšå®ãŠã£ã³ããŠãäœ¿ã£ãŠãã ããã"> <!ENTITY torbutton.context_menu.new_identity "æ°ããå¿å"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "ãã®ãµã€ãçšã®æ°ãã Tor ãµãŒããã"> @@ -27,11 +13,6 @@ <!ENTITY torbutton.button.tooltip "Torbuttonãåæç¶æã«æ»ã"> <!ENTITY torbutton.prefs.privacy_security_settings "ãã©ã€ãã·ãŒãšã»ãã¥ãªãã£ãŒã®èšå®"> <!ENTITY torbutton.prefs.restore_defaults "ããã©ã«ãèšå®ã«æ»ã"> -<!ENTITY torbutton.prefs.test_settings "èšå®ããã¹ããã"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "ãããã·ãçšããªã:"> -<!ENTITY torbutton.prefs.no_proxy_warning "èŠå: ä»¥äžã®ã©ããªãã¹ãããŒã ã®äœ¿çšãé¿ããŠãã ãã"> <!ENTITY torbutton.cookiedialog.title "Cookieä¿è·ãç®¡ç"> <!ENTITY torbutton.cookiedialog.lockCol "ä¿è·æžã¿"> <!ENTITY torbutton.cookiedialog.domainCol "ãã¹ã"> @@ -43,7 +24,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "ä¿è·ãããŠãããã®ä»¥å€åé€"> <!ENTITY torbutton.cookiedialog.saveAllCookies "æ°ããCookieãä¿è·"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "æ°ããCookieãä¿è·ããªã"> -<!ENTITY torbutton.prefs.transparentTor "ééåTorå (ã«ã¹ã¿ã ééåãããã·ãTorã®ã«ãŒã¿ãŒãå¿èŠ)"> <!ENTITY torbutton.prefs.priv_caption "ãã©ã€ãã·ãŒèšå®"> <!ENTITY torbutton.prefs.block_disk "ãã©ãŠãžã³ã°å±¥æŽããŠã§ããµã€ãã®ããŒã¿ãèšé²ããªã (ãã©ã€ããŒããã©ãŠãžã³ã°ã¢ãŒããæå¹å)"> <!ENTITY torbutton.prefs.restrict_thirdparty "ãµãŒãããŒãã£ãŒã®Cookieããã®ä»ã®ãã©ããã³ã°ããŒã¿ãå¶é"> diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties index 84c7fdd..b8735d0 100644 --- a/src/chrome/locale/ja/torbutton.properties +++ b/src/chrome/locale/ja/torbutton.properties @@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = ã¯ãªãã¯ããŠTorãç¡å¹ã«ãã torbutton.panel.label.disabled = Tor ç¡å¹ torbutton.panel.label.enabled = Tor æå¹ extensions.torbutton(a)torproject.org.description = Torbuttonã¯Torã®èšå®ãæ§æããçŽ æ©ããã€å®¹æã«ãã©ã€ããŒããªé²èŠ§ããŒã¿ãã¯ãªã¢ãããã¿ã³ãæäŸããŸãã -torbutton.popup.test.success = Torããã¯ã·ã®ãã¹ãã«æåããŸãã -torbutton.popup.test.failure = Torããã¯ã·ã®ãã¹ãã«å€±æããŸããã ããã¯ã·ãšPolipoã®èšå®ãç¢ºèªããŠãã ããã -torbutton.popup.test.confirm_toggle = çŽè¿ã®Torãããã·ãã¹ããTorã®äœ¿çšã«å€±æããŸããã\n\næ¬åœã«ããã§ãæå¹ã«ããŸããïŒ\n\næ³š: ãã®åé¡ãä¿®æ£ããå Žåã¯ãTorbuttonã®ãããã·èšå®ãŠã£ã³ããŠã§ãã¹ãã«æ»ãããã®èŠåãæ¶ãããšãã§ããŸãã -torbutton.popup.test.ff3_notice = Torã®ãããã·èšå®ããã¹ãããã«ã¯OKãã¯ãªãã¯ããŠãã ããããã®ãã¹ãã¯ããã¯ã°ã©ãŠã³ãã§å®è¡ãããŸãã®ã§ããã°ãããåŸã¡ãã ããã torbutton.popup.external.title = å€éšãã¡ã€ã«çš®å¥ãããŠã³ããŒãããŸãã torbutton.popup.external.app = Tor ãã©ãŠã¶ã¯ãã®ãã¡ã€ã«ãè¡šç€ºã§ããŸãããå¥ã®ã¢ããªã±ãŒã·ã§ã³ã§éãå¿èŠããããŸãã\n torbutton.popup.external.note = ãã¡ã€ã«ã®ã¿ã€ãã®äžã«ãã¢ããªã±ãŒã·ã§ã³ã Tor ãäœ¿çšããã€ã³ã¿ãŒãããã«æ¥ç¶ããåå ãšãªãå¯èœæ§ããããã®ããããŸãã\n @@ -22,12 +18,8 @@ torbutton.popup.external.suggest = å®åšã§ããããã«ã¯ããªãã©ã€ã³ torbutton.popup.launch = ãã¡ã€ã«ãããŠã³ããŒããã torbutton.popup.cancel = ãã£ã³ã»ã« torbutton.popup.dontask = ä»ãããã¡ã€ã«ãèªåçã«ããŠã³ããŒããã -torbutton.popup.test.no_http_proxy = Torãããã·ãã¹ã: ããŒã«ã«HTTPãããã·ã«å°éã§ããŸãããPolipoã¯æ£åžžã«åäœããŠããŸããïŒ torbutton.popup.prompted_language = ãããã©ã€ãã·ãŒãå®ãããã«ãTorbuttonã¯ãŠã§ãããŒãžã®è±èªçãèŠæ±ããããšãã§ããŸãã ããã¯ããªããæ¯åœèªã§èªã¿ãããŠã§ãããŒãžãä»£ããã«è±èªã§è¡šç€ºããããããããŸããã\n\nããé«ããã©ã€ãã·ãŒã®ããã«ãè±èªã®ãŠã§ãããŒãžãèŠæ±ããŸããïŒ torbutton.popup.no_newnym = Torã³ã³ãããŒã«ããŒãã«ã¢ã¯ã»ã¹ã§ããŸããã§ãããTorbuttonã¯æ°ããæ¥ç¶çµè·¯ãå®åšã«çšæããããšãã§ããŸããã\n\nTorãã©ãŠã¶ãã³ãã«ãèµ·åããŠããŸããïŒ -torbutton.popup.pref_error = Torbuttonã¯ãããã¡ã€ã«ãã£ã¬ã¯ããªã«ããèšå®ãã¢ããããŒãã§ããŸããã -torbutton.popup.permission_denied = Torãã©ãŠã¶ãã£ã¬ã¯ããªã®ããŒããã·ã§ã³ããªã»ããããããæ°ããªå Žæã«ã³ããŒããŠãã ããã -torbutton.popup.device_full = èšæ¶è£çœ®ã®ç©ºãå®¹éãäžè¶³ããŠããããã§ããç©ºãå®¹éãå¢ããããTorãã©ãŠã¶ãæ°ããªèšæ¶è£çœ®ãžç§»åããŠãã ããã torbutton.title.prompt_torbrowser = éèŠãªTorbuttonã®æå ± torbutton.popup.prompt_torbrowser = Torbuttonã¯çŸåšå¥æ§ã«åäœããŠããŸããããæ¢ããããšã¯ã§ããŸããã\n\nç§ãã¡ã¯ãéTorãã©ãŠãžã³ã°ã®ããã«ãäœ¿ãããŠãããã©ãŠã¶ã§ã®Torbuttonã®äœ¿çšãå®åšã§ã¯ãªãããããã®å€æŽãè¡ããŸããã ä»ã®æ¹æ³ã§ä¿®æ£ããããšãã§ããªããã°ãå€ãããŸããã\n\næ£åžžã«Firefoxãäœ¿çšãããå Žåã¯ãTorbuttonãã¢ã³ã€ã³ã¹ããŒã«ããŠãTor Browser BundleãããŠã³ããŒããã¹ãã§ãã Tor Browserã®ãã©ã€ãã·ãŒç¹æ§ã¯FirefoxãTorbuttonãšäœ¿ãããŠããæã§ããéåžžã®Firefoxã®ãããããåªå¢ã§ãã\n\nTorbuttonãåé€ããã«ã¯ãããŒã«->ã¢ããªã³->ãšã¯ã¹ãã³ã·ã§ã³ã«è¡ããããããTorbuttonã®é£ã®åé€ãã¿ã³ãã¯ãªãã¯ããŠãã ããã torbutton.popup.short_torbrowser = éèŠãªTorbuttonã®æå ±!\n\nTorbuttonã¯çŸåšåžžã«æå¹ã§ãã\n\nè©³çŽ°ã¯Torbuttonãã¯ãªãã¯ããŠãã ããã diff --git a/src/chrome/locale/jv/torbutton.dtd b/src/chrome/locale/jv/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/jv/torbutton.dtd +++ b/src/chrome/locale/jv/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/jv/torbutton.properties b/src/chrome/locale/jv/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/jv/torbutton.properties +++ b/src/chrome/locale/jv/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/ka/torbutton.dtd +++ b/src/chrome/locale/ka/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/ka/torbutton.properties b/src/chrome/locale/ka/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/ka/torbutton.properties +++ b/src/chrome/locale/ka/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/km/torbutton.dtd b/src/chrome/locale/km/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/km/torbutton.dtd +++ b/src/chrome/locale/km/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/km/torbutton.properties b/src/chrome/locale/km/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/km/torbutton.properties +++ b/src/chrome/locale/km/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/kn/torbutton.dtd b/src/chrome/locale/kn/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/kn/torbutton.dtd +++ b/src/chrome/locale/kn/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/kn/torbutton.properties b/src/chrome/locale/kn/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/kn/torbutton.properties +++ b/src/chrome/locale/kn/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index d597085..0d19bd0 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "íë¡ì ì€ì "> -<!ENTITY torbutton.prefs.recommended_settings "íì¬ ì¶ì²ë íë¡ì ì€ì ì¬ì©"> -<!ENTITY torbutton.prefs.use_polipo "Polipo ì¬ì©"> -<!ENTITY torbutton.prefs.custom_settings "ì¬ì©ì ì§ì íë¡ì ì€ì ì¬ì©"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP íë¡ì ì£Œì:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL íë¡ì ì£Œì:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP íë¡ì ì£Œì:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher íë¡ì ì£Œì:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS :"> -<!ENTITY torbutton.prefs.proxy.port "í¬íž : "> -<!ENTITY torbutton.pref_connection.notice "TorbuttonìŽ ë€ìì ì€ì ë€ì ë°êŸžì§ ëª»íê² í©ëë€."> -<!ENTITY torbutton.pref_connection.more_info "ì¶ê° ì ë³Ž"> -<!ENTITY torbutton.pref_connection_more_info.title "ëìë§"> -<!ENTITY torbutton.pref_connection_more_info.text "TorbuttonìŽ íì¬ íì±íëììµëë€. ë§ìœ Tor íë¡ìê° ìë ìŒë° íë¡ì ìë² ì€ì ì íìë €ë©Ž, Torbuttonì ë¹íì±ííê³ ìŽ ì°œìŒë¡ ëìì€ììì€. í¹ì Tor íë¡ì ì€ì ì ë°êŸžê³ ì¶ìŒìë€ë©Ž, Torbutton ì€ì íë©Žì ì¬ì©íŽ ì£Œìžì."> <!ENTITY torbutton.context_menu.new_identity "ìë¡ìŽ ì ì"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Tor ìí· ì¬êµ¬ì¶"> @@ -27,11 +13,6 @@ <!ENTITY torbutton.button.tooltip "Torbutton ì€ì ìŽêž°í"> <!ENTITY torbutton.prefs.privacy_security_settings "ê°ìž ì ë³Žì ë³Žì ì€ì "> <!ENTITY torbutton.prefs.restore_defaults "ì€ì ìŽêž°í"> -<!ENTITY torbutton.prefs.test_settings "ì€ì íì€íž"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "ë€ì ì£Œìììë íë¡ìë¥Œ ì¬ì©íì§ ìì :"> -<!ENTITY torbutton.prefs.no_proxy_warning "ì£Œì : ìŽë€ ížì€ížë€ìì ìëìì ì¬ì©íë ê²ì íŒíììì€."> <!ENTITY torbutton.cookiedialog.title "ì¿ í€ ë³Žíž êŽëŠ¬"> <!ENTITY torbutton.cookiedialog.lockCol "ë³Žížëš"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -43,7 +24,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "ë³Žížë ê² ë¹Œê³ ëªšë ì§ì°êž°"> <!ENTITY torbutton.cookiedialog.saveAllCookies "ìë¡ìŽ ì¿ í€ ë³Žíž"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ìë¡ìŽ ì¿ í€ë¥Œ ë³Žížíì§ ìì"> -<!ENTITY torbutton.prefs.transparentTor "í¬ëª Toritication (ì¬ì©ì transproxyë Tor ëŒì°í° íì)"> <!ENTITY torbutton.prefs.priv_caption "ê°ìž ì ë³Ž ì€ì "> <!ENTITY torbutton.prefs.block_disk "ëžëŒì°ì§ íì€í ëŠ¬ë ì¹ì¬ìŽíž ë°ìŽí°ë¥Œ êž°ë¡íì§ ë§ììì€ (Private Browsing ëªšë íì±í)"> <!ENTITY torbutton.prefs.restrict_thirdparty "ì 3ì ì¿ í€ì ë€ë¥ž ì¶ì ë°ìŽí° ì í"> diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties index b09f028..dad4faf 100644 --- a/src/chrome/locale/ko/torbutton.properties +++ b/src/chrome/locale/ko/torbutton.properties @@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Torë¥Œ ë¹íì±ííë €ë©Ž íŽëŠ torbutton.panel.label.disabled = Tor ë¹íì±í torbutton.panel.label.enabled = Tor íì±í extensions.torbutton(a)torproject.org.description = Torbuttonì Tor ì€ì ì íŽ ì£Œë ë²íŒì ì ê³µíê³ , ë¹ ë¥Žê³ ìœê² ê°ìž ëžëŒì°ì§ ë°ìŽí°ë¥Œ ì§ì ì€ëë€. -torbutton.popup.test.success = Tor íë¡ì íì€íž ì±ê³µ! -torbutton.popup.test.failure = Tor íë¡ì íì€íž "ì€íš"! íë¡ìì Polipo ì€ì ì íìžíììì€. -torbutton.popup.test.confirm_toggle = ìµê·Œ ëë¶ë¶ Torë¥Œ ì¬ì©íêž° ìí Tor íë¡ì íì€ížê° ì€íšíììµëë€.\n\nìŽìšë íì±ííìêž°ë¥Œ ìíë ê²ìŽ íì€íìëê¹?\n\nNote: ë¬žì ë¥Œ ê³ ì¹ìšë€ë©Ž, ìŽ ê²œê³ ë¥Œ ìì êž° ìíŽ Tor íë¡ì ì€ì ì íì€ížë¥Œ ë€ì í ì ììµëë€. -torbutton.popup.test.ff3_notice = OKë¥Œ ëë¥Žìë©Ž Tor íë¡ì ì€ì ì íì€íží©ëë€. ìŽ íì€ížë ë°±ê·žëŒìŽëìì ììë©ëë€. ì ì êž°ë€ë € ì¥¡ìì€. torbutton.popup.external.title = ìžë¶ íìŒ ì íì ë€ìŽë¡ë íìê² ìµëê¹? torbutton.popup.external.app = Tor ëžëŒì°ì ëìŽ íìŒì ë³Œ ì ììµëë€. ë€ë¥ž ìì© íë¡ê·žëšìì ìŽìŽìŒí©ëë€.\n\n torbutton.popup.external.note = íìŒ ì íì ìì© íë¡ê·žëšìŽ Torë¥Œ ì¬ì©íì§ ìê³ ìží°ë·ì ì°ê²°íë ììžìŽ ë ììë ê²ìŽ ììµëë€.\n\n @@ -22,12 +18,8 @@ torbutton.popup.external.suggest = ìì íêž° ìíì¬ ì€íëŒìž ìŒ ë torbutton.popup.launch = íìŒì ë€ìŽë¡ë íêž° torbutton.popup.cancel = ì·šì torbutton.popup.dontask = ì§êžë¶í° íìŒì ìëìŒë¡ ë€ìŽë¡ë -torbutton.popup.test.no_http_proxy = Tor íë¡ì íì€íž: ë¡ì»¬ HTTP íë¡ìì ì ê·Œí ì ììµëë€. Polipoê° íì€í ìëì€ ìëê¹? torbutton.popup.prompted_language = ë ë§ì ê°ìž ì ë³Žë¥Œ ìíŽ, Torbuttonì ììŽ ë²ì ì¹íìŽì§ë¥Œ ìì²í ì ììµëë€. ìŽê²ì ê·íì ëªšêµìŽ ëì ììŽë¥Œ íìíë ì¹ íìŽì§ë¥Œ ìŒìŒí¬ ì ììµëë€.\n\në ëì ê°ìž ì ë³Žë¥Œ ìíŽ ììŽ ì¹ íìŽì§ë¥Œ ìì²íìê² ìµëê¹? torbutton.popup.no_newnym = Torbuttonì ìì íê² ìë¡ìŽ ì ìì ì€ ì ììµëë€. ìŽê²ì Tor ì»šížë¡€ í¬ížì ì ê·Œí ì ììµëë€.\n\nTor Browser Bundleì ì¬ì©íê³ ê³ìëê¹? -torbutton.popup.pref_error = Torbuttonì Tor Browser íë¡íìŒ ëë íŽë¥Œ ìë°ìŽíž í ì ììµëë€. -torbutton.popup.permission_denied = Tor Browser ëë í ëŠ¬ì ê¶íì ìŽêž°í íìê±°ë, Tor browserë¥Œ ìë¡ìŽ ìì¹ë¡ ì®ê²š ì£Œììì€. -torbutton.popup.device_full = ìŽ ëì€í¬ë ê°ë ì°¬ ê² ê°ìµëë€. ë¹ ê³µê°ì ë§ëìê±°ë ìë¡ìŽ ì¥ì¹ë¡ Tor browserë¥Œ ì®ê²š ì£Œììì€. torbutton.title.prompt_torbrowser = ì€ìí Torbutton ì ë³Ž torbutton.popup.prompt_torbrowser = Torbuttonì ì§êž ë€ë¥Žê² ìëí©ëë€. ê·íë ëìŽì ë ì ììµëë€. ë¹Tor ëžëŒì°ì§ì ì¬ì©ë ì ìë ëžëŒì°ì žìì ì¬ì©íë ê²ì ìííêž° ëë¬žì ìŽ ë³íë¥Œ ë§ë€ììµëë€. ì°ëŠ¬ê° ìŽë€ ë€ë¥ž ë°©ë²ìŒë¡ ê³ ì¹ ì ìë ìë§ì ë²ê·žë ììµëë€. ë§ìœ íìŽìŽíì€ë¥Œ ìŒë°ì ìŒë¡ ì¬ì©íêž°ë¥Œ ìíì ë€ë©Ž Torbuttonì ìžìžì€íš íìê³ Tor Browser Bundleì ë€ìŽë¡ë íììì€. Tor browserì íëŒìŽë²ì ì€ì ì, ì¬ì§ìŽ íìŽìŽíì€ê° Torbuttonê³Œ ì°ìëëŒë, ë³Žíµì íìŽìŽíì€ì ì€ì ì ì°ì í©ëë€. Torbuttonì ì§ì°ìë €ë©Ž, ëêµ¬ - ë¶ê° êž°ë¥ - íì¥ì ë€ìŽê°ìì Torbutton ìì ì ê±° ë²íŒì ëë¥Žììì€. torbutton.popup.short_torbrowser = ì€ìí Torbutton ì ë³Ž! Torbuttonì ìŽì íì íì±íë©ëë€. ë ë§ì ì ë³Žë¥Œ ìíŽìë Torbuttonì ëë¥Žììì€. diff --git a/src/chrome/locale/ku/torbutton.dtd b/src/chrome/locale/ku/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/ku/torbutton.dtd +++ b/src/chrome/locale/ku/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/ku/torbutton.properties b/src/chrome/locale/ku/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/ku/torbutton.properties +++ b/src/chrome/locale/ku/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/kw/torbutton.dtd b/src/chrome/locale/kw/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/kw/torbutton.dtd +++ b/src/chrome/locale/kw/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/kw/torbutton.properties b/src/chrome/locale/kw/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/kw/torbutton.properties +++ b/src/chrome/locale/kw/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/ky/torbutton.dtd b/src/chrome/locale/ky/torbutton.dtd index 976f38f..cf8167b 100644 --- a/src/chrome/locale/ky/torbutton.dtd +++ b/src/chrome/locale/ky/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "ÐÐ°ÑÐŽÐ°ÐŒ"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "ÐÐ°Ò£Ñ ÐžÐœÑÐ°Ðœ"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/ky/torbutton.properties b/src/chrome/locale/ky/torbutton.properties index 0700ab3..e6e769b 100644 --- a/src/chrome/locale/ky/torbutton.properties +++ b/src/chrome/locale/ky/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = ÐÐ¹ÐœÑÑ torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/lb/torbutton.dtd b/src/chrome/locale/lb/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/lb/torbutton.dtd +++ b/src/chrome/locale/lb/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/lb/torbutton.properties b/src/chrome/locale/lb/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/lb/torbutton.properties +++ b/src/chrome/locale/lb/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/lg/torbutton.dtd b/src/chrome/locale/lg/torbutton.dtd index ee12fab..b3d1146 100644 --- a/src/chrome/locale/lg/torbutton.dtd +++ b/src/chrome/locale/lg/torbutton.dtd @@ -1,28 +1,9 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.preferences "Preferences..."> <!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -34,4 +15,3 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> diff --git a/src/chrome/locale/lg/torbutton.properties b/src/chrome/locale/lg/torbutton.properties index 7924713..971eaa7 100644 --- a/src/chrome/locale/lg/torbutton.properties +++ b/src/chrome/locale/lg/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,4 +10,3 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? diff --git a/src/chrome/locale/ln/torbutton.dtd b/src/chrome/locale/ln/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/ln/torbutton.dtd +++ b/src/chrome/locale/ln/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/ln/torbutton.properties b/src/chrome/locale/ln/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/ln/torbutton.properties +++ b/src/chrome/locale/ln/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/lo/torbutton.dtd b/src/chrome/locale/lo/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/lo/torbutton.dtd +++ b/src/chrome/locale/lo/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/lo/torbutton.properties b/src/chrome/locale/lo/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/lo/torbutton.properties +++ b/src/chrome/locale/lo/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/lt/torbutton.dtd b/src/chrome/locale/lt/torbutton.dtd index f3b2735..5a78077 100644 --- a/src/chrome/locale/lt/torbutton.dtd +++ b/src/chrome/locale/lt/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy nustatymai"> -<!ENTITY torbutton.prefs.recommended_settings "Naudoti mano Firefox versijai rekomenduojamus proxy nustatymus"> -<!ENTITY torbutton.prefs.use_polipo "Naudoti Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Prievadas:"> -<!ENTITY torbutton.pref_connection.notice "Atjunkite Torbutton kad pakeisti Å¡iuos nustatymus."> -<!ENTITY torbutton.pref_connection.more_info "Daugiau informacijos"> -<!ENTITY torbutton.pref_connection_more_info.title "Pagalba"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "Nauja tapatybÄ"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Nustatymai..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Paspauskite kad aktyvuoti Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Atstatyti numatytuosius"> -<!ENTITY torbutton.prefs.test_settings "Patikrinti nustatymus"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/lt/torbutton.properties b/src/chrome/locale/lt/torbutton.properties index 77e5bbf..e3e4454 100644 --- a/src/chrome/locale/lt/torbutton.properties +++ b/src/chrome/locale/lt/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Paspauskite kad atjungti Tor torbutton.panel.label.disabled = Tor atjungtas torbutton.panel.label.enabled = Tor Ä¯galintas extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy testas pasisekÄ! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = AtÅ¡aukti torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Svarbi Torbutton informacija torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/lv/torbutton.dtd b/src/chrome/locale/lv/torbutton.dtd index c0d8df1..7192ef1 100644 --- a/src/chrome/locale/lv/torbutton.dtd +++ b/src/chrome/locale/lv/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Starpnieka iestatÄ«jumi"> -<!ENTITY torbutton.prefs.recommended_settings "Lietot manai Firefox'a versijai ieteiktos starpnieka iestatÄ«jumus"> -<!ENTITY torbutton.prefs.use_polipo "Lietot Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Lietot starpnieka pielÄgotus iestatÄ«jumus"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP starpnieks:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL starpnieks:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP starpnieks:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher starpnieks:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS'a viesotÄjs:"> -<!ENTITY torbutton.prefs.proxy.port "Ports:"> -<!ENTITY torbutton.pref_connection.notice "AtspÄjot Torbutton, lai mainÄ«tu Å¡os iestatÄ«jumus."> -<!ENTITY torbutton.pref_connection.more_info "Papildu informÄcija"> -<!ENTITY torbutton.pref_connection_more_info.title "PalÄ«dzÄ«ba"> -<!ENTITY torbutton.pref_connection_more_info.text "Å obrÄ«d Torbutton ir iespÄjots. Ja vÄlaties mainÄ«t savus Ärpus-Tor starpnieka iestatÄ«jumus, lÅ«dzu atspÄjojiet Torbutton un tad atgriezieties te. Ja vÄlaties mainÄ«t savus Tor iestatÄ«jumus, lÅ«dzu lietojiet Torbutton'a preferenÄu logu."> <!ENTITY torbutton.context_menu.new_identity "Jauna identitÄte"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "NoklikÅ¡Ä·inÄt, lai inicializÄtu Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Atjaunot noklusÄjuma vÄrtÄ«bas"> -<!ENTITY torbutton.prefs.test_settings "PÄrbaudÄ«t iestatÄ«jumus"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Nav starpnieku priekÅ¡: "> -<!ENTITY torbutton.prefs.no_proxy_warning "BrÄ«dinÄjums: Izvairieties lietot ikvienu no augstÄk norÄdÄ«tajiem viesotÄjnosaukumiem"> <!ENTITY torbutton.cookiedialog.title "PÄrvaldÄ«t aizsardzÄ«bu no sÄ«kdatnÄm"> <!ENTITY torbutton.cookiedialog.lockCol "AizsargÄts"> <!ENTITY torbutton.cookiedialog.domainCol "ViesotÄjs"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "NoÅemt visas, izÅemot aizsargÄtÄs"> <!ENTITY torbutton.cookiedialog.saveAllCookies "AizsargÄt jaunÄs sÄ«kdatnes"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "NeaizsargÄt jaunÄs sÄ«kdatnes"> -<!ENTITY torbutton.prefs.transparentTor "PÄrredzama torifikÄcija (nepiecieÅ¡ams pielÄgots pÄrstarpnieks jeb transproxy vai Tor'a marÅ¡rutÄtÄjs)"> <!ENTITY torbutton.prefs.block_disk "NereÄ£istrÄt pÄrlÅ«koÅ¡anas vÄsturi vai tÄ«mekÄŒa vietÅu datus (iespÄjo PrivÄtas pÄrlÅ«koÅ¡anas reÅŸÄ«mu)"> <!ENTITY torbutton.prefs.restrict_thirdparty "IerobeÅŸot treÅ¡o personu sÄ«kdatnes un citus izsekoÅ¡anas datus"> <!ENTITY torbutton.prefs.block_plugins "AtspÄjot pÄrlÅ«ku spraudÅus (tÄdus kÄ Flash)"> diff --git a/src/chrome/locale/lv/torbutton.properties b/src/chrome/locale/lv/torbutton.properties index 0551ab9..98e51d1 100644 --- a/src/chrome/locale/lv/torbutton.properties +++ b/src/chrome/locale/lv/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = NoklikÅ¡Ä·inÄt, lai atspÄjotu Tor torbutton.panel.label.disabled = Tor ir atspÄjots torbutton.panel.label.enabled = Tor ir iespÄjots extensions.torbutton(a)torproject.org.description = Torbutton ir poga ar kuru konfigurÄt Tor iestatÄ«jumus, kÄ arÄ« Ätri un Ärti attÄ«rÄ«t personÄ«gos pÄrlÅ«koÅ¡anas datus. -torbutton.popup.test.success = Tor starpnieka pÄrbaude ir sekmÄ«ga! -torbutton.popup.test.failure = Tor starpnieka pÄrbaudes tests NEIZDEVÄS! PÄrbaudiet starpnieka un Polipo iestatÄ«jumus. -torbutton.popup.test.confirm_toggle = PÄdÄjÄ Tor starpnieka pÄrbaudÄ neizdevÄs izmantot Tor.â â Vai esat pÄrliecinÄts, ka tomÄr vÄlaties to iespÄjot?â â PiezÄ«me: Ja esat atrisinÄjis Å¡o problÄmu, varat atkÄrtoti palaist pÄrbaudi lodziÅÄ Torbutton starpnieka preferences, lai nebÅ«tu Å¡Ä« brÄ«dinÄjuma. -torbutton.popup.test.ff3_notice = NoklikÅ¡Ä·iniet Labi jeb OK, lai pÄrbaudÄ«tu Tor starpnieka iestatÄ«jumus. Å Ä« pÄrbaude notiks fonÄ. LÅ«dzu, esiet pacietÄ«gs. torbutton.popup.external.title = IelÄdÄt ÄrÄju saturu? torbutton.popup.external.app = NepiecieÅ¡ama ÄrÄja lietotne, lai apstrÄdÄtu:â â\n torbutton.popup.external.note = \nâ âPIEZÄªME: PÄc noklusÄjuma ÄrÄjas lietotnes NAV gana droÅ¡as Tor un var jÅ«s atklÄt!â\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nJa Å¡Ä« datne nav uzticama, jums vai nu tÄ torbutton.popup.launch = Palaist lietotni torbutton.popup.cancel = Atcelt torbutton.popup.dontask = TurpmÄk vienmÄr palaist lietotnes -torbutton.popup.test.no_http_proxy = Tor starpnieka pÄrbaude: HTTP vietÄjais starpnieks nav sasniedzams. Vai Polipo darbojas pareizi? torbutton.popup.prompted_language = Lai nodroÅ¡inÄtu jums lielÄku privÄtuma lÄ«meni, Torbutton var pieprasÄ«t tÄ«mekÄŒa vietÅu angÄŒu valodas versiju. Tas var radÄ«t situÄciju, ka tÄ«mekÄŒa vietnes, kuras izvÄlaties lasÄ«t dzimtajÄ valodÄ, tiek attÄlotas angÄŒu valodÄ.â â Vai vÄlaties pieprasÄ«t tÄ«mekÄŒa vietnes angÄŒu valodÄ, lai nodroÅ¡inÄtu lielÄku privÄtuma lÄ«meni? torbutton.popup.no_newnym = Torbutton nespÄj droÅ¡i sniegt jums jaunu identitÄti. Tai nav piekÄŒuves pie Tor vadÄ«bas porta. â â Vai esat palaidis PÄrlÅ«ka Tor komplektu? -torbutton.popup.pref_error = Torbutton nespÄj atjauninÄt preferences PÄrlÅ«ka Tor profila direktorijÄ. -torbutton.popup.permission_denied = LÅ«dzu vai nu atiestatiet pÄrlÅ«ka Tor direktorijas atÄŒaujas, vai arÄ« kopÄjiet to uz jaunu vietu. -torbutton.popup.device_full = Å Ä·iet, ka cietais disks ir pilns. LÅ«dzu, atbrÄ«vojiet vietu uz diska vai pÄrvietojiet pÄrlÅ«ku Tor uz citu ierÄ«ci. torbutton.title.prompt_torbrowser = SvarÄ«ga Torbutton informÄcija torbutton.popup.prompt_torbrowser = Torbutton tagad strÄdÄ citÄdÄk: to vairs nevarat izslÄgt.\n\nMÄs izdarÄ«jÄm Å¡o izmaiÅu jo nav droÅ¡i izmantot Torbutton pÄrlÅ«kÄ, kurÅ¡ tiek arÄ« izmantots pÄrlÅ«koÅ¡anai, kas neizmanto Tor. VienkÄrÅ¡i bija pÄrÄk daudz kÄŒÅ«du, kuras mÄs savÄdÄk nevarÄjÄm labot.\n\nJa vÄlaties turpinÄt izmantot Firefox kÄ ierasts, atinstalÄjiet Torbutton un lejupielÄdÄjiet Tor Browser Bundle. Tor Browser privÄtuma rekvizÄ«ti ir svarÄ«gÄki nekÄ Firefox rekvizÄ«ti, pat tad ja Firefox tiek izmantots ar Torbutton.\n\nLai nonÄmtu Torbutton, izvÄlieties RÄ«ko->Pievienojumi->PaplaÅ¡inÄjumi jeb Tools->Addons->Extensions un noklikÅ¡Ä·iniet uz pogu NoÅemt jeb Remove pogu, kura atrodas blakus Torbutton. torbutton.popup.short_torbrowser = SvarÄ«ga Torbutton informÄcija!\n\nTorbutton tagad ir iespÄjots vienmÄr.\n\nNoklikÅ¡Ä·iniet uz Torbutton, lai saÅemtu papildu informÄciju. diff --git a/src/chrome/locale/mg/torbutton.dtd b/src/chrome/locale/mg/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/mg/torbutton.dtd +++ b/src/chrome/locale/mg/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/mg/torbutton.properties b/src/chrome/locale/mg/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/mg/torbutton.properties +++ b/src/chrome/locale/mg/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/mi/torbutton.dtd b/src/chrome/locale/mi/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/mi/torbutton.dtd +++ b/src/chrome/locale/mi/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/mi/torbutton.properties b/src/chrome/locale/mi/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/mi/torbutton.properties +++ b/src/chrome/locale/mi/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/mk/torbutton.dtd b/src/chrome/locale/mk/torbutton.dtd index 3bbae13..2c89bd1 100644 --- a/src/chrome/locale/mk/torbutton.dtd +++ b/src/chrome/locale/mk/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "ÐÐŸÐŽÐµÑÑÐ²Ð°ÑÐ° ÐœÐ° Ð¿ÑÐŸÐºÑÐž"> -<!ENTITY torbutton.prefs.recommended_settings "ÐÐŸÑÐžÑÑÐž Ð³Ðž Ð¿ÐŸÐŽÐµÑÑÐ²Ð°ÑÐ°ÑÐ° Ð¿ÑÐµÐ¿ÐŸÑÐ°ÑÐ°ÐœÐž Ð·Ð° ÐŒÐŸÑÐ°ÑÐ° Ð²ÐµÑÐ·ÐžÑÐ° ÐœÐ° Ð€Ð°ÑÑÑÐŸÐºÑ"> -<!ENTITY torbutton.prefs.use_polipo "ÐÐŸÑÐžÑÑÐž Ð³ÐŸ Polipo"> -<!ENTITY torbutton.prefs.custom_settings "ÐÐŸÑÐžÑÑÐž ÑÐŸÐ¿ÑÑÐ²ÐµÐœÐž Ð¿ÑÐŸÐºÑÐž-Ð¿ÐŸÐŽÐµÑÑÐ²Ð°ÑÐ°"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Ð¿ÑÐŸÐºÑÐž:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Ð¿ÑÐŸÐºÑÐž:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Ð¿ÑÐŸÐºÑÐž:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Ð¿ÑÐŸÐºÑÐž:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS ÑÐŸÑÑ:"> -<!ENTITY torbutton.prefs.proxy.port "ÐÐŸÑÑÐ°:"> -<!ENTITY torbutton.pref_connection.notice "ÐÑÐºÐ»ÑÑÐµÑÐµ Ð³ÐŸ Torbutton Ð·Ð° ÐŽÐ° Ð³Ðž Ð¿ÑÐŸÐŒÐµÐœÐžÑÐµ ÐŸÐ²ÐžÐµ Ð¿ÑÐŸÐŽÐµÑÑÐ²Ð°ÑÐ°."> -<!ENTITY torbutton.pref_connection.more_info "ÐÐŸÐ²ÐµÑÐµ ÐžÐœÑÐŸÑÐŒÐ°ÑÐžÐž"> -<!ENTITY torbutton.pref_connection_more_info.title "ÐÐŸÐŒÐŸÑ"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton Ðµ ÐŒÐŸÐŒÐµÐœÑÐ°Ð»ÐœÐŸ Ð²ÐºÐ»ÑÑÐµÐœ. ÐÐŸÐºÐŸÐ»ÐºÑ ÑÐ°ÐºÐ°ÑÐµ ÐŽÐ° Ð³Ðž Ð¿ÑÐŸÐŒÐµÐœÐžÑÐµ Ð¿ÐŸÐŽÐµÑÑÐ²Ð°ÑÐ°ÑÐ° ÐœÐ° ÐÐ°ÑÐµÑÐŸ Ð¿ÑÐŸÐºÑÐž ÐºÐŸÐž ÑÑÐŸ ÐœÐµ ÑÐµ Ð¿ÐŸÐ²ÑÐ·Ð°ÐœÐž ÑÐŸ Ð¢ÐŸÑ, ÑÐŸÐ³Ð° ÐžÑÐºÐ»ÑÑÐµÑÐµ Ð³Ðž Torbutton Ðž Ð¿ÐŸÑÐŸÐ° Ð²ÑÐ°ÑÐµÑÐµ ÑÐµ ÑÑÐºÐ°. ÐÐŸÐºÐŸÐ»ÐºÑ ÑÐ°ÐºÐ°ÑÐµ ÐŽÐ° Ð³Ðž Ð¿ÑÐŸÐŒÐµÐœÐžÑÐµ Ð¿ÐŸÐŽÐµÑÑÐ²Ð°ÑÐ°ÑÐ° Ð·Ð° Ð¢ÐŸÑ, ÑÐŸÐ³Ð°Ñ ÐºÐŸÑÐžÑÑÐµÑÐµ Ð³ÐŸ Ð¿ÑÐŸÐ·ÐŸÑÐŸÑ ÐÐŸÐŽÐµÑÑÐ²Ð°ÑÐ° ÐœÐ° Ð¢ÐŸÑ."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "ÐÐŸÐŽÐµÑÑÐ²Ð°ÑÐ°..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "ÐÐ»ÐžÐºÐœÐµÑÐµ Ð·Ð° ÐžÐœÐžÑÐžÑÐ°ÑÐµ ÐœÐ° Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Ð¡ÑÐ°ÐœÐŽÐ°ÑÐŽÐœÐž Ð¿ÐŸÐŽÐµÑÑÐ²Ð°ÑÐ°"> -<!ENTITY torbutton.prefs.test_settings "Ð¢ÐµÑÑÐžÑÐ°Ñ Ð³Ðž Ð¿ÐŸÐŽÐµÑÑÐ²Ð°ÑÐ°ÑÐ°"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "ÐÐµÐ· Ð¿ÑÐŸÐºÑÐžÑÐ°ÑÐµ Ð·Ð°: "> -<!ENTITY torbutton.prefs.no_proxy_warning "ÐÐœÐžÐŒÐ°ÐœÐžÐµ: ÐžÐ·Ð±ÐµÐ³ÐœÑÐ²Ð°ÑÑÐµ ÐŽÐ° ÐœÐ°Ð²ÐµÐŽÑÐ²Ð°ÑÐµ ÑÐŸÑÑÐŸÐ²Ðž Ð¿ÐŸÐ³ÐŸÑÐµ"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/mk/torbutton.properties b/src/chrome/locale/mk/torbutton.properties index 609623b..7936dde 100644 --- a/src/chrome/locale/mk/torbutton.properties +++ b/src/chrome/locale/mk/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = ÐÐ»ÐžÐºÐœÐµÑÐµ Ð·Ð° ÐŽÐ° Ð³ÐŸ ÐžÑÐºÐ»ÑÑÐž torbutton.panel.label.disabled = Ð¢ÐŸÑ Ðµ ÐžÑÐºÐ»ÑÑÐµÐœ torbutton.panel.label.enabled = Ð¢ÐŸÑ Ðµ Ð²ÐºÐ»ÑÑÐµÐœ extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Ð¢ÐµÑÑÐŸÑ Ð·Ð° Ð¢ÐŸÑ Ð¿ÑÐŸÐºÑÐžÑÐŸ Ð±ÐµÑÐµ ÑÑÐ¿ÐµÑÐµÐœ! -torbutton.popup.test.failure = Ð¢ÐµÑÑÐŸÑ Ð·Ð° Ð¢ÐŸÑ Ð¿ÑÐŸÐºÑÐžÑÐŸ ÐÐ Ð£Ð¡ÐÐÐ! ÐÑÐŸÐ²ÐµÑÐµÑÐµ Ð³Ðž ÐÐ°ÑÐžÑÐµ Ð¿ÐŸÐŽÐµÑÑÐ²Ð°ÑÐ° ÐœÐ° Ð¿ÑÐŸÐºÑÐž ÐžÐ»Ðž ÐœÐ° Polipo. -torbutton.popup.test.confirm_toggle = ÐÐŸÑÐ»ÐµÐŽÐœÐžÐŸÑ ÑÐµÑÑ Ð·Ð° Ð¢ÐŸÑ Ð¿ÑÐŸÐºÑÐžÑÐŸ ÐœÐµ ÑÑÐ¿ÐµÐ° ÐŽÐ° Ð³ÐŸ ÐºÐŸÑÐžÑÑÐž Ð¢ÐŸÑ.\n\nÐÐ°Ð»Ðž ÑÑÐµ ÑÐžÐ³ÑÑÐœÐž ÐŽÐµÐºÐ° ÑÐ°ÐºÐ°ÑÐµ ÐŽÐ° Ð³ÐŸ Ð²ÐºÐ»ÑÑÐžÑÐµ Ð²ÐŸ ÑÐµÐºÐŸÑ ÑÐ»ÑÑÐ°Ñ?\n\nÐÐ°Ð±ÐµÐ»ÐµÑÐºÐ°: ÐÐºÐŸ Ð²ÐŸ ÐŒÐµÑÑÐ²ÑÐµÐŒÐµ ÑÑÐµ Ð³ÐŸ ÑÐµÑÐžÐ»Ðµ Ð¿ÑÐŸÐ±Ð»ÐµÐŒÐŸÑ, ÐŒÐŸÐ¶ÐµÑÐµ Ð¿ÐŸÐ²ÑÐŸÑÐœÐŸ ÐŽÐ° Ð³ÐŸ ÐœÐ°Ð¿ÑÐ°Ð²ÐžÑÐµ ÑÐµÑÑÐŸÑ Ð²ÐŸ Ð¿ÑÐŸÐ·ÐŸÑÐŸÑ Ð·Ð° Ð¿ÐŸÐŽÐµÑÑÐ²Ð°ÑÐ° ÐœÐ° Torbutton Ð·Ð° ÐŽÐ° Ð¿ÑÐµÑÑÐ°ÐœÐµ ÐŸÐ²Ð° Ð¿ÑÐµÐŽÑÐ¿ÑÐµÐŽÑÐ²Ð°ÑÐµ. -torbutton.popup.test.ff3_notice = ÐÑÐžÑÐžÑÐœÐµÑÐµ ÐÐ Ð·Ð° ÐŽÐ° Ð³Ðž ÑÐµÑÑÐžÑÐ°ÑÐµ Ð¿ÐŸÐŽÐµÑÑÐ²Ð°ÑÐ°ÑÐ° Ð·Ð° Ð¢ÐŸÑ Ð¿ÑÐŸÐºÑÐžÑÐŸ. ÐÐ²ÐŸÑ ÑÐµÑÑ ÑÐµ ÐžÐ·Ð²ÐµÐŽÑÐ²Ð° Ð²ÐŸ Ð¿ÐŸÐ·Ð°ÐŽÐžÐœÐ°, ÐÐµ ÐŒÐŸÐ»ÐžÐŒÐµ Ð·Ð° ÑÑÐ¿ÐµÐœÐžÐµ. torbutton.popup.external.title = ÐÑÐžÑÑÐ²Ð°ÑÐµ ÐœÐ° ÐµÐºÑÑÐµÑÐœÐ° ÑÐŸÐŽÑÐ¶ÐžÐœÐ°? torbutton.popup.external.app = ÐÐŸÑÑÐµÐ±ÐœÐ° Ðµ ÐµÐºÑÑÐµÑÐœÐ° Ð°Ð¿Ð»ÐžÐºÐ°ÑÐžÑÐ° Ð·Ð° ÑÐ¿ÑÐ°Ð²ÑÐ²Ð°ÑÐµ ÑÐŸ:\n\n torbutton.popup.external.note = \n\nÐÐÐÐÐÐÐšÐÐ: ÐÐºÑÑÐµÑÐœÐžÑÐµ Ð°Ð¿Ð»ÐžÐºÐ°ÑÐžÐž ÐŸÐ±ÐžÑÐœÐŸ ÐÐ ÑÐµ ÑÐ²ÐµÑÐœÐž Ð·Ð° Ð¢ÐŸÑ Ðž ÐŒÐŸÐ¶Ð°Ñ ÐŽÐ° Ð²Ðµ ÐŸÑÐºÑÐžÑÐ°Ñ!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = ÐÐ°ÐœÑÐžÑÐ°Ñ ÑÐ° Ð°Ð¿Ð»ÐžÐºÐ°ÑÐžÑÐ°ÑÐ° torbutton.popup.cancel = ÐÑÐºÐ°Ð¶Ðž ÑÐµ torbutton.popup.dontask = ÐÑÑÐµÐ³Ð° ÐœÐ°ÑÐ°ÐŒÑ, ÑÐµÐºÐŸÐ³Ð°Ñ Ð»Ð°ÐœÑÐžÑÐ°Ñ Ð³Ðž Ð°Ð¿Ð»ÐžÐºÐ°ÑÐžÐžÑÐµ -torbutton.popup.test.no_http_proxy = Ð¢ÐµÑÑÐŸÑ Ð·Ð° Ð¢ÐŸÑ Ð¿ÑÐŸÐºÑÐž: Ð»ÐŸÐºÐ°Ð»ÐœÐŸÑÐŸ HTTP Ð¿ÑÐŸÐºÑÐž Ðµ ÐœÐµÐŽÐŸÑÑÐ°Ð¿ÐœÐŸ. ÐÐ°Ð»Ðž Polipo Ðµ Ð²ÐºÐ»ÑÑÐµÐœ? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/ml/torbutton.dtd b/src/chrome/locale/ml/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/ml/torbutton.dtd +++ b/src/chrome/locale/ml/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/ml/torbutton.properties b/src/chrome/locale/ml/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/ml/torbutton.properties +++ b/src/chrome/locale/ml/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/mn/torbutton.dtd b/src/chrome/locale/mn/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/mn/torbutton.dtd +++ b/src/chrome/locale/mn/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/mn/torbutton.properties b/src/chrome/locale/mn/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/mn/torbutton.properties +++ b/src/chrome/locale/mn/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/mr/torbutton.dtd b/src/chrome/locale/mr/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/mr/torbutton.dtd +++ b/src/chrome/locale/mr/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/mr/torbutton.properties b/src/chrome/locale/mr/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/mr/torbutton.properties +++ b/src/chrome/locale/mr/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/ms/torbutton.dtd b/src/chrome/locale/ms/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/ms/torbutton.dtd +++ b/src/chrome/locale/ms/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/ms/torbutton.properties b/src/chrome/locale/ms/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/ms/torbutton.properties +++ b/src/chrome/locale/ms/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/mt/torbutton.dtd b/src/chrome/locale/mt/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/mt/torbutton.dtd +++ b/src/chrome/locale/mt/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/mt/torbutton.properties b/src/chrome/locale/mt/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/mt/torbutton.properties +++ b/src/chrome/locale/mt/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/my/torbutton.dtd b/src/chrome/locale/my/torbutton.dtd index 83c42e9..91225d4 100644 --- a/src/chrome/locale/my/torbutton.dtd +++ b/src/chrome/locale/my/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "ááá±á¬ááºáá® áá»áááºááŸááá»ááºáá»á¬áž"> -<!ENTITY torbutton.prefs.recommended_settings "áá»áœááºáá±á¬áºá· áá®ážáá»áŸá¶ááŒá±ááœá±áž áá¬ážááŸááºážá¡ááœááº á¡ááŒá¶ááŒá¯áá¬ážáá±á¬ ááá±á¬ááºáá® áá»áááºááŸááá»ááºáá»á¬ážááá¯ á¡áá¯á¶ážááŒá¯áááº"> -<!ENTITY torbutton.prefs.use_polipo "Polipo ááá¯ áá¯á¶ážáááº"> -<!ENTITY torbutton.prefs.custom_settings "ááááºááŒáá¯ááº ááá±á¬ááºáá® áá»áááºááŸááá»ááºáá»á¬ážááá¯ áá¯á¶ážáááº"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP ááá±á¬ááºáá® -"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL ááá±á¬ááºáá® -"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP ááá±á¬ááºáá® -"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher ááá±á¬ááºáá® -"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host -"> -<!ENTITY torbutton.prefs.proxy.port "Port -"> -<!ENTITY torbutton.pref_connection.notice "á¡á²áá® áá»áááºááŸááá»ááºáá»á¬ážááá¯ ááŒá±á¬ááºážáááº Torbutton ááá¯ ááááºáá«á"> -<!ENTITY torbutton.pref_connection.more_info "áá±á¬ááºáááº á¡áá»ááºá¡áááºáá»á¬áž"> -<!ENTITY torbutton.pref_connection_more_info.title "á¡áá°á¡áá®"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton ááá¯ áá±á¬áá±á¬áááº ááœááºá·áá¬ážáááºá á¡áááºá áááºá· Tor ááá±á¬ááºáá® ááá¯á¶ážáá±á¬ áá»áááºááŸááá»ááºáá»á¬ážááá¯ ááŒá±á¬ááºážááá¯áá»áŸááºá Torbutton ááá¯ ááááºááŒá®áž á€áá±áá¬ááá¯á· ááŒááºáá¬áá«á á¡áááºá áááºá· Tor áá»áááºááŸááá»ááºáá»á¬ážááá¯ ááŒá±á¬ááºážááá¯áá«áá Torbutton áŠážáá¬ážáá±ážááŸá¯ áááºážááá¯ážááá¯ áá¯á¶ážááœá²áá«á"> <!ENTITY torbutton.context_menu.new_identity "á¡áá±á¬ááºá¡áá¬áž á¡áááº"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "áŠážáá¬ážáá±ážáá»ááºáá»á¬áž..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Torbutton ááá¯ á¡áááŒá¯áááº ááŸáááºáá«á"> <!ENTITY torbutton.prefs.restore_defaults " áá°áá¡ááá¯ááºáž ááŒááºáá¬ážáááº"> -<!ENTITY torbutton.prefs.test_settings "áááºáá±ážááŸá¯ áá»áááºááŸááá»ááºáá»á¬áž"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "ááá±á¬ááºáá® áááá¯á¡ááºáááºá· á¡áá¬ -"> -<!ENTITY torbutton.prefs.no_proxy_warning "ááááá±ážáá»ááº - á¡áááºááŸ host á¡áááºáá»á¬áž áá¯á¶ážááœá²ááŸá¯ááá¯ ááŸá±á¬ááºáá«"> <!ENTITY torbutton.cookiedialog.title "ááœááºáá®áž áá¬ááœááºááŸá¯áá»á¬ážááá¯ áá®áá¶áááºá·ááœá²áááº"> <!ENTITY torbutton.cookiedialog.lockCol "á¡áá¬á¡ááœááº áá¯ááºáá¬ážáááº"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "á¡á¬ážáá¯á¶ážááá¯ áááºáá¯ááºáá«á ááá¯á·áá±á¬áº á¡áá¬á¡ááœááº áá¯ááºáá¬ážáááº"> <!ENTITY torbutton.cookiedialog.saveAllCookies "ááœááºáá®ážáááºáá»á¬ážááá¯ áá¬ááœááºáááº"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ááœááºáá®ážáááºáá»á¬ážááá¯ áá¬ááœááºááŒááºáž áááŒá¯áááº"> -<!ENTITY torbutton.prefs.transparentTor "ááœááºá·áááºážááŒááºáá¬áá±á¬ Tor áá¯á¶ážááœá²ááŸá¯ (ááááºááŒáá¯ááº transproxy ááŸááºá· Tor Router ááá¯á¡ááºáááº)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/my/torbutton.properties b/src/chrome/locale/my/torbutton.properties index 6ab566d..043cb4a 100644 --- a/src/chrome/locale/my/torbutton.properties +++ b/src/chrome/locale/my/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Tor ááá¯ ááááºáááº ááŸá torbutton.panel.label.disabled = ááááºáá¬ážáá±á¬ Tor torbutton.panel.label.enabled = ááœááºá·áá¬ážáá±á¬ Tor extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor ááá±á¬ááºáá® áááºážáááºáá»ááº á¡á±á¬ááºááŒááºáááº! -torbutton.popup.test.failure = Tor áááºážáááºááŸá¯ áá¡á±á¬ááºááŒááºáá«! áááºá· ááá±á¬ááºáá®ááŸááºá· Polipo áá»áááºááŸááá»ááºáá»á¬ážááá¯ áááºáá±ážáá«á -torbutton.popup.test.confirm_toggle = áááºááá±á¬ Tor ááá±á¬ááºáá® áááºážáááºááŸá¯ áá¡á±á¬ááºááŒááºáá«á\n\náááºážááá¯ ááœááºá·áááº áá±áá»á¬ááá¬ážá?\n\nááŸááºáá»ááº - á¡áááºá áááºáááº ááŒá¿áá¬ááá¯ ááŒá±ááŸááºážááá¯ááºáá»áŸááºá áááºážáááºááŸá¯ááá¯ Torbutton ááá±á¬ááºáá® áŠážáá¬ážáá±ážáá»ááºáá»á¬áž áááºážááá¯ážá ááŒá¯áá¯ááºááŒá®áž á€ááááá±ážáá»ááºááá¯ áááº áááºááŸá¬ážááá¯ááºáááºá -torbutton.popup.test.ff3_notice = Tor ááá±á¬ááºáá® áá»áááºááŸááá»ááºáá»á¬ážááá¯ áááºážáááºáááº áá±á¬ááºážááŒá®ááá¯ ááŸáááºáá«á á€áááºážáááºááŸá¯áááº áá±á¬ááºáá¶á ááŒááºáá»ááºáá¬ááááºá·áááºá ááááºááŸááºáá±ážááááº ááŒááºáááºá torbutton.popup.external.title = ááŒááºáááŸ á¡ááŒá±á¬ááºážá¡áá¬ááá¯ ááœááºá·áááº torbutton.popup.external.app = ááŒááºá á¡áá¹ááá®áá±ážááŸááºáž áááºáá¯ááá¯ ááŒá±ááŸááºážáááº ááá¯á¡ááºáááº - \n\n torbutton.popup.external.note = \n\nááŸááºáá»ááº - ááŒááºá á¡áá¹ááá®áá±ážááŸááºážáá»á¬ážáááº áá¯á¶ááŸááºá¡á¬ážááŒááºá· áá¯á¶ááŒá¯á¶áá±á¬ Tor ááá¯ááºáá«á áááºážá áááºá·ááá¯ áá±á«áºááá¯ááºáááºá\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \ná¡áááºá á€ááá¯ááºááá¯ torbutton.popup.launch = á¡áá¹ááá®áá±ážááŸááºážááá¯ ááœááºá·áááº torbutton.popup.cancel = áá»ááºááááºážáááº torbutton.popup.dontask = ááá¯á¡áá»áááºááŸáááŒá®áž á¡áá¹ááá®áá±ážááŸááºážáá»á¬ážááá¯ á¡ááŒá² ááœááºá·áááº -torbutton.popup.test.no_http_proxy = Tor ááá±á¬ááºáá® áááºážáááºáá»ááº - ááá¯áááº HTTP ááá±á¬ááºáá®ááá¯ áááºááŸááºáž áááŸá®ááá¯ááºáá«á Polipo áááº áá±á¬ááºážááœááºááœá¬ á¡áá¯ááº áá¯ááºáá±áá«ááá¬áž? torbutton.popup.prompted_language = áááºá· ááá¯ááºáá±ážááá¯ááºáá¬ áá¯á¶ááŒá¯á¶áá±ážááá¯ ááá¯ááá¯ áááŸááááºá Torbutton áááº ááœááºáááº áá¬áá»ááºááŸá¬áá»á¬ážááá¯ á¡ááºá¹áááááº áá¬áá¬ áá¬ážááŸááºážááŒááºá· áá±á¬ááºážáá¶áá±ážááá¯ááºáááºá áááºážááá¯á·ááŒá¯áá¯ááºááŒááºážáááº áááºá· áá¬áá¬ááŒááºá· áááºááŸá¯ááá¯áá±á¬ ááœááºáááº áá¬áá»ááºááŸá¬áá»á¬ážááá¯ á¡ááºá¹áááááº áá¬áá¬áááŒááºá· áá±á«áºááŒáá±áááº ááŒááºáááºá\n\náá¯á¶ááŒá¯á¶ááŸá¯ ááá¯ááŸááááºá¡ááœááº á¡ááºá¹áááááº áá¬áá¬ááŒááºá· ááœááºáááºáá¬áá»ááºááŸá¬áá»á¬ážááá¯ áááº áá±á¬ááºážáá¶ááá¯á áá¬áž? torbutton.popup.no_newnym = Torbutton áááº áááºá·á¡á¬áž á¡áá±á¬ááºá¡áá¬áž á¡áááºááá¯ áá¯á¶áá¯á¶ááŒá¯á¶ááŒá¯á¶ ááá±ážááá¯ááºáá«á áááºážáááº Tor ááááºážáá»á¯ááºáá±áž Port áá² ááááºáá±á¬ááºááá¯ááºáá«á\n\nTor Browser Bundle ááá¯ áááº áá¯á¶ážááœá²áá±ááá¬áž? -torbutton.popup.pref_error = Torbutton áááº áŠážâáá¬ážáá±ážáá»ááºáá»á¬ážááá¯ Tor Browser áááá¯ááá¯ááºážáá²á ááœááºážáá¶ááá±ážááá¯ááºáá«á -torbutton.popup.permission_denied = Tor Browser ááá¯ááºáááºážááŒá±á¬ááºážá¡ááœááº ááœááºá·ááŒá¯áá»ááºáá»á¬ážááá¯ ááŒááºáá»áááºáá« ááá¯á·ááá¯ááº áááºážááá¯ áá±áá¬á¡áááºááá¯á· áá±á¬áºáá®áá°ážáá«á -torbutton.popup.device_full = Disk ááŒááºá·áá±áá¯á¶áá±á«áºáááºá áá±áá¬ááá¯ á¡ááœááºáá¬ážáá« (ááá¯á·) Tor Browser ááá¯ áááºáááááá¬ á¡áááºáááºáá¯áá² ááœáŸá±á·ááá¯ááºáá«á torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/nah/torbutton.dtd b/src/chrome/locale/nah/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/nah/torbutton.dtd +++ b/src/chrome/locale/nah/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/nah/torbutton.properties b/src/chrome/locale/nah/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/nah/torbutton.properties +++ b/src/chrome/locale/nah/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/nap/torbutton.dtd b/src/chrome/locale/nap/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/nap/torbutton.dtd +++ b/src/chrome/locale/nap/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/nap/torbutton.properties b/src/chrome/locale/nap/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/nap/torbutton.properties +++ b/src/chrome/locale/nap/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd index 2f42bca..8376d7d 100644 --- a/src/chrome/locale/nb/torbutton.dtd +++ b/src/chrome/locale/nb/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxyinnstillinger"> -<!ENTITY torbutton.prefs.recommended_settings "Bruk anbefalte proxyinnstillinger for min versjon av Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Bruk Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Bruk egne proxyinnstillinger"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP-proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL-proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP-proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher-proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS-vert:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Deaktiver Torbutton for Ã¥ endre pÃ¥ disse innstillingene."> -<!ENTITY torbutton.pref_connection.more_info "Mer informasjon"> -<!ENTITY torbutton.pref_connection_more_info.title "Hjelp"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton er for Ãžyeblikket aktivert. Hvis du vil endre pÃ¥ ikke-Tor-proxyinnstillinger, vennligst deaktiver Torbutton og returner hit. Hvis du vil endre pÃ¥ Tor-innstillingene, vennligst bruk Torbutton-innstillingsvinduet."> <!ENTITY torbutton.context_menu.new_identity "Ny Identitet"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Innstillinger..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Klikk for Ã¥ initialisere Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Gjenopprett standard"> -<!ENTITY torbutton.prefs.test_settings "Test innstillinger"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Ingen proxyer for:"> -<!ENTITY torbutton.prefs.no_proxy_warning "Advarsel: UnngÃ¥ Ã¥ bruke noen av vertsnavnene ovenfor"> <!ENTITY torbutton.cookiedialog.title "AdministrÃ©r Informasjonskapslenes Beskyttelser"> <!ENTITY torbutton.cookiedialog.lockCol "Beskyttet"> <!ENTITY torbutton.cookiedialog.domainCol "Vert"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Fjern Alle Bortsett Fra Beskyttede"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Beskytt Nye Informasjonskapsler"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ikke Beskytt Nye Informasjonskapsler"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (krever egendefinert transproxy eller Tor-router)"> <!ENTITY torbutton.prefs.block_disk "Ikke lagre nettleserhistorikk eller nettsidedata (aktiverer privat nettleser Ãžkt)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Begrens tredjeparts informasjonskapsler og andre sporingsdata."> <!ENTITY torbutton.prefs.block_plugins "Deaktiver nettlesertillegg (som f.eks Flash)"> diff --git a/src/chrome/locale/nb/torbutton.properties b/src/chrome/locale/nb/torbutton.properties index 5aa7e1e..12ad8ef 100644 --- a/src/chrome/locale/nb/torbutton.properties +++ b/src/chrome/locale/nb/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Klikk for Ã¥ deaktivere Tor torbutton.panel.label.disabled = Tor er deaktivert torbutton.panel.label.enabled = Tor er aktivert extensions.torbutton(a)torproject.org.description = Torbutton tilbyr en knapp til Ã¥ konfigurere Tor-innstillinger, samt rask og enkel tilgang til Ã¥ slette privat nettleserhistorikk. -torbutton.popup.test.success = Tor proxy-test vellykket! -torbutton.popup.test.failure = Tor proxy-test feilet! Sjekk proxy og Polipo-innstillingene dine. -torbutton.popup.test.confirm_toggle = Den nyeste Tor-proxy testen feilet Ã¥ bruke Tor.\n\nEr du sikker pÃ¥ at du Ãžnsker Ã¥ aktivere allikevel?\n\nMerk: Hvis du har fikset problemet sÃ¥ kan du kjÃžre testen pÃ¥ nytt i Torbutton Proxy Innstillinger for Ã¥ eliminere denne advarselen. -torbutton.popup.test.ff3_notice = Klikk OK for Ã¥ teste Tor proxy-innstillinger. Denne testen vil kjÃžre i bakgrunnen. VÃŠr tÃ¥lmodig. torbutton.popup.external.title = Laste eksternt innhold? torbutton.popup.external.app = Et eksternt program er nÃždvendig for Ã¥ hÃ¥ndtere:\n\n torbutton.popup.external.note = \n\nMERK: Eksterne program er IKKE Tor-sikker som standard og kan rÃžpe deg!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nHvis du ikke vet om denne filen er trygg, b torbutton.popup.launch = Start program torbutton.popup.cancel = Avbryt torbutton.popup.dontask = Start alltid programmer fra nÃ¥ av -torbutton.popup.test.no_http_proxy = Tor-proxy test: Lokal HTTP-proxy kan ikke nÃ¥s. KjÃžrer Polipo skikkelig? torbutton.popup.prompted_language = For Ã¥ gi deg et bedre personvern, kan Torbutton spÃžrre om en engelsksprÃ¥klig versjon av nettsider. Dette kan resultere i at nettsider du foretrekker Ã¥ lese pÃ¥ morsmÃ¥let ditt vises pÃ¥ engelsk istedet.\n\nVil du spÃžrre om engelsksprÃ¥klige nettsider for Ã¥ bedre personvernet? torbutton.popup.no_newnym = Torbutton kan ikke trygt gi deg en ny identitet. Den har ikke tilgang til Tor Control Port.\n\nKjÃžrer du Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton kan ikke oppdatere innstillingene i Tor Browser profilkatalogen. -torbutton.popup.permission_denied = Vennligst tilbakestill enten tillatelsene til Tor Browser katalogen eller kopier den til en ny beliggenhet. -torbutton.popup.device_full = Harddisken er full. Vennligst frigjÃžr plass eller flytt Tor Browser til en ny enhet. torbutton.title.prompt_torbrowser = Viktig Torbutton informasjon torbutton.popup.prompt_torbrowser = Torbutton fungerer annerledes nÃ¥. Du kan ikke skru den av lenger.\n\nVi gjorde denne forandringen fordi det ikke er sikkert Ã¥ bruke Torbutton i en nettleser som ogsÃ¥ brukers til annen surfing enn Tor. \nDet var for mange bugs der til at vi kunne fikse det pÃ¥ en annen mÃ¥te.\n\nHvis du Ãžnsker Ã¥ bruke Firefox normalt, bÃžr du avinstallere Torbutton og laste ned Tor Browser Bundle. Personvernsinnstillingene til Tor Browser er ogsÃ¥ overlegen en normal Firefox, selv nÃ¥r Firefox brukes med Torbutton.\n\nFor Ã¥ fjerne Torbutton, gÃ¥ til VerktÃžy->Tillegg->Utvidelser og klikk pÃ¥ Fjern-knappen ved siden av Torbutton. torbutton.popup.short_torbrowser = Viktig Torbutton informasjon!\n\nTorbutton er alltid aktivert nÃ¥.\n\nKlikk pÃ¥ Torbutton for mer informasjon. diff --git a/src/chrome/locale/ne/torbutton.dtd b/src/chrome/locale/ne/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/ne/torbutton.dtd +++ b/src/chrome/locale/ne/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/ne/torbutton.properties b/src/chrome/locale/ne/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/ne/torbutton.properties +++ b/src/chrome/locale/ne/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index f377870..e5c2b3a 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy-instellingen"> -<!ENTITY torbutton.prefs.recommended_settings "De aanbevolen proxy-instellingen voor mijn versie van Firefox gebruiken"> -<!ENTITY torbutton.prefs.use_polipo "Polipo gebruiken"> -<!ENTITY torbutton.prefs.custom_settings "Aangepaste proxy-instellingen gebruiken"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS host:"> -<!ENTITY torbutton.prefs.proxy.port "Poort:"> -<!ENTITY torbutton.pref_connection.notice "Torbutton dient uitgeschakeld te worden om deze instellingen te kunnen wijzigen."> -<!ENTITY torbutton.pref_connection.more_info "Meer informatie"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is momenteel ingeschakeld. Als u uw niet aan Tor gerelateerde proxy-instellingen wilt wijzigen dient u Torbutton uit te schakelen en dan hier terug te komen. Als u uw Tor instellingen wilt wijzigen, gebruik dan het Torbutton Voorkeuren-venster."> <!ENTITY torbutton.context_menu.new_identity "Nieuwe identiteit"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Nieuw tor circuit voor deze website"> @@ -27,11 +13,6 @@ <!ENTITY torbutton.button.tooltip "Klik hier om Torbutton te initialiseren"> <!ENTITY torbutton.prefs.privacy_security_settings "Privacy- en beveiligingsinstellingen"> <!ENTITY torbutton.prefs.restore_defaults "Terugzetten op begintoestand"> -<!ENTITY torbutton.prefs.test_settings "Testen van de instellingen"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Geen proxy voor: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Opgelet: gebruik van bovenstaande hostnamen vermijden"> <!ENTITY torbutton.cookiedialog.title "Beheer Cookie Beveiligingen"> <!ENTITY torbutton.cookiedialog.lockCol "Beveiligd"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -43,7 +24,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Verwijder alle behalve beveiligde"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Beveilig nieuwe Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Beveilig nieuwe Cookies niet"> -<!ENTITY torbutton.prefs.transparentTor "Transparante Torificatie (Heeft aangepaste transparente proxy of Tor router nodig)"> <!ENTITY torbutton.prefs.priv_caption "Privacyinstellingen"> <!ENTITY torbutton.prefs.block_disk "Bewaar geen surfgeschiedenis of websitegegevens. (Schakelt PrivÃ©navigatie in.)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Beperk cookies en andere tracking-gegevens van derden"> diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties index 3647617..056e445 100644 --- a/src/chrome/locale/nl/torbutton.properties +++ b/src/chrome/locale/nl/torbutton.properties @@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Hier klikken om Tor uit te schakelen torbutton.panel.label.disabled = Tor uitgeschakeld torbutton.panel.label.enabled = Tor ingeschakeld extensions.torbutton(a)torproject.org.description = Torbutton biedt een knop aan om Tor instellingen te configuren en snel en makkelijk privÃ© surfdata op te schonen. -torbutton.popup.test.success = Tor proxy test geslaagd! -torbutton.popup.test.failure = Tor proxy test MISLUKT! Proxy en Polipo instellingen controlleren. -torbutton.popup.test.confirm_toggle = De laatst uitgevoerde Tor proxy test is mislukt.\n\n Wilt U toch naar Tor wisselen ?\n\n Opmerking: Als het probleem opgelost is, kan de test in het Torbutton Proxy instellingsscherm opnieuw uitgevoerd worden om deze melding te vermijden. -torbutton.popup.test.ff3_notice = Klik op OK om de Tor proxy instellingen te testen. Deze test gebeurt op de achtergrond. Even geduld aub. torbutton.popup.external.title = Wilt u een extern bestandstype downloaden? torbutton.popup.external.app = Tor Browser kan dit bestand niet weergeven. U zou het moeten openen in een andere applicatie.\n\n torbutton.popup.external.note = Bepaalde type bestanden kunnen ervoor zorgen dat applicaties verbinding met het internet maken zonder Tor.\n\n @@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Om veilig te surfen, zou u alleen bestanden m torbutton.popup.launch = Download bestand torbutton.popup.cancel = Annuleren torbutton.popup.dontask = Download bestanden automatisch vanaf nu -torbutton.popup.test.no_http_proxy = Tor proxy test : De lokale HTTP proxy is niet bereikbaar. Werkt Polipo zoals het hoort ? torbutton.popup.prompted_language = Om je meer privacy te geven kan Torbutton pagina's in de Engelse taal opvragen. Dit kan er voor zorgen dat web pagina's die je graag in je eigen taal wilt lezen in het Engels weergegeven worden. Wil je web pagina's in de Engelse taal opvragen voor betere privacy? torbutton.popup.no_newnym = Torbutton je niet veilig een nieuwe identiteit geven. Het heeft geen toegang tot de Tor Control Port.\n\nGebruik je de Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton kan instellingen niet bijwerken in de Tor Browser profiel folder. -torbutton.popup.permission_denied = Stel de rechten van de Tor Browser folder opnieuw in of kopieer deze naar een nieuwe lokatie. -torbutton.popup.device_full = De schijf lijkt vol te zijn. Maak ruimte vrij of verplaats Tor Browser naar een nieuw apparaat. torbutton.title.prompt_torbrowser = Belangrijke Torbutton informatie torbutton.popup.prompt_torbrowser = Torbutton werkt nu anders: je kan het niet meer uitzetten.\n\nWe hebben deze verandering doorgevoerd, omdat het niet veilig is om Torbutton te gebruiken in een browser welke ook gebruikt wordt voor niet-Tor browsen. Er zaten teveel fouten in welke we niet konden repareren op een andere manier.\n\nAls je Firefox wilt blijven gebruiken op de normale manier, dan zal je Torbutten moeten deinstalleren en de Tor Browser Bundle moeten downloaden. De privacy eigenschappen van Tor Browser zijn ook superieur ten opzichte van de normale Firefox, zelfs wanneer Firefox gebruikt wordt met Torbutton.\n\nOm Torbutton te verwijderen, ga naar Extra->Add-ons->Extensies en klik dan op de knop Uitschakelen naast Torbutton. torbutton.popup.short_torbrowser = Belangrijke Torbutton Informatie!\n\nTorbutten is nu altijd ingeschakeld.\n\nKlik op de Torbutton voor meer informatie. diff --git a/src/chrome/locale/nn/torbutton.dtd b/src/chrome/locale/nn/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/nn/torbutton.dtd +++ b/src/chrome/locale/nn/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/nn/torbutton.properties b/src/chrome/locale/nn/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/nn/torbutton.properties +++ b/src/chrome/locale/nn/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/nso/torbutton.dtd b/src/chrome/locale/nso/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/nso/torbutton.dtd +++ b/src/chrome/locale/nso/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/nso/torbutton.properties b/src/chrome/locale/nso/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/nso/torbutton.properties +++ b/src/chrome/locale/nso/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/oc/torbutton.dtd b/src/chrome/locale/oc/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/oc/torbutton.dtd +++ b/src/chrome/locale/oc/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/oc/torbutton.properties b/src/chrome/locale/oc/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/oc/torbutton.properties +++ b/src/chrome/locale/oc/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/or/torbutton.dtd b/src/chrome/locale/or/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/or/torbutton.dtd +++ b/src/chrome/locale/or/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/or/torbutton.properties b/src/chrome/locale/or/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/or/torbutton.properties +++ b/src/chrome/locale/or/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/pa/torbutton.dtd b/src/chrome/locale/pa/torbutton.dtd index 4330980..70622d3 100644 --- a/src/chrome/locale/pa/torbutton.dtd +++ b/src/chrome/locale/pa/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "àšªàš°àšŸàšàšžà© àšžà©àšàš¿à©°àš"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "àšà©àšŠ àšªàš°àšŸàšàšžà© àšžà©àšàš¿à©°àš àšŠàš¿àš"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "àšžàš¹àšŸàšàš€àšŸ"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "S"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "àšà©àšžàš àšžà©àšàš¿à©°àš"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/pa/torbutton.properties b/src/chrome/locale/pa/torbutton.properties index 7866f6f..93bbd40 100644 --- a/src/chrome/locale/pa/torbutton.properties +++ b/src/chrome/locale/pa/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = àš°à©±àšŠ àšàš°à© torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/pap/torbutton.dtd b/src/chrome/locale/pap/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/pap/torbutton.dtd +++ b/src/chrome/locale/pap/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/pap/torbutton.properties b/src/chrome/locale/pap/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/pap/torbutton.properties +++ b/src/chrome/locale/pap/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd index eabc8ef..0006944 100644 --- a/src/chrome/locale/pl/torbutton.dtd +++ b/src/chrome/locale/pl/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Ustawienia proxy"> -<!ENTITY torbutton.prefs.recommended_settings "UÅŒyj zalecanych ustawieÅ proxy dla mojej wersji Firefoksa"> -<!ENTITY torbutton.prefs.use_polipo "UÅŒywaj Polipo"> -<!ENTITY torbutton.prefs.custom_settings "UÅŒyj spersonalizowanych ustawieÅ proxy."> -<!ENTITY torbutton.prefs.proxy.host.http "Serwer proxy HTTP:"> -<!ENTITY torbutton.prefs.proxy.host.https "Serwer proxy SSL:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "Serwer proxy FTP:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Serwer proxy Gopher:"> -<!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Aby zmieniÄ te ustawienia wyÅÄcz Torbutton."> -<!ENTITY torbutton.pref_connection.more_info "WiÄcej informacji"> -<!ENTITY torbutton.pref_connection_more_info.title "Pomoc"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton jest wÅÄczony. JeÅli chcesz zmieniÄ inne ustawienia proxy musisz wyÅÄczyÄ Torbutton i powrÃ³ciÄ tutaj. JeÅli chcesz zmieniÄ ustawienia proxy Tor, zrÃ³b to tutaj."> <!ENTITY torbutton.context_menu.new_identity "Nowa ToÅŒsamoÅÄ"> <!ENTITY torbutton.context_menu.new_identity_key "o"> <!ENTITY torbutton.context_menu.new_circuit "Nowy obwÃ³d dla tej strony"> @@ -27,11 +13,6 @@ <!ENTITY torbutton.button.tooltip "Kliknij tutaj, aby uruchomiÄ Torbutton"> <!ENTITY torbutton.prefs.privacy_security_settings "Ustawienia prywatnoÅci i bezpieczeÅstwa"> <!ENTITY torbutton.prefs.restore_defaults "Ustawienia domyÅlne"> -<!ENTITY torbutton.prefs.test_settings "Testuj ustawienia"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Brak proxy dla: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Uwaga: Unikaj podawania nazw hostÃ³w powyÅŒej"> <!ENTITY torbutton.cookiedialog.title "ZarzÄdzaj ochronÄ ciasteczek"> <!ENTITY torbutton.cookiedialog.lockCol "Chronione"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -43,7 +24,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "UsuÅ wszystkie oprÃ³cz chronionych"> <!ENTITY torbutton.cookiedialog.saveAllCookies "ChroÅ nowe ciasteczka"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Nie chroÅ nowych ciasteczek"> -<!ENTITY torbutton.prefs.transparentTor "Przezroczysta toryfikacja (wymaga wÅasnego transproxy lub routera Tora)"> <!ENTITY torbutton.prefs.priv_caption "Ustawienia PrywatnoÅci"> <!ENTITY torbutton.prefs.block_disk "Nie zapisuj historii przeglÄdania i danych o stronach (wÅÄcza Tryb Prywatny)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Ograniczaj ciasteczka firm trzecich i inne dane sÅuÅŒÄce do Åledzenia"> diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties index 7bcb6bb..7164f69 100644 --- a/src/chrome/locale/pl/torbutton.properties +++ b/src/chrome/locale/pl/torbutton.properties @@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Kliknij tutaj, aby wyÅÄczyÄ Tora torbutton.panel.label.disabled = Tor wyÅÄczony torbutton.panel.label.enabled = Tor wÅÄczony extensions.torbutton(a)torproject.org.description = Torbutton udostÄpnia przycisk do konfiguracji ustawieÅ Tora oraz szybkiego i Åatwego usuwania prywatnych danych z przeglÄdarki. -torbutton.popup.test.success = Test proxy zakoÅczony pomyÅlnie! -torbutton.popup.test.failure = Test proxy siÄ NIE POWIÃDÅ! SprawdÅº swoje ustawienia proxy i Polipo. -torbutton.popup.test.confirm_toggle = Najnowszemu testowi proxy Tor nie udaÅo siÄ skorzystaÄ z Tora.\n\nNa pewno chcesz wÅÄczyÄ mimo tego?\n\nUwaga: JeÅli problem zostaÅ poprawiony, moÅŒesz ponownie uruchomiÄ test w oknie Preferencji Proxy Torbuttona, aby wyÅÄczyÄ to ostrzeÅŒenie. -torbutton.popup.test.ff3_notice = Kliknij OK aby przetestowaÄ ustawienia proxy. Testowanie odbywa siÄ w tle. Prosimy o cierpliwoÅÄ. torbutton.popup.external.title = PobraÄ zewnÄtrzny typ pliku? torbutton.popup.external.app = Tor Browser nie moÅŒe wyÅwietliÄ tego pliku. Musisz otworzyÄ go z innej aplikacji\n\n torbutton.popup.external.note = NiektÃ³re typy plikÃ³w mogÄ spowodowaÄ poÅÄczenie siÄ aplikacji z internetem bez uÅŒycia sieci Tor.\n\n @@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Aby byÄ bezpiecznym, pobrane pliki naleÅŒy u torbutton.popup.launch = Pobierz plik torbutton.popup.cancel = Anuluj torbutton.popup.dontask = Automatyczne pobieranie plikÃ³w jest od teraz wÅÄczone -torbutton.popup.test.no_http_proxy = Test Tor proxy: Lokalne Proxy HTTP jest nieosiÄgalne. Czy Polipo dziaÅa prawidÅowo? torbutton.popup.prompted_language = Aby daÄ Ci wiÄcej prywatnoÅci, Torbutton moÅŒe ÅŒÄdaÄ angielskich wersji stron internetowych. To moÅŒe spowodowaÄ, ÅŒe strony, ktÃ³re wolisz czytaÄ we wÅasnym jÄzyku bÄdÄ siÄ zamiast tego wyÅwietlaÄ po angielsku.\n\nCzy chcesz ÅŒÄdaÄ stron w jÄzyku angielskim dla lepszej prywatnoÅci? torbutton.popup.no_newnym = Torbutton nie moÅŒe bezpiecznie daÄ Ci nowej toÅŒsamoÅci. Nie ma dostÄpu do Portu Kontrolnego Tora.\n\nUÅŒywasz Paczki Tora z PrzeglÄdarkÄ? -torbutton.popup.pref_error = Torbutton nie moÅŒe zaktualizowaÄ preferencji w katalogu profilowym PrzeglÄdarki Tora. -torbutton.popup.permission_denied = ProszÄ albo ponownie ustawiÄ uprawnienia do katalogu PrzeglÄdarki Tora albo skopiowaÄ go w nowe miejsce. -torbutton.popup.device_full = Dysk zdaje siÄ byÄ peÅny. ProszÄ zwolniÄ miejsce lub przenieÅÄ PrzeglÄdarkÄ Tora na nowe urzÄdzenie. torbutton.title.prompt_torbrowser = WaÅŒne informacje o Torbuttonie torbutton.popup.prompt_torbrowser = Torbutton teraz dziaÅa inaczej: nie moÅŒna juÅŒ go wyÅÄczyÄ.\n\nZrobiliÅmy tÄ zmianÄ, gdyÅŒ nie jest bezpiecznie uÅŒywaÄ Torbuttona w przeglÄdarce uÅŒywanej takÅŒe do przeglÄdania sieci bez Tora. ByÅo za duÅŒo bÅÄdÃ³w, ktÃ³rych nie mogliÅmy naprawiÄ inaczej.\n\nJeÅli chcesz dalej normalnie uÅŒywaÄ Firefoksa, odinstaluj Torbutton i pobierz PaczkÄ Tora z PrzeglÄdarkÄ. Cechy prywatnoÅci w PrzeglÄdarce Tora sÄ lepsze od tych w normalnym Firefoksie, nawet gdy jest uÅŒywany z Torbutonem.\n\nAby usunÄÄ Torbuttona, wejdÅº do NarzÄdzia->Dodatki->Rozszerzenia i kliknij przycisk UsuÅ obok Torbuttona. torbutton.popup.short_torbrowser = WaÅŒne informacje o Torbuttonie!\n\nTorbutton jest teraz ciÄgle wÅÄczony.\n\nKliknij Turbutton, aby dowiedzieÄ siÄ wiÄcej. diff --git a/src/chrome/locale/pms/torbutton.dtd b/src/chrome/locale/pms/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/pms/torbutton.dtd +++ b/src/chrome/locale/pms/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/pms/torbutton.properties b/src/chrome/locale/pms/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/pms/torbutton.properties +++ b/src/chrome/locale/pms/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/ps/torbutton.dtd b/src/chrome/locale/ps/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/ps/torbutton.dtd +++ b/src/chrome/locale/ps/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/ps/torbutton.properties b/src/chrome/locale/ps/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/ps/torbutton.properties +++ b/src/chrome/locale/ps/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd index e2dc1dd..a95eb42 100644 --- a/src/chrome/locale/pt-BR/torbutton.dtd +++ b/src/chrome/locale/pt-BR/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "ConfiguraÃ§Ãµes de Proxy"> -<!ENTITY torbutton.prefs.recommended_settings "Usar as configuraÃ§Ãµes de proxy recomendadas para a minha versÃ£o de Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Usar o Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Usar configuraÃ§Ãµes de proxy personalizadas"> -<!ENTITY torbutton.prefs.proxy.host.http "Proxy para HTTP:"> -<!ENTITY torbutton.prefs.proxy.host.https "Proxy para SSL:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy para FTP:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy para Gopher:"> -<!ENTITY torbutton.prefs.proxy.host.socks "Host para SOCKS:"> -<!ENTITY torbutton.prefs.proxy.port "Porta:"> -<!ENTITY torbutton.pref_connection.notice "Desabilitar o BotÃ£o do Tor para alterar essas configuraÃ§Ãµes."> -<!ENTITY torbutton.pref_connection.more_info "Mais informaÃ§Ãµes"> -<!ENTITY torbutton.pref_connection_more_info.title "Ajuda"> -<!ENTITY torbutton.pref_connection_more_info.text "O BotÃ£o do Tor estÃ¡ habilitado. Se deseja alterar as configuraÃ§Ãµes de proxy nÃ£o relacionadas ao Tor, por favor desabilite o BotÃ£o do Tor e retorne aqui. Se vocÃª deseja alterar as configuraÃ§Ãµes do Tor, por favor use a janela de configuraÃ§Ãµes do BotÃ£o do Tor."> <!ENTITY torbutton.context_menu.new_identity "Nova Identidade"> <!ENTITY torbutton.context_menu.new_identity_key "Eu"> <!ENTITY torbutton.context_menu.preferences "ConfiguraÃ§Ãµes..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Clique para iniciar o BotÃ£o do Tor"> <!ENTITY torbutton.prefs.restore_defaults "Restaurar padrÃ£o"> -<!ENTITY torbutton.prefs.test_settings "Testar configuraÃ§Ãµes"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Sem Proxy para: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Aviso: evite usar quaisquer dos hosts acima"> <!ENTITY torbutton.cookiedialog.title "Gerenciar ProteÃ§Ãµes de Cookies"> <!ENTITY torbutton.cookiedialog.lockCol "Protegido"> <!ENTITY torbutton.cookiedialog.domainCol "Hospedeiro"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remover Tudo Exceto Protegidos"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger Novos Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "NÃ£o Prototeger Novos COOKIES"> -<!ENTITY torbutton.prefs.transparentTor "TorificaÃ§Ã£o Transparente (Requer transpoxy customizado ou roteador Tor)"> <!ENTITY torbutton.prefs.block_disk "NÃ£o gravar o histÃ³rico de navegaÃ§Ã£o ou dados do site (permite NavegaÃ§Ã£o em modo privado)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de controle"> <!ENTITY torbutton.prefs.block_plugins "Desabilita plugins do browser (como o Flash)"> diff --git a/src/chrome/locale/pt-BR/torbutton.properties b/src/chrome/locale/pt-BR/torbutton.properties index cc48df6..6a58d4b 100644 --- a/src/chrome/locale/pt-BR/torbutton.properties +++ b/src/chrome/locale/pt-BR/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Clique para desabilitar Tor torbutton.panel.label.disabled = Tor desabilitado torbutton.panel.label.enabled = Tor habilitado extensions.torbutton(a)torproject.org.description = Torbutton fornece um botÃ£o para rapidamente configurar o Tor e facilmente limpar dados de navegaÃ§Ã£o privados. -torbutton.popup.test.success = O teste do proxy Tor foi feito com sucesso. -torbutton.popup.test.failure = O teste do proxy FALHOU! Verifique seu proxy e as configuraÃ§Ãµes do Polipo. -torbutton.popup.test.confirm_toggle = O test do proxy Tor mais recente falhou ao usar o Tor.\n\nVocÃª tem certeza que deseja habilitar assim mesmo?\n\nNota: Se vocÃª tiver arrumado o problema, vocÃª pode retornar ao teste na janela Torbutton Proxy Preferences para eliminar este aviso. -torbutton.popup.test.ff3_notice = Clique OK para testar as configuraÃ§Ãµes do proxy Tor. Este teste acontecerÃ¡ em segundo plano. Por favor seja paciente. torbutton.popup.external.title = Carregar conteÃºdo externo? torbutton.popup.external.app = Uma aplicaÃ§Ã£o externa Ã© necessÃ¡ria para manipular:\n\n torbutton.popup.external.note = \n\nNOTA: AplicaÃ§Ãµes externas NÃO sÃ£o seguras por padrÃ£o e podem desmascarar vocÃª!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nSe este arquivo nÃ£o Ã© confiÃ¡vel, vocÃª d torbutton.popup.launch = Rode a aplicaÃ§Ã£o torbutton.popup.cancel = Cancelado torbutton.popup.dontask = Sempre ative aplicaÃ§Ãµes a partir de agora -torbutton.popup.test.no_http_proxy = Teste do Tor proxy: HTTP Proxy local estÃ¡ inacessÃvel. Polipo estÃ¡ rodando devidamente? torbutton.popup.prompted_language = Para proporcionar mais privacidade a vocÃª, o Torbutton pode requisitar a versÃ£o em inglÃªs de pÃ¡ginas da web. Isso pode fazer com que pÃ¡ginas que vocÃª prefere ler na sua lÃngua nativa apareÃ§am em InglÃªs. torbutton.popup.no_newnym = O Torbutton nÃ£o pode te dar uma nova identidade com seguranÃ§a. Ele nÃ£o tem acesso Ã Porta de Controle Tor.\n\\n\nVocÃª estÃ¡ usando o Tor Browser Bundle? -torbutton.popup.pref_error = O Torbutton nÃ£o pode atualizar as preferÃªncias na pasta de perfil do Tor Browser. -torbutton.popup.permission_denied = Por favor, restaure as permissÃµes da pasta do Tor browser ou copie-a para um outro lugar. -torbutton.popup.device_full = Este disco parece estar cheio. Por favor, libere espaÃ§o ou mova o Tor Browser para um novo dispositivo. torbutton.title.prompt_torbrowser = InformaÃ§Ã£o Importante do Torbutton torbutton.popup.prompt_torbrowser = O Torbutton agora funciona de forma diferente: vocÃª nÃ£o pode mais desliga-lo.\n\nFizemos essa mudanÃ§a porque nÃ£o Ã© seguro utilizar o Torbutton em navegador que ao mesmo tempo seja usado para navegaÃ§Ã£o nÃ£o-Tor. Eram causados bugs demais que nÃ£o pudemos resolver de nenhuma outra forma.\n\nSe vocÃª deseja continuar usando o Firefox normalmente, vocÃª deve desinstalar o Torbutton e baixar o Tor Browser Bundle. As configuraÃ§Ãµes de privacidade do Tor Browser tambÃ©m sÃ£o superiores Ã quelas do Firefox comum, mesmo quando era usado com o Torbutton.\n\nPara remover o Torbutton, vÃ¡ em Ferramentas->Complementes->ExtensÃµes e clique no botÃ£o remover prÃ³ximo ao Torbutton. torbutton.popup.short_torbrowser = InformaÃ§Ã£o Importante do Torbutton!\n\nO Torbutton agora mantem-se sempre habilitado.\n\nClique no Torbutton para mais informaÃ§Ãµes. diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd index 67e8649..9e4dcf7 100644 --- a/src/chrome/locale/pt/torbutton.dtd +++ b/src/chrome/locale/pt/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "ConfiguraÃ§Ãµes do Proxy"> -<!ENTITY torbutton.prefs.recommended_settings "Utilize as configuraÃ§Ãµes recomendadas do proxy para a minha versÃ£o do Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Utilizar Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Utilizar as configuraÃ§Ãµes do proxy personalizadas"> -<!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:"> -<!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:"> -<!ENTITY torbutton.prefs.proxy.host.socks "Hospedeiro SOCKS:"> -<!ENTITY torbutton.prefs.proxy.port "Porta:"> -<!ENTITY torbutton.pref_connection.notice "Desativar o Torbutton para alterar estas configuraÃ§Ãµes."> -<!ENTITY torbutton.pref_connection.more_info "Mais informaÃ§Ã£o"> -<!ENTITY torbutton.pref_connection_more_info.title "Ajuda"> -<!ENTITY torbutton.pref_connection_more_info.text "O Torbutton estÃ¡ ativado. Se desejar alterar as configuraÃ§Ãµes proxy que nÃ£o sejam do Tor, por favor, desative o Torbutton e volte aqui. Se desejar alterar as configuraÃ§Ãµes do Tor, por favor, utilize a janela de preferÃªncias do Torbutton."> <!ENTITY torbutton.context_menu.new_identity "Nova Identidade"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Novo Circuito Tor para este Site"> @@ -27,11 +13,6 @@ <!ENTITY torbutton.button.tooltip "Clique para inicializar o Torbutton"> <!ENTITY torbutton.prefs.privacy_security_settings "ConfiguraÃ§Ãµes de Privacidade e SeguranÃ§a"> <!ENTITY torbutton.prefs.restore_defaults "Restaurar PredefiniÃ§Ãµes"> -<!ENTITY torbutton.prefs.test_settings "Testar ConfiguraÃ§Ãµes"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Nenhum proxy para: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Aviso: evite utilizar quaisquer nomes de hospedeiro acima"> <!ENTITY torbutton.cookiedialog.title "Gerir ProteÃ§Ãµes dos Cookies"> <!ENTITY torbutton.cookiedialog.lockCol "Protegido"> <!ENTITY torbutton.cookiedialog.domainCol "Hospedeiro"> @@ -43,7 +24,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remover Tudo Exceto Protegidos"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Proteger Novos Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "NÃ£o Proteger Novos Cookies"> -<!ENTITY torbutton.prefs.transparentTor "TorrificaÃ§Ã£o Transparente (requer transpoxy personalizado ou encaminhamento do Tor)"> <!ENTITY torbutton.prefs.priv_caption "ConfiguraÃ§Ãµes de Privacidade"> <!ENTITY torbutton.prefs.block_disk "NÃ£o gravar o histÃ³rico de navegaÃ§Ã£o ou os dados do site da Web (ativa o Modo de NavegaÃ§Ã£o Privado)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir os cookies de terceiros e outros dados de rastreamento"> diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties index e44eadd..2c1e704 100644 --- a/src/chrome/locale/pt/torbutton.properties +++ b/src/chrome/locale/pt/torbutton.properties @@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Clique para desativar o Tor torbutton.panel.label.disabled = Tor Desativado torbutton.panel.label.enabled = Tor Ativado extensions.torbutton(a)torproject.org.description = o Torbutton proporciona um botÃ£o para configurar as configuraÃ§Ãµes do Tor e para limpar facilmente e rapidamente os dados de navegaÃ§Ã£o privados. -torbutton.popup.test.success = Teste do proxy bem sucedido! -torbutton.popup.test.failure = Teste do proxy Tor - FALHOU! Verifique as configuraÃ§Ãµes do proxy e Polipo. -torbutton.popup.test.confirm_toggle = O mais recente teste de utilizaÃ§Ã£o de Tor falhou.\n\nTem a certeza que deseja continuar mesmo assim?\n\nNota: Se jÃ¡ resolveu o problema, Ã© recomendado voltar a testar a ligaÃ§Ã£o nas PreferÃªncias do Torbutton para remover este aviso. -torbutton.popup.test.ff3_notice = Clique em "CONFIRMAR" para testar as configuraÃ§Ãµes do proxy Tor. Este teste serÃ¡ realizado em segundo plano. Por favor, seja paciente. torbutton.popup.external.title = Transferir um tipo de ficheiro externo? torbutton.popup.external.app = O navegador Tor nÃ£o consegue exibir este ficheiro. PoderÃ¡ ter que o abrir com outra aplicaÃ§Ã£o.\n\n torbutton.popup.external.note = Alguns tipos dos ficheiros podem fazer com que as aplicaÃ§Ãµes liguem Ã Internet sem utilizar o Tor.\n @@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Para sua seguranÃ§a, sÃ³ deverÃ¡ abrir os fic torbutton.popup.launch = Transferir ficheiro torbutton.popup.cancel = Cancelar torbutton.popup.dontask = A partir de agora, transferir automaticamente os ficheiros -torbutton.popup.test.no_http_proxy = Teste do proxy do Tor: Proxy HTTP local inacessÃvel. O Polipo estÃ¡ devidamente em execuÃ§Ã£o? torbutton.popup.prompted_language = Para lhe fornecer maior privacidade, o Torbutton pode requerer o uso da versÃ£o em inglÃªs em pÃ¡ginas da Internet. Isto pode causar a visualizaÃ§Ã£o em inglÃªs das pÃ¡ginas que prefere ler em portuguÃªs.\n\nPretende visualizar pÃ¡ginas em inglÃªs, para melhor privacidade? torbutton.popup.no_newnym = O Torbutton nÃ£o pode, em seguranÃ§a, fornecer-lhe uma nova identidade. NÃ£o tem acesso Ã porta de controle Tor.\n\nEstÃ¡ a usar o Tor Browser Bundle? -torbutton.popup.pref_error = O Torbutton nÃ£o consegue atualizar as preferÃªncias na diretoria do perfil do Navegador Tor. -torbutton.popup.permission_denied = Por favor, reinicie as permissÃµes da diretoria do Navegador Tor ou copie-a para uma nova localizaÃ§Ã£o. -torbutton.popup.device_full = O disco parece estar cheio. Por favor, liberte espaÃ§o ou mova o Navegador Tor para um novo dispositivo. torbutton.title.prompt_torbrowser = InformaÃ§Ã£o Importante do Torbutton torbutton.popup.prompt_torbrowser = O Torbutton funciona agora de forma diferente: jÃ¡ nÃ£o pode desligÃ¡-lo.\n\nProcedemos a esta alteraÃ§Ã£o porque nÃ£o Ã© seguro usar o Torbutton num explorador tambÃ©m usado para buscas fora do Tor. Havia demasiados erros que nÃ£o conseguimos corrigir de outra forma.\n\nSe pretende continuar a usar o Firefox normalmente, deve desinstalar o Torbutton e carregar o Tor Browser Bundle para o seu computador. As polÃticas de privacidade do Explorador do Tor tambÃ©m sÃ£o superiores Ã s normais no Firefox, mesmo quando este Ã© usado com o Torbutton.\n\nPara remover o Torbutton abra Ferramentas->AcessÃ³rios->ExtensÃµes e clique no botÃ£o Remover junto ao Torbutton. torbutton.popup.short_torbrowser = InformaÃ§Ã£o importante do Torbutton!\nO Torbutton nÃ£o estÃ¡ sempre activo.\nClique no Torbutton para mais informaÃ§Ã£o. diff --git a/src/chrome/locale/ro/torbutton.dtd b/src/chrome/locale/ro/torbutton.dtd index 2a7e79b..c1d2cc7 100644 --- a/src/chrome/locale/ro/torbutton.dtd +++ b/src/chrome/locale/ro/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "SetÄrile pentru proxy"> -<!ENTITY torbutton.prefs.recommended_settings "FoloseÈte setÄrile pentru proxy recomandate pentru versiunea mea de Firefox"> -<!ENTITY torbutton.prefs.use_polipo "FoloseÈte Polipo"> -<!ENTITY torbutton.prefs.custom_settings "FoloseÈte setÄri individualizate pentru proxy"> -<!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:"> -<!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:"> -<!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:"> -<!ENTITY torbutton.prefs.proxy.port "Portul:"> -<!ENTITY torbutton.pref_connection.notice "DezactivaÅ£i Torbutton pentru a schimba aceste setÄri."> -<!ENTITY torbutton.pref_connection.more_info "Informatii suplimentare"> -<!ENTITY torbutton.pref_connection_more_info.title "Ajutor"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton este activatÄ Ã®n acest moment. DacÄ doriÅ£i sÄ schimbaÅ£i setÄrile non-proxy Tor, dezactivaÅ£i Torbutton Åi vÄ rugÄm sÄ reveniÅ£i aici. DacÄ doriÅ£i sÄ vÄ schimbaÅ£i setÄrile Tor, vÄ rugÄm sÄ folosiÅ£i fereastra de preferinÅ£Ä Torbutton."> <!ENTITY torbutton.context_menu.new_identity "Identitate noua"> <!ENTITY torbutton.context_menu.new_identity_key "l"> <!ENTITY torbutton.context_menu.preferences "PreferinÈe..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "ApasÄ pentru pornirea Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "RestaureazÄ setÄrile implicite"> -<!ENTITY torbutton.prefs.test_settings "SetÄrile pentru testÄri"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Nici un proxy pentru:"> -<!ENTITY torbutton.prefs.no_proxy_warning "ATENÈIE: EvitaÈi sÄ folosiÈi unul din hostname-le de mai sus"> <!ENTITY torbutton.cookiedialog.title "GestioneazÄ ProtecÅ£ii Cookie"> <!ENTITY torbutton.cookiedialog.lockCol "Protejat"> <!ENTITY torbutton.cookiedialog.domainCol "Gazda"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Indeparteaza tot, mai putin protejat"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protejeaza Cookie-urile noi"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Nu proteja Cookie-urile noi"> -<!ENTITY torbutton.prefs.transparentTor "Torificare transparentÄ (NecesitÄ transproy sau Tor modificat)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/ro/torbutton.properties b/src/chrome/locale/ro/torbutton.properties index cf8e250..95c6fd8 100644 --- a/src/chrome/locale/ro/torbutton.properties +++ b/src/chrome/locale/ro/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click pentru a opri Tor torbutton.panel.label.disabled = Tor a fost oprit torbutton.panel.label.enabled = Tor a fost pornit extensions.torbutton(a)torproject.org.description = ButonulTOR ofera posibilitatea de a configura setarile browser-ului si de a golii rapid si usor datele private ale navigarii. -torbutton.popup.test.success = Testul proxy Tor a fost efectuat cu succes! -torbutton.popup.test.failure = Testul proxy Tor a EÅUAT! VerificaÅ£i setÄrile proxy Åi Polipo. -torbutton.popup.test.confirm_toggle = Cel mai recent test de proxy Tor a eÅuat sÄ foloseasca Tor.\n\nEÅti sigur cÄ vrei sÄ Ã®l activezi oricum?\n\nObservatie: DacÄ aÅ£i fixat problema, puteÅ£i sÄ rulaÅ£i din nou testul Proxy Torbutton din fereastra Preferences sÄ elimine acest avertisment. -torbutton.popup.test.ff3_notice = ApasÄ OK pentru a testa setÄrile proxy Tor. Acest test se va efectua Ã®n spate. VÄ rugÄm sÄ aveÅ£i rÄbdare. torbutton.popup.external.title = SÄ Ã®ncarc conÈinutul extern? torbutton.popup.external.app = O aplicaÅ£ie externÄ este necesarÄ sÄ se ocupe de:\n\n torbutton.popup.external.note = \n\nObservatie: Aplicatiile externe NU sunt sigure cu setÄrile implicite Tor, Åi vÄ pot demasca!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nDaca fisierul nu este de incredere, ar treb torbutton.popup.launch = PorneÈte aplicaÈia torbutton.popup.cancel = Anulare torbutton.popup.dontask = Ãntotdeauna lanseazÄ aplicaÅ£ii de acum Ã®ncolo -torbutton.popup.test.no_http_proxy = Testul proxy Tor: Local proxy HTTP este inaccesibil. Este Polipo executat corect? torbutton.popup.prompted_language = Pentru a va asigura o confidentialitate sporita, Torbutton poate solicita versiunea in limba engleza a paginilor web. Acest lucru poate determina afisarea in limba engleza a paginilor pe care ati fi dorit sa le cititi in limba dumneavoastra natala.\n\nDoriti sa solicitati versiunea in limba engleza a paginilor web pentru a va bucura de o confidentialitate sporita ? torbutton.popup.no_newnym = Torbutton nu va poate oferi in siguranta o noua identitate. Nu are acces la Tor Control Port\n\nSunteti sigur ca utilizati Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton nu poate actualiza preferintele in directorul de profile al Tor Bowser. -torbutton.popup.permission_denied = Va rugam fie sa resetati permisiunile directorului Tor Browser fie sa il copiati intr-o locatie noua. -torbutton.popup.device_full = Discul pare sa fie plin. Va rugam sa asigurati mai mult spatiu liber pe disc sau sa mutati Tor browser pe un nou dispozitiv. torbutton.title.prompt_torbrowser = Informatii importante Torbutton torbutton.popup.prompt_torbrowser = Torbutton lucreaza diferit acum: nu mai poate fi inchis. Am facut aceasta schimbare deoarece Torbutton nu poate fi folosit in siguranta intr-un browser care e utilizat si pentru navigare non-Tor. Erau prea multe buguri pe care nu le puteam remedia in alt fel. Daca doriti sa continuati sa folositi Firefox normal, ar trebui sa dezinstalati Torbutton si sa descarcati Tor Browser Bundle. Proprietatile de navigare privata ale Tor Browser sunt deasemenea superioare celor ale Firefox normal, chiar si atunci cand Firefox este folosit cu Torbutton. Sa indepartati Torbutton, mergeti la Unelte->Suplimente->Extensii si faceti click pe butonul Elimina de langa Torbutton. torbutton.popup.short_torbrowser = Informatie Torbutton importanta! Torbutton este acum permanent activat. Faceti click pe Torbutton pentru mai multe informatii. diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index 36a27e6..49b9d98 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "ÐÐ°ÑÑÑÐŸÐ¹ÐºÐž Ð¿ÑÐŸÐºÑÐž"> -<!ENTITY torbutton.prefs.recommended_settings "ÐÑÐ¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÑ Ð¿Ð°ÑÐ°ÐŒÐµÑÑÑ Ð¿ÑÐŸÐºÑÐž, ÑÐµÐºÐŸÐŒÐµÐœÐŽÐŸÐ²Ð°ÐœÐœÑÐµ ÐŽÐ»Ñ ÐŽÐ°ÐœÐœÐŸÐ¹ Ð²ÐµÑÑÐžÐž Firefox"> -<!ENTITY torbutton.prefs.use_polipo "ÐÑÐ¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÑ Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Ð£ÑÑÐ°ÐœÐŸÐ²ÐžÑÑ Ð¿Ð°ÑÐ°ÐŒÐµÑÑÑ Ð¿ÑÐŸÐºÑÐž Ð²ÑÑÑÐœÑÑ"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP-Ð¿ÑÐŸÐºÑÐž:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL-Ð¿ÑÐŸÐºÑÐž:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP-Ð¿ÑÐŸÐºÑÐž:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher-Ð¿ÑÐŸÐºÑÐž:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS-Ð¿ÑÐŸÑÐŸÐºÐŸÐ»:"> -<!ENTITY torbutton.prefs.proxy.port "ÐÐŸÑÑ:"> -<!ENTITY torbutton.pref_connection.notice "ÐÑÐºÐ»ÑÑÐžÑÑ Torbutton ÐŽÐ»Ñ ÐžÐ·ÐŒÐµÐœÐµÐœÐžÑ ÐœÐ°ÑÑÑÐŸÐµÐº ÐœÐµÐŸÐ±ÑÐŸÐŽÐžÐŒÐŸ."> -<!ENTITY torbutton.pref_connection.more_info "ÐÐŸÐŽÑÐŸÐ±ÐœÐŸÑÑÐž"> -<!ENTITY torbutton.pref_connection_more_info.title "ÐÐŸÐŒÐŸÑÑ"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton Ð²ÐºÐ»ÑÑÐµÐœ. ÐÑÐ»Ðž Ð²Ñ ÑÐŸÑÐžÑÐµ ÐžÐ·ÐŒÐµÐœÐžÑÑ ÐœÐ°ÑÑÑÐŸÐ¹ÐºÐž Ð¿ÑÐŸÐºÑÐž, ÐœÐµ ÑÐ²Ð»ÑÑÑÐµÐ³ÐŸÑÑ ÑÐ°ÑÑÑÑ ÑÐµÑÐž Tor, ÐœÐµÐŸÐ±ÑÐŸÐŽÐžÐŒÐŸ ÑÐœÐ°ÑÐ°Ð»Ð° ÐŸÑÐºÐ»ÑÑÐžÑÑ Torbutton Ðž Ð·Ð°ÑÐµÐŒ Ð²ÐµÑÐœÑÑÑÑÑ ÑÑÐŽÐ°. ÐÑÐ»Ðž Ð²Ñ ÑÐŸÑÐžÑÐµ ÐžÐ·ÐŒÐµÐœÐžÑÑ ÐœÐ°ÑÑÑÐŸÐ¹ÐºÐž Tor, ÐœÐµÐŸÐ±ÑÐŸÐŽÐžÐŒÐŸ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÑ ÐŸÐºÐœÐŸ ÐœÐ°ÑÑÑÐŸÐµÐº Torbutton."> <!ENTITY torbutton.context_menu.new_identity "ÐÐŸÐ²Ð°Ñ Ð»ÐžÑÐœÐŸÑÑÑ"> <!ENTITY torbutton.context_menu.new_identity_key "Ð¯"> <!ENTITY torbutton.context_menu.new_circuit "ÐÐŸÐ²Ð°Ñ ÑÐµÐ¿ÐŸÑÐºÐ° Tor ÐŽÐ»Ñ ÑÑÐŸÐ³ÐŸ cÐ°Ð¹ÑÐ°"> @@ -27,11 +13,6 @@ <!ENTITY torbutton.button.tooltip "ÐÐ°Ð¶ÐŒÐžÑÐµ, ÑÑÐŸÐ±Ñ ÐžÐœÐžÑÐžÐ°Ð»ÐžÐ·ÐžÑÐŸÐ²Ð°ÑÑ Torbutton"> <!ENTITY torbutton.prefs.privacy_security_settings "ÐÐ°ÑÑÑÐŸÐ¹ÐºÐž ÐºÐŸÐœÑÐžÐŽÐµÐœÑÐžÐ°Ð»ÑÐœÐŸÑÑÐž Ðž Ð±ÐµÐ·ÐŸÐ¿Ð°ÑÐœÐŸÑÑÐž"> <!ENTITY torbutton.prefs.restore_defaults "ÐÐŸÑÑÑÐ°ÐœÐŸÐ²ÐžÑÑ Ð·ÐœÐ°ÑÐµÐœÐžÑ Ð¿ÐŸ ÑÐŒÐŸÐ»ÑÐ°ÐœÐžÑ"> -<!ENTITY torbutton.prefs.test_settings "ÐÑÐŸÐ²ÐµÑÐžÑÑ ÐœÐ°ÑÑÑÐŸÐ¹ÐºÐž"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS 4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS 5"> -<!ENTITY torbutton.prefs.no_proxies_on "ÐÐµÑ Ð¿ÑÐŸÐºÑÐž ÐŽÐ»Ñ: "> -<!ENTITY torbutton.prefs.no_proxy_warning "ÐÐœÐžÐŒÐ°ÐœÐžÐµ: ÐÐµ Ð²ÐœÐŸÑÐžÑÐµ ÐœÐžÐºÐ°ÐºÐžÑ ÐžÐŒÐµÐœ ÐŽÐŸÐŒÐµÐœÐŸÐ² Ð² Ð¿ÐŸÐ»Ðµ Ð²ÑÑÐµ"> <!ENTITY torbutton.cookiedialog.title "Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐœÐžÐµ Ð·Ð°ÑÐžÑÐŸÐ¹ ÐºÑÐºÐž-ÑÐ°Ð¹Ð»ÐŸÐ²"> <!ENTITY torbutton.cookiedialog.lockCol "ÐÐ°ÑÐžÑÐµÐœÐŸ"> <!ENTITY torbutton.cookiedialog.domainCol "ÐÐµÐŽÑÑÐžÐ¹ ÑÐ·ÐµÐ»"> @@ -43,7 +24,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Ð£ÐŽÐ°Ð»ÐžÑÑ Ð²ÑÐµ, ÐºÑÐŸÐŒÐµ Ð·Ð°ÑÐžÑÑÐœÐœÑÑ"> <!ENTITY torbutton.cookiedialog.saveAllCookies "ÐÐ°ÑÐžÑÐ°ÑÑ ÐœÐŸÐ²ÑÐµ ÐºÑÐºÐž-ÑÐ°Ð¹Ð»Ñ"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ÐÐµ Ð·Ð°ÑÐžÑÐ°ÑÑ ÐœÐŸÐ²ÑÐµ ÐºÑÐºÐž-ÑÐ°Ð¹Ð»Ñ"> -<!ENTITY torbutton.prefs.transparentTor "ÐÑÐŸÐ·ÑÐ°ÑÐœÐ°Ñ "ÑÐŸÑÐžÑÐžÐºÐ°ÑÐžÑ" (ÑÑÐµÐ±ÑÐµÑ Ð¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÐµÐ»ÑÑÐºÐžÑ transproxy ÐžÐ»Ðž Tor-ÐŒÐ°ÑÑÑÑÑÐžÐ·Ð°ÑÐŸÑÐ°)"> <!ENTITY torbutton.prefs.priv_caption "ÐÐ°ÑÑÑÐŸÐ¹ÐºÐž ÐºÐŸÐœÑÐžÐŽÐµÐœÑÐžÐ°Ð»ÑÐœÐŸÑÑÐž"> <!ENTITY torbutton.prefs.block_disk "ÐÐµ ÑÐŸÑÑÐ°ÐœÑÑÑ ÐžÑÑÐŸÑÐžÑ Ð¶ÑÑÐœÐ°Ð»Ð° Ð¿ÐŸÑÐµÑÐµÐœÐžÐ¹ Ðž ÐŽÐ°ÐœÐœÑÐµ Ñ Ð¿ÐŸÑÐµÑÐ°ÐµÐŒÑÑ ÑÐ°Ð¹ÑÐŸÐ² (Ð°ÐºÑÐžÐ²ÐžÑÑÐµÑ ÑÑÐœÐºÑÐžÑ ÐºÐŸÐœÑÐžÐŽÐµÐœÑÐžÐ°Ð»ÑÐœÐŸÐ³ÐŸ Ð¿ÑÐŸÑÐŒÐŸÑÑÐ°)"> <!ENTITY torbutton.prefs.restrict_thirdparty "ÐÐ»ÐŸÐºÐžÑÐŸÐ²Ð°ÑÑ ÑÑÐŸÑÐŸÐœÐœÐžÐµ ÐºÑÐºÐž-ÑÐ°Ð¹Ð»Ñ Ðž ÐŽÑÑÐ³ÐžÐµ ÐŽÐ°ÐœÐœÑÐµ ÑÐ»ÐµÐ¶ÐµÐœÐžÑ"> diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties index 65d1d63..5f6f439 100644 --- a/src/chrome/locale/ru/torbutton.properties +++ b/src/chrome/locale/ru/torbutton.properties @@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = ÐÐ°Ð¶ÐŒÐžÑÐµ, ÑÑÐŸÐ±Ñ ÐŸÑÐºÐ»ÑÑÐžÑÑ torbutton.panel.label.disabled = Tor ÐŸÑÐºÐ»ÑÑÐµÐœ torbutton.panel.label.enabled = Tor Ð²ÐºÐ»ÑÑÐµÐœ extensions.torbutton(a)torproject.org.description = Torbutton Ð¿ÑÐµÐŽÑÑÐŒÐ°ÑÑÐžÐ²Ð°ÐµÑ ÐºÐœÐŸÐ¿ÐºÑ, ÑÑÐŸÐ±Ñ ÐœÐ°ÑÑÑÐŸÐžÑÑ Tor Ðž Ð±ÑÑÑÑÐŸ Ðž Ð»ÐµÐ³ÐºÐŸ ÐŸÑÐžÑÑÐžÑÑ Ð»ÐžÑÐœÑÐµ ÐŽÐ°ÐœÐœÑÐµ Ð¿ÑÐŸÑÐŒÐŸÑÑÐ°. -torbutton.popup.test.success = Tor proxy ÑÐµÑÑ ÑÑÐ¿ÐµÑÐœÐŸ Ð¿ÑÐŸÐ¹ÐŽÐµÐœ! -torbutton.popup.test.failure = Ð¢ÐµÑÑ Tor Ð¿ÑÐŸÐºÑÐž Ð·Ð°Ð²ÐµÑÑÐžÐ»ÑÑ ÐÐÐ£ÐÐÐ§ÐÐ! ÐÑÐŸÐ²ÐµÑÑÑÐµ Ð²Ð°Ñ Ð¿ÑÐŸÐºÑÐž Ðž ÐºÐŸÐœÑÐžÐ³ÑÑÐ°ÑÐžÑ Polipo. -torbutton.popup.test.confirm_toggle = Ð¡Ð°ÐŒÐŸÐµ Ð¿ÐŸÑÐ»ÐµÐŽÐœÐµÐµ ÐžÑÐ¿ÑÑÐ°ÐœÐžÐµ Tor Ð¿ÑÐŸÐºÑÐž ÐœÐµ ÑÐŽÐ°Ð»ÐŸÑÑ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÑ Tor.\n\nÐÑ ÑÐ²ÐµÑÐµÐœÑ ÑÑÐŸ ÑÐŸÑÐžÑÐµ Ð²ÐºÐ»ÑÑÐžÑÑ Tor ÐœÐµ ÑÐŒÐŸÑÑÑ ÐœÐ° Ð¿ÑÐŸÐ²Ð°Ð» ÑÐµÑÑÐ°?\n\nÐÑÐžÐŒÐµÑÐ°ÐœÐžÐµ: ÐÑÐ»Ðž Ð¿ÑÐŸÐ±Ð»ÐµÐŒÐ° ÑÐµÑÐµÐœÐ°, ÐŒÐŸÐ¶ÐœÐŸ Ð±ÑÐŽÐµÑ Ð¿ÐŸÐ²ÑÐŸÑÐœÑÑ ÐžÑÐ¿ÑÑÐ°ÐœÐžÐ¹ Ð² ÐŸÐºÐœÐµ 'ÐÐ°ÑÑÑÐŸÐ¹ÐºÐ° Ð¿ÑÐŸÐºÑÐž Torbutton' ÐŽÐ»Ñ ÑÑÑÑÐ°ÐœÐµÐœÐžÑ ÑÑÐŸÐ³ÐŸ Ð¿ÑÐµÐŽÑÐ¿ÑÐµÐ¶ÐŽÐµÐœÐžÑ. -torbutton.popup.test.ff3_notice = ÐÐ°Ð¶ÐŒÐžÑÐµ OK ÐŽÐ»Ñ Ð¿ÑÐŸÐ²ÐµÑÐºÐž ÐœÐ°ÑÑÑÐŸÐµÐº Tor. ÐÑÐŸÑ ÑÐµÑÑ Ð²ÑÐ¿ÐŸÐ»ÐœÑÐµÑÑÑ Ð² ÑÐŸÐœÐµ. ÐÐŸÐ¶Ð°Ð»ÑÐ¹ÑÑÐ°, ÐŽÐŸÐ¶ÐŽÐžÑÐµÑÑ ÑÐµÐ·ÑÐ»ÑÑÐ°ÑÐŸÐ². torbutton.popup.external.title = Ð¡ÐºÐ°ÑÐ°ÑÑ Ð²ÐœÐµÑÐœÐžÐ¹ ÑÐ°Ð¹Ð»? torbutton.popup.external.app = Tor Browser ÐœÐµ ÐŒÐŸÐ¶ÐµÑ Ð¿ÐŸÐºÐ°Ð·Ð°ÑÑ ÑÑÐŸÑ ÑÐ°Ð¹Ð». ÐÐ°ÐŒ ÐœÐµÐŸÐ±ÑÐŸÐŽÐžÐŒÐŸ ÐŸÑÐºÑÑÑÑ ÐµÐ³ÐŸ Ñ Ð¿ÐŸÐŒÐŸÑÑÑ ÐŽÑÑÐ³ÐŸÐ³ÐŸ Ð¿ÑÐžÐ»ÐŸÐ¶ÐµÐœÐžÑ.\n\n torbutton.popup.external.note = ÐÐµÐºÐŸÑÐŸÑÑÐµ ÑÐžÐ¿Ñ ÑÐ°Ð¹Ð»ÐŸÐ² ÐŒÐŸÐ³ÑÑ Ð²ÑÐ·Ð²Ð°ÑÑ Ð¿ÑÐžÐ»ÐŸÐ¶ÐµÐœÐžÑ, ÑÐŸÐµÐŽÐžÐœÑÑÑÐžÐµÑÑ Ñ ÑÐµÑÑÑ Ð±ÐµÐ· ÐžÑÐ¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÐœÐžÑ Tor.\n\n @@ -22,12 +18,8 @@ torbutton.popup.external.suggest = ÐÐ»Ñ Ð±ÐµÐ·ÐŸÐ¿Ð°ÑÐœÐŸÑÑÐž, ÑÐµÐºÐŸÐŒÐµ torbutton.popup.launch = Ð¡ÐºÐ°ÑÐ°ÑÑ ÑÐ°Ð¹Ð» torbutton.popup.cancel = ÐÑÐŒÐµÐœÐžÑÑ torbutton.popup.dontask = Ð¡ ÑÑÐŸÐ³ÐŸ ÐŒÐŸÐŒÐµÐœÑÐ° ÑÐºÐ°ÑÐžÐ²Ð°ÑÑ ÑÐ°Ð¹Ð»Ñ Ð°Ð²ÑÐŸÐŒÐ°ÑÐžÑÐµÑÐºÐž -torbutton.popup.test.no_http_proxy = Tor Ð¿ÑÐŸÐºÑÐž-ÑÐµÑÑ: ÐÐµÑÑÐœÑÐµ HTTP-Ð¿ÑÐŸÐºÑÐž ÐœÐµÐŽÐŸÑÑÑÐ¿ÐœÑ. Ð Ð°Ð±ÐŸÑÐ°ÐµÑ-Ð»Ðž Polipo ÐŽÐŸÐ»Ð¶ÐœÑÐŒ ÐŸÐ±ÑÐ°Ð·ÐŸÐŒ? torbutton.popup.prompted_language = ÐÐ»Ñ Ð¿ÑÐµÐŽÐŸÑÑÐ°Ð²Ð»ÐµÐœÐžÑ Ð±ÐŸÐ»ÑÑÐµÐ¹ Ð¿ÑÐžÐ²Ð°ÑÐœÐŸÑÑÐž, Torbutton ÐŒÐŸÐ¶ÐµÑ Ð·Ð°Ð¿ÑÐ°ÑÐžÐ²Ð°ÑÑ Ð²ÐµÑÑÐžÐž ÑÑÑÐ°ÐœÐžÑ ÐœÐ° Ð°ÐœÐ³Ð»ÐžÐ¹ÑÐºÐŸÐŒ ÑÐ·ÑÐºÐµ. ÐÑÐŸ ÐŒÐŸÐ¶ÐµÑ Ð¿ÐŸÐ²Ð»ÐµÑÑ ÐŸÑÐŸÐ±ÑÐ°Ð¶ÐµÐœÐžÐµ ÑÑÑÐ°ÐœÐžÑ ÐœÐ° Ð°ÐœÐ³Ð»ÐžÐ¹ÑÐºÐŸÐŒ ÑÐ·ÑÐºÐµ, Ð²ÐŒÐµÑÑÐŸ ÐŸÑÐŸÐ±ÑÐ°Ð¶ÐµÐœÐžÑ ÐžÑ ÐœÐ° Ð²Ð°ÑÐµÐŒ ÑÐŸÐŽÐœÐŸÐŒ ÑÐ·ÑÐºÐµ.\n\nÐ¥ÐŸÑÐžÑÐµ Ð·Ð°Ð¿ÑÐ°ÑÐžÐ²Ð°ÑÑ ÑÑÑÐ°ÐœÐžÑÑ ÐœÐ° Ð°ÐœÐ³Ð»ÐžÐ¹ÑÐºÐŸÐŒ ÑÐ·ÑÐºÐµ ÐŽÐ»Ñ Ð±ÐŸÐ»ÑÑÐµÐ¹ Ð¿ÑÐžÐ²Ð°ÑÐœÐŸÑÑÐž? torbutton.popup.no_newnym = Torbutton ÐœÐµ ÐŒÐŸÐ¶ÐµÑ Ð±ÐµÐ·ÐŸÐ¿Ð°ÑÐœÐŸ ÐŽÐ°ÑÑ Ð²Ð°ÐŒ ÐœÐŸÐ²ÑÑ Ð»ÐžÑÐœÐŸÑÑÑ. ÐÐœ ÐœÐµ ÐžÐŒÐµÐµÑ ÐŽÐŸÑÑÑÐ¿Ð° Ðº Tor Control Port.\n\nÐÑ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÑÐµ Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton ÐœÐµ ÐŒÐŸÐ¶ÐµÑ ÐŸÐ±ÐœÐŸÐ²ÐžÑÑ ÐœÐ°ÑÑÑÐŸÐ¹ÐºÐž Ð² Ð¿Ð°Ð¿ÐºÐµ Ð¿ÑÐŸÑÐžÐ»Ñ Tor Browser. -torbutton.popup.permission_denied = ÐÐŸÐ¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð»ÐžÐ±ÐŸ ÑÐ±ÑÐŸÑÑÑÐµ ÑÐ°Ð·ÑÐµÑÐµÐœÐžÑ ÐŽÐ»Ñ Ð¿Ð°Ð¿ÐºÐž Tor Browser ÐžÐ»Ðž ÑÐºÐŸÐ¿ÐžÑÑÐ¹ÑÐµ ÐµÑ Ð² ÐŽÑÑÐ³ÐŸÐµ ÐŒÐµÑÑÐŸ. -torbutton.popup.device_full = ÐÐŸÑÐŸÐ¶Ðµ, ÑÑÐŸ ÐŽÐžÑÐº Ð·Ð°Ð¿ÐŸÐ»ÐœÐµÐœ. ÐÐŸÐ¶Ð°Ð»ÑÐ¹ÑÑÐ°, ÐŸÑÐ²ÐŸÐ±ÐŸÐŽÐžÑÐµ ÐŒÐµÑÑÐŸ ÐžÐ»Ðž Ð¿ÐµÑÐµÐŒÐµÑÑÐžÑÐµ Tor Browser ÐœÐ° ÐŽÑÑÐ³ÐŸÐ¹ ÐŽÐžÑÐº. torbutton.title.prompt_torbrowser = ÐÐ°Ð¶ÐœÐ°Ñ ÐžÐœÑÐŸÑÐŒÐ°ÑÐžÑ Torbutton torbutton.popup.prompt_torbrowser = Torbutton ÑÐ°Ð±ÐŸÑÐ°ÐµÑ Ð¿ÐŸ-ÐŽÑÑÐ³ÐŸÐŒÑ. ÐÑ ÐœÐµ ÐŒÐŸÐ¶ÐµÑÐµ Ð²ÑÐºÐ»ÑÑÐžÑÑ ÐµÐ³ÐŸ Ð±ÐŸÐ»ÑÑÐµ â â ÐÑ ÑÐŽÐµÐ»Ð°Ð»Ðž ÑÑÐŸ ÐžÐ·ÐŒÐµÐœÐµÐœÐžÐµ, Ð¿ÐŸÑÐŸÐŒÑ ÑÑÐŸ ÑÑÐŸ ÐœÐµ Ð±ÐµÐ·ÐŸÐ¿Ð°ÑÐœÐŸ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÑ Torbutton Ð² Ð±ÑÐ°ÑÐ·ÐµÑÐµ, ÐºÐŸÑÐŸÑÑÐ¹ ÑÐ°ÐºÐ¶Ðµ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÑÑÑ ÐŽÐ»Ñ ÐœÐµ-Tor Ð¿ÑÐŸÑÐŒÐŸÑÑÐ°. Ð¡ÑÑÐµÑÑÐ²ÐŸÐ²Ð°Ð»Ðž ÑÐ»ÐžÑÐºÐŸÐŒ ÐŒÐœÐŸÐ³ÐŸ ÐŸÑÐžÐ±ÐŸÐº ÑÐ°ÐŒ, ÑÑÐŸ ÐŒÑ ÐœÐµ ÐŒÐŸÐ³Ð»Ðž ÐžÑÐ¿ÑÐ°Ð²ÐžÑÑ ÐœÐžÐºÐ°ÐºÐžÐŒ ÐŽÑÑÐ³ÐžÐŒ ÑÐ¿ÐŸÑÐŸÐ±ÐŸÐŒ. â â ÐÑÐ»Ðž Ð²Ñ ÑÐŸÑÐžÑÐµ Ð¿ÑÐŸÐŽÐŸÐ»Ð¶Ð°ÑÑ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÑ Firefox ÐœÐŸÑÐŒÐ°Ð»ÑÐœÐŸ, Ð²Ñ ÐŽÐŸÐ»Ð¶ÐœÑ ÑÐŽÐ°Ð»ÐžÑÑ Torbutton Ðž ÑÐºÐ°ÑÐ°ÑÑ Tor Browser Bundle. Ð¡Ð²ÐŸÐ¹ÑÑÐ²Ð° ÐºÐŸÐœÑÐžÐŽÐµÐœÑÐžÐ°Ð»ÑÐœÐŸÑÑÐž Tor Browser ÑÐ°ÐºÐ¶Ðµ Ð¿ÑÐµÐ²ÐŸÑÑÐŸÐŽÑÑ ÐŸÐ±ÑÑÐœÑÐ¹ Firefox, ÐŽÐ°Ð¶Ðµ ÐµÑÐ»Ðž Firefox ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÑÑÑ Ñ Torbutton. â â Ð§ÑÐŸÐ±Ñ ÑÐŽÐ°Ð»ÐžÑÑ Torbutton, Ð¿ÐµÑÐµÐ¹ÐŽÐ žÑÐµ Ð² ÐŒÐµÐœÑ Ð¡ÐµÑÐ²ÐžÑ-> ÐÐŸÐ¿ÐŸÐ»ÐœÐµÐœÐžÑ-> Ð Ð°ÑÑÐžÑÐµÐœÐžÑ, Ð° Ð·Ð°ÑÐµÐŒ ÐœÐ°Ð¶ÐŒÐžÑÐµ ÐºÐœÐŸÐ¿ÐºÑ Ð£ÐŽÐ°Ð»ÐžÑÑ ÑÑÐŽÐŸÐŒ Ñ Torbutton. torbutton.popup.short_torbrowser = ÐÐ°Ð¶ÐœÐ°Ñ ÐžÐœÑÐŸÑÐŒÐ°ÑÐžÑ Torbutton! â â Torbutton ÑÐµÐ¿ÐµÑÑ Ð²ÑÐµÐ³ÐŽÐ° Ð²ÐºÐ»ÑÑÐµÐœ. â â ÐÐ°Ð¶ÐŒÐžÑÐµ ÐœÐ° Torbutton ÐŽÐ»Ñ Ð¿ÐŸÐ»ÑÑÐµÐœÐžÑ ÐŽÐŸÐ¿ÐŸÐ»ÐœÐžÑÐµÐ»ÑÐœÐŸÐ¹ ÐžÐœÑÐŸÑÐŒÐ°ÑÐžÐž. diff --git a/src/chrome/locale/sco/torbutton.dtd b/src/chrome/locale/sco/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/sco/torbutton.dtd +++ b/src/chrome/locale/sco/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/sco/torbutton.properties b/src/chrome/locale/sco/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/sco/torbutton.properties +++ b/src/chrome/locale/sco/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/sk/torbutton.dtd b/src/chrome/locale/sk/torbutton.dtd index 1daf430..77ce90a 100644 --- a/src/chrome/locale/sk/torbutton.dtd +++ b/src/chrome/locale/sk/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Nastavenie proxy"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "PomocnÃk"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "NovÃ¡ identita"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "ObnoviÅ¥ predvolenÃ©"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/sk/torbutton.properties b/src/chrome/locale/sk/torbutton.properties index dc5055e..6267903 100644 --- a/src/chrome/locale/sk/torbutton.properties +++ b/src/chrome/locale/sk/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Kliknite pre vypnutie Tor torbutton.panel.label.disabled = Tor vypnutÃœ torbutton.panel.label.enabled = Tor zapnutÃœ extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test bol ÃºspeÅ¡nÃœ! -torbutton.popup.test.failure = Tor proxy test bol NEÃSPEÅ NÃ! Skontrolujte VaÅ¡e proxy a Polipo nastavenia. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = NaÄÃtaÅ¥ externÃœ obsah? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = SpustiÅ¥ aplikÃ¡ciu torbutton.popup.cancel = ZruÅ¡iÅ¥ torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = DÃŽleÅŸitÃ© Torbutton InformÃ¡cie torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = DÃŽleÅŸitÃ© Torbutton InformÃ¡cie!\n\nTorbutton je odteraz povolenÃœ.\n\nStlaÄte Torbutton pre viacej informÃ¡ciÃ. diff --git a/src/chrome/locale/sl/torbutton.dtd b/src/chrome/locale/sl/torbutton.dtd index 074e67b..d18faf7 100644 --- a/src/chrome/locale/sl/torbutton.dtd +++ b/src/chrome/locale/sl/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Nastavitve posredniÅ¡kega (proxy) streÅŸnika"> -<!ENTITY torbutton.prefs.recommended_settings "Uporabi priporoÄene nastavitve posredniÅ¡kega streÅŸnika za mojo razliÄico Firefoxa"> -<!ENTITY torbutton.prefs.use_polipo "uporaba polipo"> -<!ENTITY torbutton.prefs.custom_settings "Uporabi nastavitve proxy streÅŸnika po meri"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP posredniÅ¡ki streÅŸnik:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL posredniÅ¡ki streÅŸnik:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP posredniÅ¡ki streÅŸnik:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher posredniÅ¡ki streÅŸnik:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS gostitelj:"> -<!ENTITY torbutton.prefs.proxy.port "Vrata:"> -<!ENTITY torbutton.pref_connection.notice "Äe ÅŸelite spremeniti te nastavitve onemogoÄite razÅ¡iritev Torbutton."> -<!ENTITY torbutton.pref_connection.more_info "VeÄ informacij"> -<!ENTITY torbutton.pref_connection_more_info.title "PomoÄ"> -<!ENTITY torbutton.pref_connection_more_info.text "RazÅ¡iritev Torbutton je trenutno omogoÄena. Äe ÅŸelite spremeniti nastavitve ne-Tor posredniÅ¡kega streÅŸnika (proxy) najprej onemogoÄite razÅ¡iritev Torbutton, nato pa se vrnite na to mesto. Äe ÅŸelite spremeniti nastavitve povezave v Tor omreÅŸje uporabite nastavitve razÅ¡iritve Torbutton."> <!ENTITY torbutton.context_menu.new_identity "nova indetiteta"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Nastavitve..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Klikni za inicializiranje razÅ¡iritve Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Privzete nastavitve"> -<!ENTITY torbutton.prefs.test_settings "Preveri nastavitve"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Ne uporabi Proxi za: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Opozorilo: izogibaj se uporabi zgornjih oznak (hostname)"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ne zaÅ¡Äiti novih piÅ¡kotkov"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/sl/torbutton.properties b/src/chrome/locale/sl/torbutton.properties index 4648fec..9f8156a 100644 --- a/src/chrome/locale/sl/torbutton.properties +++ b/src/chrome/locale/sl/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Klikni za izklop anonimizacije torbutton.panel.label.disabled = Anonimizacija izkljuÄena torbutton.panel.label.enabled = Anonimizacija vkljuÄena extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test je uspeÅ¡en! -torbutton.popup.test.failure = Tor proxy test NI USPEÅ EN! preveri svoje poroxy in Polipo nastavitve. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = pritisni OK da preverite Tor proxy nastavitve. Test se bo izvajal v ozadju. Bodite potrpeÅŸljivi torbutton.popup.external.title = NaloÅŸi zunanje vsebine? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = ZaÅŸeni program torbutton.popup.cancel = PrekliÄi torbutton.popup.dontask = Vedno zaÅŸeni program. -torbutton.popup.test.no_http_proxy = Tor proxy test: Lokalni HTTP proxy je nedosegljiv. Ali Polipo deluje pravilno? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = Na disku ni veÄ prostora. Naredite prostor ali premaknite Tor brskalnik na drugo napravo. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/so/torbutton.dtd b/src/chrome/locale/so/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/so/torbutton.dtd +++ b/src/chrome/locale/so/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/so/torbutton.properties b/src/chrome/locale/so/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/so/torbutton.properties +++ b/src/chrome/locale/so/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/son/torbutton.dtd b/src/chrome/locale/son/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/son/torbutton.dtd +++ b/src/chrome/locale/son/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/son/torbutton.properties b/src/chrome/locale/son/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/son/torbutton.properties +++ b/src/chrome/locale/son/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/sq/torbutton.dtd b/src/chrome/locale/sq/torbutton.dtd index f3ac414..c9f35bf 100644 --- a/src/chrome/locale/sq/torbutton.dtd +++ b/src/chrome/locale/sq/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Konfigurimi i Proxy"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Porta:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "NdihmÃ«"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "Identitet i Ri"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/sq/torbutton.properties b/src/chrome/locale/sq/torbutton.properties index 268554b..1a9bd3e 100644 --- a/src/chrome/locale/sq/torbutton.properties +++ b/src/chrome/locale/sq/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Anullo torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/sr/torbutton.dtd b/src/chrome/locale/sr/torbutton.dtd index 78509f0..6b62886 100644 --- a/src/chrome/locale/sr/torbutton.dtd +++ b/src/chrome/locale/sr/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "ÐÐŸÑÑÐ°Ð²ÐºÐµ Ð¿ÐŸÑÑÐµÐŽÐœÐžÐºÐ°"> -<!ENTITY torbutton.prefs.recommended_settings "ÐÐŸÑÐžÑÑÐž Ð¿ÑÐµÐ¿ÐŸÑÑÑÐµÐœÐµ Ð¿ÐŸÑÑÐ°Ð²ÐºÐµ Ð¿ÐŸÑÑÐµÐŽÐœÐžÐºÐ° Ð·Ð° ÐŒÐŸÑÐµ ÐžÐ·ÐŽÐ°ÑÐµ ÑÐ°ÑÐµÑÑÐŸÐºÑÐ°"> -<!ENTITY torbutton.prefs.use_polipo "ÐÐŸÑÐžÑÑÐž Polipo"> -<!ENTITY torbutton.prefs.custom_settings "ÐÐŸÑÐžÑÑÐž Ð¿ÑÐžÐ»Ð°Ð³ÐŸÑÐµÐœÐµ Ð¿ÐŸÑÑÐ°Ð²ÐºÐµ Ð¿ÐŸÑÑÐµÐŽÐœÐžÐºÐ°"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Ð¿ÐŸÑÑÐµÐŽÐœÐžÐº:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Ð¿ÐŸÑÑÐµÐŽÐœÐžÐº:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Ð¿ÐŸÑÑÐµÐŽÐœÐžÐº:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Ð¿ÐŸÑÑÐµÐŽÐœÐžÐº:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS ÐŽÐŸÐŒÐ°ÑÐžÐœ:"> -<!ENTITY torbutton.prefs.proxy.port "ÐÐŸÑÑ:"> -<!ENTITY torbutton.pref_connection.notice "ÐÐ°Ð±ÑÐ°ÐœÐž Ð¿ÑÐŸÐŒÐµÐœÑ ÐŸÐ²ÐžÑ Ð¿ÐŸÑÑÐ°Ð²ÐºÐž."> -<!ENTITY torbutton.pref_connection.more_info "ÐÐžÑÐµ ÐžÐœÑÐŸÑÐŒÐ°ÑÐžÑÐ°"> -<!ENTITY torbutton.pref_connection_more_info.title "ÐÐŸÐŒÐŸÑ"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton ÑÐµ ÑÑÐµÐœÑÑÐœÐŸ ÐŸÐŒÐŸÐ³ÑÑÐµÐœ. ÐÐºÐŸ Ð¶ÐµÐ»ÐžÑÐµ ÐŽÐ° Ð¿ÑÐŸÐŒÐµÐœÐžÑÐµ ÑÐ²ÐŸÑÐµ Ð¿ÐŸÑÑÐ°Ð²ÐºÐµ Ð¿ÐŸÑÑÐµÐŽÐœÐžÐºÐ° ÐœÐµÐ²ÐµÐ·Ð°ÐœÐµ Ð·Ð° Tor, ÐŒÐŸÐ»ÐžÐŒÐŸ ÐÐ°Ñ ÐŽÐ° ÐŸÐœÐµÐŒÐŸÐ³ÑÑÐžÑÐµ Torbutton Ðž Ð²ÑÐ°ÑÐžÑÐµ ÑÐµ ÐŸÐ²ÐŽÐµ. ÐÐºÐŸ Ð¶ÐµÐ»ÐžÑÐµ ÐŽÐ° Ð¿ÑÐŸÐŒÐµÐœÐžÑÐµ ÑÐ²ÐŸÑÐµ Tor Ð¿ÐŸÑÑÐ°Ð²ÐºÐµ, ÐŒÐŸÐ»ÐžÐŒÐŸ ÐÐ°Ñ ÐŽÐ° ÐºÐŸÑÐžÑÑÐžÑÐµ Ð¿ÑÐŸÐ·ÐŸÑ Ð·Ð° Ð¿ÐŸÐŽÐµÑÐ°Ð²Ð°ÑÐ°."> <!ENTITY torbutton.context_menu.new_identity "ÐÐŸÐ² ÐžÐŽÐµÐœÑÐžÑÐµÑ"> <!ENTITY torbutton.context_menu.new_identity_key "Ð"> <!ENTITY torbutton.context_menu.preferences "ÐÐŸÑÑÐ°Ð²ÐºÐµ..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "ÐŠ"> <!ENTITY torbutton.button.tooltip "ÐÐ»ÐžÐºÐœÐžÑÐµ ÐŽÐ° Ð±ÐžÑÑÐµ Ð¿ÐŸÐºÑÐµÐœÑÐ»Ðž Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "ÐÐŸÐ²ÑÐ°ÑÐž Ð¿ÐŸÐŽÑÐ°Ð·ÑÐŒÐµÐ²Ð°ÐœÐŸ"> -<!ENTITY torbutton.prefs.test_settings "ÐÑÐŸÐ²ÐµÑÐ° Ð¿ÐŸÑÑÐ°Ð²ÐºÐž"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "ÐÐµÐ· Ð¿ÐŸÑÑÐµÐŽÐœÐžÐºÐ° Ð·Ð°:"> -<!ENTITY torbutton.prefs.no_proxy_warning "Ð£Ð¿ÐŸÐ·ÐŸÑÐµÑÐµ: ÐžÐ·Ð±ÐµÐ³ÐœÐž ÐºÐŸÑÐžÑÑÐµÑÐµ ÐžÐ·ÐœÐ°ÐŽ ÐœÐ°Ð²ÐµÐŽÐµÐœÐµ ÐœÐ°Ð·ÐžÐ²Ðµ ÐŽÐŸÐŒÐ°ÑÐžÐœÐ°"> <!ENTITY torbutton.cookiedialog.title "Ð£ÑÐµÐŽÐž Ð·Ð°ÑÑÐžÑÑ ÐºÐŸÐ»Ð°ÑÐžÑÐ°"> <!ENTITY torbutton.cookiedialog.lockCol "ÐÐ°ÑÑÐžÑÐµÐœ"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Ð£ÐºÐ»ÐŸÐœÐž ÑÐ²Ðµ ÐŸÑÐžÐŒ Ð·Ð°ÑÑÐžÑÐµÐœÐžÑ"> <!ENTITY torbutton.cookiedialog.saveAllCookies "ÐÐ°ÑÑÐžÑÐž ÐœÐŸÐ²Ðµ ÐºÐŸÐ»Ð°ÑÐžÑÐµ"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ÐÐµ ÑÑÐžÑÐž ÐœÐŸÐ²Ðµ ÐºÐŸÐ»Ð°ÑÐžÑÐµ"> -<!ENTITY torbutton.prefs.transparentTor "Ð¢ÑÐ°ÐœÑÐ¿Ð°ÑÐµÐœÑÐ° Ð¢ÐŸÑÐžÑÐžÐºÐ°ÑÐžÑÐ° (Ð·Ð°ÑÑÐµÐ²Ð° Ð¿ÐŸÑÐµÐ±Ð°Ðœ Tor Ð¿ÑÐŸÐºÑÐž ÐžÐ»Ðž Tor ÑÑÑÐµÑ)"> <!ENTITY torbutton.prefs.block_disk "Ne pamti moji istoriju pretrazivanja ili podatke sa web sajtova(Omogucava Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Ogranici cookies i druge podatke o pracenju"> <!ENTITY torbutton.prefs.block_plugins "OnemogucÌi dodatke pretrazivaca (kao Å¡to su Flash )"> diff --git a/src/chrome/locale/sr/torbutton.properties b/src/chrome/locale/sr/torbutton.properties index eb50993..b587448 100644 --- a/src/chrome/locale/sr/torbutton.properties +++ b/src/chrome/locale/sr/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = ÐÐ»ÐžÐºÐœÐžÑÐµ ÐŽÐ° Ð±ÐžÑÑÐµ ÐŸÐœÐµÐŒÐŸÐ³ torbutton.panel.label.disabled = Ð¢ÐŸÑ ÑÐµ ÐŸÐœÐµÐŒÐŸÐ³ÑÑÐµÐœ torbutton.panel.label.enabled = Ð¢ÐŸÑ ÑÐµ ÐŸÐŒÐŸÐ³ÑÑÐµÐœ extensions.torbutton(a)torproject.org.description = Torbutton nudi dugme za konfiguraciju Tor postavki i lako i brzo ciscenje pretrazivackih informacija. -torbutton.popup.test.success = Ð¢ÐµÑÑÐžÑÐ°ÑÐµ Ð¿ÐŸÑÑÐµÐŽÐœÐžÑÐºÐŸÐ³ ÑÐµÑÐ²ÐµÑÐ° ÑÐµ ÑÑÐ¿ÐµÐ»ÐŸ! -torbutton.popup.test.failure = ÐÐµ ÐŒÐŸÐ³Ñ ÐŽÐ° ÑÐµÑÑÐžÑÐ°ÐŒ ÑÐµÑÐ²ÐµÑ. ÐÑÐŸÐ²ÐµÑÐžÑÐµ Ð¿ÐŸÑÑÐµÐŽÐœÐžÑÐºÐ° Ð¿ÐŸÐŽÐµÑÐ°Ð²Ð°ÑÐ° Ðž Ð¿ÐŸÐŽÐµÑÐ°Ð²Ð°ÑÐ° ÐÐŸÐ»ÐžÐ¿Ð°. -torbutton.popup.test.confirm_toggle = ÐÐ°ÑÐœÐŸÐ²ÐžÑÐµ ÑÐµÑÑÐžÑÐ°ÑÐµ Ð¢ÐŸÑ Ð¿ÐŸÑÑÐµÐŽÐœÐžÐºÐ° ÐœÐžÑÐµ ÑÑÐ¿ÐµÐ»ÐŸ ÐŽÐ° ÑÐµ ÑÑÐºÐ»Ð°ÐŽÐž Ñ Ð¢ÐŸÑ ÐŒÑÐµÐ¶ÐŸÐŒ.\n\nÐÐµÐ»ÐžÑÐµ Ð»Ðž ÐžÐ¿Ð°Ðº ÐŽÐ° Ð³Ð° ÐŸÐŒÐŸÐ³ÑÑÐžÑÐµ?\n\nÐÐ°Ð¿ÐŸÐŒÐµÐœÐ°: Ð°ÐºÐŸ ÑÑÐµ Ð¿ÑÐŸÐœÐ°ÑÐ»Ðž ÑÐµÑÐµÑÐµ Ð¿ÑÐŸÐ±Ð»ÐµÐŒÐ°, ÐŒÐŸÐ¶ÐµÑÐµ Ð¿ÐŸÐœÐŸÐ²ÐŸ ÐŽÐ° Ð¿ÐŸÐºÑÐµÐœÐµÑÐµ ÑÐµÑÑ Ñ Ð¿ÐŸÐŽÐµÑÐ°Ð²Ð°ÑÐžÐŒÐ° Ð¿ÐŸÑÑÐµÐŽÐœÐžÐºÐ° Ð¢ÐŸÑÐ±Ð°ÑÐŸÐœÐ° ÐŽÐ° Ð±ÐžÑÑÐµ ÑÐµ ÑÐµÑÐžÐ»Ðž ÐŸÐ²ÐŸÐ³ ÑÐ¿ÐŸÐ·ÐŸÑÐµÑÐ°. -torbutton.popup.test.ff3_notice = ÐÐ»ÐžÐºÐœÐžÑÐµ ÐœÐ° âÐ£ ÑÐµÐŽÑâ ÐŽÐ° ÐžÑÐ¿ÑÐŸÐ±Ð°ÑÐµ Ð¿ÐŸÐŽÐµÑÐ°Ð²Ð°ÑÐ° Ð¢ÐŸÑ Ð¿ÐŸÑÑÐµÐŽÐœÐžÐºÐ°. ÐÐ²Ð° Ð¿ÑÐŸÐ±Ð° ÑÐµ ÑÐµ ÐŸÐŽÐžÐ³ÑÐ°ÑÐž Ñ Ð¿ÐŸÐ·Ð°ÐŽÐžÐœÐž. ÐÑÐŽÐžÑÐµ ÑÑÑÐ¿ÑÐžÐ²Ðž. torbutton.popup.external.title = Ð£ÑÐžÑÐ°ÑÐž ÑÐ¿ÐŸÑÐœÐž ÑÐ°ÐŽÑÐ¶Ð°Ñ? torbutton.popup.external.app = ÐÐŸÑÑÐµÐ±Ð°Ðœ ÑÐµ ÑÐ¿ÐŸÑÐœÐž Ð¿ÑÐŸÐ³ÑÐ°ÐŒ Ð·Ð° ÑÑÐºÐŸÐ²Ð°ÑÐµ:\n\n torbutton.popup.external.note = \n\nÐÐ°Ð¿ÐŸÐŒÐµÐœÐ°: ÑÐ¿ÐŸÑÐœÐž Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐž ÐœÐµ Ð³Ð°ÑÐ°ÐœÑÑÑÑ Ð±ÐµÐ·Ð±ÐµÐŽÐœÐŸÑÑ Ðž ÐŒÐŸÐ³Ñ Ð²Ð°Ñ ÐŸÑÐºÑÐžÑÐž!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nÐÐºÐŸ ÐœÐµÐŒÐ°ÑÐµ Ð¿ÐŸÐ²ÐµÑÐµÑÐ° Ñ ÐŸ torbutton.popup.launch = ÐÐŸÐºÑÐµÐœÐž Ð¿ÑÐŸÐ³ÑÐ°ÐŒ torbutton.popup.cancel = ÐÑÐºÐ°Ð¶Ðž torbutton.popup.dontask = ÐÐŽÑÐ°ÐŽ ÑÐ²ÐµÐº Ð¿ÐŸÐºÑÐµÑÐž Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐµ -torbutton.popup.test.no_http_proxy = ÐÑÐŸÐ±Ð° Ð¢ÐŸÑ Ð¿ÐŸÑÑÐµÐŽÐœÐžÐºÐ°: Ð»ÐŸÐºÐ°Ð»ÐœÐž HTTP Ð¿ÐŸÑÑÐµÐŽÐœÐžÐº ÑÐµ ÐœÐµÐŽÐŸÑÑÑÐ¿Ð°Ðœ. ÐÑÐŸÐ²ÐµÑÐžÑÐµ ÐŽÐ° Ð»Ðž ÑÐµ ÐÐŸÐ»ÐžÐ¿ÐŸ ÐžÑÐ¿ÑÐ°Ð²ÐœÐŸ Ð¿ÐŸÐŽÐµÑÐµÐœ. torbutton.popup.prompted_language = ÐÐ° Ð±Ðž Ð²Ð°ÐŒ ÐŸÐ±ÐµÐ·Ð±ÐµÐŽÐžÐŸ Ð±ÐŸÑÑ Ð¿ÑÐžÐ²Ð°ÑÐœÐŸÑÑ, Ð¢ÐŸÑÐ±Ð°ÑÐŸÐœ ÐŒÐŸÐ¶Ðµ ÐŽÐ° Ð·Ð°ÑÑÐµÐ²Ð° ÐµÐœÐ³Ð»ÐµÑÐºÑ Ð²ÐµÑÐ·ÐžÑÑ ÐžÐœÑÐµÑÐœÐµÑ ÑÑÑÐ°ÐœÐžÑÐ°. ÐÐ±ÐŸÐ³ ÑÐŸÐ³Ð°, ÐŒÐŸÐ³ÑÑÐµ ÑÐµ ÐŽÐ° ÑÐµ ÑÐµ ÑÑÑÐ°ÐœÐžÑÐµ ÐºÐŸÑÐµ Ð±ÐžÑÑÐµ ÐžÐœÐ°ÑÐµ ÑÐžÑÐ°Ð»Ðž ÐœÐ° ÐŒÐ°ÑÐµÑÑÐµÐŒ ÑÐµÐ·ÐžÐºÑ Ð¿ÑÐžÐºÐ°Ð·ÐžÐ²Ð°ÑÐž ÐœÐ° ÐµÐœÐ³Ð»ÐµÑÐºÐŸÐŒ ÑÐµÐ·ÐžÐºÑ.\n\nÐÐµÐ»ÐžÑÐµ Ð»Ðž ÐŽÐ° Ð·Ð°ÑÑÐµÐ²Ð°ÑÐµ ÑÑÑÐ°ÐœÐžÑÐµ ÐœÐ° ÐµÐœÐ³Ð»ÐµÑÐºÐŸÐŒ ÑÐµÐ·ÐžÐºÑ Ñ ÑÐžÑÑ Ð±ÐŸÑÐµ Ð¿ÑÐžÐ²Ð°ÑÐœÐŸÑÑÐž? torbutton.popup.no_newnym = Ð¢ÐŸÑÐ±Ð°ÑÐŸÐœ ÐœÐµ ÐŒÐŸÐ¶Ðµ Ð±ÐµÐ·Ð±ÐµÐŽÐœÐŸ ÐŽÐ° Ð²Ð°ÐŒ ÐŽÐŸÐŽÐµÐ»Ðž ÐœÐŸÐ²Ðž ÐžÐŽÐµÐœÑÐžÑÐµÑ ÑÐµÑ ÐœÐµÐŒÐ° Ð¿ÑÐžÑÑÑÐ¿ Ð¢ÐŸÑ ÐºÐŸÐœÑÑÐŸÐ»ÐœÐŸÐŒ Ð¿ÐŸÑÑÑ.\n\nÐÐŸÑÐžÑÑÐžÑÐµ Ð»Ðž Ð¢ÐŸÑ Ð¿ÑÐµÐ³Ð»ÐµÐŽÐ°Ñ? -torbutton.popup.pref_error = Ð¢ÐŸÑÐ±Ð°ÑÐŸÐœ ÐœÐµ ÐŒÐŸÐ¶Ðµ ÐŽÐ° Ð°Ð¶ÑÑÐžÑÐ° Ð¿ÐŸÐŽÐµÑÐ°Ð²Ð°ÑÐ° Ñ ÑÐ°ÑÑÐžÐºÐ»Ðž Ð·Ð° Ð¿ÑÐŸÑÐžÐ»Ðµ Ð¢ÐŸÑ Ð¿ÑÐµÐ³Ð»ÐµÐŽÐ°ÑÐ°. -torbutton.popup.permission_denied = ÐÐŸÐœÐžÑÑÐžÑÐµ ÐŽÐŸÐ·Ð²ÐŸÐ»Ðµ ÑÐ°ÑÑÐžÐºÐ»Ðµ Ñ ÐºÐŸÑÐŸÑ ÑÐµ ÐœÐ°Ð»Ð°Ð·Ðž Ð¢ÐŸÑ Ð¿ÑÐµÐ³Ð»ÐµÐŽÐ°Ñ ÐžÐ»Ðž ÑÐµ Ð¿ÑÐµÐŒÐµÑÑÐžÑÐµ ÐœÐ° ÐœÐŸÐ²Ñ Ð»ÐŸÐºÐ°ÑÐžÑÑ. -torbutton.popup.device_full = ÐÐ·Ð³Ð»ÐµÐŽÐ° ÐŽÐ° ÑÐµ ÐŽÐžÑÐº Ð¿ÑÐœ. ÐÑÐ»ÐŸÐ±ÐŸÐŽÐžÑÐµ ÐœÐµÑÑÐŸ Ð¿ÑÐŸÑÑÐŸÑÐ° ÐžÐ»Ðž Ð¿ÑÐµÐŒÐµÑÑÐžÑÐµ Ð¢ÐŸÑ Ð¿ÑÐµÐ³Ð»ÐµÐŽÐ°Ñ ÐœÐ° ÐœÐŸÐ²Ðž ÑÑÐµÑÐ°Ñ. torbutton.title.prompt_torbrowser = Vazne Torbutton informacije torbutton.popup.prompt_torbrowser = Torbutton sada funkcionise drugacije: vise ga ne mozete iskljuciti.\n\nNapravili smo ovu promenu jer nije sigurno koristiti Torbutton u pretrazivacu koji je takodjer koristen za pretrazivanje van Tor-a. Jednostavno ima previse gresaka da ih nismo mogli resiti na bilo koji drugi nacin.\n\nAko zelite da nastavite korisiti Firefox kao i obicno, trebate izbrisati Torbutton i preuzeti Tor paket sa interneta. Postavke za privatnost Tor pretrazivaca su dosta bolje od onih koje Firefox nudi, cak i kad koristite Firefox sa Torbutton dodatkom.\n\nDa izbriste Torbutton, kliknite na Tools->Addons->Extensions i zatim kliknite na Remove dugme pored Torbutton dodatka. torbutton.popup.short_torbrowser = Vazne Torbutton informacije\n\nTorbutton je sada stalno ukljucen.\n\nKliknite na Torbutton za vise informacija. diff --git a/src/chrome/locale/st/torbutton.dtd b/src/chrome/locale/st/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/st/torbutton.dtd +++ b/src/chrome/locale/st/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/st/torbutton.properties b/src/chrome/locale/st/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/st/torbutton.properties +++ b/src/chrome/locale/st/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/su/torbutton.dtd b/src/chrome/locale/su/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/su/torbutton.dtd +++ b/src/chrome/locale/su/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/su/torbutton.properties b/src/chrome/locale/su/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/su/torbutton.properties +++ b/src/chrome/locale/su/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index 4978d15..f65b669 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "InstÃ€llningar fÃ¶r proxy"> -<!ENTITY torbutton.prefs.recommended_settings "AnvÃ€nd rekommenderade proxy-instÃ€llningar fÃ¶r min version av Firefox"> -<!ENTITY torbutton.prefs.use_polipo "AnvÃ€nd Polipo"> -<!ENTITY torbutton.prefs.custom_settings "AnvÃ€nd egen instÃ€llning fÃ¶r proxyn"> -<!ENTITY torbutton.prefs.proxy.host.http "Proxy fÃ¶r HTTP:"> -<!ENTITY torbutton.prefs.proxy.host.https "Proxy fÃ¶r SSL:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy fÃ¶r FTP:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy fÃ¶r Gopher:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS vÃ€rd:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Inaktivera Torbutton fÃ¶r att Ã€ndra dessa instÃ€llningar."> -<!ENTITY torbutton.pref_connection.more_info "Mer information"> -<!ENTITY torbutton.pref_connection_more_info.title "HjÃ€lp"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton Ã€r aktiverad. Om du vill Ã€ndra instÃ€llningar fÃ¶r proxy utan Tor, inaktivera Tor och kom tillbaka hit. Om du vill Ã€ndra instÃ€llningar fÃ¶r Tor, anvÃ€nd Torbutton-instÃ€llningarna."> <!ENTITY torbutton.context_menu.new_identity "Ny identitet"> <!ENTITY torbutton.context_menu.new_identity_key "N"> <!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets fÃ¶r den hÃ€r webbsidan"> @@ -27,11 +13,6 @@ <!ENTITY torbutton.button.tooltip "Klicka fÃ¶r att installera Torbutton"> <!ENTITY torbutton.prefs.privacy_security_settings "Integritet- och sÃ€kerhetsinstÃ€llningar"> <!ENTITY torbutton.prefs.restore_defaults "ÃterstÃ€ll till standard"> -<!ENTITY torbutton.prefs.test_settings "Testa instÃ€llningar"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Ingen proxy fÃ¶r:"> -<!ENTITY torbutton.prefs.no_proxy_warning "Varning: Undvik att anvÃ€nda vÃ€rdnamn hÃ€r ovan"> <!ENTITY torbutton.cookiedialog.title "Hantera skyddade kakor"> <!ENTITY torbutton.cookiedialog.lockCol "Skyddad"> <!ENTITY torbutton.cookiedialog.domainCol "VÃ€rd"> @@ -43,7 +24,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Ta bort alla icke-skyddade"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Skydda nya kakor"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Skydda inte nya kakor"> -<!ENTITY torbutton.prefs.transparentTor "Transparent torifikation (KrÃ€ver skrÃ€ddarsydd transproxy eller Tor router)"> <!ENTITY torbutton.prefs.priv_caption "SekretessinstÃ€llningar"> <!ENTITY torbutton.prefs.block_disk "Spara ingen historik eller webbplatsdata (aktiverar privat surfning)"> <!ENTITY torbutton.prefs.restrict_thirdparty "BegrÃ€nsa tredjepartskakor och annan tracking data"> diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index 217c2c8..e04426e 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Klicka fÃ¶r att inaktivera Tor torbutton.panel.label.disabled = Tor inaktiv torbutton.panel.label.enabled = Tor aktiv extensions.torbutton(a)torproject.org.description = Torbutton ger en knapp fÃ¶r att konfigurera Tor instÃ€llningar och snabbt och enkelt rensa privat surfdata. -torbutton.popup.test.success = Tor-proxy testet lyckades! -torbutton.popup.test.failure = Tor proxy MISSLYCKADES! Kontrollera din proxy och instÃ€llningar polipo. -torbutton.popup.test.confirm_toggle = Det senaste Tor proxy testet misslyckades att anvÃ€nda Tor.\n\nÃr du sÃ€ker att du vill aktivera Ã€ndÃ¥?\n\nNotera: Om du fixat problemet kan du kÃ¶ra om testet i Torbuttons Proxy Preferenser fÃ¶r att eliminera denna varning. -torbutton.popup.test.ff3_notice = Klicka pÃ¥ OK fÃ¶r att testa Tors proxyinstÃ€llningar. Detta test kommer att ske i bakgrunden. Ha tÃ¥lamod. torbutton.popup.external.title = HÃ€mta hem en extern filtyp? torbutton.popup.external.app = Tor Browser kan inte visa filen. Du behÃ¶ver Ã¶ppna den i ett annat program.\n\n torbutton.popup.external.note = Vissa typer av filer kan fÃ¥ program att ansluta till internet utan att anvÃ€nda Tor.\n\n @@ -22,12 +18,8 @@ torbutton.popup.external.suggest = Det Ã€r sÃ€krast att Ã¶ppna filer du har hÃ€m torbutton.popup.launch = HÃ€mta hem filen torbutton.popup.cancel = Avbryt torbutton.popup.dontask = HÃ€mta hem filer automatiskt i fortsÃ€ttningen -torbutton.popup.test.no_http_proxy = Tor proxy test: Lokal HTTP Proxy Ã€r onÃ¥bar. Ãr Polipo igÃ¥ng ordentligt? torbutton.popup.prompted_language = FÃ¶r ett bÃ€ttre integritetsskydd kan Torbutton begÃ€ra den engelska versionen av webbsidor. Detta kan gÃ¶ra att webbsidor som du fÃ¶redrar att lÃ€sa pÃ¥ ditt modersmÃ¥l visas pÃ¥ engelska istÃ€llet.\\\n\\\n Vill du visa sidor pÃ¥ engelska fÃ¶r att fÃ¥ ett bÃ€ttre integritetsskydd? torbutton.popup.no_newnym = Torbutton kan inte sÃ€kert ge dig en ny identitet. Det har inte tillgÃ¥ng till Tor Control Port.\n\nKÃ¶r du Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton kan inte uppdatera instÃ€llningar i Tor Browser profilen katalog. -torbutton.popup.permission_denied = Du antingen Ã¥terstÃ€lla behÃ¶righeterna Tor Browser katalogen eller kopiera den till en ny plats. -torbutton.popup.device_full = Skivan verkar vara full. VÃ€nligen frigÃ¶ra utrymme eller flytta Tor webblÃ€sare till en ny enhet. torbutton.title.prompt_torbrowser = Viktig information om Torbutton torbutton.popup.prompt_torbrowser = Torbutton fungerar annorlunda nu: Du kan inte slÃ¥ av den lÃ€ngre.\n\nVi gjorde denna fÃ¶rÃ€ndring eftersom det inte Ã€r sÃ€kert att anvÃ€nda Torbutton i en webblÃ€sare som ocksÃ¥ anvÃ€nds fÃ¶r icke-Tor surfning. Det var fÃ¶r mÃ¥nga buggar som vi inte kunde fixa pÃ¥ nÃ¥got annat sÃ€tt.\n\nOm du vill fortsÃ€tta anvÃ€nda Firefox normalt sÃ¥ bÃ¶r du avinstallera Tor Browser och ladda ner Tor Browser Bundle. Tor Browser skyddar ditt privatliv bÃ€ttre Ã€n vanliga Firefox, Ã€ven nÃ€r Firefox anvÃ€nds med Tor Browser.\n\nFÃ¶r att ta bort Torbutton, gÃ¥ till Verktyg->TillÃ€gg->TillÃ€gg och klicka pÃ¥ Ta bort-knappen bredvid Torbutton. torbutton.popup.short_torbrowser = Viktig information om Torbutton!\n\nTorbutton Ã€r nu alltid aktiverad.\n\nKlicka pÃ¥ Torbutton fÃ¶r mer information. diff --git a/src/chrome/locale/sw/torbutton.dtd b/src/chrome/locale/sw/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/sw/torbutton.dtd +++ b/src/chrome/locale/sw/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/sw/torbutton.properties b/src/chrome/locale/sw/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/sw/torbutton.properties +++ b/src/chrome/locale/sw/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/ta/torbutton.dtd b/src/chrome/locale/ta/torbutton.dtd index ed4f8e1..ee8f465 100644 --- a/src/chrome/locale/ta/torbutton.dtd +++ b/src/chrome/locale/ta/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "à®à®€à®µà®¿"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/ta/torbutton.properties b/src/chrome/locale/ta/torbutton.properties index 2f6b0db..800a594 100644 --- a/src/chrome/locale/ta/torbutton.properties +++ b/src/chrome/locale/ta/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = à®°à®€à¯à®€à¯à®à¯à®¯à¯ torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/te/torbutton.dtd b/src/chrome/locale/te/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/te/torbutton.dtd +++ b/src/chrome/locale/te/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/te/torbutton.properties b/src/chrome/locale/te/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/te/torbutton.properties +++ b/src/chrome/locale/te/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/tg/torbutton.dtd b/src/chrome/locale/tg/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/tg/torbutton.dtd +++ b/src/chrome/locale/tg/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/tg/torbutton.properties b/src/chrome/locale/tg/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/tg/torbutton.properties +++ b/src/chrome/locale/tg/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/th/torbutton.dtd b/src/chrome/locale/th/torbutton.dtd index 6b7d4db..9525f2d 100644 --- a/src/chrome/locale/th/torbutton.dtd +++ b/src/chrome/locale/th/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "àžàž³àž«àžàžàžà¹àž² Proxy"> -<!ENTITY torbutton.prefs.recommended_settings "àžàž³àžà¹à¹àž² Proxy àžàžµà¹à¹àž«àž¡àž²àž°àžªàž¡àž¡àž²à¹àžà¹àžàž±àž Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "àžàž³ Proxy àžàžµà¹àžàž³àž«àžàžàž¡àž²à¹àžà¹"> -<!ENTITY torbutton.prefs.proxy.host.http "àžà¹àž² HTTP Proxy :"> -<!ENTITY torbutton.prefs.proxy.host.https "àžà¹àž² SSL Proxy :"> -<!ENTITY torbutton.prefs.proxy.host.ftp "àžà¹àž² FTP Proxy :"> -<!ENTITY torbutton.prefs.proxy.host.gopher "àžà¹àž² Gopher Proxy :"> -<!ENTITY torbutton.prefs.proxy.host.socks "àžà¹àž² SOCKS Host :"> -<!ENTITY torbutton.prefs.proxy.port "àžà¹àž² Port :"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "àžà¹àžàž¡àž¹àž¥à¹àžàžŽà¹àž¡à¹àžàžŽàž¡"> -<!ENTITY torbutton.pref_connection_more_info.title "àžàž§àž²àž¡àžà¹àž§àž¢à¹àž«àž¥àž·àž"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "àžªàž£à¹àž²àžàžàž±àž§àžàžà¹àž«àž¡à¹"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/th/torbutton.properties b/src/chrome/locale/th/torbutton.properties index 150fe6c..cea4206 100644 --- a/src/chrome/locale/th/torbutton.properties +++ b/src/chrome/locale/th/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = àž¢àžà¹àž¥àžŽàž torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/ti/torbutton.dtd b/src/chrome/locale/ti/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/ti/torbutton.dtd +++ b/src/chrome/locale/ti/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/ti/torbutton.properties b/src/chrome/locale/ti/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/ti/torbutton.properties +++ b/src/chrome/locale/ti/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/tk/torbutton.dtd b/src/chrome/locale/tk/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/tk/torbutton.dtd +++ b/src/chrome/locale/tk/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/tk/torbutton.properties b/src/chrome/locale/tk/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/tk/torbutton.properties +++ b/src/chrome/locale/tk/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index eb18fdb..f0ed069 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Vekil Sunucu AyarlarÄ±"> -<!ENTITY torbutton.prefs.recommended_settings "Firefox sÃŒrÃŒmÃŒm iÃ§in Ã¶nerilen vekil sunucu ayarlarÄ± kullanÄ±lsÄ±n"> -<!ENTITY torbutton.prefs.use_polipo "Polipo KullanÄ±lsÄ±n"> -<!ENTITY torbutton.prefs.custom_settings "Ãzel vekil sunucu ayarlarÄ± kullanÄ±lsÄ±n"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Vekil Sunucusu:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Vekil Sunucusu:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Vekil Sunucusu:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Vekil Sunucusu:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Sunucusu:"> -<!ENTITY torbutton.prefs.proxy.port "KapÄ±:"> -<!ENTITY torbutton.pref_connection.notice "Bu ayarlarÄ± uygulamak iÃ§in Torbutton devre dÄ±ÅÄ± bÄ±rakÄ±lsÄ±n."> -<!ENTITY torbutton.pref_connection.more_info "AyrÄ±ntÄ±lÄ± bilgiler"> -<!ENTITY torbutton.pref_connection_more_info.title "YardÄ±m"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton Åu anda etkin. Tor-DÄ±ÅÄ± vekil sunucu ayarlarÄ±nÄ± deÄiÅtirmek istiyorsanÄ±z, Torbutton uygulamasÄ±nÄ± devre dÄ±ÅÄ± bÄ±rakÄ±p buraya geri gelin. Tor ayarlarÄ±nÄ±zÄ± deÄiÅtirmek istiyorsanÄ±z Torbutton ayarlarÄ± penceresini kullanÄ±n."> <!ENTITY torbutton.context_menu.new_identity "Yeni Kimlik"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Bu site iÃ§in Tor devresini yenile"> @@ -27,11 +13,6 @@ <!ENTITY torbutton.button.tooltip "Torbutton uygulamasÄ±nÄ± baÅlatmak iÃ§in tÄ±klayÄ±n"> <!ENTITY torbutton.prefs.privacy_security_settings "Gizlilik ve GÃŒvenlik AyarlarÄ±"> <!ENTITY torbutton.prefs.restore_defaults "VarsayÄ±lanlarÄ± YÃŒkle"> -<!ENTITY torbutton.prefs.test_settings "AyarlarÄ± SÄ±na"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "Åunun iÃ§in vekil sunucu yok:"> -<!ENTITY torbutton.prefs.no_proxy_warning "UyarÄ±: YukarÄ±daki sunucu adlarÄ±nÄ± kullanmaktan kaÃ§Ä±nÄ±n"> <!ENTITY torbutton.cookiedialog.title "Ãerez KorumasÄ± YÃ¶netimi"> <!ENTITY torbutton.cookiedialog.lockCol "KorunmuÅ"> <!ENTITY torbutton.cookiedialog.domainCol "Sunucu"> @@ -43,7 +24,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Korunanlar DÄ±ÅÄ±nda TÃŒmÃŒnÃŒ Sil"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Yeni Ãerezleri Koru"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Yeni Ãerezleri Koruma"> -<!ENTITY torbutton.prefs.transparentTor "Saydam Tor Ä°letiÅimi (Ã¶zel transproxy yada Tor yÃ¶nelticisi gerekir)"> <!ENTITY torbutton.prefs.priv_caption "Gizlilik AyarlarÄ±"> <!ENTITY torbutton.prefs.block_disk "Tarama geÃ§miÅini ve web sitesi bilgileri kaydedilmesin (Gizli Tarama Kipi kullanÄ±lÄ±r)"> <!ENTITY torbutton.prefs.restrict_thirdparty "3. taraf Ã§erez ve diÄer iz sÃŒrÃŒcÃŒ bilgiler engellensin"> diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties index 309096c..357a6eb 100644 --- a/src/chrome/locale/tr/torbutton.properties +++ b/src/chrome/locale/tr/torbutton.properties @@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Tor yazÄ±lÄ±mÄ±nÄ± devre dÄ±ÅÄ± bÄ±rakmak iÃ§ torbutton.panel.label.disabled = Tor Devre DÄ±ÅÄ± torbutton.panel.label.enabled = Tor Etkin extensions.torbutton(a)torproject.org.description = Torbutton, Tor ayarlarÄ±nÄ± yapabileceÄiniz ve kiÅisel tarama verilerini hÄ±zlÄ± ve kolayca silebileceÄiniz bir dÃŒÄme sunar. -torbutton.popup.test.success = Tor vekil sunucu sÄ±namasÄ± baÅarÄ±lÄ±! -torbutton.popup.test.failure = Tor vekil sunucu sÄ±namasÄ± baÅarÄ±sÄ±z oldu! LÃŒtfen vekil sunucunuzu ve Polipo ayarlarÄ±nÄ± denetleyin. -torbutton.popup.test.confirm_toggle = Son Tor vekil sunucu sÄ±namasÄ±nda Tor kullanÄ±lamadÄ±.\n\nYine de etkinleÅtirmek ister misiniz?\n\nNot: Sorunu Ã§Ã¶zdÃŒyseniz bu uyarÄ±yÄ± kaldÄ±rmak iÃ§in Torbutton Vekil Sunucu AyarlarÄ± bÃ¶lÃŒmÃŒnden sÄ±namayÄ± yeniden yapabilirsiniz. -torbutton.popup.test.ff3_notice = Tor vekil sunucu ayarlarÄ±nÄ± sÄ±namak iÃ§in Tamam ÃŒzerine tÄ±klayÄ±n. Bu sÄ±nama artalanda yapÄ±lacak. LÃŒtfen sabÄ±rlÄ± olun. torbutton.popup.external.title = DÄ±Å bir dosya tÃŒrÃŒ indirilsin mi? torbutton.popup.external.app = Tor Browser bu dosyayÄ± gÃ¶rÃŒntÃŒleyemiyor. BaÅka bir uygulamayla aÃ§manÄ±z gerekecek.\n torbutton.popup.external.note = BazÄ± dosya tÃŒrleri uygulamalarÄ±n Tor kullanmadan Ä°nternet baÄlantÄ±sÄ± kurmasÄ±na neden olabilir.\n @@ -22,12 +18,8 @@ torbutton.popup.external.suggest = GÃŒvende olmak iÃ§in, indirilen dosyalarÄ± ya torbutton.popup.launch = DosyayÄ± indir torbutton.popup.cancel = Ä°ptal\n torbutton.popup.dontask = Bundan sonra dosyalar otomatik indirilsin -torbutton.popup.test.no_http_proxy = Tor vekil sunucu sÄ±namasÄ±: Yerel HTTP vekil sunucusuna ulaÅÄ±lamÄ±yor. Polipo dÃŒzgÃŒn Ã§alÄ±ÅÄ±yor mu? torbutton.popup.prompted_language = Daha fazla gizlilik icin, Torbutton sayfalarÄ±n Ä°ngilizce sÃŒrÃŒmlerini gÃ¶stermeyi isteyebilir. Bu Ã¶zellik, web sayfalarÄ±nÄ±n ana diliniz yerine Ä°ngilizce gÃ¶rÃŒntÃŒlenmesine neden olabilir.\n\nDaha iyi gizlilik iÃ§in web sayfalarÄ±nÄ±n Ä°ngilizce sÃŒrÃŒmlerinin gÃ¶rÃŒntÃŒlenmesini ister misiniz? torbutton.popup.no_newnym = Torbutton size yeni bir gÃŒvenli kimlik saÄlayamadÄ±. Tor Denetim KapÄ±sÄ±na giriÅ yapÄ±lamÄ±yor.\n\nTor Browser Bundle yazÄ±lÄ±mÄ±nÄ± Ã§alÄ±ÅtÄ±rdÄ±ÄÄ±nÄ±za emin olun. -torbutton.popup.pref_error = Torbutton, Tor Browser profil klasÃ¶rÃŒnÃŒn iÃ§indeki ayarlarÄ± gÃŒncelleyemedi. -torbutton.popup.permission_denied = LÃŒtfen Tor Browser klasÃ¶rÃŒnÃŒn izinlerini sÄ±fÄ±rlayÄ±n ya da baÅka bir konuma taÅÄ±yÄ±n. -torbutton.popup.device_full = Disk dolmuÅ gÃ¶rÃŒnÃŒyor. LÃŒtfen diskte yer aÃ§Ä±n ya da Tor Browser yazÄ±lÄ±mÄ±nÄ± baÅka bir aygÄ±t ÃŒzerine taÅÄ±yÄ±n. torbutton.title.prompt_torbrowser = Ãnemli Torbutton Bilgisi torbutton.popup.prompt_torbrowser = Torbutton Åimdi farklÄ± Ã§alÄ±ÅÄ±yor: artÄ±k kapatamÄ±yorsunuz.\n\nBu deÄiÅikliÄi yapmamÄ±zÄ±n nedeni Tor-DÄ±ÅÄ± kullanÄ±lan bir tarayÄ±cÄ±da Torbutton kullanmanÄ±n gÃŒvenli olmamasÄ±. BaÅka tÃŒrlÃŒ Ã§Ã¶zemeyeceÄimiz birÃ§ok hata vardÄ±.\n\nFirefox tarayÄ±cÄ±sÄ±nÄ± normal olarak kullanmak istiyorsanÄ±z, Torbutton yazÄ±lÄ±mÄ±nÄ± kaldÄ±rÄ±p Tor Browser Bundle paketini indirebilirsiniz. Tor Browser gizlilik Ã¶zellikleri normal Firefox tarayÄ±cÄ±sÄ±na, hatta Torbutton ile kullanan Firefox ikilisine gÃ¶re Ã§ok daha ÃŒstÃŒndÃŒr.\n\nTorbutton yazÄ±lÄ±mÄ±nÄ± kaldÄ±rmak iÃ§in, AraÃ§lar->Eklentiler->UzantÄ±lar bÃ¶lÃŒmÃŒne gidin ve Torbutton yazÄ±lÄ±mÄ±nÄ±n yanÄ±ndaki KaldÄ±r dÃŒÄmesine tÄ±klayÄ±n. torbutton.popup.short_torbrowser = Ãnemli Torbutton Bilgisi!\n\nTorbutton artÄ±k kapatÄ±lamayacak Åekilde etkinleÅtirildi.\n\nAyrÄ±ntÄ±lÄ± bilgi almak iÃ§in Torbutton ÃŒzerine tÄ±klayÄ±n. diff --git a/src/chrome/locale/uk/torbutton.dtd b/src/chrome/locale/uk/torbutton.dtd index 407d025..978b9b6 100644 --- a/src/chrome/locale/uk/torbutton.dtd +++ b/src/chrome/locale/uk/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "ÐÐ°ÑÐ°ÐŒÐµÑÑÐž Ð¿ÑÐŸÐºÑÑ"> -<!ENTITY torbutton.prefs.recommended_settings "ÐÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÐ²Ð°ÑÐž ÑÐµÐºÐŸÐŒÐµÐœÐŽÐŸÐ²Ð°ÐœÑ Ð¿Ð°ÑÐ°ÐŒÐµÑÑÐž ÐŽÐ»Ñ ÐŒÐŸÑÑ Ð²ÐµÑÑÑÑ Firefox"> -<!ENTITY torbutton.prefs.use_polipo "ÐÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÐ²Ð°ÑÐž Polipo"> -<!ENTITY torbutton.prefs.custom_settings "ÐÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÐ²Ð°ÑÐž Ð·Ð²ÐžÑÐ°Ð¹ÐœÑ ÐœÐ°Ð»Ð°ÑÑÑÐ²Ð°ÐœÐœÑ Ð¿ÑÐŸÐºÑÑ"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Ð¿ÑÐŸÐºÑÑ:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Ð¿ÑÐŸÐºÑÑ:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Ð¿ÑÐŸÐºÑÑ:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Ð¿ÑÐŸÐºÑÑ:"> -<!ENTITY torbutton.prefs.proxy.host.socks "ÐÑÐ·ÐŸÐ» SOCKS:"> -<!ENTITY torbutton.prefs.proxy.port "ÐÐŸÑÑ:"> -<!ENTITY torbutton.pref_connection.notice "ÐÐžÐŒÐºÐœÑÑÑ Torbutton, ÑÐŸÐ± Ð·ÐŒÑÐœÐžÑÐž ÑÑ ÐœÐ°Ð»Ð°ÑÑÑÐ²Ð°ÐœÐœÑ"> -<!ENTITY torbutton.pref_connection.more_info "ÐÑÐ»ÑÑÐµ ÑÐœÑÐŸÑÐŒÐ°ÑÑÑ"> -<!ENTITY torbutton.pref_connection_more_info.title "ÐÐŸÐ²ÑÐŽÐºÐ°"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton Ð·Ð°ÑÐ°Ð· ÑÐ²ÑÐŒÐºÐœÐµÐœÐŸ. Ð¯ÐºÑÐŸ ÐÐž Ð±Ð°Ð¶Ð°ÑÑÐµ Ð·ÐŒÑÐœÐžÑÐž ÐœÐ°Ð»Ð°ÑÑÑÐ²Ð°ÐœÐœÑ Ð¿ÑÐŸÐºÑÑ (ÐœÐµ Tor-Ð¿ÑÐŸÐºÑÑ), Ð¿ÑÐŸÑÑ Ð²ÐžÐŒÐºÐœÑÑÐž Torbutton ÑÐ° Ð¿ÐŸÐ²ÐµÑÐœÑÑÐžÑÑ ÑÑÐŽÐž. Ð¯ÐºÑÐŸ Ð¶ Ð±Ð°Ð¶Ð°ÐœÐ° Ð·ÐŒÑÐœÐ° ÑÐŸÑÐºÐ°ÑÐžÐŒÐµÑÑÑÑ Tor-Ð¿ÑÐŸÐºÑÑ, Ð¿ÑÐŸÑÑ ÑÐµ ÑÐŸÐ±ÐžÑÐž ÑÐµÑÐµÐ· Ð²ÑÐºÐœÐŸ ÐœÐ°Ð»Ð°ÑÑÑÐ²Ð°ÐœÐœÑ Torbutton."> <!ENTITY torbutton.context_menu.new_identity "ÐÐŸÐ²Ð° ÐŸÑÐŸÐ±ÐžÑÑÑÑÑÑ"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°ÐœÐœÑ..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "ÐÐ»Ð°ÑÐœÑÑÑ ÐŽÐ»Ñ Ð·Ð°Ð¿ÑÑÐºÑ Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "ÐÐ° ÐÐ°ÐŒÐŸÐ²ÑÑÐ²Ð°ÐœÐœÑÐŒ"> -<!ENTITY torbutton.prefs.test_settings "ÐÐµÑÐµÐ²ÑÑÐžÑÐž ÐÐ°ÑÑÑÐŸÐ¹ÐºÐž"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "ÐÐµ Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÐ²Ð°ÑÐž Ð¿ÑÐŸÐºÑÑ ÐŽÐ»Ñ: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Ð£Ð²Ð°Ð³Ð°: Ð£ÐœÐžÐºÐ°Ð¹ÑÐµ Ð²ÐžÐºÐŸÑÐžÑÑÐ°ÐœÐœÑ Ð±ÑÐŽÑ ÑÐºÐŸÐ³ÐŸ Ð· ÐœÐžÑÐµÐ·Ð°Ð·ÐœÐ°ÑÐµÐœÐžÑ ÑÐŸÑÑÑÐ²"> <!ENTITY torbutton.cookiedialog.title "ÐÐµÑÑÐ²Ð°ÑÐž ÐÐ°ÑÐžÑÑÐŸÐŒ ÐÑÐºÑÐ²"> <!ENTITY torbutton.cookiedialog.lockCol "ÐÐ°ÑÐžÑÐµÐœÐŸ"> <!ENTITY torbutton.cookiedialog.domainCol "Ð¥ÐŸÑÑ"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "ÐÐžÐŽÐ°Ð»ÐžÑÐž Ð£ÑÑ, ÐÐºÑÑÐŒ ÐÐ°ÑÐžÑÐµÐœÐžÑ"> <!ENTITY torbutton.cookiedialog.saveAllCookies "ÐÐ°ÑÐžÑÐ°ÑÐž ÐÐŸÐ²Ñ ÐÑÐºÐž"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "ÐÐµ ÐÐ°ÑÐžÑÐ°ÑÐž ÐÐŸÐ²Ñ ÐÑÐºÐž"> -<!ENTITY torbutton.prefs.transparentTor "ÐÑÐŸÐ·ÐŸÑÐ° Ð¢ÐŸÑÑÑÑÐºÐ°ÑÑÑ (ÐÐžÐŒÐ°Ð³Ð°Ñ ÐºÐŸÑÐžÑÑÑÐ²Ð°ÑÑÐºÐžÑ transproxy Ð°Ð±ÐŸ Tor-ÐŒÐ°ÑÑÑÑÑÐžÐ·Ð°ÑÐŸÑÐ°)"> <!ENTITY torbutton.prefs.block_disk "ÐÐµ Ð·Ð±ÐµÑÑÐ³Ð°ÑÐž ÑÑÑÐŸÑÑÑ Ð¿ÐµÑÐµÐ³Ð»ÑÐŽÑÐ² Ð°Ð±ÐŸ ÐŽÐ°ÐœÑ Ð· Ð²ÑÐŽÐ²ÑÐŽÑÐ²Ð°ÐœÐžÑ ÑÐ°Ð¹ÑÑÐ² (Ð°ÐºÑÐžÐ²ÑÑ ÑÑÐœÐºÑÑÑ Ð¿ÑÐžÐ²Ð°ÑÐœÐŸÐ³ÐŸ Ð¿ÐµÑÐµÐ³Ð»ÑÐŽÑ)"> <!ENTITY torbutton.prefs.restrict_thirdparty "ÐÐ»ÐŸÐºÑÐ²Ð°ÑÐž ÑÑÐŸÑÐŸÐœÐœÑ ÐºÑÐºÐž ÑÐ° ÑÐœÑÑ ÐŽÐ°ÐœÑ Ð²ÑÐŽÑÑÐµÐ¶ÐµÐœÐœÑ"> <!ENTITY torbutton.prefs.block_plugins "ÐÐžÐŒÐºÐœÑÑÐž ÑÐŸÐ·ÑÐžÑÐµÐœÐœÑ Ð¿ÐµÑÐµÐ³Ð»ÑÐŽÐ°ÑÐ° (ÑÐ°ÐºÑ ÑÐº Flash)"> diff --git a/src/chrome/locale/uk/torbutton.properties b/src/chrome/locale/uk/torbutton.properties index e4dbb08..c12fe3e 100644 --- a/src/chrome/locale/uk/torbutton.properties +++ b/src/chrome/locale/uk/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = ÐÐ°ÑÐžÑÐœÑÑÑ Ð°Ð±Ðž Ð²ÐžÐŒÐºÐœÑÑÐž Tor torbutton.panel.label.disabled = Tor ÐÐžÐŒÐºÐœÐµÐœÐŸ torbutton.panel.label.enabled = Tor Ð£Ð²ÑÐŒÐºÐœÐµÐœÐŸ extensions.torbutton(a)torproject.org.description = Torbutton Ð¿ÐµÑÐµÐŽÐ±Ð°ÑÐ°Ñ ÐºÐœÐŸÐ¿ÐºÑ, ÑÐŸÐ± ÐœÐ°Ð»Ð°ÑÑÑÐ²Ð°ÑÐž Tor Ñ ÑÐ²ÐžÐŽÐºÐŸ ÑÐ° Ð»ÐµÐ³ÐºÐŸ ÐŸÑÐžÑÑÐžÑÐž ÐŸÑÐŸÐ±ÐžÑÑÑ ÐŽÐ°ÐœÑ Ð¿ÐµÑÐµÐ³Ð»ÑÐŽÑ. -torbutton.popup.test.success = Ð¢ÐµÑÑ Ð¿ÑÐŸÐµÑÑ-ÑÐµÑÐ²ÐµÑÐ° Tor Ð¿ÑÐŸÐ¹ÑÐŸÐ² ÑÑÐ¿ÑÑÐœÐŸ! -torbutton.popup.test.failure = Ð¢ÐµÑÑ Ð¿ÑÐŸÐºÑÑ-ÑÐµÑÐ²ÐµÑÐ° ÐÐ ÐÐ ÐÐÐÐÐÐ! ÐÐµÑÐµÐ²ÑÑÑÐµ ÑÐ²ÑÐ¹ Ð¿ÑÐŸÐºÑÑ-ÑÐµÑÐ²ÐµÑ ÑÐ° Ð¿Ð°ÑÐ°ÐŒÐµÑÑÐž Polipo. -torbutton.popup.test.confirm_toggle = Ð¡Ð°ÐŒÐžÐ¹ ÐŸÑÑÐ°ÐœÐœÑÐ¹ Tor Ð¿ÑÐŸÐºÑÑ ÑÐµÑÑ ÐœÐµ Ð² Ð·ÐŒÐŸÐ·Ñ Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÐ²Ð°ÑÐž Tor.\\n\n\\n\nÐÐž Ð²Ð¿ÐµÐ²ÐœÐµÐœÑ, ÑÐŸ Ð²Ðž ÑÐŸÑÐµÑÐµ Ð²ÐºÐ»ÑÑÐžÑÐž Ñ Ð±ÑÐŽÑ-ÑÐºÐŸÐŒÑ Ð²ÐžÐ¿Ð°ÐŽÐºÑ?\\n\n\\n\nÐÑÐžÐŒÑÑÐºÐ°: Ð¯ÐºÑÐŸ Ð²Ðž Ð²ÐžÑÑÑÐžÐ»Ðž Ð¿ÑÐŸÐ±Ð»ÐµÐŒÑ, Ð²Ðž ÐŒÐŸÐ¶ÐµÑÐµ Ð¿ÐµÑÐµÐ·Ð°Ð¿ÑÑÑÐžÑÐž ÑÐµÑÑ Ñ Ð²ÑÐºÐœÑ 'ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°ÐœÐœÑ Ð¿ÑÐŸÐºÑÑ Torbutton', ÑÐŸÐ± ÑÑÑÐœÑÑÐž ÑÐµ Ð¿ÐŸÐ¿ÐµÑÐµÐŽÐ¶ÐµÐœÐœÑ. -torbutton.popup.test.ff3_notice = ÐÐ°ÑÐžÑÐœÑÑÑ OK, ÑÐŸÐ± Ð¿ÐµÑÐµÐ²ÑÑÐžÑÐž ÐœÐ°Ð»Ð°ÑÑÑÐ²Ð°ÐœÐœÑ Tor Ð¿ÑÐŸÐºÑÑ. ÐŠÐµÐ¹ ÑÐµÑÑ Ð±ÑÐŽÐµ Ð²ÐžÐºÐŸÐœÑÐ²Ð°ÑÐžÑÑ Ñ ÑÐŸÐœÐŸÐ²ÐŸÐŒÑ ÑÐµÐ¶ÐžÐŒÑ. ÐÑÐŽÑ Ð»Ð°ÑÐºÐ°, Ð±ÑÐŽÑÑÐµ ÑÐµÑÐ¿Ð»ÑÑÑ. torbutton.popup.external.title = ÐÐ°Ð²Ð°ÐœÑÐ°Ð¶ÐžÑÐž Ð·ÐŸÐ²ÐœÑÑÐœÑÐ¹ Ð²ÐŒÑÑÑ? torbutton.popup.external.app = ÐÐŸÐ²ÐœÑÑÐœÑ Ð¿ÑÐžÐºÐ»Ð°ÐŽÐœÐ° Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐ° ÐœÐµÐŸÐ±ÑÑÐŽÐœÐ° ÐŽÐ»Ñ ÐŸÐ±ÑÐŸÐ±ÐºÐž:\\n\n\\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = ÐÐ°Ð¿ÑÑÑÐžÑÐž ÐŽÐŸÐŽÐ°ÑÐŸÐº torbutton.popup.cancel = ÐÑÐŽÐŒÐŸÐ²Ð° torbutton.popup.dontask = ÐÐ°Ð²Ð¶ÐŽÐž Ð·Ð°Ð¿ÑÑÐºÐ°ÑÐž ÐŽÐŸÐŽÐ°ÑÐºÐž Ð· ÑÑÐŸÐ³ÐŸ ÐŒÐŸÐŒÐµÐœÑÑ -torbutton.popup.test.no_http_proxy = Tor Ð¿ÑÐŸÐºÑÑ ÑÐµÑÑ: ÐÐŸÐºÐ°Ð»ÑÐœÐžÐ¹ Ð¿ÑÐŸÐºÑÑ-ÑÐµÑÐ²ÐµÑ HTTP â ÐœÐµÐŽÐŸÑÑÑÐ¿ÐœÐžÐ¹. Ð§Ðž Ð¿ÑÐ°ÑÑÑ Polipo ÐœÐ°Ð»ÐµÐ¶ÐœÐžÐŒ ÑÐžÐœÐŸÐŒ? torbutton.popup.prompted_language = ÐÐ»Ñ ÐœÐ°ÐŽÐ°ÐœÐœÑ Ð±ÑÐ»ÑÑÐŸÑ Ð¿ÑÐžÐ²Ð°ÑÐœÐŸÑÑÑ, Torbutton ÐŒÐŸÐ¶Ðµ Ð·Ð°Ð¿ÐžÑÑÐ²Ð°ÑÐž Ð²ÐµÑÑÑÑ ÑÑÐŸÑÑÐœÐŸÐº Ð°ÐœÐ³Ð»ÑÐ¹ÑÑÐºÐŸÑ ÐŒÐŸÐ²ÐŸÑ. ÐŠÐµ ÐŒÐŸÐ¶Ðµ ÑÐ¿ÑÐžÑÐžÐœÐžÑÐž Ð²ÑÐŽÐŸÐ±ÑÐ°Ð¶ÐµÐœÐœÑ ÑÑÐŸÑÑÐœÐŸÐº Ð°ÐœÐ³Ð»ÑÐ¹ÑÑÐºÐŸÑ ÐŒÐŸÐ²ÐŸÑ, Ð·Ð°ÐŒÑÑÑÑ Ð²ÑÐŽÐŸÐ±ÑÐ°Ð¶ÐµÐœÐœÑ ÑÑ ÐœÐ° Ð²Ð°ÑÑÐ¹ ÑÑÐŽÐœÑÐ¹ ÐŒÐŸÐ²Ñ.\\n\n\\n\nÐ§Ðž Ð²Ðž Ð±Ð°Ð¶Ð°ÑÑÐµ Ð·Ð°Ð¿ÐžÑÑÐ²Ð°ÑÐž ÑÑÐŸÑÑÐœÐºÐž Ð°ÐœÐ³Ð»ÑÐ¹ÑÑÐºÐŸÑ ÐŒÐŸÐ²ÐŸÑ ÐŽÐ»Ñ Ð±ÑÐ»ÑÑÐŸÑ Ð¿ÑÐžÐ²Ð°ÑÐœÐŸÑÑÑ? torbutton.popup.no_newnym = Torbutton ÐœÐµ ÐŒÐŸÐ¶Ðµ Ð±ÐµÐ·Ð¿ÐµÑÐœÐŸ ÐŽÐ°ÑÐž Ð²Ð°ÐŒ ÐœÐŸÐ²Ñ ÐŸÑÐŸÐ±ÐžÑÑÑÑÑÑ. ÐÑÐœ ÐœÐµ ÐŒÐ°Ñ ÐŽÐŸÑÑÑÐ¿Ñ ÐŽÐŸ Tor Control Port.\\n\n\\n\nÐÐž Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÑÑÐµ Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton ÐœÐµ ÐŒÐŸÐ¶Ðµ ÐŸÐœÐŸÐ²ÐžÑÐž ÐœÐ°Ð»Ð°ÑÑÑÐ²Ð°ÐœÐœÑ Ð² Ð¿Ð°Ð¿ÑÑ Ð¿ÑÐŸÑÑÐ»Ñ ÐÐµÑÐµÐ³Ð»ÑÐŽÐ°ÑÐ° Tor. -torbutton.popup.permission_denied = ÐÑÐŽÑ Ð»Ð°ÑÐºÐ°, Ð°Ð±ÐŸ ÑÐºÐžÐœÑÑÐµ ÐŽÐŸÐ·Ð²ÐŸÐ»Ðž ÐŽÐ»Ñ Ð¿Ð°Ð¿ÐºÐž ÐÐµÑÐµÐ³Ð»ÑÐŽÐ°ÑÐ° Tor Ð°Ð±ÐŸ ÑÐºÐŸÐ¿ÑÑÐ¹ÑÐµ ÑÑ Ð² ÑÐœÑÐµ ÐŒÑÑÑÐµ. -torbutton.popup.device_full = Ð¡ÑÐŸÐ¶Ðµ, ÑÐŸ ÐŽÐžÑÐº Ð·Ð°Ð¿ÐŸÐ²ÐœÐµÐœÐžÐ¹. ÐÑÐŽÑ Ð»Ð°ÑÐºÐ°, Ð·Ð²ÑÐ»ÑÐœÑÑÑ ÐŒÑÑÑÐµ Ð°Ð±ÐŸ Ð¿ÐµÑÐµÐŒÑÑÑÑÑÑ ÐÐµÑÐµÐ³Ð»ÑÐŽÐ°Ñ Tor ÐœÐ° ÑÐœÑÐžÐ¹ Ð¿ÑÐžÑÑÑÑÐ¹. torbutton.title.prompt_torbrowser = ÐÐ°Ð¶Ð»ÐžÐ²Ð° ÑÐœÑÐŸÑÐŒÐ°ÑÑÑ Torbutton torbutton.popup.prompt_torbrowser = Torbutton Ð²Ð¶Ðµ Ð¿ÑÐ°ÑÑÑ Ð¿ÐŸ-ÑÐœÑÐŸÐŒÑ: ÐÐž Ð±ÑÐ»ÑÑÐµ ÐœÐµ ÐŒÐŸÐ¶ÐµÑÐµ Ð¹ÐŸÐ³ÐŸ Ð²ÐžÐŒÐºÐœÑÑÐž.\\n\n\\n\nÐÐž Ð·ÑÐŸÐ±ÐžÐ»Ðž ÑÑ Ð·ÐŒÑÐœÑ, ÑÐŸÐŒÑ ÑÐŸ ÑÐµ ÐœÐµ Ð±ÐµÐ·Ð¿ÐµÑÐœÐŸ Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÐ²Ð°ÑÐž Torbutton Ð² Ð±ÑÐ°ÑÐ·ÐµÑÑ, ÑÐºÐžÐ¹ ÑÐ°ÐºÐŸÐ¶ Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÑÑÑÑÑ ÐŽÐ»Ñ ÐœÐµ-Tor Ð¿ÐµÑÐµÐ³Ð»ÑÐŽÑ. ÐÑÐœÑÐ²Ð°Ð»ÐŸ Ð·Ð°ÐœÐ°ÐŽÑÐŸ Ð±Ð°Ð³Ð°ÑÐŸ Ð¿ÐŸÐŒÐžÐ»ÐŸÐº, ÑÐ°Ðº ÑÐŸ ÐŒÐž ÐœÐµ Ð·ÐŒÐŸÐ³Ð»Ðž Ð²ÐžÐ¿ÑÐ°Ð²ÐžÑÐž ÐœÑÑÐºÐžÐŒ ÑÐœÑÐžÐŒ ÑÐ¿ÐŸÑÐŸÐ±ÐŸÐŒ.\\n\n\\n\nÐ¯ÐºÑÐŸ Ð²Ðž ÑÐŸÑÐµÑÐµ Ð¿ÑÐŸÐŽÐŸÐ²Ð¶ÑÐ²Ð°ÑÐž Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÐ²Ð°ÑÐž Firefox ÐœÐŸÑÐŒÐ°Ð»ÑÐœÐŸ, Ð²Ðž Ð¿ÐŸÐ²ÐžÐœÐœÑ Ð²ÐžÐŽÐ°Ð»ÐžÑÐž Torbutton Ñ Ð·Ð°Ð²Ð°ÐœÑÐ°Ð¶ÐžÑÐž Tor Browser Bundle. ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°ÐœÐœÑ ÐºÐŸÐœÑÑÐŽÐµÐœÑÑÐ¹ÐœÐŸÑÑÑ Tor Browser ÑÐ°ÐºÐŸÐ¶ Ð¿ÐµÑÐµÐ²ÐµÑÑÑÑÑÑ ÑÐ°ÐºÑ Ñ Ð·Ð²ÐžÑÐ°Ð¹ÐœÐŸÐŒÑ Firefox, ÐœÐ°Ð²ÑÑÑ, ÑÐºÑÐŸ Firefox Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÑÑÑÑÑ Ð· Torbutton.\\n\n\\n\nÐ©ÐŸÐ± Ð²ÐžÐŽÐ°Ð»ÐžÑÐž Torbutton, Ð¿ÐµÑÐµÐ¹ÐŽÑÑÑ Ð² ÐŒÐµÐœÑ Ð¡ÐµÑÐ²ÑÑ-> ÐÐŸÐ¿ÐŸÐ²ÐœÐµÐœÐœÑ-> Ð ÐŸÐ·ÑÐžÑÐµÐœÐœÑ, Ð° Ð¿ÐŸÑÑÐŒ ÐœÐ°ÑÐžÑÐœÑÑÑ ÐºÐœÐŸÐ¿ÐºÑ ÐÐžÐŽÐ°Ð»ÐžÑÐž Ð¿ÐŸÑÑÑ Ð· Torbutton. torbutton.popup.short_torbrowser = ÐÐ°Ð¶Ð»ÐžÐ²Ð° ÑÐœÑÐŸÑÐŒÐ°ÑÑÑ Torbutton!\\n\n\\n\nTorbutton ÑÐµÐ¿ÐµÑ Ð·Ð°Ð²Ð¶ÐŽÐž Ð²ÐºÐ»ÑÑÐµÐœÐžÐ¹.\\n\n\\n\nÐÐ°ÑÐžÑÐœÑÑÑ ÐœÐ° Torbutton ÐŽÐ»Ñ ÐŸÑÑÐžÐŒÐ°ÐœÐœÑ ÐŽÐŸÐŽÐ°ÑÐºÐŸÐ²ÐŸÑ ÑÐœÑÐŸÑÐŒÐ°ÑÑÑ. diff --git a/src/chrome/locale/ur/torbutton.dtd b/src/chrome/locale/ur/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/ur/torbutton.dtd +++ b/src/chrome/locale/ur/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/ur/torbutton.properties b/src/chrome/locale/ur/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/ur/torbutton.properties +++ b/src/chrome/locale/ur/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/ve/torbutton.dtd b/src/chrome/locale/ve/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/ve/torbutton.dtd +++ b/src/chrome/locale/ve/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/ve/torbutton.properties b/src/chrome/locale/ve/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/ve/torbutton.properties +++ b/src/chrome/locale/ve/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd index ec685a9..92c1120 100644 --- a/src/chrome/locale/vi/torbutton.dtd +++ b/src/chrome/locale/vi/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "CÃ¡c Thiáº¿t láºp Proxy"> -<!ENTITY torbutton.prefs.recommended_settings "DÃ¹ng thiáº¿t láºp proxy khuyáº¿n nghá» cho phiÃªn báº£n trÃ¬nh duyá»t Firefox cá»§a tÃŽi"> -<!ENTITY torbutton.prefs.use_polipo "DÃ¹ng Polipo"> -<!ENTITY torbutton.prefs.custom_settings "DÃ¹ng thiáº¿t láºp proxy tÃ¹y biáº¿n"> -<!ENTITY torbutton.prefs.proxy.host.http "Proxy giao thá»©c HTTP:"> -<!ENTITY torbutton.prefs.proxy.host.https "Proxy giao thá»©c SSL:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy giao thá»©c FTP:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Cá»ng:"> -<!ENTITY torbutton.pref_connection.notice "VÃŽ hiá»u Torbutton Äá» thay Äá»i cÃ¡c thiáº¿t Äáº·t nÃ y."> -<!ENTITY torbutton.pref_connection.more_info "ThÃªm thÃŽng tin"> -<!ENTITY torbutton.pref_connection_more_info.title "Trá»£ giÃºp"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton hiá»n Äang ÄÆ°á»£c hiá»u hÃ³a. Náº¿u báº¡n muá»n thay Äá»i thiáº¿t láºp proxy khÃŽng thuá»c chÆ°Æ¡ng trÃ¬nh Tor, vui lÃ²ng táº¯t Torbutton vÃ quay trá» láº¡i ÄÃ¢y. Náº¿u báº¡n muá»n thay Äá»i thiáº¿t láºp tá»« Tor, vui lÃ²ng dÃ¹ng cá»a sá» tÃ¹y chá»nh Torbutton."> <!ENTITY torbutton.context_menu.new_identity "GiÃ¡m Äá»nh Má»i"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "VÃ²ng Tor má»i cho trang nÃ y"> @@ -27,11 +13,6 @@ <!ENTITY torbutton.button.tooltip "Nháº¥p Äá» nháºn diá»n Torbutton"> <!ENTITY torbutton.prefs.privacy_security_settings "CÃ i Äáº·t RiÃªng tÆ° vÃ Báº£o máºt"> <!ENTITY torbutton.prefs.restore_defaults "KhÃŽi phá»¥c Máº·c Äá»nh"> -<!ENTITY torbutton.prefs.test_settings "Thiáº¿t láºp Thá» nghiá»m"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "KhÃŽng cÃ³ á»Šy nhiá»m cho:"> -<!ENTITY torbutton.prefs.no_proxy_warning "Cáº£nh bÃ¡o: TrÃ¡nh sá» dá»¥ng báº¥t ká»³ tÃªn mÃ¡y chá»§ á» trÃªn"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -43,7 +24,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.priv_caption "CÃ i Äáº·t RiÃªng tÆ°"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties index a401338..34169dc 100644 --- a/src/chrome/locale/vi/torbutton.properties +++ b/src/chrome/locale/vi/torbutton.properties @@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = Nháº¥n Äá» táº¯t Tor torbutton.panel.label.disabled = Tor bá» táº¯t torbutton.panel.label.enabled = Tor ÄÆ°á»£c báºt extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Thá» nghiá»m Tor thÃ nh cÃŽng! -torbutton.popup.test.failure = Tor proxy kiá»m tra cÃ³ lá»i! Kiá»m tra proxy vÃ nhá»¯ng cÃ i Äáº·t cá»§a Polipo cá»§a báº¡n. -torbutton.popup.test.confirm_toggle = Cuá»c thá» nghiá»m Tor á»§y nhiá»m gáº§n ÄÃ¢y nháº¥t ÄÃ£ tháº¥t báº¡i trong viá»c xá» dá»¥ng Tor.\n\nBáº¡n cÃ³ cháº¯c lÃ báº¡n muá»n báºt lÃªn khÃŽng?\n\nLÆ°u Ãœ: Náº¿u báº¡n ÄÃ£ sá»a ÄÆ°á»£c váº¥n Äá», báº¡n cÃ³ thá» cháº¡y kiá»m tra láº¡i trong cá»a sá» nhá»¯ng TÃ¹y thÃch á»Šy nhiá»m cá»§a Torbutton Äá» loáº¡i bá» cáº£nh bÃ¡o nÃ y. -torbutton.popup.test.ff3_notice = Nháº¥n OK Äá» thá» nghiá»m thiáº¿t láºp proxy Tor. Thá» nghiá»m nÃ y sáºœ diá»n ra trong háºu cáº£nh. Xin hÃ£y kiÃªn nháº«n. torbutton.popup.external.title = Download an external file type? torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n @@ -22,12 +18,8 @@ torbutton.popup.external.suggest = To be safe, you should only open downloaded f torbutton.popup.launch = Download file torbutton.popup.cancel = Há»§y bá» torbutton.popup.dontask = Automatically download files from now on -torbutton.popup.test.no_http_proxy = Thá» nghiá»m Tor á»§y nhiá»m: HTTP á»§y nhiá»m Äá»a phÆ°Æ¡ng khÃŽng thá» tá»i ÄÆ°á»£c. Polipo cÃ³ Äang cháº¡y ÄÃºng cÃ¡ch khÃŽng? torbutton.popup.prompted_language = Äá» báº¡n cÃ³ thÃªm sÆ° riÃªng tÆ°, Torbutton cÃ³ thá» yÃªu cáº§u trang máº¡ng sá» dá»¥ng phiÃªn báº£n Tiáº¿ng Anh. ÄÃ¢y cÃ³ thá» lÃ nguyÃªn nhÃ¢n trang máº¡ng mÃ báº¡n Äá» nghá» hiá»n thá» tiáº¿n báº£n Äá»a láº¡i hiá»n thá» Tiáº¿ng Anh.\n\nBáº¡n cÃ³ muá»n yÃªu cáº§u trang máº¡ng tiáº¿ng anh Äá» cÃ³ thÃªm sá»± riÃªng tÆ°? torbutton.popup.no_newnym = Torbutton cÃ³ thá» ÄÆ°a báº¡n má»t danh tÃnh má»i má»t cÃ¡ch khÃŽng an toÃ n. NÃ³ khÃŽng há» truy cáºp vÃ o Tor Control Port.\n\nCÃ³ pháº£i báº¡n Äang dÃ¹ng Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton khÃŽng thá» cáºp nháºt thiáº¿t láºp trong thÆ° má»¥c há» sÆ¡. -torbutton.popup.permission_denied = Háº£y cÃ i láº¡i quyá»n truy cáºp cho thÆ° má»¥c cá»§a trÃ¬nh duyá»t Tor hoáº·c chÃ©p nÃ³ vÃŽ má»t thÆ° má»¥c má»i. -torbutton.popup.device_full = á» lÆ°u trá»¯ ÄÃ£ Äáº§y, Háº£y chuáº©n bá» thÃªm chá» trá»ng hoáº·c di chuyá»n trÃ¬nh duyá»t Tor qua má»t thiáº¿t bá» má»i. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/wa/torbutton.dtd b/src/chrome/locale/wa/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/wa/torbutton.dtd +++ b/src/chrome/locale/wa/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/wa/torbutton.properties b/src/chrome/locale/wa/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/wa/torbutton.properties +++ b/src/chrome/locale/wa/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/wo/torbutton.dtd b/src/chrome/locale/wo/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/wo/torbutton.dtd +++ b/src/chrome/locale/wo/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/wo/torbutton.properties b/src/chrome/locale/wo/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/wo/torbutton.properties +++ b/src/chrome/locale/wo/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 280f682..58f72fb 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "ä»£çè®Ÿçœ®"> -<!ENTITY torbutton.prefs.recommended_settings "è¯¥çæ¬ç Firefox äœ¿çšæšèä»£çè®Ÿçœ®"> -<!ENTITY torbutton.prefs.use_polipo "äœ¿çš Polipo"> -<!ENTITY torbutton.prefs.custom_settings "èªå®ä¹ä»£çè®Ÿçœ®"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP ä»£çïŒ"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL ä»£çïŒ"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP ä»£çïŒ"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher ä»£çïŒ"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS ä»£çïŒ"> -<!ENTITY torbutton.prefs.proxy.port "ç«¯å£ïŒ"> -<!ENTITY torbutton.pref_connection.notice "çŠæ¢ Torbutton æŽæ¹è¿äºè®Ÿçœ®ã"> -<!ENTITY torbutton.pref_connection.more_info "æŽå€ä¿¡æ¯"> -<!ENTITY torbutton.pref_connection_more_info.title "åž®å©"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton åœåå·²å¯çšãåŠéå¯¹ Tor ä¹å€çä»£çè®Ÿçœ®è¿è¡æŽæ¹ïŒè¯·çŠçš Torbutton ååè¿åè¿éãåŠéæŽæ¹ Tor çè®Ÿçœ®ïŒè¯·åš Torbutton éŠéé¡¹çªå£äžè¿è¡è®Ÿçœ®ã"> <!ENTITY torbutton.context_menu.new_identity "æ°èº«ä»œ"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "äžºæ€ç«ç¹äœ¿çšæ° Tor çº¿è·¯"> @@ -27,11 +13,6 @@ <!ENTITY torbutton.button.tooltip "ç¹æ€åå§å Torbutton"> <!ENTITY torbutton.prefs.privacy_security_settings "éç§äžå®åšè®Ÿçœ®"> <!ENTITY torbutton.prefs.restore_defaults "æ¢å€é»è®€è®Ÿçœ®"> -<!ENTITY torbutton.prefs.test_settings "æµè¯ä»£çè®Ÿçœ®"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "äžäœ¿çšä»£ççå°å:"> -<!ENTITY torbutton.prefs.no_proxy_warning "èŠåïŒè¯·äžèŠäœ¿çšäžè¿°ä»»äœäž»æºåã"> <!ENTITY torbutton.cookiedialog.title "ç®¡çåä¿æ€ç Cookie"> <!ENTITY torbutton.cookiedialog.lockCol "åä¿æ€"> <!ENTITY torbutton.cookiedialog.domainCol "æå¡åš"> @@ -43,7 +24,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "åšéšç§»é€ä»ä¿çåä¿æ€ç Cookie"> <!ENTITY torbutton.cookiedialog.saveAllCookies "ä¿æ€æ°ç Cookie"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "äžä¿æ€æ°ç Cookie"> -<!ENTITY torbutton.prefs.transparentTor "Tor åŒºåéæä»£çïŒéèŠèªè®Ÿ TransProxy æ Tor è·¯ç±ïŒ"> <!ENTITY torbutton.prefs.priv_caption "éç§è®Ÿçœ®"> <!ENTITY torbutton.prefs.block_disk "çŠæ¢è®°åœæµè§åå²æçœç«æ°æ®ïŒå¯çšéç§æµè§æš¡åŒïŒ"> <!ENTITY torbutton.prefs.restrict_thirdparty "éå¶ç¬¬äžæ¹ cookie åå¶ä»æ°æ®è·èžªçšåº"> diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties index 7379381..52484d7 100644 --- a/src/chrome/locale/zh-CN/torbutton.properties +++ b/src/chrome/locale/zh-CN/torbutton.properties @@ -11,10 +11,6 @@ torbutton.panel.tooltip.enabled = ç¹å»çŠçš Tor torbutton.panel.label.disabled = Tor å·²çŠçš torbutton.panel.label.enabled = Tor å·²å¯çš extensions.torbutton(a)torproject.org.description = Torbutton æ¯äžäžªæé®ïŒå¯å¯¹âTor è®Ÿçœ®âè¿è¡ä¿®æ¹ïŒå¹¶å¯å¿«éèæ¹äŸ¿å°æžé€æµè§åšéç§æ°æ®ã -torbutton.popup.test.success = Tor ä»£çæµè¯æåïŒ -torbutton.popup.test.failure = Tor ä»£çæµè¯å€±èŽ¥ïŒè¯·æ£æ¥ä»£çå Polipo è®Ÿçœ®ã -torbutton.popup.test.confirm_toggle = äžäžæ¬¡ Tor ä»£çæµè¯å€±èŽ¥ã\n\næšè¿èŠå¯çšä»£çåïŒ\n\næ³šæïŒåŠææšå·²ç»è§£å³äºä»£çé®é¢ïŒè¯·æåŒ Torbutton ä»£çè®Ÿçœ®çªå£ïŒæ¶é€æ€èŠåã -torbutton.popup.test.ff3_notice = åå»âç¡®å®âæµè¯ Tor çä»£çè®Ÿçœ®ãæµè¯å°åšåå°è¿è¡ïŒè¯·èå¿çåŸã torbutton.popup.external.title = äžèœœäžäžªå€éšæä»¶ç±»åïŒ torbutton.popup.external.app = Tor Browser æ æ³æŸç€ºæ€æä»¶ãæšéèŠçšå¶ä»åºçšçšåºæåŒå®ã\n\n torbutton.popup.external.note = éšåæä»¶ç±»åå¯èœäŒå¯ŒèŽåºçšçšåºåšäžäœ¿çš Tor çæåµäžè¿æ¥äºèçœã\n\n @@ -22,12 +18,8 @@ torbutton.popup.external.suggest = äžºäºå®åšèµ·è§ïŒæšåºè¯¥åªåšçŠ»çº¿ç¶ torbutton.popup.launch = äžèœœæä»¶ torbutton.popup.cancel = åæ¶ torbutton.popup.dontask = ä»¥åèªåšäžèœœæä»¶ -torbutton.popup.test.no_http_proxy = Tor ä»£çæµè¯ïŒæ¬å° HTTP ä»£çäžå¯èŸŸïŒæšç Polipo æ£åžžå¯åšäºåïŒ torbutton.popup.prompted_language = äžºäºæŽå¥œå°ä¿æ€éç§ïŒ Torbutton å¯ä»¥è¯·æ±çœé¡µçè±è¯çæ¬ãè¿å¯èœå¯ŒèŽæšåžææµè§çæ¬åè¯èšççœé¡µä»¥è±è¯æŸç€ºã\n\näžºäºæŽå¥œå°ä¿æ€éç§ïŒæ¯åŠè¯·æ±çœé¡µä»¥è±è¯æŸç€ºïŒ torbutton.popup.no_newnym = Torbutton æ æ³å®åšå°äžºæšåæ¢äžäžªæ°èº«ä»œãå®æ æ³è®¿é® Tor çæ§å¶ç«¯å£ã\n\næšç®åæ£åšäœ¿çš Tor æµè§åšå¥ä»¶åïŒ -torbutton.popup.pref_error = Torbutton æ æ³æŽæ° Tor æµè§åšéçœ®ç®åœäžçéŠéé¡¹ã -torbutton.popup.permission_denied = è¯·éçœ® Tor æµè§åšç®åœçæä»¶æéæå°å¶å€å¶å°äžäžªæ°äœçœ®ã -torbutton.popup.device_full = ç¡¬çç©ºéŽå·²æ»¡ãè¯·éæŸäžäºç©ºéŽæå° Tor æµè§åšç§»åšè³å¶ä»æ°è®Ÿå€ã torbutton.title.prompt_torbrowser = Torbutton éèŠä¿¡æ¯ torbutton.popup.prompt_torbrowser = Torbutton å·¥äœæ¹åŒæææ¹åïŒå®äžåæ¯æäžŽæ¶å³éã\n\nååºè¿ç§æ¹åæ¯å äžºåšéå¿åæµè§çæµè§åšäžïŒåæ¶äœ¿çš Torbutton å¹¶äžå®åšãæå€ªå€æ æ³åæçéè¯¯ã\n\nåŠææšåžææ£åžžäœ¿çš Firefox ïŒè¯·åžèœœ Torbutton æä»¶ïŒäžèœœ Tor æµè§åšå¥ä»¶ãTor æµè§åšçéç§ç¹æ§äŒäºæ®éç Firefox ïŒå³äœ¿Firefoxäžäœ¿çšäºTorbuttonã\n\nç§»é€ TorbuttonïŒè¯·å° å·¥å·Tools->éå ç»ä»¶Addons->æ©å±Extensions äžïŒåš Torbutton æç¹å»åžèœœã torbutton.popup.short_torbrowser = Torbutton éèŠä¿¡æ¯ïŒ\n\nTorbutton ç®åå·²ç¥å€äºå¯çšç¶æã\n\nç¹å» Torbutton è·åæŽå€ä¿¡æ¯ã diff --git a/src/chrome/locale/zh-HK/torbutton.dtd b/src/chrome/locale/zh-HK/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/zh-HK/torbutton.dtd +++ b/src/chrome/locale/zh-HK/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/zh-HK/torbutton.properties b/src/chrome/locale/zh-HK/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/zh-HK/torbutton.properties +++ b/src/chrome/locale/zh-HK/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd index dd8f504..3e521cc 100644 --- a/src/chrome/locale/zh-TW/torbutton.dtd +++ b/src/chrome/locale/zh-TW/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy èšå®"> -<!ENTITY torbutton.prefs.recommended_settings "åšFirefox äœ¿çšå»ºè°ç Proxy èšå®"> -<!ENTITY torbutton.prefs.use_polipo "äœ¿çš Polipo"> -<!ENTITY torbutton.prefs.custom_settings "äœ¿çšèªèšçProxy èšå®"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "åçšTorbuttonäŸæ¹è®èšå®"> -<!ENTITY torbutton.pref_connection.more_info "æŽå€è³èš"> -<!ENTITY torbutton.pref_connection_more_info.title "å¹«å©"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton çŸåšå·²ç¶åçšãåŠææšæ³æ¹è®é-Tor Proxyçèšå®ïŒè«åçšTorbuttonäžŠåå°éè£ãåŠææšæ³æ¹è®Torçèšå®ïŒè«äœ¿çšTorbutton èšçœ®èŠçªã"> <!ENTITY torbutton.context_menu.new_identity "æŽæèº«ä»œ"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "èšçœ®...(P)"> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "é»æä»¥åå§ Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "ååŸ©é èšåŒ"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/zh-TW/torbutton.properties b/src/chrome/locale/zh-TW/torbutton.properties index e17ddf2..129d4d0 100644 --- a/src/chrome/locale/zh-TW/torbutton.properties +++ b/src/chrome/locale/zh-TW/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = é»æä»¥åçš Tor torbutton.panel.label.disabled = Tor å·²åçš torbutton.panel.label.enabled = Tor å·²åçš extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy æž¬è©Šéé! -torbutton.popup.test.failure = Tor proxy æž¬è©Šå€±æ! è«åæ¬¡æª¢æ¥æš Proxy è Polipo èšå®ã -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = æäž OK åŸéå§æž¬è©Š Tor Proxy èšå®ãéåæž¬è©Šæåšèæ¯éäœãè«çšåŸã torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nåŠæéåæªæ¡æ¯äžè¢«ä¿¡ä»»çïŒæš torbutton.popup.launch = ååæçšçšåŒ torbutton.popup.cancel = åæ¶ torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton ç¡æ³å®åšççµŠæšäžåæ°çèº«åãå®ç¡æ³åå Tor æ§å¶é£æ¥å ã\n\næšæ£åšäœ¿çš Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = ç£ç¢ç©ºéå¯èœå·²æ»¿ãè«ç©ºåºäžäºç©ºéææ¯å° Tor Browser æ¬ç§»è³åŠäžåè£çœ®ã torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/locale/zu/torbutton.dtd b/src/chrome/locale/zu/torbutton.dtd index ed9793e..ee8f465 100644 --- a/src/chrome/locale/zu/torbutton.dtd +++ b/src/chrome/locale/zu/torbutton.dtd @@ -1,17 +1,3 @@ -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> -<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> -<!ENTITY torbutton.prefs.use_polipo "Use Polipo"> -<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings"> -<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:"> -<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:"> -<!ENTITY torbutton.prefs.proxy.port "Port:"> -<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings."> -<!ENTITY torbutton.pref_connection.more_info "More information"> -<!ENTITY torbutton.pref_connection_more_info.title "Help"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> @@ -24,11 +10,6 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.test_settings "Test Settings"> -<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> -<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> -<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: "> -<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above"> <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> <!ENTITY torbutton.cookiedialog.lockCol "Protected"> <!ENTITY torbutton.cookiedialog.domainCol "Host"> @@ -40,7 +21,6 @@ <!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> -<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> diff --git a/src/chrome/locale/zu/torbutton.properties b/src/chrome/locale/zu/torbutton.properties index d8c1430..ee5b1f9 100644 --- a/src/chrome/locale/zu/torbutton.properties +++ b/src/chrome/locale/zu/torbutton.properties @@ -3,10 +3,6 @@ torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. -torbutton.popup.test.success = Tor proxy test successful! -torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings. -torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning. -torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient. torbutton.popup.external.title = Load external content? torbutton.popup.external.app = An external application is needed to handle:\n\n torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n @@ -14,12 +10,8 @@ torbutton.popup.external.suggest = \nIf this file is untrusted, you should eithe torbutton.popup.launch = Launch application torbutton.popup.cancel = Cancel torbutton.popup.dontask = Always launch applications from now on -torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory. -torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location. -torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device. torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/skin/p.png b/src/chrome/skin/p.png deleted file mode 100644 index aa65cab..0000000 Binary files a/src/chrome/skin/p.png and /dev/null differ diff --git a/src/chrome/skin/poff.png b/src/chrome/skin/poff.png deleted file mode 100644 index 5ab9e61..0000000 Binary files a/src/chrome/skin/poff.png and /dev/null differ diff --git a/src/chrome/skin/punknown.png b/src/chrome/skin/punknown.png deleted file mode 100644 index 346b6a5..0000000 Binary files a/src/chrome/skin/punknown.png and /dev/null differ diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css index 2c6bbfb..5bdcaa6 100644 --- a/src/chrome/skin/torbutton.css +++ b/src/chrome/skin/torbutton.css @@ -32,25 +32,6 @@ toolbar[iconsize="small"] #torbutton-button[tbUpdateNeeded="true"] { -moz-image-region: rect(1px, 17px, 17px, 1px); } -#torbutton-panel { - list-style-image: url("chrome://torbutton/skin/tor-16.png"); -} -#torbutton-panel[tbstatus="on"] { - list-style-image: url("chrome://torbutton/skin/tor-enabled-16.png"); -} -#torbutton-panel[tbstatus="off"] { - list-style-image: url("chrome://torbutton/skin/tor-disabled-16.png"); -} -toolbar[iconsize="small"] #torbutton-panel { - list-style-image: url("chrome://torbutton/skin/tor-16.png"); -} -toolbar[iconsize="small"] #torbutton-panel[tbstatus="on"] { - list-style-image: url("chrome://torbutton/skin/tor-enabled-16.png"); -} -toolbar[iconsize="small"] #torbutton-panel[tbstatus="off"] { - list-style-image: url("chrome://torbutton/skin/tor-disabled-16.png"); -} - #torbutton-button-tb { list-style-image: url("chrome://torbutton/skin/tor-24.png"); } @@ -89,18 +70,6 @@ toolbar[iconsize="small"] #torbutton-button-tb-msg[tbstatus="off"] { list-style-image: url("chrome://torbutton/skin/tor-disabled-16.png"); } -statusbarpanel#plugins-status { - list-style-image: url("chrome://torbutton/skin/punknown.png"); -} - -statusbarpanel#plugins-status[status="1"] { - list-style-image: url("chrome://torbutton/skin/p.png"); -} - -statusbarpanel#plugins-status[status="0"] { - list-style-image: url("chrome://torbutton/skin/poff.png"); -} - #torbutton-checkForUpdate[tbUpdateNeeded] { font-weight: bold; } diff --git a/src/components/cookie-jar-selector.js b/src/components/cookie-jar-selector.js index c06fef7..33e5800 100644 --- a/src/components/cookie-jar-selector.js +++ b/src/components/cookie-jar-selector.js @@ -161,8 +161,7 @@ function CookieJarSelector() { }; this.addProtectedCookie = function(cookie) { - var tor_enabled = this.prefs.getBoolPref("extensions.torbutton.tor_enabled"); - var name = tor_enabled? "tor" : "nontor"; + var name = "tor"; var cookies = this.getProtectedCookies(name); if (typeof(cookies) == "undefined" || cookies == null @@ -229,8 +228,7 @@ function CookieJarSelector() { }; this.protectCookies = function(cookies) { - var tor_enabled = this.prefs.getBoolPref("extensions.torbutton.tor_enabled"); - var name = tor_enabled? "tor" : "nontor"; + var name = "tor"; this._writeProtectCookies(cookies,name); if (!this.prefs.getBoolPref("extensions.torbutton.block_disk")) { // save protected cookies to file @@ -438,22 +436,10 @@ function CookieJarSelector() { return; } jarThis.logger.log(3, "Got timer update. Saving changed cookies to jar."); - var tor_enabled = - jarThis.prefs.getBoolPref("extensions.torbutton.tor_enabled"); - - if(tor_enabled != - jarThis.prefs.getBoolPref("extensions.torbutton.settings_applied")) { - jarThis.logger.log(3, "Neat. Timer fired during transition."); - return; - } this.cookie_changed = false; - if(tor_enabled) { - jarThis.saveCookies("tor"); - } else { - jarThis.saveCookies("nontor"); - } + jarThis.saveCookies("tor"); jarThis.logger.log(2, "Timer done. Cookies saved"); } }; @@ -509,7 +495,9 @@ CookieJarSelector.prototype = var prefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch); this.timerCallback.cookie_changed = true; - if (aData == "added" && prefs.getBoolPref("extensions.torbutton.cookie_auto_protect") && ((!prefs.getBoolPref("extensions.torbutton.tor_memory_jar") && prefs.getBoolPref("extensions.torbutton.tor_enabled")) || (!prefs.getBoolPref("extensions.torbutton.nontor_memory_jar") && !prefs.getBoolPref("extensions.torbutton.tor_enabled")))) + if (aData == "added" + && prefs.getBoolPref("extensions.torbutton.cookie_auto_protect") + && !prefs.getBoolPref("extensions.torbutton.tor_memory_jar")) { this.addProtectedCookie(aSubject.QueryInterface(Components.interfaces.nsICookie2));//protect the new cookie! } diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index 7b22a90..e56fed3 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -1,4 +1,4 @@ -// Bug 1506 Android P1/TBB P5: This code providers users with notification +// Bug 1506 Android P1/TBB P5: This code provides users with notification // in the event of external app launch. We want it to exist in the desktop // port, but it is probably useless for Android. @@ -61,11 +61,6 @@ ExternalAppBlocker.prototype = // method of nsIClassInfo getHelperForLanguage: function(count) { return null; }, - /* Determine whether we should ask the user to run the app */ - _blockApp: function() { - return this._prefs.getBoolPref("extensions.torbutton.tor_enabled"); - }, - // Returns true if launch should proceed. _confirmLaunch: function() { if (!this._prefs.getBoolPref("extensions.torbutton.launch_warning")) { @@ -106,7 +101,7 @@ ExternalAppBlocker.prototype = if (topic == "external-app-requested") { this.logger.log(3, "External app requested"); // subject.data is true if the launch should be canceled. - if (this._blockApp() && (subject instanceof Ci.nsISupportsPRBool) + if ((subject instanceof Ci.nsISupportsPRBool) && !subject.data /* not canceled already */ && !this._confirmLaunch()) { subject.data = true; // The user said to cancel the launch. diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js index de39e64..467019e 100644 --- a/src/components/startup-observer.js +++ b/src/components/startup-observer.js @@ -8,11 +8,7 @@ * Cases tested (each during Tor and Non-Tor, FF4 and FF3.6) * 1. Crash * 2. Upgrade - * 3. Uninstall: - * XXX: Currently broken. Need - * https://developer.mozilla.org/en/Addons/Add-on_Manager/AddonListener#onOper… - * https://developer.mozilla.org/en/Addons/Add-on_Manager/AddonManager#addAddo… - * 4. Fresh install + * 3. Fresh install * *************************************************************************/ @@ -24,20 +20,14 @@ const Cr = Components.results; const kMODULE_NAME = "Startup"; const kMODULE_CONTRACTID = "@torproject.org/startup-observer;1"; const kMODULE_CID = Components.ID("06322def-6fde-4c06-aef6-47ae8e799629"); -const TORBUTTON_EXTENSION_UUID = "{E0204BD5-9D31-402B-A99D-A6AA8FFEBDCA}"; function StartupObserver() { - this._uninstall = false; this.logger = Components.classes["@torproject.org/torbutton-logger;1"] .getService(Components.interfaces.nsISupports).wrappedJSObject; this._prefs = Components.classes["@mozilla.org/preferences-service;1"] .getService(Components.interfaces.nsIPrefBranch); this.logger.log(3, "Startup Observer created"); - var observerService = Cc["@mozilla.org/observer-service;1"]. - getService(Ci.nsIObserverService); - observerService.addObserver(this, "quit-application-granted", false); - var env = Cc["@mozilla.org/process/environment;1"] .getService(Ci.nsIEnvironment); var prefName = "browser.startup.homepage"; @@ -64,49 +54,9 @@ function StartupObserver() { } catch(e) { this.logger.log(4, "Early proxy change failed. Will try again at profile load. Error: "+e); } - - // Bug 1506 P2/P3: You probably want to register this observer to clean up - // prefs if you're going to support using normal firefox. - Components.utils.import("resource://gre/modules/AddonManager.jsm"); - this.onEnabling = this.onOperationCancelled; - this.onDisabling = this.onUninstalling; - AddonManager.addAddonListener(this); } StartupObserver.prototype = { - // AddonListeners. We need to listen to see if we are about to be - // disabled or uninstalled. We also need to track this, and listen - // for an arbitrary "cancel" event that changes the current state. - // XXX: If firefox crashes before quit here, and still manages to uninstall - // us somehow, we will leave the browser in a sorry state... Let's hope they - // have the sense not to uninstall addons after an improper shutdown/crash - // (or at least give us this event again in that case). - // Bug 1506 P2/P3: You probably want to register this observer to clean up - // prefs if you're going to support using normal firefox. - onUninstalling: function(addon, needsRestart) { - if (addon.id.toUpperCase() == TORBUTTON_EXTENSION_UUID) { - this._uninstall = true; - this.logger.log(4, "User requested disable/uninstall of Torbutton. Preparing for death."); - - if (!needsRestart) { - this.logger.log(5, - "Torbutton uninstalled/disabled, but a restart is not needed? How can this happen?"); - } - } - }, - - // This is done in the constructor. JS doesn't allow this... - //onDisabling: this.onUninstalling, - - // Bug 1506 P2/P3: You probably want to register this observer to clean up - // prefs if you're going to support using normal firefox. - onOperationCancelled: function(addon) { - if (addon.id.toUpperCase() == TORBUTTON_EXTENSION_UUID) { - this.logger.log(4, "Uninstall of Torbutton canceled. Hurray!"); - this._uninstall = false; - } - }, - // Bug 6803: We need to get the env vars early due to // some weird proxy caching code that showed up in FF15. // Otherwise, homepage domain loads fail forever. @@ -116,37 +66,27 @@ StartupObserver.prototype = { .getService(Components.interfaces.nsIEnvironment); if (environ.exists("TOR_SOCKS_PORT")) { - this._prefs.setIntPref('extensions.torbutton.socks_port', - parseInt(environ.get("TOR_SOCKS_PORT"))); if (this.is_tbb) { - this._prefs.setIntPref('network.proxy.socks_port', parseInt(environ.get("TOR_SOCKS_PORT"))); - - // XXX: Hack for TBB people who alternate between transproxy and non - this._prefs.setCharPref('extensions.torbutton.settings_method', 'recommended'); - this._prefs.setBoolPref('extensions.torbutton.saved.transparentTor', false); + this._prefs.setIntPref('network.proxy.socks_port', + parseInt(environ.get("TOR_SOCKS_PORT"))); this._prefs.setBoolPref('network.proxy.socks_remote_dns', true); this._prefs.setIntPref('network.proxy.type', 1); } this.logger.log(3, "Reset socks port to "+environ.get("TOR_SOCKS_PORT")); - } else if (this._prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') { - this._prefs.setIntPref('extensions.torbutton.socks_port', 9150); + } else { + this._prefs.setIntPref('network.proxy.socks_port', 9150); } if (environ.exists("TOR_SOCKS_HOST")) { - this._prefs.setCharPref('extensions.torbutton.socks_host', environ.get("TOR_SOCKS_HOST")); if (this.is_tbb) { this._prefs.setCharPref('network.proxy.socks', environ.get("TOR_SOCKS_HOST")); } - } else if (this._prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') { - this._prefs.setCharPref('extensions.torbutton.socks_host', '127.0.0.1'); + } else { + this._prefs.setCharPref('network.proxy.socks', '127.0.0.1'); } if (environ.exists("TOR_TRANSPROXY")) { this.logger.log(3, "Resetting Tor settings to transproxy"); - this._prefs.setCharPref('extensions.torbutton.settings_method', 'transparent'); - this._prefs.setBoolPref('extensions.torbutton.saved.transparentTor', true); - this._prefs.setIntPref('extensions.torbutton.socks_port', 0); - this._prefs.setCharPref('extensions.torbutton.socks_host', ""); if (this.is_tbb) { this._prefs.setBoolPref('network.proxy.socks_remote_dns', false); this._prefs.setIntPref('network.proxy.type', 0); @@ -170,32 +110,6 @@ StartupObserver.prototype = { this._prefs.setBoolPref("extensions.torbutton.startup", true); this.setProxySettings(); - } else if (topic == "quit-application-granted") { - // Bug 1506 P2/P3: You probably want to register this observer to clean up - // prefs if you're going to support using normal firefox. - this.logger.log(3, "Got firefox quit event."); - var chrome = null; - try { - var wm = Cc["@mozilla.org/appshell/window-mediator;1"] - .getService(Components.interfaces.nsIWindowMediator); - var chrome = wm.getMostRecentWindow("navigator:browser"); - } catch(e) { - this.logger.log(3, "Exception on shutdown window: "+e); - } - - if (this._uninstall) { - if (chrome) { - chrome.torbutton_disable_tor(); - this.logger.log(4, - "Disabling Torbutton prior to uninstall."); - } else { - this.logger.log(5, - "User asked to uninstall, but we have no window!"); - } - } - - this.logger.log(3, "Torbutton normal exit."); - //this.unregister(); } // In all cases, force prefs to be synced to disk diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 1e46694..a3105da 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -4,71 +4,20 @@ pref("extensions.torbutton.logmethod",1); // 0=stdout, 1=errorconsole, 2=debuglo // Display prefs pref("extensions.torbutton.display_circuit", true); -pref("extensions.torbutton.display_panel",true); -pref("extensions.torbutton.panel_style",'text'); pref("extensions.torbutton(a)torproject.org.description", "chrome://torbutton/locale/torbutton.properties"); pref("extensions.torbutton.updateNeeded", false); pref("extensions.torbutton.hide_sync_ui", true); -// proxy prefs -pref("extensions.torbutton.settings_method",'recommended'); -pref("extensions.torbutton.use_privoxy",true); -pref("extensions.torbutton.http_proxy",""); -pref("extensions.torbutton.http_port",0); -pref("extensions.torbutton.https_proxy",""); -pref("extensions.torbutton.https_port",0); -pref("extensions.torbutton.ftp_proxy",""); -pref("extensions.torbutton.ftp_port",0); -pref("extensions.torbutton.gopher_proxy",""); -pref("extensions.torbutton.gopher_port",0); -pref("extensions.torbutton.socks_host",""); -pref("extensions.torbutton.socks_port",0); -pref("extensions.torbutton.socks_version",5); +// Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true); pref("extensions.torbutton.test_url","https://check.torproject.org/?TorButton=true"); pref("extensions.torbutton.test_url_interactive", "https://check.torproject.org/?lang=__LANG__"); pref("extensions.torbutton.local_tor_check",true); -pref("extensions.torbutton.test_failed",false); -pref("extensions.torbutton.no_proxies_on",""); pref("extensions.torbutton.versioncheck_url","https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions"); pref("extensions.torbutton.versioncheck_enabled",true); pref("extensions.torbutton.use_nontor_proxy",false); -// XXX: wtf prefs? These seem not actually connected, but govern -// if user wants own tor proxy settings -pref("extensions.torbutton.custom.http_proxy",""); -pref("extensions.torbutton.custom.http_port",0); -pref("extensions.torbutton.custom.https_proxy",""); -pref("extensions.torbutton.custom.https_port",0); -pref("extensions.torbutton.custom.ftp_proxy",""); -pref("extensions.torbutton.custom.ftp_port",0); -pref("extensions.torbutton.custom.gopher_proxy",""); -pref("extensions.torbutton.custom.gopher_port",0); -pref("extensions.torbutton.custom.socks_host",""); -pref("extensions.torbutton.custom.socks_port",0); -pref("extensions.torbutton.custom.socks_version",5); - -// saved prefs: -pref("extensions.torbutton.saved.type", 0); -pref("extensions.torbutton.saved.http_proxy", ""); -pref("extensions.torbutton.saved.http_port",0); -pref("extensions.torbutton.saved.https_proxy",""); -pref("extensions.torbutton.saved.https_port",0); -pref("extensions.torbutton.saved.ftp_proxy",""); -pref("extensions.torbutton.saved.ftp_port",0); -pref("extensions.torbutton.saved.gopher_proxy",""); -pref("extensions.torbutton.saved.gopher_port",0); -pref("extensions.torbutton.saved.socks_host",""); -pref("extensions.torbutton.saved.socks_version",0); -pref("extensions.torbutton.saved.socks_port",0); -pref("extensions.torbutton.saved.socks_remote_dns",false); -pref("extensions.torbutton.saved.no_proxies_on",""); -pref("extensions.torbutton.saved.transparentTor",false); - // State prefs: -pref("extensions.torbutton.tor_enabled",false); -pref("extensions.torbutton.proxies_applied",false); -pref("extensions.torbutton.settings_applied",false); pref("extensions.torbutton.startup",false); pref("extensions.torbutton.inserted_button",false); pref("extensions.torbutton.prompted_language",false); @@ -81,21 +30,16 @@ pref("extensions.torbutton.startup_resize_period", true); // Security prefs: pref("extensions.torbutton.no_tor_plugins",true); -pref("extensions.torbutton.cookie_jars",false); pref("extensions.torbutton.cookie_protections",true); pref("extensions.torbutton.cookie_auto_protect",false); -pref("extensions.torbutton.dual_cookie_jars",true); pref("extensions.torbutton.spoof_english",true); pref("extensions.torbutton.clear_http_auth",true); -pref("extensions.torbutton.close_tor",false); -pref("extensions.torbutton.close_nontor",false); pref("extensions.torbutton.close_newnym",true); pref("extensions.torbutton.resize_new_windows",true); pref("extensions.torbutton.resize_windows",true); pref("extensions.torbutton.startup_state", 2); // 0=non-tor, 1=tor, 2=last pref("extensions.torbutton.tor_memory_jar",false); pref("extensions.torbutton.nontor_memory_jar",false); -pref("extensions.torbutton.tz_string",""); pref("extensions.torbutton.launch_warning",true); // Opt out of Firefox addon pings: // https://developer.mozilla.org/en/Addons/Working_with_AMO

1 0

[tor-browser/tor-browser-45.3.0esr-6.0-1] fixup! Bug 13252 - Do not store data in the app bundle
by gk＠torproject.org 23 Aug '16

23 Aug '16

commit 7c50120b217807b98a8a99d16c53b760d2119280 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 26 11:49:20 2016 -0400 fixup! Bug 13252 - Do not store data in the app bundle For Orfox, store browser data in the app home directory. Fixes bug 19706. --- toolkit/xre/nsXREDirProvider.cpp | 2 ++ xpcom/io/TorFileUtils.cpp | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp index e3c1449..f50fed1 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -1280,6 +1280,7 @@ nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal) nsresult rv = GetTorBrowserUserDataDir(getter_AddRefs(localDir)); NS_ENSURE_SUCCESS(rv, rv); +#if !defined(ANDROID) #ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR rv = localDir->AppendNative(NS_LITERAL_CSTRING("Browser")); #else @@ -1287,6 +1288,7 @@ nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal) XPCOM_FILE_PATH_SEPARATOR "Browser")); #endif NS_ENSURE_SUCCESS(rv, rv); +#endif if (aLocal) { rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); diff --git a/xpcom/io/TorFileUtils.cpp b/xpcom/io/TorFileUtils.cpp index 2b0b100..c45961a 100644 --- a/xpcom/io/TorFileUtils.cpp +++ b/xpcom/io/TorFileUtils.cpp @@ -81,6 +81,13 @@ TorBrowser_GetUserDataDir(nsIFile *aExeFile, nsIFile** aFile) } #endif +#elif defined(ANDROID) + // Orfox stores data in the app home directory. + const char* homeDir = getenv("HOME"); + if (!homeDir || !*homeDir) + return NS_ERROR_FAILURE; + nsresult rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true, + getter_AddRefs(tbDataDir)); #else // User data is embedded within the application directory (i.e., // TOR_BROWSER_DATA_OUTSIDE_APP_DIR is not defined).

1 0

[tor-browser/tor-browser-45.3.0esr-6.5-1] fixup! Bug 13252 - Do not store data in the app bundle
by gk＠torproject.org 23 Aug '16

23 Aug '16

commit b8726ee81e6eca2e302e2ea85c0d09ad22be1ec5 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 26 11:49:20 2016 -0400 fixup! Bug 13252 - Do not store data in the app bundle For Orfox, store browser data in the app home directory. Fixes bug 19706. --- toolkit/xre/nsXREDirProvider.cpp | 2 ++ xpcom/io/TorFileUtils.cpp | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp index e3c1449..f50fed1 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -1280,6 +1280,7 @@ nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal) nsresult rv = GetTorBrowserUserDataDir(getter_AddRefs(localDir)); NS_ENSURE_SUCCESS(rv, rv); +#if !defined(ANDROID) #ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR rv = localDir->AppendNative(NS_LITERAL_CSTRING("Browser")); #else @@ -1287,6 +1288,7 @@ nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal) XPCOM_FILE_PATH_SEPARATOR "Browser")); #endif NS_ENSURE_SUCCESS(rv, rv); +#endif if (aLocal) { rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); diff --git a/xpcom/io/TorFileUtils.cpp b/xpcom/io/TorFileUtils.cpp index 2b0b100..c45961a 100644 --- a/xpcom/io/TorFileUtils.cpp +++ b/xpcom/io/TorFileUtils.cpp @@ -81,6 +81,13 @@ TorBrowser_GetUserDataDir(nsIFile *aExeFile, nsIFile** aFile) } #endif +#elif defined(ANDROID) + // Orfox stores data in the app home directory. + const char* homeDir = getenv("HOME"); + if (!homeDir || !*homeDir) + return NS_ERROR_FAILURE; + nsresult rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true, + getter_AddRefs(tbDataDir)); #else // User data is embedded within the application directory (i.e., // TOR_BROWSER_DATA_OUTSIDE_APP_DIR is not defined).

1 0

[tor-browser-bundle/master] Actually fix that bug with shifting when there's nothing to shift.
by gk＠torproject.org 19 Aug '16

19 Aug '16

commit ce368417b914f74383bafddd268b2f1a2e9dc509 Author: Linus Nordberg <linus(a)torproject.org> Date: Fri Aug 19 13:24:24 2016 +0200 Actually fix that bug with shifting when there's nothing to shift. --- tools/continuous-builds/park-nightly.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh index dff87e2..378eb21 100755 --- a/tools/continuous-builds/park-nightly.sh +++ b/tools/continuous-builds/park-nightly.sh @@ -8,7 +8,7 @@ if [ "$1" = "-v" ]; then fi DESTDIR=~/public_html/builds -if [ -n "$DESTDIR" ]; then +if [ -n "$1" ]; then DESTDIR=$1 shift fi

1 0

[tor-browser-bundle/hardened-builds] Actually fix that bug with shifting when there's nothing to shift.
by gk＠torproject.org 19 Aug '16

19 Aug '16

commit 4424456c869552bf9b238fbc15a390a0d5ca8d9a Author: Linus Nordberg <linus(a)torproject.org> Date: Fri Aug 19 13:24:24 2016 +0200 Actually fix that bug with shifting when there's nothing to shift. --- tools/continuous-builds/park-nightly.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh index dff87e2..378eb21 100755 --- a/tools/continuous-builds/park-nightly.sh +++ b/tools/continuous-builds/park-nightly.sh @@ -8,7 +8,7 @@ if [ "$1" = "-v" ]; then fi DESTDIR=~/public_html/builds -if [ -n "$DESTDIR" ]; then +if [ -n "$1" ]; then DESTDIR=$1 shift fi

1 0

[tor-browser-bundle/hardened-builds] Don't shift unconditionally.
by gk＠torproject.org 19 Aug '16

19 Aug '16

commit c1d4e1f132cbe239b6586b456822017a5276f7ad Author: Linus Nordberg <linus(a)torproject.org> Date: Fri Aug 19 13:00:17 2016 +0200 Don't shift unconditionally. --- tools/continuous-builds/park-nightly.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh index 944e3a1..dff87e2 100755 --- a/tools/continuous-builds/park-nightly.sh +++ b/tools/continuous-builds/park-nightly.sh @@ -7,8 +7,11 @@ if [ "$1" = "-v" ]; then shift fi -DESTDIR=$1; shift -[ -z "$DESTDIR" ] && DESTDIR=~/public_html/builds +DESTDIR=~/public_html/builds +if [ -n "$DESTDIR" ]; then + DESTDIR=$1 + shift +fi do_check() { SAVEDPWD=$PWD

1 0

[tor-browser-bundle/master] Don't shift unconditionally.
by gk＠torproject.org 19 Aug '16

19 Aug '16

commit 0b888ea05c97153c40a02b4c676d5291f9b3b4c8 Author: Linus Nordberg <linus(a)torproject.org> Date: Fri Aug 19 13:00:17 2016 +0200 Don't shift unconditionally. --- tools/continuous-builds/park-nightly.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh index 944e3a1..dff87e2 100755 --- a/tools/continuous-builds/park-nightly.sh +++ b/tools/continuous-builds/park-nightly.sh @@ -7,8 +7,11 @@ if [ "$1" = "-v" ]; then shift fi -DESTDIR=$1; shift -[ -z "$DESTDIR" ] && DESTDIR=~/public_html/builds +DESTDIR=~/public_html/builds +if [ -n "$DESTDIR" ]; then + DESTDIR=$1 + shift +fi do_check() { SAVEDPWD=$PWD

1 0

[torbutton/master] Bug 19837: Whitelist internal URLs that Firefox requires for media.
by gk＠torproject.org 19 Aug '16

19 Aug '16

commit 61b395a433c821bd4b17f69b956eb149f12f525e Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Mon Aug 15 18:53:05 2016 +0000 Bug 19837: Whitelist internal URLs that Firefox requires for media. Firefox requires being able to load chrome:// and resource:// URLs for things like the media player, with the origin set to the remote URL that triggered the load. This is unfortunate in that there's no way to disambiguate malicious JS versus someone opening a video file (for example). See https://trac.torproject.org/projects/tor/ticket/19837#comment:5 for why this is a huge nightmare and will eventually require C++ code. --- src/components/content-policy.js | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/components/content-policy.js b/src/components/content-policy.js index e025ecd..3379eb7 100644 --- a/src/components/content-policy.js +++ b/src/components/content-policy.js @@ -21,7 +21,26 @@ ContentPolicy.prototype = { contractID: "@torproject.org/content-policy;1", QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPolicy]), + uriWhitelist: { + // Video playback. + "chrome://global/content/TopLevelVideoDocument.js": Ci.nsIContentPolicy.TYPE_SCRIPT, + "resource://gre/res/TopLevelVideoDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, + "chrome://global/skin/media/TopLevelVideoDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, + "chrome://global/content/bindings/videocontrols.xml": Ci.nsIContentPolicy.TYPE_XBL, + "chrome://global/content/bindings/scale.xml": Ci.nsIContentPolicy.TYPE_XBL, + "chrome://global/content/bindings/progressmeter.xml": Ci.nsIContentPolicy.TYPE_XBL, + + // Image display. + "resource://gre/res/ImageDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, + "resource://gre/res/TopLevelImageDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, + "chrome://global/skin/media/TopLevelImageDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, + + // Resizing text boxes. + "chrome://global/content/bindings/resizer.xml": Ci.nsIContentPolicy.TYPE_XBL, + }, + shouldLoad: function(aContentType, aContentLocation, aRequestOrigin, aContext, aMimeTypeGuess, aExtra) { + // Accept if no content URI or scheme is not a resource/chrome. if (!aContentLocation || !(aContentLocation.schemeIs('resource') || aContentLocation.schemeIs('chrome'))) return Ci.nsIContentPolicy.ACCEPT; @@ -34,6 +53,16 @@ ContentPolicy.prototype = { if (Ci.nsIContentPolicy.TYPE_DOCUMENT === aContentType) return Ci.nsIContentPolicy.ACCEPT; + // There's certain things that break horribly if they aren't allowed to + // access URIs with proscribed schemes, with `aContentOrigin` basically + // set to arbibrary URIs. + // + // XXX: Feature gate this behind the security slider or something, I don't + // give a fuck. + if (aContentLocation.spec in this.uriWhitelist) + if (this.uriWhitelist[aContentLocation.spec] == aContentType) + return Ci.nsIContentPolicy.ACCEPT; + return Ci.nsIContentPolicy.REJECT_REQUEST; },

1 0

[tor-browser-bundle/hardened-builds] Version bumps for hardened nightly
by gk＠torproject.org 19 Aug '16

19 Aug '16

commit 0d8810c64d578e2b7cf659f2aecfe12b07d2fab5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 19 07:21:00 2016 +0000 Version bumps for hardened nightly --- gitian/versions.nightly | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index dead59c..1d216fa 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,7 +17,7 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.2.0esr +FIREFOX_VERSION=45.3.0esr TORBROWSER_UPDATE_CHANNEL=default @@ -55,7 +55,7 @@ GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.1t GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.2.0 CLANG_VER=r247539 @@ -77,7 +77,7 @@ ELFUTILS_VER=0.160 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.11-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.14-fx+fn+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -112,7 +112,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390 +NOSCRIPT_HASH=39bc71be20c318578239ea791c0341dbfcd13b33559af080cea386eeec08b337 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] NoScript version bump for nightlies
by gk＠torproject.org 19 Aug '16

19 Aug '16

commit 0a0a8c01236ddb50f5f4f87da28758f8e65214de Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 19 07:19:11 2016 +0000 NoScript version bump for nightlies --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 749f8ea..f92a471 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -75,7 +75,7 @@ NSIS_VER=2.51 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.12-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.14-fx+fn+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -109,7 +109,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=3fa641dcb60455c950cef0c15effa8ca060b3b05405f46f55cbdb922929027e7 +NOSCRIPT_HASH=39bc71be20c318578239ea791c0341dbfcd13b33559af080cea386eeec08b337 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Fold in stable changelog
by gk＠torproject.org 19 Aug '16

19 Aug '16

commit 10aa41a5d6abf25a912616c39d9e39ebb7cc29d6 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 19 09:15:28 2016 +0200 Fold in stable changelog --- Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c0abf86..4506e37 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,9 @@ +Tor Browser 6.0.4 -- August 16 + * All Platforms + * Update Tor to 0.2.8.6 + * Update NoScript to 2.9.0.14 + * Bug 19890: Disable installation of system addons + Tor Browser 6.5a2-hardened -- August 3 * All Platforms * Update Firefox to 45.3.0esr

1 0

[tor-browser-bundle/hardened-builds] Make park-nightly.sh deal with hardened builds as well.
by gk＠torproject.org 18 Aug '16

18 Aug '16

commit 3c531d7b77ef6420de1ac03e793afb200a9dd72c Author: Linus Nordberg <linus(a)torproject.org> Date: Mon Apr 25 11:02:42 2016 +0200 Make park-nightly.sh deal with hardened builds as well. - Get the name of the directory in the tar file from the tar file rather than trying to construct it using a static string and date(1). This to accomodate hardened builds and to remove the bug where we start the build before midnight but finish it after. - Add explaining comments. - Change the name of the stamp file to reflect that we're using this for more than ordinary nightlies. - Rename some badly named variables. - Prune old hardened builds too. --- tools/continuous-builds/park-nightly.sh | 50 +++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh index 63967c9..944e3a1 100755 --- a/tools/continuous-builds/park-nightly.sh +++ b/tools/continuous-builds/park-nightly.sh @@ -1,18 +1,14 @@ #! /bin/sh -# usage: park-nightly.sh [DIR] - -V=1 #debug is enabled by default for now +# usage: park-nightly.sh [DESTDIR] +V=0 # Verbose. if [ "$1" = "-v" ]; then V=1 shift fi -DIR=$1 -[ -z "$DIR" ] && DIR=~/public_html/builds - -DSTDIR=tbb-nightly-$(date -u +%F) # Must be the same as at source. -[ -z "$V" ] || echo "Aiming to fill up $DIR/$DSTDIR" +DESTDIR=$1; shift +[ -z "$DESTDIR" ] && DESTDIR=~/public_html/builds do_check() { SAVEDPWD=$PWD @@ -25,29 +21,41 @@ do_check() { cd $SAVEDPWD } -if [ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ]; then - [ -z "$V" ] || echo "Files already here, just doing the checking" - do_check $DIR/$DSTDIR - exit -fi - +# Create a staging directory and cd there. STAGINGDIR=.staging.$(date -u +%s) [ -z "$V" ] || echo "Temporary staging dir is $STAGINGDIR" [ -d $STAGINGDIR ] || mkdir $STAGINGDIR chmod 700 $STAGINGDIR; cd $STAGINGDIR || exit 7 +# Untar incoming data. [ -z "$V" ] || echo "Saving files to disk" TAROPT=x [ -z "$V" ] || TAROPT=${TAROPT}v tar $TAROPT -f - || exit 6 -touch $DSTDIR/tbb-nightly.stamp -do_check $DSTDIR || exit 2 -[ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ] && \ - rm -rf $DIR/$DSTDIR -[ -z "$V" ] || echo "Moving $DSTDIR to $DIR/" -mv $DSTDIR $DIR/ || exit 1 +# Tar file should contain exactly one directory. +INCOMING=$(ls | head -1) +[ -z "$V" ] || echo "Aiming to fill up $DESTDIR/$INCOMING" + +# Stamp the directory. +touch $INCOMING/park-nightly.stamp + +# Verify checksums. +do_check $INCOMING || exit 2 + +# Clean up destination directory iff it has a stamp file. +[ -d $DESTDIR/$INCOMING ] && [ -e $DESTDIR/$INCOMING/park-nightly.stamp ] && \ + rm -rf $DESTDIR/$INCOMING + +# Move incoming data to destination directory. +[ -d $DESTDIR ] || mkdir $DESTDIR +[ -z "$V" ] || echo "Moving $INCOMING to $DESTDIR/" +mv $INCOMING $DESTDIR/ || exit 1 [ -z "$V" ] || echo "All good, all good" +# Clean up staging directory and remove old builds. cd ..; rmdir $STAGINGDIR -[ -x ~/usr/bin/prune-old-builds ] && ~/usr/bin/prune-old-builds $DIR +if [ -x ~/usr/bin/prune-old-builds ]; then + ~/usr/bin/prune-old-builds --prefix=tbb-nightly- $DESTDIR + ~/usr/bin/prune-old-builds --prefix=tbb-nightly-hardened- $DESTDIR +fi

1 0

[tor-browser-bundle/hardened-builds] Add BUILD_TBB_FAKE_STATUS knob.
by gk＠torproject.org 18 Aug '16

18 Aug '16

commit 1ca598902fc50e0064c82a66414630ccbea5d385 Author: Linus Nordberg <linus(a)torproject.org> Date: Mon Apr 25 11:05:52 2016 +0200 Add BUILD_TBB_FAKE_STATUS knob. Useful when testing parts of the machinery not related to the actualy build, like uploading to remote host. Set BUILD_TBB_FAKE_STATUS to 'done' and the script will skip the build part. --- tools/continuous-builds/build-tbb.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 37e912a..7a7e812 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -43,6 +43,7 @@ logfile=build-logs/$(date -u +%s).log cd $BUILDDIR || exit 1 status=init +[ -n "$BUILD_TBB_FAKE_STATUS" ] && status=$BUILD_TBB_FAKE_STATUS n=0 MAKE_TARGET=$TARGET while [ $status != done ]; do

1 0

[tor-browser-bundle/master] Make park-nightly.sh deal with hardened builds as well.
by gk＠torproject.org 18 Aug '16

18 Aug '16

commit c13c5f559ad3e6d848b73a3ca42f08e2ae657161 Author: Linus Nordberg <linus(a)torproject.org> Date: Mon Apr 25 11:02:42 2016 +0200 Make park-nightly.sh deal with hardened builds as well. - Get the name of the directory in the tar file from the tar file rather than trying to construct it using a static string and date(1). This to accomodate hardened builds and to remove the bug where we start the build before midnight but finish it after. - Add explaining comments. - Change the name of the stamp file to reflect that we're using this for more than ordinary nightlies. - Rename some badly named variables. - Prune old hardened builds too. --- tools/continuous-builds/park-nightly.sh | 50 +++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh index 63967c9..944e3a1 100755 --- a/tools/continuous-builds/park-nightly.sh +++ b/tools/continuous-builds/park-nightly.sh @@ -1,18 +1,14 @@ #! /bin/sh -# usage: park-nightly.sh [DIR] - -V=1 #debug is enabled by default for now +# usage: park-nightly.sh [DESTDIR] +V=0 # Verbose. if [ "$1" = "-v" ]; then V=1 shift fi -DIR=$1 -[ -z "$DIR" ] && DIR=~/public_html/builds - -DSTDIR=tbb-nightly-$(date -u +%F) # Must be the same as at source. -[ -z "$V" ] || echo "Aiming to fill up $DIR/$DSTDIR" +DESTDIR=$1; shift +[ -z "$DESTDIR" ] && DESTDIR=~/public_html/builds do_check() { SAVEDPWD=$PWD @@ -25,29 +21,41 @@ do_check() { cd $SAVEDPWD } -if [ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ]; then - [ -z "$V" ] || echo "Files already here, just doing the checking" - do_check $DIR/$DSTDIR - exit -fi - +# Create a staging directory and cd there. STAGINGDIR=.staging.$(date -u +%s) [ -z "$V" ] || echo "Temporary staging dir is $STAGINGDIR" [ -d $STAGINGDIR ] || mkdir $STAGINGDIR chmod 700 $STAGINGDIR; cd $STAGINGDIR || exit 7 +# Untar incoming data. [ -z "$V" ] || echo "Saving files to disk" TAROPT=x [ -z "$V" ] || TAROPT=${TAROPT}v tar $TAROPT -f - || exit 6 -touch $DSTDIR/tbb-nightly.stamp -do_check $DSTDIR || exit 2 -[ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ] && \ - rm -rf $DIR/$DSTDIR -[ -z "$V" ] || echo "Moving $DSTDIR to $DIR/" -mv $DSTDIR $DIR/ || exit 1 +# Tar file should contain exactly one directory. +INCOMING=$(ls | head -1) +[ -z "$V" ] || echo "Aiming to fill up $DESTDIR/$INCOMING" + +# Stamp the directory. +touch $INCOMING/park-nightly.stamp + +# Verify checksums. +do_check $INCOMING || exit 2 + +# Clean up destination directory iff it has a stamp file. +[ -d $DESTDIR/$INCOMING ] && [ -e $DESTDIR/$INCOMING/park-nightly.stamp ] && \ + rm -rf $DESTDIR/$INCOMING + +# Move incoming data to destination directory. +[ -d $DESTDIR ] || mkdir $DESTDIR +[ -z "$V" ] || echo "Moving $INCOMING to $DESTDIR/" +mv $INCOMING $DESTDIR/ || exit 1 [ -z "$V" ] || echo "All good, all good" +# Clean up staging directory and remove old builds. cd ..; rmdir $STAGINGDIR -[ -x ~/usr/bin/prune-old-builds ] && ~/usr/bin/prune-old-builds $DIR +if [ -x ~/usr/bin/prune-old-builds ]; then + ~/usr/bin/prune-old-builds --prefix=tbb-nightly- $DESTDIR + ~/usr/bin/prune-old-builds --prefix=tbb-nightly-hardened- $DESTDIR +fi

1 0

[tor-browser-bundle/master] Add BUILD_TBB_FAKE_STATUS knob.
by gk＠torproject.org 18 Aug '16

18 Aug '16

commit 028d1d1e9385e5bc254d228c986872c136225cbb Author: Linus Nordberg <linus(a)torproject.org> Date: Mon Apr 25 11:05:52 2016 +0200 Add BUILD_TBB_FAKE_STATUS knob. Useful when testing parts of the machinery not related to the actualy build, like uploading to remote host. Set BUILD_TBB_FAKE_STATUS to 'done' and the script will skip the build part. --- tools/continuous-builds/build-tbb.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 37e912a..7a7e812 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -43,6 +43,7 @@ logfile=build-logs/$(date -u +%s).log cd $BUILDDIR || exit 1 status=init +[ -n "$BUILD_TBB_FAKE_STATUS" ] && status=$BUILD_TBB_FAKE_STATUS n=0 MAKE_TARGET=$TARGET while [ $status != done ]; do

1 0

[tor-browser-bundle/hardened-builds] Don't tail nonexistent files.
by gk＠torproject.org 18 Aug '16

18 Aug '16

commit ba295be2532724b81433795e16f94d53cbaa3321 Author: Linus Nordberg <linus(a)torproject.org> Date: Thu Aug 18 10:27:15 2016 +0200 Don't tail nonexistent files. --- tools/continuous-builds/build-tbb.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index f0ff132..37e912a 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -69,9 +69,9 @@ if [ $status = done ]; then else echo "$0: giving up after $n tries" | tee -a $logfile if [ -n "$LOGRECIPIENTS" ]; then - FILES="$logfile \ - ../../gitian-builder/var/build.log \ - ../../gitian-builder/var/target.log" + FILES="$logfile" + [ -r ../../gitian-builder/var/build.log ] && FILES="$FILES ../../gitian-builder/var/build.log" + [ -r ../../gitian-builder/var/target.log ] && FILES="$FILES ../../gitian-builder/var/target.log" tail -n 50 $FILES | $MAILX -E -s "Nightly build failure -- $(date -u +%F)" \ $LOGSENDER -- $LOGRECIPIENTS fi

1 0

[tor-browser-bundle/master] Don't tail nonexistent files.
by gk＠torproject.org 18 Aug '16

18 Aug '16

commit 3e227e871cefa8123e38d509d5b4d3e08efa4483 Author: Linus Nordberg <linus(a)torproject.org> Date: Thu Aug 18 10:27:15 2016 +0200 Don't tail nonexistent files. --- tools/continuous-builds/build-tbb.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index f0ff132..37e912a 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -69,9 +69,9 @@ if [ $status = done ]; then else echo "$0: giving up after $n tries" | tee -a $logfile if [ -n "$LOGRECIPIENTS" ]; then - FILES="$logfile \ - ../../gitian-builder/var/build.log \ - ../../gitian-builder/var/target.log" + FILES="$logfile" + [ -r ../../gitian-builder/var/build.log ] && FILES="$FILES ../../gitian-builder/var/build.log" + [ -r ../../gitian-builder/var/target.log ] && FILES="$FILES ../../gitian-builder/var/target.log" tail -n 50 $FILES | $MAILX -E -s "Nightly build failure -- $(date -u +%F)" \ $LOGSENDER -- $LOGRECIPIENTS fi

1 0

[torbutton/maint-1.9.5] Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times
by gk＠torproject.org 15 Aug '16

15 Aug '16

commit 6e88f9cd13bd70e1626a912c789b146f07e88f33 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Aug 12 09:44:59 2016 -0400 Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times Do not add another notification if one is already visible. --- src/chrome/content/torbutton.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 9f6233c..3256335 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -3371,6 +3371,12 @@ var torbutton_resizelistener = if (m_tb_prefs. getIntPref("extensions.torbutton.maximize_warnings_remaining") > 0) { + // Do not add another notification if one is already showing. + const kNotificationName = "torbutton-maximize-notification"; + let box = gBrowser.getNotificationBox(); + if (box.getNotificationWithValue(kNotificationName)) + return; + // Rate-limit showing our notification if needed. if (m_tb_resize_date === null) { m_tb_resize_date = Date.now(); @@ -3392,7 +3398,6 @@ var torbutton_resizelistener = let bundle = sbSvc. createBundle("chrome://global/locale/commonDialogs.properties"); let button_label = bundle.GetStringFromName("OK"); - let box = gBrowser.getNotificationBox(); let buttons = [{ label: button_label, @@ -3409,9 +3414,8 @@ var torbutton_resizelistener = let message = torbutton_get_property_string("torbutton.maximize_warning"); - box.appendNotification(message, 'new-menu-notification', null, + box.appendNotification(message, kNotificationName, null, priority, buttons); - return; } // This is for some weird OS-specific behavior on start-up where,

1 0

[torbutton/master] Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times
by gk＠torproject.org 15 Aug '16

15 Aug '16

commit 808ed83b2fa89ea7865b5bad6a2f287922e88702 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Aug 12 09:44:59 2016 -0400 Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times Do not add another notification if one is already visible. --- src/chrome/content/torbutton.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 7160deb..81f5a23 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -3280,6 +3280,12 @@ var torbutton_resizelistener = if (m_tb_prefs. getIntPref("extensions.torbutton.maximize_warnings_remaining") > 0) { + // Do not add another notification if one is already showing. + const kNotificationName = "torbutton-maximize-notification"; + let box = gBrowser.getNotificationBox(); + if (box.getNotificationWithValue(kNotificationName)) + return; + // Rate-limit showing our notification if needed. if (m_tb_resize_date === null) { m_tb_resize_date = Date.now(); @@ -3301,7 +3307,6 @@ var torbutton_resizelistener = let bundle = sbSvc. createBundle("chrome://global/locale/commonDialogs.properties"); let button_label = bundle.GetStringFromName("OK"); - let box = gBrowser.getNotificationBox(); let buttons = [{ label: button_label, @@ -3318,9 +3323,8 @@ var torbutton_resizelistener = let message = torbutton_get_property_string("torbutton.maximize_warning"); - box.appendNotification(message, 'new-menu-notification', null, + box.appendNotification(message, kNotificationName, null, priority, buttons); - return; } // This is for some weird OS-specific behavior on start-up where,

1 0

[tor-browser/tor-browser-45.3.0esr-6.5-1] Bug 17858: Cannot create incremental MARs for hardened builds.
by gk＠torproject.org 15 Aug '16

15 Aug '16

commit 37e6040d25803771bfe4ef294d90d4e13e4eebb0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Aug 12 13:36:03 2016 -0400 Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. --- .mozconfig-asan | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.mozconfig-asan b/.mozconfig-asan index 1a723cf..814362d 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -5,6 +5,13 @@ export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fwrapv" # We need to add -ldl explicitely due to bug 1213698 export LDFLAGS="-fsanitize=address -ldl" +# Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff +# (which is part of mar-tools and is not distributed to end-users) with +# ASan. See bug 17858. +export HOST_CFLAGS="-fwrapv" +export HOST_CXXFLAGS="-fwrapv" +export HOST_LDFLAGS="-ldl" + mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1

1 0

[tor-browser-bundle/maint-6.0] Update gk's key in torbutton.gpg
by gk＠torproject.org 12 Aug '16

12 Aug '16

commit 371af28389e4546abbb3d86ef6a42c0cd3cf18f9 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 12 08:03:58 2016 +0000 Update gk's key in torbutton.gpg --- gitian/gpg/torbutton.gpg | Bin 94114 -> 135369 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg index da40f76..17b6c70 100644 Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ

1 0

[tor-browser-bundle/maint-6.0] Release preparations for 6.0.4
by gk＠torproject.org 12 Aug '16

12 Aug '16

commit c8b7419a32d6e9b7fed38fea60ce51f02f56a496 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 12 07:44:11 2016 +0000 Release preparations for 6.0.4 Versions, changelog and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ gitian/versions | 8 ++++---- tools/update-responses/config.yml | 7 ++++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c4a255d..2bdf3e2 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,9 @@ +Tor Browser 6.0.4 -- August 16 + * All Platforms + * Update Tor to 0.2.8.6 + * Update NoScript to 2.9.0.14 + * Bug 19890: Disable installation of system addons + Tor Browser 6.0.3 -- August 2 * All Platforms * Update Firefox to 45.3.0esr diff --git a/gitian/versions b/gitian/versions index f6d8648..67c114c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -14,8 +14,8 @@ FIREFOX_VERSION=45.3.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1 -TOR_TAG=tor-0.2.7.6 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2 +TOR_TAG=tor-0.2.8.6 TORLAUNCHER_TAG=0.2.9.3 TORBUTTON_TAG=1.9.5.6 HTTPSE_TAG=5.2.1 @@ -66,7 +66,7 @@ NSIS_VER=2.51 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.12-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.14-fx+fn+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -99,7 +99,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=3fa641dcb60455c950cef0c15effa8ca060b3b05405f46f55cbdb922929027e7 +NOSCRIPT_HASH=39bc71be20c318578239ea791c0341dbfcd13b33559af080cea386eeec08b337 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index ff17d28..f20e9b1 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -16,13 +16,14 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 6.5a2 - release: 6.0.3 + release: 6.0.4 versions: - 6.0.3: + 6.0.4: platformVersion: 45.3.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-603-released + detailsURL: https://blog.torproject.org/blog/tor-browser-604-released incremental_from: - 6.0.2 + - 6.0.3 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser/tor-browser-45.3.0esr-6.5-1] Bug 19890: Disable installation of system addons
by gk＠torproject.org 12 Aug '16

12 Aug '16

commit 8af42ff851bab2d9b17d380c170f06c28b94c74b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 11 11:00:24 2016 +0000 Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. --- browser/app/profile/firefox.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 1dd964b..6e424cb 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -69,8 +69,8 @@ pref("extensions.hotfix.cert.checkAttributes", true); pref("extensions.hotfix.certs.1.sha1Fingerprint", "91:53:98:0C:C1:86:DF:47:8F:35:22:9E:11:C9:A7:31:04:49:A1:AA"); pref("extensions.hotfix.certs.2.sha1Fingerprint", "39:E7:2B:7A:5B:CF:37:78:F9:5D:4A:E0:53:2D:2F:3D:68:53:C5:60"); -// Check AUS for system add-on updates. -pref("extensions.systemAddon.update.url", "https://aus5.mozilla.org/update/3/SystemAddons/%VERSION%/%BUILD_ID%/%BUILD_…"); +// No AUS check for system add-on updates for Tor Browser users. +pref("extensions.systemAddon.update.url", ""); // Disable add-ons that are not installed by the user in all scopes by default. // See the SCOPE constants in AddonManager.jsm for values to use here.

1 0

[tor-browser-bundle/hardened-builds] Bug 19854: fix URLs in downloads.json file
by gk＠torproject.org 12 Aug '16

12 Aug '16

commit ce5edcb55cee57b56ea3577474232e85464ff78e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 8 12:14:23 2016 +0200 Bug 19854: fix URLs in downloads.json file --- tools/update-responses/config.yml | 4 ++-- tools/update-responses/update_responses | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 191c246..77c8b46 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -3,6 +3,8 @@ releases_dir: ../../gitian download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser gpg_keyring: ../../gitian/gpg/torbrowser.gpg + bundles_url: https://dist.torproject.org/torbrowser + mars_url: https://cdn.torproject.org/aus1/torbrowser build_targets: linux32: Linux_x86-gcc3 linux64: Linux_x86_64-gcc3 @@ -19,7 +21,6 @@ versions: 6.0.1: platformVersion: 45.2.0 detailsURL: https://blog.torproject.org/blog/tor-browser-601-released - download_url: https://cdn.torproject.org/aus1/torbrowser/6.0.1 incremental_from: - 4.5.3 migrate_archs: @@ -30,7 +31,6 @@ versions: 6.5a2-hardened: platformVersion: 45.3.0 detailsURL: https://blog.torproject.org/blog/tor-browser-65a2-hardened-released - download_url: https://cdn.torproject.org/aus1/torbrowser/6.5a2-hardened incremental_from: - 6.5a1-hardened migrate_archs: diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index cf307da..faa1037 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -84,6 +84,7 @@ sub get_version_files { return if $config->{versions}{$version}{files}; my $files = {}; my $vdir = "$releases_dir/$version"; + my $download_url = "$config->{download}{mars_url}/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { next unless -f "$vdir/$file"; @@ -91,7 +92,7 @@ sub get_version_files { my ($os, $lang) = ($1, $2); $files->{$os}{$lang}{complete} = { type => 'complete', - URL => "$config->{versions}{$version}{download_url}/$file", + URL => "$download_url/$file", size => -s "$vdir/$file", hashFunction => 'SHA512', hashValue => get_sha512_hex_of_file("$vdir/$file"), @@ -102,7 +103,7 @@ sub get_version_files { my ($os, $from_version, $lang) = ($1, $2, $3); $files->{$os}{$lang}{partial}{$from_version} = { type => 'partial', - URL => "$config->{versions}{$version}{download_url}/$file", + URL => "$download_url/$file", size => -s "$vdir/$file", hashFunction => 'SHA512', hashValue => get_sha512_hex_of_file("$vdir/$file"), @@ -117,6 +118,7 @@ sub get_version_downloads { my ($config, $version) = @_; my $downloads = {}; my $vdir = "$releases_dir/$version"; + my $download_url = "$config->{download}{bundles_url}/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { next unless -f "$vdir/$file"; @@ -131,8 +133,8 @@ sub get_version_downloads { next; } $downloads->{$os}{$lang} = { - binary => "$config->{versions}{$version}{download_url}/$file", - sig => "$config->{versions}{$version}{download_url}/$file.asc", + binary => "$download_url/$file", + sig => "$download_url/$file.asc", }; } closedir $d; @@ -175,12 +177,13 @@ sub create_incremental_mar { my $mar_file = "tor-browser-$os-${from_version}-${new_version}_$lang.incremental.mar"; print "Starting $mar_file\n"; my $mar_file_path = "$releases_dir/$new_version/$mar_file"; + my $download_url = "$config->{download}{mars_url}/$new_version"; my $finished_file = sub { exit_error "Error creating $mar_file" unless $_[1] == 0; print "Finished $mar_file\n"; $config->{versions}{$new_version}{files}{$os}{$lang}{partial}{$from_version} = { type => 'partial', - URL => "$config->{versions}{$new_version}{download_url}/$mar_file", + URL => "$download_url/$mar_file", size => -s $mar_file_path, hashFunction => 'SHA512', hashValue => get_sha512_hex_of_file($mar_file_path), @@ -205,7 +208,7 @@ sub create_incremental_mars_for_version { $pm->run_on_finish(sub { $_[2]->(@_) }); my $v = $config->{versions}{$version}; foreach my $from_version (@{$v->{incremental_from}}) { - $config->{versions}{$from_version} //= { download_url => '' }; + $config->{versions}{$from_version} //= {}; get_version_files($config, $from_version); my $from_v = $config->{versions}{$from_version}; foreach my $os (keys %{$v->{files}}) {

1 0

[tor-browser-bundle/maint-6.0] Bug 19854: fix URLs in downloads.json file
by gk＠torproject.org 11 Aug '16

11 Aug '16

commit f9d27acb00da3a44206024a6ee3549173d61e6fa Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 8 12:14:23 2016 +0200 Bug 19854: fix URLs in downloads.json file --- tools/update-responses/config.yml | 14 +++++++------- tools/update-responses/update_responses | 15 +++++++++------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 36192fc..ff17d28 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -3,6 +3,8 @@ releases_dir: ../../gitian download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser gpg_keyring: ../../gitian/gpg/torbrowser.gpg + bundles_url: https://dist.torproject.org/torbrowser + mars_url: https://cdn.torproject.org/aus1/torbrowser build_targets: linux32: Linux_x86-gcc3 linux64: Linux_x86_64-gcc3 @@ -13,13 +15,12 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 6.0a5 + alpha: 6.5a2 release: 6.0.3 versions: 6.0.3: platformVersion: 45.3.0 detailsURL: https://blog.torproject.org/blog/tor-browser-603-released - download_url: https://cdn.torproject.org/aus1/torbrowser/6.0.3 incremental_from: - 6.0.2 migrate_archs: @@ -27,12 +28,11 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 6.0a5: - platformVersion: 45.1.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-60a5-released - download_url: https://cdn.torproject.org/aus1/torbrowser/6.0a5 + 6.5a2: + platformVersion: 45.3.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-65a2-released incremental_from: - - 6.0a4 + - 6.5a1 migrate_archs: osx32: osx64 osx32: diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index cf307da..faa1037 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -84,6 +84,7 @@ sub get_version_files { return if $config->{versions}{$version}{files}; my $files = {}; my $vdir = "$releases_dir/$version"; + my $download_url = "$config->{download}{mars_url}/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { next unless -f "$vdir/$file"; @@ -91,7 +92,7 @@ sub get_version_files { my ($os, $lang) = ($1, $2); $files->{$os}{$lang}{complete} = { type => 'complete', - URL => "$config->{versions}{$version}{download_url}/$file", + URL => "$download_url/$file", size => -s "$vdir/$file", hashFunction => 'SHA512', hashValue => get_sha512_hex_of_file("$vdir/$file"), @@ -102,7 +103,7 @@ sub get_version_files { my ($os, $from_version, $lang) = ($1, $2, $3); $files->{$os}{$lang}{partial}{$from_version} = { type => 'partial', - URL => "$config->{versions}{$version}{download_url}/$file", + URL => "$download_url/$file", size => -s "$vdir/$file", hashFunction => 'SHA512', hashValue => get_sha512_hex_of_file("$vdir/$file"), @@ -117,6 +118,7 @@ sub get_version_downloads { my ($config, $version) = @_; my $downloads = {}; my $vdir = "$releases_dir/$version"; + my $download_url = "$config->{download}{bundles_url}/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { next unless -f "$vdir/$file"; @@ -131,8 +133,8 @@ sub get_version_downloads { next; } $downloads->{$os}{$lang} = { - binary => "$config->{versions}{$version}{download_url}/$file", - sig => "$config->{versions}{$version}{download_url}/$file.asc", + binary => "$download_url/$file", + sig => "$download_url/$file.asc", }; } closedir $d; @@ -175,12 +177,13 @@ sub create_incremental_mar { my $mar_file = "tor-browser-$os-${from_version}-${new_version}_$lang.incremental.mar"; print "Starting $mar_file\n"; my $mar_file_path = "$releases_dir/$new_version/$mar_file"; + my $download_url = "$config->{download}{mars_url}/$new_version"; my $finished_file = sub { exit_error "Error creating $mar_file" unless $_[1] == 0; print "Finished $mar_file\n"; $config->{versions}{$new_version}{files}{$os}{$lang}{partial}{$from_version} = { type => 'partial', - URL => "$config->{versions}{$new_version}{download_url}/$mar_file", + URL => "$download_url/$mar_file", size => -s $mar_file_path, hashFunction => 'SHA512', hashValue => get_sha512_hex_of_file($mar_file_path), @@ -205,7 +208,7 @@ sub create_incremental_mars_for_version { $pm->run_on_finish(sub { $_[2]->(@_) }); my $v = $config->{versions}{$version}; foreach my $from_version (@{$v->{incremental_from}}) { - $config->{versions}{$from_version} //= { download_url => '' }; + $config->{versions}{$from_version} //= {}; get_version_files($config, $from_version); my $from_v = $config->{versions}{$from_version}; foreach my $os (keys %{$v->{files}}) {

1 0

[tor-browser-bundle/master] Bug 19854: fix URLs in downloads.json file
by gk＠torproject.org 11 Aug '16

11 Aug '16

commit 858cdf3e315b068277c9e6bda7ef6108498a85b5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 8 12:14:23 2016 +0200 Bug 19854: fix URLs in downloads.json file --- tools/update-responses/config.yml | 4 ++-- tools/update-responses/update_responses | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 59b9179..050328e 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -3,6 +3,8 @@ releases_dir: ../../gitian download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser gpg_keyring: ../../gitian/gpg/torbrowser.gpg + bundles_url: https://dist.torproject.org/torbrowser + mars_url: https://cdn.torproject.org/aus1/torbrowser build_targets: linux32: Linux_x86-gcc3 linux64: Linux_x86_64-gcc3 @@ -19,7 +21,6 @@ versions: 6.0.1: platformVersion: 45.2.0 detailsURL: https://blog.torproject.org/blog/tor-browser-601-released - download_url: https://cdn.torproject.org/aus1/torbrowser/6.0.1 incremental_from: - 5.5.5 - 6.0 @@ -31,7 +32,6 @@ versions: 6.5a2: platformVersion: 45.3.0 detailsURL: https://blog.torproject.org/blog/tor-browser-65a2-released - download_url: https://cdn.torproject.org/aus1/torbrowser/6.5a2 incremental_from: - 6.5a1 migrate_archs: diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index cf307da..faa1037 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -84,6 +84,7 @@ sub get_version_files { return if $config->{versions}{$version}{files}; my $files = {}; my $vdir = "$releases_dir/$version"; + my $download_url = "$config->{download}{mars_url}/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { next unless -f "$vdir/$file"; @@ -91,7 +92,7 @@ sub get_version_files { my ($os, $lang) = ($1, $2); $files->{$os}{$lang}{complete} = { type => 'complete', - URL => "$config->{versions}{$version}{download_url}/$file", + URL => "$download_url/$file", size => -s "$vdir/$file", hashFunction => 'SHA512', hashValue => get_sha512_hex_of_file("$vdir/$file"), @@ -102,7 +103,7 @@ sub get_version_files { my ($os, $from_version, $lang) = ($1, $2, $3); $files->{$os}{$lang}{partial}{$from_version} = { type => 'partial', - URL => "$config->{versions}{$version}{download_url}/$file", + URL => "$download_url/$file", size => -s "$vdir/$file", hashFunction => 'SHA512', hashValue => get_sha512_hex_of_file("$vdir/$file"), @@ -117,6 +118,7 @@ sub get_version_downloads { my ($config, $version) = @_; my $downloads = {}; my $vdir = "$releases_dir/$version"; + my $download_url = "$config->{download}{bundles_url}/$version"; opendir(my $d, $vdir) or exit_error "Error opening directory $vdir"; foreach my $file (readdir $d) { next unless -f "$vdir/$file"; @@ -131,8 +133,8 @@ sub get_version_downloads { next; } $downloads->{$os}{$lang} = { - binary => "$config->{versions}{$version}{download_url}/$file", - sig => "$config->{versions}{$version}{download_url}/$file.asc", + binary => "$download_url/$file", + sig => "$download_url/$file.asc", }; } closedir $d; @@ -175,12 +177,13 @@ sub create_incremental_mar { my $mar_file = "tor-browser-$os-${from_version}-${new_version}_$lang.incremental.mar"; print "Starting $mar_file\n"; my $mar_file_path = "$releases_dir/$new_version/$mar_file"; + my $download_url = "$config->{download}{mars_url}/$new_version"; my $finished_file = sub { exit_error "Error creating $mar_file" unless $_[1] == 0; print "Finished $mar_file\n"; $config->{versions}{$new_version}{files}{$os}{$lang}{partial}{$from_version} = { type => 'partial', - URL => "$config->{versions}{$new_version}{download_url}/$mar_file", + URL => "$download_url/$mar_file", size => -s $mar_file_path, hashFunction => 'SHA512', hashValue => get_sha512_hex_of_file($mar_file_path), @@ -205,7 +208,7 @@ sub create_incremental_mars_for_version { $pm->run_on_finish(sub { $_[2]->(@_) }); my $v = $config->{versions}{$version}; foreach my $from_version (@{$v->{incremental_from}}) { - $config->{versions}{$from_version} //= { download_url => '' }; + $config->{versions}{$from_version} //= {}; get_version_files($config, $from_version); my $from_v = $config->{versions}{$from_version}; foreach my $os (keys %{$v->{files}}) {

1 0

[tor-browser-bundle/hardened-builds] Cleaning up gk's key
by gk＠torproject.org 11 Aug '16

11 Aug '16

commit 857bd13779d9fccd0081f0cd69e7538d6531d616 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 11 11:30:42 2016 +0000 Cleaning up gk's key --- gitian/gpg/gk.gpg | Bin 113673 -> 41255 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/gk.gpg b/gitian/gpg/gk.gpg index 359ea69..9037e43 100644 Binary files a/gitian/gpg/gk.gpg and b/gitian/gpg/gk.gpg differ

1 0

[tor-browser-bundle/master] Cleaning up gk's key
by gk＠torproject.org 11 Aug '16

11 Aug '16

commit 2dcef4073f367121ba4a4e80a0a62892ffb011c7 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 11 11:20:27 2016 +0000 Cleaning up gk's key --- gitian/gpg/gk.gpg | Bin 72418 -> 41255 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/gk.gpg b/gitian/gpg/gk.gpg index 2f78b14..9037e43 100644 Binary files a/gitian/gpg/gk.gpg and b/gitian/gpg/gk.gpg differ

1 0

[tor-browser-bundle/maint-6.0] Cleaning up gk's key
by gk＠torproject.org 11 Aug '16

11 Aug '16

commit dc8a94bd5979fdbc3e4819e7948a8424cee72688 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 11 11:20:27 2016 +0000 Cleaning up gk's key --- gitian/gpg/gk.gpg | Bin 72418 -> 41255 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/gk.gpg b/gitian/gpg/gk.gpg index 2f78b14..9037e43 100644 Binary files a/gitian/gpg/gk.gpg and b/gitian/gpg/gk.gpg differ

1 0

[tor-browser/tor-browser-45.3.0esr-6.0-1] Bug 19890: Disable installation of system addons
by gk＠torproject.org 11 Aug '16

11 Aug '16

commit 61700466ddefff3005633a6e31f34133eb98197f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 11 11:00:24 2016 +0000 Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. --- browser/app/profile/firefox.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 1dd964b..6e424cb 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -69,8 +69,8 @@ pref("extensions.hotfix.cert.checkAttributes", true); pref("extensions.hotfix.certs.1.sha1Fingerprint", "91:53:98:0C:C1:86:DF:47:8F:35:22:9E:11:C9:A7:31:04:49:A1:AA"); pref("extensions.hotfix.certs.2.sha1Fingerprint", "39:E7:2B:7A:5B:CF:37:78:F9:5D:4A:E0:53:2D:2F:3D:68:53:C5:60"); -// Check AUS for system add-on updates. -pref("extensions.systemAddon.update.url", "https://aus5.mozilla.org/update/3/SystemAddons/%VERSION%/%BUILD_ID%/%BUILD_…"); +// No AUS check for system add-on updates for Tor Browser users. +pref("extensions.systemAddon.update.url", ""); // Disable add-ons that are not installed by the user in all scopes by default. // See the SCOPE constants in AddonManager.jsm for values to use here.

1 0

[tor-browser-bundle/hardened-builds] Bug 19818: add config.yml option for the releases directory path
by gk＠torproject.org 11 Aug '16

11 Aug '16

commit fcf89874d5b9919633d312e89d8aea529f5664d2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 8 11:50:38 2016 +0200 Bug 19818: add config.yml option for the releases directory path --- tools/update-responses/config.yml | 1 + tools/update-responses/update_responses | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 8eaeae6..191c246 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -1,4 +1,5 @@ --- +releases_dir: ../../gitian download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser gpg_keyring: ../../gitian/gpg/torbrowser.gpg diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 1a7cb14..cf307da 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -30,7 +30,8 @@ setlocale(LC_ALL, "C"); my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); my %htdocsfiles; -my $releases_dir = "$FindBin::Bin/../../gitian"; +my $releases_dir = $config->{releases_dir}; +$releases_dir = "$FindBin::Bin/$releases_dir" unless $releases_dir =~ m/^\//; my @check_errors; sub exit_error {

1 0

[tor-browser-bundle/maint-6.0] Bug 19818: add config.yml option for the releases directory path
by gk＠torproject.org 11 Aug '16

11 Aug '16

commit 1bb5bba64b60009c3deb8cc5119dd41d7615f3d4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 8 11:50:38 2016 +0200 Bug 19818: add config.yml option for the releases directory path --- tools/update-responses/config.yml | 1 + tools/update-responses/update_responses | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 16843df..36192fc 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -1,4 +1,5 @@ --- +releases_dir: ../../gitian download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser gpg_keyring: ../../gitian/gpg/torbrowser.gpg diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 1a7cb14..cf307da 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -30,7 +30,8 @@ setlocale(LC_ALL, "C"); my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); my %htdocsfiles; -my $releases_dir = "$FindBin::Bin/../../gitian"; +my $releases_dir = $config->{releases_dir}; +$releases_dir = "$FindBin::Bin/$releases_dir" unless $releases_dir =~ m/^\//; my @check_errors; sub exit_error {

1 0

[tor-browser-bundle/master] Bug 19818: add config.yml option for the releases directory path
by gk＠torproject.org 11 Aug '16

11 Aug '16

commit 260c051a69a7323084793c23c6ed53cd1344dd72 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 8 11:50:38 2016 +0200 Bug 19818: add config.yml option for the releases directory path --- tools/update-responses/config.yml | 1 + tools/update-responses/update_responses | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 7b92a72..59b9179 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -1,4 +1,5 @@ --- +releases_dir: ../../gitian download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser gpg_keyring: ../../gitian/gpg/torbrowser.gpg diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 1a7cb14..cf307da 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -30,7 +30,8 @@ setlocale(LC_ALL, "C"); my $htdocsdir = "$FindBin::Bin/htdocs"; my $config = LoadFile("$FindBin::Bin/config.yml"); my %htdocsfiles; -my $releases_dir = "$FindBin::Bin/../../gitian"; +my $releases_dir = $config->{releases_dir}; +$releases_dir = "$FindBin::Bin/$releases_dir" unless $releases_dir =~ m/^\//; my @check_errors; sub exit_error {

1 0

[tor-browser/tor-browser-45.3.0esr-6.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 11 Aug '16

11 Aug '16

commit 219b21731bec577b8797a8914612f0ae9e55d1ad Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 10 13:43:25 2016 -0400 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Improve the about:tbupdate page: Show the browser name and version in the upper right corner (bug 19835). Use bold text in a couple of places (bug 19336). --- browser/base/content/abouttbupdate/aboutTBUpdate.css | 20 ++++++++++++++++++++ .../base/content/abouttbupdate/aboutTBUpdate.xhtml | 4 +++- browser/base/content/tab-content.js | 13 +++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.css b/browser/base/content/abouttbupdate/aboutTBUpdate.css index 489c9d2..c171c58 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.css +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.css @@ -6,6 +6,20 @@ body { background-size: 100% 100%; } +#torbrowser-version { + /* These CSS rules match the about:tor page */ + position: fixed; + top: 6px; + right: 6px; + height: 30px; + width: 200px; + white-space: pre-wrap; + text-align: right; + color: #4d4d4d; + font-family: "Liberation Sans", Arial, Helvetica, sans-serif; + font-size: 14px; +} + #logo { background-image: url("chrome://browser/content/abouttbupdate/aboutTBUpdateLogo.png"); height: 128px; @@ -21,6 +35,7 @@ body { #msg-updated { font-size: 120%; + font-weight: bold; margin-bottom: 20px; } @@ -28,6 +43,11 @@ body { margin: 0px 20px 20px 20px; } +#changelog-heading { + font-weight: bold; + margin-bottom: 4px; +} + #changelog { margin-left: 20px; white-space: pre; diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml index 3a29e0c..115ec40 100644 --- a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml @@ -20,6 +20,7 @@ type="text/javascript;version=1.7"/> </head> <body dir="&locale.dir;" onload="init()"> +<div id="torbrowser-version"/> <div id="logo"/> <div id="msg"> <div id="msg-updated">&aboutTBUpdate.updated;</div> @@ -27,7 +28,8 @@ </div> </div> <br clear="all"/> -<div id="changelog-container">&aboutTBUpdate.changeLogHeading; +<div id="changelog-container"> +<div id="changelog-heading">&aboutTBUpdate.changeLogHeading;</div> <div id="changelog"></div> </div> </body> diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js index 44489a2..b0f960a 100644 --- a/browser/base/content/tab-content.js +++ b/browser/base/content/tab-content.js @@ -5,6 +5,11 @@ /* This content script contains code that requires a tab browser. */ +#ifdef TOR_BROWSER_VERSION +# Add double-quotes back on (stripped by JarMaker.py). +#expand const TOR_BROWSER_VERSION = "__TOR_BROWSER_VERSION__"; +#endif + var {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); @@ -391,6 +396,14 @@ let AboutTBUpdateListener = { let doc = content.document; doc.getElementById("infolink").setAttribute("href", this.getPostUpdateURL()); doc.getElementById("changelog").textContent = this.getChangeLogText(); + + const kBrandBundle = "chrome://branding/locale/brand.properties"; + let brandBundle = Cc["@mozilla.org/intl/stringbundle;1"] + .getService(Ci.nsIStringBundleService) + .createBundle(kBrandBundle); + let productName = brandBundle.GetStringFromName("brandFullName"); + doc.getElementById("torbrowser-version").textContent = productName + "\n" + + TOR_BROWSER_VERSION; }, // Extract the post update URL from this page's query string.

1 0

[tor-browser-bundle/master] Folding in changelogs
by gk＠torproject.org 09 Aug '16

09 Aug '16

commit c5862ce43fab3ae20546456fb294ae84cf6941cd Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 9 08:40:30 2016 +0000 Folding in changelogs --- Bundle-Data/Docs/ChangeLog.txt | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index eb79991..c0abf86 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,36 @@ +Tor Browser 6.5a2-hardened -- August 3 + * All Platforms + * Update Firefox to 45.3.0esr + * Update Tor to tor-0.2.8.5-rc + * Update Torbutton to 1.9.6.1 + * Bug 19689: Use proper parent window for plugin prompt + * Bug 19206: Avoid SOCKS auth and NEWNYM collisions when sharing a tor client + * Bug 19417: Disable asm.js (but add code to clear on New Identity if enabled) + * Bug 19273: Improve external app launch handling and associated warnings + * Bug 8725: Block addon resource and url fingerprinting with nsIContentPolicy + * Update HTTPS-Everywhere to 5.2.1 + * Update NoScript to 2.9.0.12 + * Bug 17406: Include Selfrando into our hardened builds + * Bug 19417: Disable asmjs for now + * Bug 19715: Disable the meek-google pluggable transport option + * Bug 19714: Remove mercurius4 obfs4 bridge + * Bug 19585: Fix regression test for keyboard layout fingerprinting + * Bug 19515: Tor Browser is crashing in graphics code + * Bug 18513: Favicon requests can bypass New Identity + * Bug 19273: Write C++ patch for external app launch handling + * Bug 16998: Isolate preconnect requests to URL bar domain + * Bug 18923: Add script to run all Tor Browser regression tests + * Bug 19478: Prevent millisecond resolution leaks in File API + * Bug 19401: Fix broken PDF download button + * Bug 19411: Don't show update icon if a partial update failed + * Bug 19400: Back out GCC bug workaround to avoid asmjs crash + * Bug 19735: Switch default search engine to DuckDuckGo + * Bug 19276: Disable Xrender due to possible performance regressions + * Bug 19725: Remove old updater files left on disk after upgrade to 6.x + * Build System + * All Platforms + * Bug 19703: Upgrade Go to 1.6.3 + Tor Browser 6.5a2 -- August 3 * All Platforms * Update Firefox to 45.3.0esr @@ -38,6 +71,25 @@ Tor Browser 6.5a2 -- August 3 * All Platforms * Bug 19703: Upgrade Go to 1.6.3 +Tor Browser 6.0.3 -- August 2 + * All Platforms + * Update Firefox to 45.3.0esr + * Update Torbutton to 1.9.5.6 + * Bug 19417: Disable asmjs for now + * Bug 19689: Use proper parent window for plugin prompt + * Update HTTPS-Everywhere to 5.2.1 + * Update NoScript to 2.9.0.12 + * Bug 19417: Disable asmjs for now + * Bug 19715: Disable the meek-google pluggable transport option + * Bug 19714: Remove mercurius4 obfs4 bridge + * Bug 19585: Fix regression test for keyboard layout fingerprinting + * Bug 19515: Tor Browser is crashing in graphics code + * Bug 18513: Favicon requests can bypass New Identity + * OS X + * Bug 19269: Icon doesn't appear in Applications folder or Dock + * Android + * Bug 19484: Avoid compilation error when MOZ_UPDATER is not defined + Tor Browser 6.0.2 -- June 21 * All Platforms * Update Torbutton to 1.9.5.5

1 0

[tor-browser-bundle/master] Bump versions for nightlies
by gk＠torproject.org 02 Aug '16

02 Aug '16

commit edfaa1e39cb9cfc3d0c019116b98e71aa9c788eb Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 2 09:50:36 2016 +0000 Bump versions for nightlies --- gitian/versions.nightly | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 7d66421..749f8ea 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,7 +17,7 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.2.0esr +FIREFOX_VERSION=45.3.0esr TORBROWSER_UPDATE_CHANNEL=default @@ -54,7 +54,7 @@ GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.1t GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=r247539 @@ -75,7 +75,7 @@ NSIS_VER=2.51 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.11-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.12-fx+fn+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -109,7 +109,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390 +NOSCRIPT_HASH=3fa641dcb60455c950cef0c15effa8ca060b3b05405f46f55cbdb922929027e7 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/hardened-builds] correcting mirror
by gk＠torproject.org 01 Aug '16

01 Aug '16

commit f7fda5e4d6c0cb5147cf4b8629aac1a877ae5bff Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 1 13:23:20 2016 +0000 correcting mirror --- gitian/fetch-inputs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 4d48089..c663051 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -6,7 +6,7 @@ MIRROR_URL=https://people.torproject.org/~mikeperry/mirrors/sources/ MIRROR_URL_DCF=https://people.torproject.org/~dcf/mirrors/sources/ MIRROR_URL_ASN=https://people.torproject.org/~asn/mirrors/sources/ -MIRROR_URL_GK=https://people.torproject.org/~asn/mirrors/sources/ +MIRROR_URL_GK=https://people.torproject.org/~gk/mirrors/sources/ set -e set -u umask 0022

1 0

[tor-browser-bundle/hardened-builds] Updating CCTOOLS source url
by gk＠torproject.org 01 Aug '16

01 Aug '16

commit efbddbb105bfc7c3197c8ea79e7039a95a55cfbc Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 1 13:16:01 2016 +0000 Updating CCTOOLS source url --- gitian/fetch-inputs.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 1bf69a2..4d48089 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -6,6 +6,7 @@ MIRROR_URL=https://people.torproject.org/~mikeperry/mirrors/sources/ MIRROR_URL_DCF=https://people.torproject.org/~dcf/mirrors/sources/ MIRROR_URL_ASN=https://people.torproject.org/~asn/mirrors/sources/ +MIRROR_URL_GK=https://people.torproject.org/~asn/mirrors/sources/ set -e set -u umask 0022 @@ -138,6 +139,13 @@ do get "${!PACKAGE}" "${MIRROR_URL}${!PACKAGE}" done +for i in CCTOOLS +do + PACKAGE="${i}_PACKAGE" + URL="${MIRROR_URL_GK}${!PACKAGE}" + get "${!PACKAGE}" "${MIRROR_URL_GK}${!PACKAGE}" +done + # XXX: Omit googlecode.com packages because Google won't allow wget -N # and because the download seems to 404 about 50% of the time. for i in ARGPARSE

1 0

[tor-browser-bundle/hardened-builds] Add Selfrando sources for to versions.alpha
by gk＠torproject.org 01 Aug '16

01 Aug '16

commit d4e78124c4aef4220d59acd03df49c94c67801d1 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 1 12:42:22 2016 +0000 Add Selfrando sources for to versions.alpha --- gitian/versions.alpha | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index dba74e7..fae60f8 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -45,6 +45,7 @@ GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 +SELFRANDO_TAG=8e49e7aa664625d8e4793579864231b151589d0f GITIAN_TAG=tor-browser-builder-4-1 @@ -68,6 +69,7 @@ PARSLEY_VER=1.2 GO14_VER=1.4.3 GO_VER=1.6.3 NSIS_VER=2.51 +ELFUTILS_VER=0.160 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -99,6 +101,7 @@ NOTOJPFONT_PACKAGE=NotoSansJP-Regular.otf NOTOKRFONT_PACKAGE=NotoSansKR-Regular.otf NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf +ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=4a6ee491a2fdb22e519c76fdc2a628bb3cec12762cd456861d207996c8a07088 @@ -159,3 +162,4 @@ NOTOJPFONT_URL=${NOTOCJKBASE_URL}/${NOTOJPFONT_PACKAGE} NOTOKRFONT_URL=${NOTOCJKBASE_URL}/${NOTOKRFONT_PACKAGE} NOTOSCFONT_URL=${NOTOCJKBASE_URL}/${NOTOSCFONT_PACKAGE} NOTOTCFONT_URL=${NOTOCJKBASE_URL}/${NOTOTCFONT_PACKAGE} +ELFUTILS_URL=https://fedorahosted.org/releases/e/l/elfutils/${ELFUTILS_VER}/${ELFUTILS_PACKAGE}

1 0

[tor-browser-bundle/hardened-builds] updating gk's key
by gk＠torproject.org 01 Aug '16

01 Aug '16

commit 1911d4e4ae2ed9de4bc466e63ae1cbdaff409d77 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 1 11:50:36 2016 +0000 updating gk's key --- gitian/gpg/gk.gpg | Bin 72418 -> 113673 bytes gitian/gpg/torbutton.gpg | Bin 94114 -> 135369 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/gk.gpg b/gitian/gpg/gk.gpg index 2f78b14..359ea69 100644 Binary files a/gitian/gpg/gk.gpg and b/gitian/gpg/gk.gpg differ diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg index da40f76..17b6c70 100644 Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ

1 0

[tor-browser-bundle/hardened-builds] Making the git-gpg-wrapper executable
by gk＠torproject.org 01 Aug '16

01 Aug '16

commit 166f1c2a301c5f8ca8d949e32ad2728c6bdb42af Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jul 30 10:00:11 2016 +0000 Making the git-gpg-wrapper executable --- gitian/git-gpg-wrapper | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/git-gpg-wrapper b/gitian/git-gpg-wrapper old mode 100644 new mode 100755

1 0

[tor-browser-bundle/hardened-builds] Release preparations for 6.5a2-hardened
by gk＠torproject.org 01 Aug '16

01 Aug '16

commit 4daeed06ac415ba19617cebfb41b5fe7d26c1fcd Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 1 09:44:41 2016 +0000 Release preparations for 6.5a2-hardened Changelog update, versions bumps, config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 33 +++++++++++++++++++++++++++++++++ gitian/versions.alpha | 14 +++++++------- tools/update-responses/config.yml | 12 ++++++------ 3 files changed, 46 insertions(+), 13 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 40a36c9..2cdc4b7 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,36 @@ +Tor Browser 6.5a2-hardened -- August 3 + * All Platforms + * Update Firefox to 45.3.0esr + * Update Tor to tor-0.2.8.5-rc + * Update Torbutton to 1.9.6.1 + * Bug 19689: Use proper parent window for plugin prompt + * Bug 19206: Avoid SOCKS auth and NEWNYM collisions when sharing a tor client + * Bug 19417: Disable asm.js (but add code to clear on New Identity if enabled) + * Bug 19273: Improve external app launch handling and associated warnings + * Bug 8725: Block addon resource and url fingerprinting with nsIContentPolicy + * Update HTTPS-Everywhere to 5.2.1 + * Update NoScript to 2.9.0.12 + * Bug 17406: Include Selfrando into our hardened builds + * Bug 19417: Disable asmjs for now + * Bug 19715: Disable the meek-google pluggable transport option + * Bug 19714: Remove mercurius4 obfs4 bridge + * Bug 19585: Fix regression test for keyboard layout fingerprinting + * Bug 19515: Tor Browser is crashing in graphics code + * Bug 18513: Favicon requests can bypass New Identity + * Bug 19273: Write C++ patch for external app launch handling + * Bug 16998: Isolate preconnect requests to URL bar domain + * Bug 18923: Add script to run all Tor Browser regression tests + * Bug 19478: Prevent millisecond resolution leaks in File API + * Bug 19401: Fix broken PDF download button + * Bug 19411: Don't show update icon if a partial update failed + * Bug 19400: Back out GCC bug workaround to avoid asmjs crash + * Bug 19735: Switch default search engine to DuckDuckGo + * Bug 19276: Disable Xrender due to possible performance regressions + * Bug 19725: Remove old updater files left on disk after upgrade to 6.x + * Build System + * All Platforms + * Bug 19703: Upgrade Go to 1.6.3 + Tor Browser 6.5a1-hardened -- June 8 * All Platforms * Update Firefox to 45.2.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 29595cc..dba74e7 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,15 +14,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=45.2.0esr +FIREFOX_VERSION=45.3.0esr TORBROWSER_UPDATE_CHANNEL=hardened TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1 -TOR_TAG=tor-0.2.8.3-alpha +TOR_TAG=tor-0.2.8.5-rc TORLAUNCHER_TAG=0.2.8.5 -TORBUTTON_TAG=1.9.6 -HTTPSE_TAG=5.1.9 +TORBUTTON_TAG=1.9.6.1 +HTTPSE_TAG=5.2.1 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -51,7 +51,7 @@ GITIAN_TAG=tor-browser-builder-4-1 OPENSSL_VER=1.0.1t GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.2.0 CLANG_VER=r247539 @@ -72,7 +72,7 @@ NSIS_VER=2.51 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.11-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.12-fx+fn+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -106,7 +106,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390 +NOSCRIPT_HASH=3fa641dcb60455c950cef0c15effa8ca060b3b05405f46f55cbdb922929027e7 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 179f882..8eaeae6 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -12,7 +12,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - hardened: 6.5a1-hardened + hardened: 6.5a2-hardened release: 6.0.1 versions: 6.0.1: @@ -26,12 +26,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 6.5a1-hardened: - platformVersion: 45.2.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-65a1-hardened-released - download_url: https://cdn.torproject.org/aus1/torbrowser/6.5a1-hardened + 6.5a2-hardened: + platformVersion: 45.3.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-65a2-hardened-released + download_url: https://cdn.torproject.org/aus1/torbrowser/6.5a2-hardened incremental_from: - - 6.0a5-hardened + - 6.5a1-hardened migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/hardened-builds] Bug 19737: Allow git tag signatures made using an expired key
by gk＠torproject.org 01 Aug '16

01 Aug '16

commit c6458e49f9dd51708e22c84f26195c50d0ff2d0b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 27 22:53:19 2016 +0200 Bug 19737: Allow git tag signatures made using an expired key We are adding a gitian/git-gpg-wrapper script which validates signatures made using an expired key. To do that, we use gpgv rather than gpg, and any EXPKEYSIG line from the gpg `--status-fd` output is replaced by a GOODSIG line. --- gitian/git-gpg-wrapper | 13 +++++++++++++ gitian/verify-tags.sh | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gitian/git-gpg-wrapper b/gitian/git-gpg-wrapper new file mode 100644 index 0000000..f137d6d --- /dev/null +++ b/gitian/git-gpg-wrapper @@ -0,0 +1,13 @@ +#!/bin/bash +# This wrapper script is used by git to verify signatures made using +# an expired key. +# https://bugs.torproject.org/19737 +set -e +if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--verify' ] +then + gpgv "$1" "$3" "$4" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' + exit ${PIPESTATUS[0]} +else + exec gpg "$@" +fi diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 5908801..8277fca 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -37,10 +37,11 @@ verify_git() { local gpghome=$(mktemp -d) echo "rm -rf '$gpghome'" >> "$CLEANUP" - GNUPGHOME="$gpghome" gpg --import "$keyring" + GNUPGHOME="$gpghome" gpg --no-default-keyring --keyring trustedkeys.gpg --import "$keyring" pushd . cd "$dir" + git config --local gpg.program "$WRAPPER_DIR/git-gpg-wrapper" if ! GNUPGHOME="$gpghome" git tag -v "$tag"; then echo >&2 "$dir: verification of tag $tag against $keyring failed!" exit 1

1 0

[tor-browser-bundle/hardened-builds] Update gk's key
by gk＠torproject.org 01 Aug '16

01 Aug '16

commit 61f56b3022059f79246306d8aff6e71fd04c6802 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jul 30 09:29:24 2016 +0000 Update gk's key --- gitian/gpg/gk.gpg | Bin 33866 -> 72418 bytes gitian/gpg/torbutton.gpg | Bin 55562 -> 94114 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/gk.gpg b/gitian/gpg/gk.gpg index ad731ca..2f78b14 100644 Binary files a/gitian/gpg/gk.gpg and b/gitian/gpg/gk.gpg differ diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg index e4a03dd..da40f76 100644 Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ

1 0

[tor-browser-bundle/master] Update Chaneglog and tor-browser version
by gk＠torproject.org 30 Jul '16

30 Jul '16

commit 8eca2970d9b1b3b4d071f4cb837e16d7637e83b9 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jul 30 11:56:37 2016 +0000 Update Chaneglog and tor-browser version --- Bundle-Data/Docs/ChangeLog.txt | 2 ++ gitian/versions.alpha | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 0f089ec..eb79991 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -26,8 +26,10 @@ Tor Browser 6.5a2 -- August 3 * Bug 19735: Switch default search engine to DuckDuckGo * Windows * Bug 19348: Adapt to more than one build target on Windows (fixes updates) + * Bug 19725: Remove old updater files left on disk after upgrade to 6.x * Linux * Bug 19276: Disable Xrender due to possible performance regressions + * Bug 19725: Remove old updater files left on disk after upgrade to 6.x * OS X * Bug 19269: Icon doesn't appear in Applications folder or Dock * Android diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 031a839..4be792f 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,7 +14,7 @@ FIREFOX_VERSION=45.3.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2 TOR_TAG=tor-0.2.8.5-rc TORLAUNCHER_TAG=0.2.9.3 TORBUTTON_TAG=1.9.6.1

1 0

[tor-browser/tor-browser-45.3.0esr-6.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 30 Jul '16

30 Jul '16

commit e0f6ebcc0f63602d59bb1b954029d1950a3e58a5 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 26 10:40:24 2016 -0400 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. When updating from an earlier version to Tor Browser 6.0 or later, old update info files are left behind on Linux and Windows. Remove them. This fixes bug 19725. --- toolkit/mozapps/update/nsUpdateService.js | 40 +++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js index 4495210..b9b91fc 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -1946,6 +1946,10 @@ UpdateService.prototype = { * notify the user of install success. */ _postUpdateProcessing: function AUS__postUpdateProcessing() { +#if defined(TOR_BROWSER_UPDATE) && !defined(XP_MACOSX) + this._removeOrphanedTorBrowserFiles(); +#endif + if (!this.canCheckForUpdates) { LOG("UpdateService:_postUpdateProcessing - unable to check for " + "updates... returning early"); @@ -2113,6 +2117,42 @@ UpdateService.prototype = { cleanUpMozUpdaterDirs(); }, +#if defined(TOR_BROWSER_UPDATE) && !defined(XP_MACOSX) + /** + * When updating from an earlier version to Tor Browser 6.0 or later, old + * update info files are left behind on Linux and Windows. Remove them. + */ + _removeOrphanedTorBrowserFiles: function AUS__removeOrphanedTorBrowserFiles() { + try { + let oldUpdateInfoDir = getAppBaseDir(); // aka the Browser directory. + +#ifdef XP_WIN + // On Windows, the updater files were stored under + // Browser/TorBrowser/Data/Browser/Caches/firefox/ + oldUpdateInfoDir.appendRelativePath( + "TorBrowser\\Data\\Browser\\Caches\\firefox"); +#endif + + // Remove the updates directory. + let updatesDir = oldUpdateInfoDir.clone(); + updatesDir.append("updates"); + if (updatesDir.exists() && updatesDir.isDirectory()) { + updatesDir.remove(true); + } + + // Remove files: active-update.xml and updates.xml + let filesToRemove = [ "active-update.xml", "updates.xml" ]; + filesToRemove.forEach(function(aFileName) { + let f = oldUpdateInfoDir.clone(); + f.append(aFileName); + if (f.exists()) { + f.remove(false); + } + }); + } catch (e) {} + }, +#endif + /** * Register an observer when the network comes online, so we can short-circuit * the app.update.interval when there isn't connectivity

1 0

[tor-browser-bundle/hardened-builds] Bug 19703: Upgrade Go to 1.6.3.
by gk＠torproject.org 30 Jul '16

30 Jul '16

commit 645f3ea6c81aef0b8d1ef25ae2d9ebe30d7669a6 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 21 16:15:19 2016 -0700 Bug 19703: Upgrade Go to 1.6.3. --- gitian/versions | 4 ++-- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- gitian/versions.nightly | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gitian/versions b/gitian/versions index d45eca0..22b52ff 100755 --- a/gitian/versions +++ b/gitian/versions @@ -58,7 +58,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.6.2 +GO_VER=1.6.3 NSIS_VER=2.51 ## File names for the source packages @@ -110,7 +110,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 81f8a47..29595cc 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -66,7 +66,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.6.2 +GO_VER=1.6.3 NSIS_VER=2.51 ## File names for the source packages @@ -118,7 +118,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad diff --git a/gitian/versions.beta b/gitian/versions.beta index 7a305a1..92761a4 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -51,7 +51,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.6.2 +GO_VER=1.6.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -102,7 +102,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da diff --git a/gitian/versions.nightly b/gitian/versions.nightly index c6dad5b..dead59c 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -70,7 +70,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.6.2 +GO_VER=1.6.3 NSIS_VER=2.51 ELFUTILS_VER=0.160 @@ -124,7 +124,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad

1 0

[tor-browser-bundle/master] Update Changelog (for Go update)
by gk＠torproject.org 30 Jul '16

30 Jul '16

commit 081e1be4fe08bce70a1a2874e7832493c5360f20 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jul 30 11:45:39 2016 +0000 Update Changelog (for Go update) --- Bundle-Data/Docs/ChangeLog.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 264f839..0f089ec 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -32,6 +32,9 @@ Tor Browser 6.5a2 -- August 3 * Bug 19269: Icon doesn't appear in Applications folder or Dock * Android * Bug 19484: Avoid compilation error when MOZ_UPDATER is not defined + * Build System + * All Platforms + * Bug 19703: Upgrade Go to 1.6.3 Tor Browser 6.0.2 -- June 21 * All Platforms

1 0

[tor-browser-bundle/master] Bug 19703: Upgrade Go to 1.6.3.
by gk＠torproject.org 30 Jul '16

30 Jul '16

commit 1aa712a555e0ec9ff7a121f2d7429b4783bcf2ad Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 21 16:15:19 2016 -0700 Bug 19703: Upgrade Go to 1.6.3. --- gitian/versions | 4 ++-- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- gitian/versions.nightly | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gitian/versions b/gitian/versions index 96e684a..c3fdb32 100755 --- a/gitian/versions +++ b/gitian/versions @@ -62,7 +62,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.6.2 +GO_VER=1.6.3 NSIS_VER=2.51 ## File names for the source packages @@ -114,7 +114,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 14b68dc..031a839 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -62,7 +62,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.6.2 +GO_VER=1.6.3 NSIS_VER=2.51 ## File names for the source packages @@ -114,7 +114,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad diff --git a/gitian/versions.beta b/gitian/versions.beta index 3a1d893..89003ff 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -49,7 +49,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.6.2 +GO_VER=1.6.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -96,7 +96,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 STIXMATHFONT_HASH=e3b0f712e2644438eee2d0dcd2b10b2d54f1b972039de95b2f8e800bae1adbd8 NOTOEMOJIFONT_HASH=415dc6290378574135b64c808dc640c1df7531973290c4970c51fdeb849cb0c5 NOTOJPFONT_HASH=3e8146c4ce0945f255cb9dbc12b392380af80bd117e0a60eae555c99c7e618da diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 88394c6..7d66421 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -69,7 +69,7 @@ SETUPTOOLS_VER=1.4 PARSLEY_VER=1.2 # We need a Go 1.4 to bootstrap later versions; see https://golang.org/doc/install/source#go14 GO14_VER=1.4.3 -GO_VER=1.6.2 +GO_VER=1.6.3 NSIS_VER=2.51 ## File names for the source packages @@ -121,7 +121,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO14_HASH=9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 -GO_HASH=787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc +GO_HASH=6326aeed5f86cf18f16d6dc831405614f855e2d416a91fd3fdc334f772345b00 NSIS_HASH=43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 NSIS_DEBIAN_HASH=1dee6957b4a4b8dfe69bcf28bc7f301a13b96b3fa5a394e36c8926ae781e774a GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad

1 0

[tor-browser-bundle/master] Release preparations for 6.5a2
by gk＠torproject.org 30 Jul '16

30 Jul '16

commit 14379e81b51d6aecf3b27c20c471990f4a1dc08f Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jul 30 11:15:10 2016 +0000 Release preparations for 6.5a2 Version bumps; changelog update; config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 35 +++++++++++++++++++++++++++++++++++ gitian/versions.alpha | 14 +++++++------- tools/update-responses/config.yml | 12 ++++++------ 3 files changed, 48 insertions(+), 13 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ae5529d..264f839 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,38 @@ +Tor Browser 6.5a2 -- August 3 + * All Platforms + * Update Firefox to 45.3.0esr + * Update Tor to tor-0.2.8.5-rc + * Update Torbutton to 1.9.6.1 + * Bug 19689: Use proper parent window for plugin prompt + * Bug 19206: Avoid SOCKS auth and NEWNYM collisions when sharing a tor client + * Bug 19417: Disable asm.js (but add code to clear on New Identity if enabled) + * Bug 19273: Improve external app launch handling and associated warnings + * Bug 8725: Block addon resource and url fingerprinting with nsIContentPolicy + * Update HTTPS-Everywhere to 5.2.1 + * Update NoScript to 2.9.0.12 + * Bug 19417: Disable asmjs for now + * Bug 19715: Disable the meek-google pluggable transport option + * Bug 19714: Remove mercurius4 obfs4 bridge + * Bug 19585: Fix regression test for keyboard layout fingerprinting + * Bug 19515: Tor Browser is crashing in graphics code + * Bug 18513: Favicon requests can bypass New Identity + * Bug 19273: Write C++ patch for external app launch handling + * Bug 16998: Isolate preconnect requests to URL bar domain + * Bug 18923: Add script to run all Tor Browser regression tests + * Bug 19478: Prevent millisecond resolution leaks in File API + * Bug 19401: Fix broken PDF download button + * Bug 19411: Don't show update icon if a partial update failed + * Bug 19400: Back out GCC bug workaround to avoid asmjs crash + * Bug 19735: Switch default search engine to DuckDuckGo + * Windows + * Bug 19348: Adapt to more than one build target on Windows (fixes updates) + * Linux + * Bug 19276: Disable Xrender due to possible performance regressions + * OS X + * Bug 19269: Icon doesn't appear in Applications folder or Dock + * Android + * Bug 19484: Avoid compilation error when MOZ_UPDATER is not defined + Tor Browser 6.0.2 -- June 21 * All Platforms * Update Torbutton to 1.9.5.5 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 39b3c98..14b68dc 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=45.2.0esr +FIREFOX_VERSION=45.3.0esr TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build1 -TOR_TAG=tor-0.2.8.3-alpha +TOR_TAG=tor-0.2.8.5-rc TORLAUNCHER_TAG=0.2.9.3 -TORBUTTON_TAG=1.9.6 -HTTPSE_TAG=5.1.9 +TORBUTTON_TAG=1.9.6.1 +HTTPSE_TAG=5.2.1 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -47,7 +47,7 @@ GITIAN_TAG=tor-browser-builder-4-1 OPENSSL_VER=1.0.1t GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=r247539 @@ -68,7 +68,7 @@ NSIS_VER=2.51 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.11-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.12-fx+fn+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -102,7 +102,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390 +NOSCRIPT_HASH=3fa641dcb60455c950cef0c15effa8ca060b3b05405f46f55cbdb922929027e7 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 0425afc..7b92a72 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -12,7 +12,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 6.5a1 + alpha: 6.5a2 release: 6.0.1 versions: 6.0.1: @@ -27,12 +27,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 6.5a1: - platformVersion: 45.2.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-65a1-released - download_url: https://cdn.torproject.org/aus1/torbrowser/6.5a1 + 6.5a2: + platformVersion: 45.3.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-65a2-released + download_url: https://cdn.torproject.org/aus1/torbrowser/6.5a2 incremental_from: - - 6.0a5 + - 6.5a1 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/master] Making the git-gpg-wrapper executable
by gk＠torproject.org 30 Jul '16

30 Jul '16

commit 771b1ad79107ad15ea26c2b41da7267dc2e8fb56 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jul 30 10:00:11 2016 +0000 Making the git-gpg-wrapper executable --- gitian/git-gpg-wrapper | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/git-gpg-wrapper b/gitian/git-gpg-wrapper old mode 100644 new mode 100755

1 0

[tor-browser-bundle/master] Bug 19737: Allow git tag signatures made using an expired key
by gk＠torproject.org 30 Jul '16

30 Jul '16

commit 7923b2184b46d4f9b861db256f28e00ee47d390d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 27 22:53:19 2016 +0200 Bug 19737: Allow git tag signatures made using an expired key We are adding a gitian/git-gpg-wrapper script which validates signatures made using an expired key. To do that, we use gpgv rather than gpg, and any EXPKEYSIG line from the gpg `--status-fd` output is replaced by a GOODSIG line. --- gitian/git-gpg-wrapper | 13 +++++++++++++ gitian/verify-tags.sh | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gitian/git-gpg-wrapper b/gitian/git-gpg-wrapper new file mode 100644 index 0000000..f137d6d --- /dev/null +++ b/gitian/git-gpg-wrapper @@ -0,0 +1,13 @@ +#!/bin/bash +# This wrapper script is used by git to verify signatures made using +# an expired key. +# https://bugs.torproject.org/19737 +set -e +if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--verify' ] +then + gpgv "$1" "$3" "$4" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' + exit ${PIPESTATUS[0]} +else + exec gpg "$@" +fi diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 7d92e36..baea827 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -37,10 +37,11 @@ verify_git() { local gpghome=$(mktemp -d) echo "rm -rf '$gpghome'" >> "$CLEANUP" - GNUPGHOME="$gpghome" gpg --import "$keyring" + GNUPGHOME="$gpghome" gpg --no-default-keyring --keyring trustedkeys.gpg --import "$keyring" pushd . cd "$dir" + git config --local gpg.program "$WRAPPER_DIR/git-gpg-wrapper" if ! GNUPGHOME="$gpghome" git tag -v "$tag"; then echo >&2 "$dir: verification of tag $tag against $keyring failed!" exit 1

1 0

[tor-browser-bundle/master] Update gk's key
by gk＠torproject.org 30 Jul '16

30 Jul '16

commit 638d79fccb2e49ad871616e3cc339ff031df524c Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jul 30 09:29:24 2016 +0000 Update gk's key --- gitian/gpg/gk.gpg | Bin 33866 -> 72418 bytes gitian/gpg/torbutton.gpg | Bin 55562 -> 94114 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/gk.gpg b/gitian/gpg/gk.gpg index ad731ca..2f78b14 100644 Binary files a/gitian/gpg/gk.gpg and b/gitian/gpg/gk.gpg differ diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg index e4a03dd..da40f76 100644 Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] fixup! fixup! Regression tests for "Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing"
by gk＠torproject.org 30 Jul '16

30 Jul '16

commit 83f53ee4897f6047c0c691d86833c6960311768e Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jul 30 10:36:40 2016 +0000 fixup! fixup! Regression tests for "Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing" Fixup typo. --- tbb-tests/browser_tor_omnibox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tbb-tests/browser_tor_omnibox.js b/tbb-tests/browser_tor_omnibox.js index 082dd84..e18b2a8 100644 --- a/tbb-tests/browser_tor_omnibox.js +++ b/tbb-tests/browser_tor_omnibox.js @@ -8,7 +8,7 @@ function test() { engineIDs = browserSearchService.getEngines().map(e => e.identifier); // Check that we have the correct engines installed, in the right order. - is(engineIDs[0], "ddg", "Default search engine is disconnect"); + is(engineIDs[0], "ddg", "Default search engine is duckduckgo"); is(engineIDs[1], "youtube", "Secondary search engine is youtube"); is(engineIDs[2], "google", "Google is third search engine"); }

1 0

[tor-browser-bundle/maint-6.0] Making the git-gpg-wrapper executable
by gk＠torproject.org 30 Jul '16

30 Jul '16

commit 89a0db3a46be3c97b82c11fa85d66e97ee406971 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jul 30 10:00:11 2016 +0000 Making the git-gpg-wrapper executable --- gitian/git-gpg-wrapper | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/git-gpg-wrapper b/gitian/git-gpg-wrapper old mode 100644 new mode 100755

1 0

[tor-browser-bundle/maint-6.0] Update gk's key
by gk＠torproject.org 30 Jul '16

30 Jul '16

commit f40aa39010ca734f40e2888604d7a631aa31f5f5 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jul 30 09:29:24 2016 +0000 Update gk's key --- gitian/gpg/gk.gpg | Bin 33866 -> 72418 bytes gitian/gpg/torbutton.gpg | Bin 55562 -> 94114 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/gk.gpg b/gitian/gpg/gk.gpg index ad731ca..2f78b14 100644 Binary files a/gitian/gpg/gk.gpg and b/gitian/gpg/gk.gpg differ diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg index e4a03dd..da40f76 100644 Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ

1 0

[tor-browser-bundle/maint-6.0] Version bumps; Changelog update
by gk＠torproject.org 30 Jul '16

30 Jul '16

commit 12dcde3326c98fea5bce7a017269492620cd11ca Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jul 30 11:21:59 2016 +0200 Version bumps; Changelog update --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 2abd47e..c4a255d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,6 +5,7 @@ Tor Browser 6.0.3 -- August 2 * Bug 19417: Disable asmjs for now * Bug 19689: Use proper parent window for plugin prompt * Update HTTPS-Everywhere to 5.2.1 + * Update NoScript to 2.9.0.12 * Bug 19417: Disable asmjs for now * Bug 19715: Disable the meek-google pluggable transport option * Bug 19714: Remove mercurius4 obfs4 bridge diff --git a/gitian/versions b/gitian/versions index c46c735..f6d8648 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,14 +10,14 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=45.2.0esr +FIREFOX_VERSION=45.3.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.9.3 -TORBUTTON_TAG=1.9.5.5 +TORBUTTON_TAG=1.9.5.6 HTTPSE_TAG=5.2.1 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 @@ -47,7 +47,7 @@ GITIAN_TAG=tor-browser-builder-4-1 OPENSSL_VER=1.0.1t GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=r247539 @@ -66,7 +66,7 @@ NSIS_VER=2.51 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.11-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.12-fx+fn+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -99,7 +99,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390 +NOSCRIPT_HASH=3fa641dcb60455c950cef0c15effa8ca060b3b05405f46f55cbdb922929027e7 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/maint-6.0] Bug 19737: Allow git tag signatures made using an expired key
by gk＠torproject.org 30 Jul '16

30 Jul '16

commit adcf907e1d54de5b9fcca736ca28b69d70c738fb Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 27 22:53:19 2016 +0200 Bug 19737: Allow git tag signatures made using an expired key We are adding a gitian/git-gpg-wrapper script which validates signatures made using an expired key. To do that, we use gpgv rather than gpg, and any EXPKEYSIG line from the gpg `--status-fd` output is replaced by a GOODSIG line. --- gitian/git-gpg-wrapper | 13 +++++++++++++ gitian/verify-tags.sh | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gitian/git-gpg-wrapper b/gitian/git-gpg-wrapper new file mode 100644 index 0000000..f137d6d --- /dev/null +++ b/gitian/git-gpg-wrapper @@ -0,0 +1,13 @@ +#!/bin/bash +# This wrapper script is used by git to verify signatures made using +# an expired key. +# https://bugs.torproject.org/19737 +set -e +if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--verify' ] +then + gpgv "$1" "$3" "$4" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' + exit ${PIPESTATUS[0]} +else + exec gpg "$@" +fi diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index a966626..e006fb0 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -37,10 +37,11 @@ verify_git() { local gpghome=$(mktemp -d) echo "rm -rf '$gpghome'" >> "$CLEANUP" - GNUPGHOME="$gpghome" gpg --import "$keyring" + GNUPGHOME="$gpghome" gpg --no-default-keyring --keyring trustedkeys.gpg --import "$keyring" pushd . cd "$dir" + git config --local gpg.program "$WRAPPER_DIR/git-gpg-wrapper" if ! GNUPGHOME="$gpghome" git tag -v "$tag"; then echo >&2 "$dir: verification of tag $tag against $keyring failed!" exit 1

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
by mikeperry＠torproject.org 29 Jul '16

29 Jul '16

commit 59a087921cc38432f6829c3bccf3ba23fe184c63 Author: difw <something@something> Date: Thu Jul 28 12:15:05 2016 -0700 fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Switch Default to DuckDuckGo HTTPS. Add .onion. --- browser/app/profile/000-tor-browser.js | 4 ++-- browser/locales/en-US/searchplugins/ddg-onion.xml | 11 +++++++++++ browser/locales/en-US/searchplugins/ddg.xml | 4 ++-- browser/locales/en-US/searchplugins/list.txt | 1 + 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index c60b341..a5c0e7f 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -268,7 +268,7 @@ pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\" // Putting the search engine prefs into this file to fix #11236. // Default search engine -pref("browser.search.defaultenginename", "Disconnect"); +pref("browser.search.defaultenginename", "DuckDuckGo"); // Make sure we use the same search engine regardless of locale pref("browser.search.geoSpecificDefaults", false); @@ -276,7 +276,7 @@ pref("browser.search.geoSpecificDefaults", false); // Somewhat surprisingly we get some random behavior if we specify more than // two search engines as below. See // https://bugzilla.mozilla.org/show_bug.cgi?id=1126722 for details. -pref("browser.search.order.extra.1", "Disconnect"); +pref("browser.search.order.extra.1", "DuckDuckGo"); pref("browser.search.order.extra.2", "YouTube"); // Hacks/workarounds: Direct2D seems to crash w/ lots of video cards w/ MinGW? diff --git a/browser/locales/en-US/searchplugins/ddg-onion.xml b/browser/locales/en-US/searchplugins/ddg-onion.xml new file mode 100644 index 0000000..009da7e --- /dev/null +++ b/browser/locales/en-US/searchplugins/ddg-onion.xml @@ -0,0 +1,11 @@ +<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/"> +<ShortName>DuckDuckGoOnion</ShortName> +<Description>Duck Duck Go Onion</Description> +<InputEncoding>UTF-8</InputEncoding> +<Image height="16" width="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAB8lBMVEUAAADkRQzjPwPjQQXkRQ3iPwTiQQXgPQPeQgrcOwPVNgDVNQDWOgbTMwDRMgDQMwDSMwDRNwTQLgDRJgDSJwDSLgDSNwTjOgDiOADjOQDkPADhQAXzs5v+/fv////0vKbiRQvgPQHpdUr85NzuknPdKgDcIwDnZzj2w7HqeU/gPQLsimb/+PftjWn97Obpb0LdJQDeLQDtjmvsi2jgSBDnbULgOQD/39HgLQDeMgDpeFLgSBH0v670uqbaJQD2qImWvP/G1Ob5+/3u//+fvvXyp47dMwDaLwD0u6v0v6/aNQDiXi/aKQD3qozU7/8gSY2vvtg0ZK/OqLDaKQHYKgLgWTfaNADZMgDZMADZLADzqpD7//+xwdz//9H/5Bn/7Bn//ADofADYMADYMQDZOgPXLgDiZDj//97/0AD3tQDvlgHZOgbXLATXMADWMgDfXjLVLQD///z+0AD/3Rn/yRnwnQDcVjbVMQDyv67wuKTSJwDRHQD+8O/tg3/iQQDwhAHnawHWMADvtKfyva7XQxHga0bQGQD2vbH/u8LXIQCmPQzja07XQxLliGn99fPkcVHvhnGZ5VguvUU5wktBwCcAgxzydVv/8/XmiGngdlL+ysi3+I8LtCE80V6P3YmX4sDleljSNQLzr6D7sKPXNQTSIwAEAbMrAAAAF3RSTlMARqSkRvPz80PTpKRG3fPe3hio9/eoGP50jNsAAAABYktHRB5yCiArAAAAyElEQVQYGQXBvUqCYRiA4fu2V9Tn+UQddI3aCpxaOoU6iU4gcqqpoYbALXBuCuoYmttamq JDiEoh4YP+MOi6BNCh+uYKEGiOVNCXXxA2XDVV/UyfKbRCXTLQWAxbP2vt8Ue/uYDvfim91615sb2um6rqtrr/NFb1cUf1Ybd06areU6lSlYpK79jzK1SyJOkfhOl8JGEcqV5zoKrTRqO6yUzIzNu46ijdM1VV9bhuUJ/nZURExLRzUiPQm3kKXHi4BAEGOmOi78A/L1QoU/VHoTsAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTQtMDEtMTlUMjA6MDE6MTEtMDU6MDAuET6cAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE0LTAxLTE5VDIwOjAxOjExLTA1OjAwX0yGIAAAAABJRU5ErkJggg==</Image> +<Url type="text/html" method="POST" template="http://3g2upl4pq6kufc4m.onion/html/"> + <Param name="q" value="{searchTerms}"/> +</Url> +<SearchForm>http://3g2upl4pq6kufc4m.onion/html/</SearchForm> +</SearchPlugin> + diff --git a/browser/locales/en-US/searchplugins/ddg.xml b/browser/locales/en-US/searchplugins/ddg.xml index d82cdbd..aceb0ac 100644 --- a/browser/locales/en-US/searchplugins/ddg.xml +++ b/browser/locales/en-US/searchplugins/ddg.xml @@ -22,9 +22,9 @@ AScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAA AAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMAD AADwDwAA+B8AAA==</Image> -<Url type="text/html" method="POST" template="http://3g2upl4pq6kufc4m.onion/html/"> +<Url type="text/html" method="POST" template="https://duckduckgo.com/"> <Param name="q" value="{searchTerms}"/> </Url> -<SearchForm>http://3g2upl4pq6kufc4m.onion/html/</SearchForm> +<SearchForm>https://duckduckgo.com/</SearchForm> </SearchPlugin> diff --git a/browser/locales/en-US/searchplugins/list.txt b/browser/locales/en-US/searchplugins/list.txt index 71b6c0f..0b4f1fb 100644 --- a/browser/locales/en-US/searchplugins/list.txt +++ b/browser/locales/en-US/searchplugins/list.txt @@ -2,6 +2,7 @@ disconnect youtube twitter wikipedia +ddg-onion startpage yahoo google

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] fixup! Regression tests for "Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing"
by mikeperry＠torproject.org 29 Jul '16

29 Jul '16

commit 146ae4cc141f702785f896ff8c90bdfa0ab90b60 Author: difw <something@something> Date: Fri Jul 29 09:32:22 2016 -0700 fixup! Regression tests for "Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing" Update tests. --- tbb-tests/browser_tor_omnibox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tbb-tests/browser_tor_omnibox.js b/tbb-tests/browser_tor_omnibox.js index 8648551..082dd84 100644 --- a/tbb-tests/browser_tor_omnibox.js +++ b/tbb-tests/browser_tor_omnibox.js @@ -8,7 +8,7 @@ function test() { engineIDs = browserSearchService.getEngines().map(e => e.identifier); // Check that we have the correct engines installed, in the right order. - is(engineIDs[0], "disconnect", "Default search engine is disconnect"); + is(engineIDs[0], "ddg", "Default search engine is disconnect"); is(engineIDs[1], "youtube", "Secondary search engine is youtube"); is(engineIDs[2], "google", "Google is third search engine"); }

1 0

[torbutton/master] Release preparations for 1.9.6.1
by mikeperry＠torproject.org 29 Jul '16

29 Jul '16

commit e403cd883db74649eed86aed0edaf3d101d07fbb Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jul 28 17:03:03 2016 -0700 Release preparations for 1.9.6.1 CHANGELOG update, version bump --- src/CHANGELOG | 7 +++++++ src/install.rdf | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index e62bafd..cd5ce27 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,10 @@ +1.9.6.1 + * Bug 19206: Avoid SOCKS auth and NEWNYM collisions when sharing a tor client + * Bug 19417: Disable asm.js (but add code to clear on New Identity if enabled) + * Bug 19689: Plugin usage prompt is parented to wrong window + * Bug 19273: Improve external app launch handling and associated warnings + * Bug 8725: Block addon resource and url fingerprinting with nsIContentPolicy + 1.9.6 * Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu * Bug 18905: Hide unusable items from help menu diff --git a/src/install.rdf b/src/install.rdf index db269d5..e33fdb9 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.6</em:version> + <em:version>1.9.6.1</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 8725: Block `resource://` based fingerprinting with nsIContentPolicy.
by mikeperry＠torproject.org 28 Jul '16

28 Jul '16

commit 3bff5aaea6e1a732ff908527f67d1784ecf23c57 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Fri Jun 17 01:25:09 2016 +0000 Bug 8725: Block `resource://` based fingerprinting with nsIContentPolicy. Based on ResourceFilter: A direct workaround for https://bugzil.la/863246 https://notabug.org/desktopd/no-resource-uri-leak/src/master/src/resource-f… --- src/chrome.manifest | 4 ++++ src/components/content-policy.js | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/src/chrome.manifest b/src/chrome.manifest index e85a205..340ed27 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -170,6 +170,10 @@ category profile-after-change CookieJarSelector @torproject.org/cookie-jar-selec component {65be2be0-ceb4-44c2-91a5-9c75c53430bf} components/torRefSpoofer.js contract @torproject.org/torRefSpoofer;1 {65be2be0-ceb4-44c2-91a5-9c75c53430bf} +component {4c03be7d-492f-990e-f0da-f3689e564898} components/content-policy.js +contract @torproject.org/content-policy;1 {4c03be7d-492f-990e-f0da-f3689e564898} +category content-policy ContentPolicy @torproject.org/content-policy;1 + category profile-after-change RefSpoofer @torproject.org/torRefSpoofer;1 category profile-after-change StartupObserver @torproject.org/startup-observer;1 category profile-after-change DomainIsolator @torproject.org/domain-isolator;1 diff --git a/src/components/content-policy.js b/src/components/content-policy.js new file mode 100644 index 0000000..b4b33a7 --- /dev/null +++ b/src/components/content-policy.js @@ -0,0 +1,48 @@ +/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- + * This Source Code Form is subject to the terms of the Mozilla Public + * 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/. */ + +/* + * Based on ResourceFilter: A direct workaround for https://bugzil.la/863246 + * https://notabug.org/desktopd/no-resource-uri-leak/src/master/src/resource-f… + */ + +const Ci = Components.interfaces, Cu = Components.utils; + +// Import XPCOMUtils object. +Cu.import("resource://gre/modules/XPCOMUtils.jsm"); + +function ContentPolicy() {} + +ContentPolicy.prototype = { + classDescription: "ContentPolicy", + classID: Components.ID("{4c03be7d-492f-990e-f0da-f3689e564898}"), + contractID: "@torproject.org/content-policy;1", + QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPolicy]), + + _xpcom_categories: [{category: "content-policy"}], + + shouldLoad: function(aContentType, aContentLocation, aRequestOrigin, aContext, aMimeTypeGuess, aExtra) { + // Accept if no content URI or scheme is not a resource. + if (!aContentLocation || !aContentLocation.schemeIs('resource')) + return Ci.nsIContentPolicy.ACCEPT; + + // Accept if no origin URI, or if the origin URI scheme is chrome/resource. + if (!aRequestOrigin || aRequestOrigin.schemeIs('resource') || aRequestOrigin.schemeIs('chrome')) + return Ci.nsIContentPolicy.ACCEPT; + + // Accept if resource directly loaded into a tab. + if (Ci.nsIContentPolicy.TYPE_DOCUMENT === aContentType) + return Ci.nsIContentPolicy.ACCEPT; + + return Ci.nsIContentPolicy.REJECT_REQUEST; + }, + + shouldProcess: function(aContentType, aContentLocation, aRequestOrigin, aContext, aMimeType, aExtra) { + return Ci.nsIContentPolicy.ACCEPT; + }, +}; + +// Firefox >= 4.0 (Old versions are extremely irrelevant). +var NSGetFactory = XPCOMUtils.generateNSGetFactory([ContentPolicy]);

1 0

[torbutton/master] Bug 8725: Consistently deny redirects to browser/addon internal URLs.
by mikeperry＠torproject.org 28 Jul '16

28 Jul '16

commit fa67687df5fc72c0b6085d9941331277d32319f3 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Sat Jul 16 03:37:27 2016 +0000 Bug 8725: Consistently deny redirects to browser/addon internal URLs. The browser's behavior is different depending on if a given internal resource is available or not, regardless of the fact that the actual body will not load due to the various safeguards and checks. This normalizes the behavior by denying all redirects destined for URLs with proscribed browser internal schemes (`resource`, `about`, `chrome`). --- src/components/content-policy.js | 41 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/src/components/content-policy.js b/src/components/content-policy.js index c6c8aa9..e025ecd 100644 --- a/src/components/content-policy.js +++ b/src/components/content-policy.js @@ -8,7 +8,7 @@ * https://notabug.org/desktopd/no-resource-uri-leak/src/master/src/resource-f… */ -const Ci = Components.interfaces, Cu = Components.utils; +const Cc = Components.classes, Ci = Components.interfaces, Cu = Components.utils; // Import XPCOMUtils object. Cu.import("resource://gre/modules/XPCOMUtils.jsm"); @@ -21,8 +21,6 @@ ContentPolicy.prototype = { contractID: "@torproject.org/content-policy;1", QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPolicy]), - _xpcom_categories: [{category: "content-policy"}], - shouldLoad: function(aContentType, aContentLocation, aRequestOrigin, aContext, aMimeTypeGuess, aExtra) { // Accept if no content URI or scheme is not a resource/chrome. if (!aContentLocation || !(aContentLocation.schemeIs('resource') || aContentLocation.schemeIs('chrome'))) @@ -44,5 +42,42 @@ ContentPolicy.prototype = { }, }; +// Install a HTTP response handler to check for redirects to URLs with schemes +// that should be internal to the browser. There's various safeguards and +// checks that cause the body to be unavailable, but the `onLoad()` behavior +// is inconsistent, which results in leaking information about the specific +// user agent instance (eg: what addons are installed). +var requestObserver = { + ioService: Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService), + observerService: Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService), + + start: function() { + this.observerService.addObserver(this, "http-on-examine-response", false); + }, + + observe: function(aSubject, aTopic, aData) { + let aChannel = aSubject.QueryInterface(Ci.nsIHttpChannel); + let aStatus = aChannel.responseStatus; + + // If this is a redirect... + // + // Note: Technically `304 Not Modifed` isn't a redirect, but receiving that + // to the proscribed schemes is nonsensical. + if (aStatus >= 300 && aStatus < 400) { + let location = aChannel.getResponseHeader("Location"); + let aUri = this.ioService.newURI(location, null, null); + + // And it's redirecting into the browser or addon's internal URLs... + if (aUri.schemeIs("resource") || aUri.schemeIs("chrome") || aUri.schemeIs("about")) { + // Cancel the request. + aSubject.cancel(Components.results.NS_BINDING_ABORTED); + } + } + }, +}; + // Firefox >= 4.0 (Old versions are extremely irrelevant). var NSGetFactory = XPCOMUtils.generateNSGetFactory([ContentPolicy]); + +// Register the request observer to handle redirects. +requestObserver.start();

1 0

[torbutton/master] Merge remote-tracking branch 'yawning/bug8725_take3'
by mikeperry＠torproject.org 28 Jul '16

28 Jul '16

commit 3b8e1a3508c7cb15d15c93149acab81ea8c51d9a Merge: 7dd7101 fa67687 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jul 28 15:06:21 2016 -0700 Merge remote-tracking branch 'yawning/bug8725_take3' src/chrome.manifest | 4 ++ src/components/content-policy.js | 83 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+)

1 0

[torbutton/master] Bug 8725: Block `chrome://` based fingerprinting with nsIContentPolicy.
by mikeperry＠torproject.org 28 Jul '16

28 Jul '16

commit ace11cd8020aaf0136ee58aa074666f10c14abb9 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Fri Jun 17 01:27:14 2016 +0000 Bug 8725: Block `chrome://` based fingerprinting with nsIContentPolicy. Most addons do not set `contentaccessible=yes`, however behavior should be consistent even if such addons are installed. This does not affect any of the standard addons shipped with Tor Browser, but will break user installed addons that depend on actually being able to access `chrome://` URLs in this manner. --- src/components/content-policy.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/content-policy.js b/src/components/content-policy.js index b4b33a7..c6c8aa9 100644 --- a/src/components/content-policy.js +++ b/src/components/content-policy.js @@ -24,12 +24,12 @@ ContentPolicy.prototype = { _xpcom_categories: [{category: "content-policy"}], shouldLoad: function(aContentType, aContentLocation, aRequestOrigin, aContext, aMimeTypeGuess, aExtra) { - // Accept if no content URI or scheme is not a resource. - if (!aContentLocation || !aContentLocation.schemeIs('resource')) + // Accept if no content URI or scheme is not a resource/chrome. + if (!aContentLocation || !(aContentLocation.schemeIs('resource') || aContentLocation.schemeIs('chrome'))) return Ci.nsIContentPolicy.ACCEPT; - // Accept if no origin URI, or if the origin URI scheme is chrome/resource. - if (!aRequestOrigin || aRequestOrigin.schemeIs('resource') || aRequestOrigin.schemeIs('chrome')) + // Accept if no origin URI or if origin scheme is chrome/resource/about. + if (!aRequestOrigin || aRequestOrigin.schemeIs('resource') || aRequestOrigin.schemeIs('chrome') || aRequestOrigin.schemeIs('about')) return Ci.nsIContentPolicy.ACCEPT; // Accept if resource directly loaded into a tab.

1 0

[tor-browser-bundle/maint-6.0] Release preparations for 6.0.3
by gk＠torproject.org 22 Jul '16

22 Jul '16

commit 033fe948a692f545d50132ebe2046704be5dff7d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jul 22 16:40:03 2016 +0000 Release preparations for 6.0.3 --- Bundle-Data/Docs/ChangeLog.txt | 18 ++++++++++++++++++ gitian/versions | 2 +- tools/update-responses/config.yml | 13 ++++++------- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 6325c23..2abd47e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,21 @@ +Tor Browser 6.0.3 -- August 2 + * All Platforms + * Update Firefox to 45.3.0esr + * Update Torbutton to 1.9.5.6 + * Bug 19417: Disable asmjs for now + * Bug 19689: Use proper parent window for plugin prompt + * Update HTTPS-Everywhere to 5.2.1 + * Bug 19417: Disable asmjs for now + * Bug 19715: Disable the meek-google pluggable transport option + * Bug 19714: Remove mercurius4 obfs4 bridge + * Bug 19585: Fix regression test for keyboard layout fingerprinting + * Bug 19515: Tor Browser is crashing in graphics code + * Bug 18513: Favicon requests can bypass New Identity + * OS X + * Bug 19269: Icon doesn't appear in Applications folder or Dock + * Android + * Bug 19484: Avoid compilation error when MOZ_UPDATER is not defined + Tor Browser 6.0.2 -- June 21 * All Platforms * Update Torbutton to 1.9.5.5 diff --git a/gitian/versions b/gitian/versions index 6e54edd..c46c735 100755 --- a/gitian/versions +++ b/gitian/versions @@ -18,7 +18,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.9.3 TORBUTTON_TAG=1.9.5.5 -HTTPSE_TAG=5.1.9 +HTTPSE_TAG=5.2.1 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 4e89b8a..16843df 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -13,15 +13,14 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 6.0a5 - release: 6.0.2 + release: 6.0.3 versions: - 6.0.2: - platformVersion: 45.2.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-602-released - download_url: https://cdn.torproject.org/aus1/torbrowser/6.0.2 + 6.0.3: + platformVersion: 45.3.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-603-released + download_url: https://cdn.torproject.org/aus1/torbrowser/6.0.3 incremental_from: - - 6.0 - - 6.0.1 + - 6.0.2 migrate_archs: osx32: osx64 osx32:

1 0

[torbutton/maint-1.9.5] Release preparations for 1.9.5.6
by gk＠torproject.org 22 Jul '16

22 Jul '16

commit 7b983fe74fca4bc29d68e0a4ed3c2eeae2ba1113 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jul 22 14:33:41 2016 +0000 Release preparations for 1.9.5.6 --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 77ba290..28cff54 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.9.5.6 + * Bug 19417: Disable asmjs for now + * Bug 19689: Use proper parent windows for plugin prompt + 1.9.5.5 * Bug 19417: Clear asmjscache diff --git a/src/install.rdf b/src/install.rdf index ac45b1d..9098991 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.5.5</em:version> + <em:version>1.9.5.6</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

[tor-browser-bundle/hardened-builds] Bug 19714: Remove mercurius4 obfs4 bridge.
by gk＠torproject.org 20 Jul '16

20 Jul '16

commit df8ba4909c0e2638f21d4ff93cf9ebb9ff548af9 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 19 15:27:59 2016 -0700 Bug 19714: Remove mercurius4 obfs4 bridge. https://lists.torproject.org/pipermail/tor-project/2016-July/000524.html --- Bundle-Data/PTConfigs/bridge_prefs.js | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 50cd673..0b33d8c 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -20,18 +20,17 @@ pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 7 pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:60873 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:60873 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/maint-6.0] Bug 19714: Remove mercurius4 obfs4 bridge.
by gk＠torproject.org 20 Jul '16

20 Jul '16

commit 761b42f9fcc21cac5fc02fe0e884bea1494a0b31 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 19 15:27:59 2016 -0700 Bug 19714: Remove mercurius4 obfs4 bridge. https://lists.torproject.org/pipermail/tor-project/2016-July/000524.html --- Bundle-Data/PTConfigs/bridge_prefs.js | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 50cd673..0b33d8c 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -20,18 +20,17 @@ pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 7 pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:60873 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:60873 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/master] Bug 19714: Remove mercurius4 obfs4 bridge.
by gk＠torproject.org 20 Jul '16

20 Jul '16

commit bd20a2aa5a157eb7d8afd87811c9ebbe0127b654 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 19 15:27:59 2016 -0700 Bug 19714: Remove mercurius4 obfs4 bridge. https://lists.torproject.org/pipermail/tor-project/2016-July/000524.html --- Bundle-Data/PTConfigs/bridge_prefs.js | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 50cd673..0b33d8c 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -20,18 +20,17 @@ pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 7 pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:60873 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:60873 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/hardened-builds] Bug 19715: Disable the meek-google pluggable transport option.
by gk＠torproject.org 20 Jul '16

20 Jul '16

commit 2d278df7625814bde8f2c3b8d6ca9da822425dd1 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 19 16:17:16 2016 -0700 Bug 19715: Disable the meek-google pluggable transport option. meek-google was shut down by Google Cloud Platform: https://lists.torproject.org/pipermail/tor-talk/2016-June/041699.html --- Bundle-Data/PTConfigs/bridge_prefs.js | 1 - 1 file changed, 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 379f256..50cd673 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -33,6 +33,5 @@ pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:60873 pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/maint-6.0] Bug 19715: Disable the meek-google pluggable transport option.
by gk＠torproject.org 20 Jul '16

20 Jul '16

commit 2a637b1850fe3ca7fbb1a40f584519d3193c571c Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 19 16:17:16 2016 -0700 Bug 19715: Disable the meek-google pluggable transport option. meek-google was shut down by Google Cloud Platform: https://lists.torproject.org/pipermail/tor-talk/2016-June/041699.html --- Bundle-Data/PTConfigs/bridge_prefs.js | 1 - 1 file changed, 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 379f256..50cd673 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -33,6 +33,5 @@ pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:60873 pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/master] Fold in stable changelog
by gk＠torproject.org 20 Jul '16

20 Jul '16

commit dce9a2f6d9c3b546fdefe07ff94d2c9c545ced3f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jul 18 10:00:53 2016 +0000 Fold in stable changelog --- Bundle-Data/Docs/ChangeLog.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 83963d1..ae5529d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,15 @@ +Tor Browser 6.0.2 -- June 21 + * All Platforms + * Update Torbutton to 1.9.5.5 + * Bug 19417: Clear asmjscache + * Bug 19401: Fix broken PDF download button + * Bug 19411: Don't show update icon if a partial update failed + * Bug 19400: Back out GCC bug workaround to avoid asmjs crash + * Windows + * Bug 19348: Adapt to more than one build target on Windows (fixes updates) + * Linux + * Bug 19276: Disable Xrender due to possible performance regressions + Tor Browser 6.5a1-hardened -- June 8 * All Platforms * Update Firefox to 45.2.0esr

1 0

[tor-browser-bundle/master] Bug 19715: Disable the meek-google pluggable transport option.
by gk＠torproject.org 20 Jul '16

20 Jul '16

commit f57843f57ac2839d997e01a1f139947ffdc31eae Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 19 16:17:16 2016 -0700 Bug 19715: Disable the meek-google pluggable transport option. meek-google was shut down by Google Cloud Platform: https://lists.torproject.org/pipermail/tor-talk/2016-June/041699.html --- Bundle-Data/PTConfigs/bridge_prefs.js | 1 - 1 file changed, 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 379f256..50cd673 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -33,6 +33,5 @@ pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:60873 pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[torbutton/master] Bug 19273: Avoid JavaScript patching of the external app helper dialog.
by gk＠torproject.org 17 Jul '16

17 Jul '16

commit 6d5dc7845579ca99d9c46d921876e477ba60935f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jun 29 10:33:17 2016 -0400 Bug 19273: Avoid JavaScript patching of the external app helper dialog. Display the external app confirmation dialog in response to the new "external-app-requested" observer service notification. Remove messy overrides of Mozilla components and console log filtering. Remove obsolete "on-modify-drag-list" observer and pre-Firefox 4.0 module registration code from the External App Handler component. --- src/chrome.manifest | 5 +- src/chrome/content/torbutton.js | 93 ----------- src/components/external-app-blocker.js | 295 +++++---------------------------- 3 files changed, 44 insertions(+), 349 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index e85a205..bb6bcf9 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -143,9 +143,7 @@ style chrome://global/content/customizeToolbar.xul chrome://torbutton/skin/torbu # Firefox 4-style component registration component {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} components/external-app-blocker.js -contract @mozilla.org/mime;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} -contract @mozilla.org/uriloader/external-protocol-service;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} -contract @mozilla.org/uriloader/external-helper-app-service;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} +contract @torproject.org/torbutton-extAppBlockerService;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} component {06322def-6fde-4c06-aef6-47ae8e799629} components/startup-observer.js contract @torproject.org/startup-observer;1 {06322def-6fde-4c06-aef6-47ae8e799629} @@ -173,3 +171,4 @@ contract @torproject.org/torRefSpoofer;1 {65be2be0-ceb4-44c2-91a5-9c75c53430bf} category profile-after-change RefSpoofer @torproject.org/torRefSpoofer;1 category profile-after-change StartupObserver @torproject.org/startup-observer;1 category profile-after-change DomainIsolator @torproject.org/domain-isolator;1 +category profile-after-change ExtAppBlockerService @torproject.org/torbutton-extAppBlockerService;1 diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 3203cef..5eb26d9 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -3054,104 +3054,12 @@ function torbutton_is_windowed(wind) { return true; } -// This is the console observer used for getting unwanted error messages -// resulting from JS -> C++ transition filtered out. -var torbutton_console_observer = { - - obs : null, - - register: function() { - this.obs = Cc["@mozilla.org/observer-service;1"]. - getService(Ci.nsIObserverService); - this.obs.addObserver(this, "web-console-created", false); - }, - - unregister: function() { - if (this.obs) { - this.obs.removeObserver(this, "web-console-created"); - } - }, - - observe: function(subject, topic, data) { - if (topic === "web-console-created") { - var id = subject.QueryInterface(Ci.nsISupportsString).toString(), - con = HUDService.getHudReferenceById(id); - con.ui.reportPageErrorOld = con.ui.reportPageError; - // Filtering the messages by making them hidden adding the - // "hidden-message" class. If the message does not need to get filtered - // the original method is executed without any modifications. - con.ui.reportPageError = - function WCF_reportPageError(aCategory, aScriptError) { - var message = aScriptError.errorMessage; - if (message && message.indexOf("NS_ERROR_NOT_AVAILABLE") > -1 && - message.indexOf("external-app-blocker.js") > -1) { - return this.reportPageErrorOld(aCategory, aScriptError).classList. - add("hidden-message"); - } else { - return this.reportPageErrorOld(aCategory, aScriptError); - } - } - } - } -}; - -// Ideally, we only need to patch/override one method to avoid errors showing up -// in the browser console. Alas, that is not as easy given the presence of -// cached messages and the Web Console which we need to consider as well while -// overriding Devtool methods. Thus, we patch the code path that is called when -// the browser console is already open AND additionally the one when cached -// messages are displayed. -function torbutton_handle_console() { - torbutton_console_observer.register(); - try { - // Filtering using the "web-console-created" notification is not enough as - // the cached messages are already loaded when it is fired. Therefore, - // change |getCachedMessages()| slighty to fit the needs at hand. - // The original code is https://mxr.mozilla.org/mozilla-esr24/source/ - // toolkit/devtools/webconsole/WebConsoleUtils.jsm#998 ff. and distributed - // under the MPL 2.0 license. - ConsoleServiceListener.prototype.getCachedMessages = - function CSL_getCachedMessages(aIncludePrivate = false) { - var innerWindowID = this.window ? WebConsoleUtils. - getInnerWindowId(this.window) : null; - var errors = Services.console.getMessageArray() || []; - - return errors.filter((aError) => { - if (aError instanceof Ci.nsIScriptError) { - var message = aError.message; - if (message && message.indexOf("NS_ERROR_NOT_AVAILABLE") > -1 && - message.indexOf("external-app-blocker.js") > -1) { - return false; - } - if (!aIncludePrivate && aError.isFromPrivateWindow) { - return false; - } - if (innerWindowID && - (aError.innerWindowID != innerWindowID || - !this.isCategoryAllowed(aError.category))) { - return false; - } - } - else if (innerWindowID) { - // If this is not an nsIScriptError and we need to do window-based - // filtering we skip this message. - return false; - } - - return true; - }); - }; - } catch (e) {} -} - // Bug 1506 P3: This is needed pretty much only for the version check // and the window resizing. See comments for individual functions for // details function torbutton_new_window(event) { torbutton_log(3, "New window"); - // Working around #9901, sigh... - torbutton_handle_console(); var browser = getBrowser(); if(!browser) { @@ -3199,7 +3107,6 @@ function torbutton_new_window(event) function torbutton_close_window(event) { torbutton_window_pref_observer.unregister(); torbutton_tor_check_observer.unregister(); - torbutton_console_observer.unregister(); window.removeEventListener("sizemodechange", m_tb_resize_handler, false); diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index b349ab4..7b22a90 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -6,165 +6,78 @@ * External App Handler. * Handles displaying confirmation dialogs for external apps and protocols * due to Firefox Bug https://bugzilla.mozilla.org/show_bug.cgi?id=440892 + * + * Also implements an observer that filters drag events to prevent OS + * access to URLs (a potential proxy bypass vector). *************************************************************************/ -// Module specific constants -const kMODULE_NAME = "Torbutton External App Handler"; - -const kMODULE_CONTRACTID_APP = "@mozilla.org/uriloader/external-helper-app-service;1"; -const kMODULE_CONTRACTID_PROTO = "@mozilla.org/uriloader/external-protocol-service;1"; -const kMODULE_CONTRACTID_MIME = "@mozilla.org/mime;1"; - - -const kMODULE_CID = Components.ID("3da0269f-fc29-4e9e-a678-c3b1cafcf13f"); - -/* Mozilla defined interfaces for FF3.0 */ -const kREAL_EXTERNAL_CID = "{A7F800E0-4306-11d4-98D0-001083010E9B}"; -const kExternalInterfaces = ["nsIObserver", "nsIMIMEService", - "nsIExternalHelperAppService", - "nsISupportsWeakReference", // XXX: Uh-oh... - "nsIExternalProtocolService", - "nsPIExternalAppLauncher"]; - -const Cr = Components.results; const Cc = Components.classes; const Ci = Components.interfaces; +const Cu = Components.utils; -var appInfo = Components.classes["@mozilla.org/xre/app-info;1"] - .getService(Components.interfaces.nsIXULAppInfo); -var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"] - .getService(Components.interfaces.nsIVersionComparator); -var is_ff3 = (versionChecker.compare(appInfo.version, "3.0a1") >= 0); +Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -function ExternalWrapper() { - this.logger = Components.classes["@torproject.org/torbutton-logger;1"] - .getService(Components.interfaces.nsISupports).wrappedJSObject; - this.logger.log(3, "Component Load 0: New ExternalWrapper."); +// Module specific constants +const kMODULE_NAME = "Torbutton External App Handler"; +const kCONTRACT_ID = "@torproject.org/torbutton-extAppBlockerService;1"; +const kMODULE_CID = Components.ID("3da0269f-fc29-4e9e-a678-c3b1cafcf13f"); - this._real_external = Components.classesByID[kREAL_EXTERNAL_CID]; - this._interfaces = kExternalInterfaces; +const kInterfaces = [Ci.nsIObserver, Ci.nsIClassInfo]; - this._prefs = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranch); +function ExternalAppBlocker() { + this.logger = Cc["@torproject.org/torbutton-logger;1"] + .getService(Ci.nsISupports).wrappedJSObject; + this.logger.log(3, "Component Load 0: New ExternalAppBlocker."); - this._external = function() { - var external = this._real_external.getService(); - for (var i = 0; i < this._interfaces.length; i++) { - external.QueryInterface(Components.interfaces[this._interfaces[i]]); - } - return external; - }; - - this.copyMethods(this._external()); + this._prefs = Cc["@mozilla.org/preferences-service;1"] + .getService(Ci.nsIPrefBranch); try { var observerService = Cc["@mozilla.org/observer-service;1"]. getService(Ci.nsIObserverService); - observerService.addObserver(this, "on-modify-drag-list", false); + observerService.addObserver(this, "external-app-requested", false); observerService.addObserver(this, "on-datatransfer-available", false); } catch(e) { - this.logger.log(5, "Failed to register drag observer"); + this.logger.log(5, "Failed to register external app observer or drag observer"); } } -ExternalWrapper.prototype = +ExternalAppBlocker.prototype = { - QueryInterface: function(iid) { - if (iid.equals(Components.interfaces.nsIClassInfo) - || iid.equals(Components.interfaces.nsISupports)) { - return this; - } - - /* We perform this explicit check first because otherwise - * the JSD exception logs are full of noise */ - var external = this._external().QueryInterface(iid); - this.copyMethods(external); - - return this; - }, + QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver]), // make this an nsIClassInfo object - flags: Components.interfaces.nsIClassInfo.DOM_OBJECT, - - // method of nsIClassInfo - - classDescription: "@mozilla.org/uriloader/external-helper-app-service;1", - contractID: "@mozilla.org/uriloader/external-helper-app-service;1", + flags: Ci.nsIClassInfo.DOM_OBJECT, + classDescription: kMODULE_NAME, + contractID: kCONTRACT_ID, classID: kMODULE_CID, // method of nsIClassInfo getInterfaces: function(count) { - var interfaceList = [Components.interfaces.nsIClassInfo]; - for (var i = 0; i < this._interfaces.length; i++) { - interfaceList.push(Components.interfaces[this._interfaces[i]]); - } - - count.value = interfaceList.length; - return interfaceList; + count.value = kInterfaces.length; + return kInterfaces; }, // method of nsIClassInfo getHelperForLanguage: function(count) { return null; }, /* Determine whether we should ask the user to run the app */ - blockApp: function() { + _blockApp: function() { return this._prefs.getBoolPref("extensions.torbutton.tor_enabled"); }, - /* Copies methods from the true object we are wrapping */ - copyMethods: function(wrapped) { - var mimic = function(newObj, method) { - if(typeof(wrapped[method]) == "function") { - // Code courtesy of timeless: - // http://www.webwizardry.net/~timeless/windowStubs.js - var params = []; - params.length = wrapped[method].length; - var x = 0; - var call; - if(params.length) call = "("+params.join().replace(/(?:)/g,function(){return "p"+(++x)})+")"; - else call = "()"; - - var fun = "(function "+call+"{"+ - "if (arguments.length < "+wrapped[method].length+")"+ - " throw Components.results.NS_ERROR_XPC_NOT_ENOUGH_ARGS;"+ - "return wrapped."+method+".apply(wrapped, arguments);})"; - newObj[method] = eval(fun); - } else { - newObj.__defineGetter__(method, function() { return wrapped[method]; }); - newObj.__defineSetter__(method, function(val) { wrapped[method] = val; }); - } - }; - for (var method in wrapped) { - if(typeof(this[method]) == "undefined") mimic(this, method); - } - }, - - loadURI: function(aUri, aContext) { - if(this.blockApp()) { - var check = {value: false}; - var result = this._confirmLaunch(aUri.spec, check); - - if (result != 0) { - return null; - } - } - - return this._external().loadURI(aUri, aContext); - }, - - // loadUrl calls loadURI - - _confirmLaunch: function(urispec, check) { + // Returns true if launch should proceed. + _confirmLaunch: function() { if (!this._prefs.getBoolPref("extensions.torbutton.launch_warning")) { - return 0; + return true; } var wm = Cc["@mozilla.org/appshell/window-mediator;1"] - .getService(Components.interfaces.nsIWindowMediator); + .getService(Ci.nsIWindowMediator); var chrome = wm.getMostRecentWindow("navigator:browser"); - var prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] - .getService(Components.interfaces.nsIPromptService); + var prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"] + .getService(Ci.nsIPromptService); var flags = prompts.BUTTON_POS_0 * prompts.BUTTON_TITLE_IS_STRING + prompts.BUTTON_POS_1 * prompts.BUTTON_TITLE_IS_STRING + prompts.BUTTON_DELAY_ENABLE + @@ -178,77 +91,32 @@ ExternalWrapper.prototype = var cancel = chrome.torbutton_get_property_string("torbutton.popup.cancel"); var dontask = chrome.torbutton_get_property_string("torbutton.popup.dontask"); + var check = {value: false}; var result = prompts.confirmEx(chrome, title, app+note+suggest+" ", flags, launch, cancel, "", dontask, check); - //var result = prompts.confirmEx(chrome, title, app+urispec+note+suggest+" ", - // flags, launch, cancel, "", dontask, check); - if (check.value) { this._prefs.setBoolPref("extensions.torbutton.launch_warning", false); } - return result; + return (0 == result); }, - doContent: function(aMimeContentType, aRequest, aContentContext, - aForceSave, aWindowContext) { - if(this.blockApp()) { - var check = {value: false}; - var result = this._confirmLaunch(aRequest.name, check); - - if (result != 0) { - return null; - } - } - - return this._external().doContent(aMimeContentType, aRequest, - aContentContext, aForceSave, aWindowContext); - }, - observe: function(subject, topic, data) { - // XXX: The on-modify-drag-list is TBB specific and can be removed. - // FF31 added the on-datatransfer-available observer instead. - if (topic == "on-modify-drag-list") { - this.logger.log(3, "Got drag observer event"); - try { - subject.QueryInterface(Ci.nsISupportsArray); - } catch(e) { - this.logger.log(5, "Drag and Drop subject is not an array: "+e); + if (topic == "external-app-requested") { + this.logger.log(3, "External app requested"); + // subject.data is true if the launch should be canceled. + if (this._blockApp() && (subject instanceof Ci.nsISupportsPRBool) + && !subject.data /* not canceled already */ + && !this._confirmLaunch()) { + subject.data = true; // The user said to cancel the launch. } - - return this.filterDragURLs(subject); } else if (topic == "on-datatransfer-available") { this.logger.log(3, "The DataTransfer is available"); return this.filterDataTransferURLs(subject); } }, - filterDragURLs: function(aTransferableArray) { - for(var i = 0; i < aTransferableArray.Count(); i++) { - this.logger.log(3, "Inspecting drag+drop transfer: "+i); - var tr = aTransferableArray.GetElementAt(i); - tr.QueryInterface(Ci.nsITransferable); - - var flavors = tr.flavorsTransferableCanExport() - .QueryInterface(Ci.nsISupportsArray); - - for (var f=0; f < flavors.Count(); f++) { - var flavor =flavors.GetElementAt(f); - flavor.QueryInterface(Ci.nsISupportsCString); - - this.logger.log(3, "Got drag+drop flavor: "+flavor); - if (flavor == "text/x-moz-url" || - flavor == "text/x-moz-url-data" || - flavor == "text/uri-list" || - flavor == "application/x-moz-file-promise-url") { - this.logger.log(3, "Removing "+flavor); - try { tr.removeDataFlavor(flavor); } catch(e) {} - } - } - } - }, - filterDataTransferURLs: function(aDataTransfer) { var types = null; var type = ""; @@ -274,83 +142,4 @@ ExternalWrapper.prototype = }; -var ExternalWrapperSingleton = null; -var ExternalWrapperFactory = new Object(); - -ExternalWrapperFactory.createInstance = function (outer, iid) -{ - if (outer != null) { - Components.returnCode = Cr.NS_ERROR_NO_AGGREGATION; - return null; - } - - if(!ExternalWrapperSingleton) - ExternalWrapperSingleton = new ExternalWrapper(); - - return ExternalWrapperSingleton; -}; - - -/** - * JS XPCOM component registration goop: - * - * Everything below is boring boilerplate and can probably be ignored. - */ - -var ExternalWrapperModule = new Object(); - -ExternalWrapperModule.registerSelf = -function (compMgr, fileSpec, location, type) { - var nsIComponentRegistrar = Components.interfaces.nsIComponentRegistrar; - compMgr = compMgr.QueryInterface(nsIComponentRegistrar); - compMgr.registerFactoryLocation(kMODULE_CID, - kMODULE_NAME, - kMODULE_CONTRACTID_APP, - fileSpec, - location, - type); - - compMgr.registerFactoryLocation(kMODULE_CID, - kMODULE_NAME, - kMODULE_CONTRACTID_PROTO, - fileSpec, - location, - type); - - compMgr.registerFactoryLocation(kMODULE_CID, - kMODULE_NAME, - kMODULE_CONTRACTID_MIME, - fileSpec, - location, - type); - -}; - -ExternalWrapperModule.getClassObject = function (compMgr, cid, iid) -{ - if (cid.equals(kMODULE_CID)) - return ExternalWrapperFactory; - - Components.returnCode = Cr.NS_ERROR_NOT_REGISTERED; - return null; -}; - -ExternalWrapperModule.canUnload = function (compMgr) -{ - return true; -}; - -/** -* XPCOMUtils.generateNSGetFactory was introduced in Mozilla 2 (Firefox 4). -* XPCOMUtils.generateNSGetModule is for Mozilla 1.9.2 (Firefox 3.6). -*/ -Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); -if (XPCOMUtils.generateNSGetFactory) { - var NSGetFactory = XPCOMUtils.generateNSGetFactory([ExternalWrapper]); -} else { - function NSGetModule(compMgr, fileSpec) - { - return ExternalWrapperModule; - } -} - +var NSGetFactory = XPCOMUtils.generateNSGetFactory([ExternalAppBlocker]);

1 0

[torbutton/master] fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog.
by gk＠torproject.org 17 Jul '16

17 Jul '16

commit 7dd710152955bd4145814c8bafed3b50dfacff75 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jul 17 14:01:25 2016 +0000 fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog. Remove remaining things needed for fixing #9901. --- src/chrome/content/torbutton.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 5eb26d9..7160deb 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -7,11 +7,6 @@ // TODO: Double-check there are no strange exploits to defeat: // http://kb.mozillazine.org/Links_to_local_pages_don%27t_work -XPCOMUtils.defineLazyModuleGetter(this, "ConsoleServiceListener", - "resource://gre/modules/devtools/WebConsoleUtils.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "WebConsoleUtils", - "resource://gre/modules/devtools/WebConsoleUtils.jsm"); - let { LoadContextInfo } = Cu.import('resource://gre/modules/LoadContextInfo.jsm'); let { Services } = Cu.import("resource://gre/modules/Services.jsm");

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] Bug 19273: Avoid JavaScript patching of the external app helper dialog.
by gk＠torproject.org 17 Jul '16

17 Jul '16

commit 4b7123f235465f26052ea0dfaeebb590a3f31e0f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jun 28 15:13:05 2016 -0400 Bug 19273: Avoid JavaScript patching of the external app helper dialog. Before launching an external application, broadcast an "external-app-requested" observer service notification to allow other modules, including extensions, a chance to cancel the launch. --- .../exthandler/nsExternalHelperAppService.cpp | 34 +++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index 2843299..5ca4e8b 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -41,6 +41,7 @@ #include "nsThreadUtils.h" #include "nsAutoPtr.h" #include "nsIMutableArray.h" +#include "nsISupportsPrimitives.h" // for nsISupportsPRBool // used to access our datastore of user-configured helper applications #include "nsIHandlerService.h" @@ -480,6 +481,22 @@ static nsresult GetDownloadDirectory(nsIFile **_directory, return NS_OK; } +static nsresult shouldCancel(bool *aShouldCancel) +{ + NS_ENSURE_ARG_POINTER(aShouldCancel); + + nsCOMPtr<nsISupportsPRBool> cancelObj = + do_CreateInstance(NS_SUPPORTS_PRBOOL_CONTRACTID); + cancelObj->SetData(false); + nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService(); + if (!obs) + return NS_ERROR_FAILURE; + + obs->NotifyObservers(cancelObj, "external-app-requested", nullptr); + cancelObj->GetData(aShouldCancel); + return NS_OK; +} + /** * Structure for storing extension->type mappings. * @see defaultMimeEntries @@ -762,6 +779,14 @@ NS_IMETHODIMP nsExternalHelperAppService::DoContent(const nsACString& aMimeConte aForceSave, aWindowContext, aStreamListener); } + // Give other modules, including extensions, a chance to cancel. + bool doCancel = false; + nsresult rv = shouldCancel(&doCancel); + NS_ENSURE_SUCCESS(rv, rv); + if (doCancel) { + return NS_ERROR_FAILURE; + } + nsAutoString fileName; nsAutoCString fileExtension; uint32_t reason = nsIHelperAppLauncherDialog::REASON_CANTHANDLE; @@ -798,7 +823,6 @@ NS_IMETHODIMP nsExternalHelperAppService::DoContent(const nsACString& aMimeConte nsAutoCString query; // We only care about the query for HTTP and HTTPS URLs - nsresult rv; bool isHTTP, isHTTPS; rv = uri->SchemeIs("http", &isHTTP); if (NS_FAILED(rv)) { @@ -1058,6 +1082,14 @@ nsExternalHelperAppService::LoadURI(nsIURI *aURI, return NS_OK; // explicitly denied } + // Give other modules, including extensions, a chance to cancel. + bool doCancel = false; + rv = shouldCancel(&doCancel); + NS_ENSURE_SUCCESS(rv, rv); + if (doCancel) { + return NS_OK; + } + nsCOMPtr<nsIHandlerInfo> handler; rv = GetProtocolHandlerInfo(scheme, getter_AddRefs(handler)); NS_ENSURE_SUCCESS(rv, rv);

1 0

[tor-browser/tor-browser-45.2.0esr-6.0-1] Bug 19417: Disable asmjs for now
by gk＠torproject.org 17 Jul '16

17 Jul '16

commit 9f49b80ab4a5c2326ca47f0736d0b865fa2272f9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 14 10:48:44 2016 +0000 Bug 19417: Disable asmjs for now --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index e3665b4..c60b341 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -223,6 +223,9 @@ pref("dom.mozTCPSocket.enabled", false); // Security slider pref("svg.in-content.enabled", true); pref("mathml.disabled", false); +// Until we address at least the linkability concerns in #19417 let's disable +// asmjs. +pref("javascript.options.asmjs", false); // Network and performance pref("network.http.pipelining", true);

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] Bug 19417: Disable asmjs for now
by gk＠torproject.org 17 Jul '16

17 Jul '16

commit 699ae74066ddc7000a3ea5f4ed68b170d1886065 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 14 10:48:44 2016 +0000 Bug 19417: Disable asmjs for now --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index e3665b4..c60b341 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -223,6 +223,9 @@ pref("dom.mozTCPSocket.enabled", false); // Security slider pref("svg.in-content.enabled", true); pref("mathml.disabled", false); +// Until we address at least the linkability concerns in #19417 let's disable +// asmjs. +pref("javascript.options.asmjs", false); // Network and performance pref("network.http.pipelining", true);

1 0

[torbutton/maint-1.9.5] Bug 19417: Disable asmjs for now
by gk＠torproject.org 17 Jul '16

17 Jul '16

commit 48252096e210b78ab56a5623b296301929faea9f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 14 10:20:12 2016 +0000 Bug 19417: Disable asmjs for now We are exempting `javascript.options.asmjs` from the Security Slider for now and set it to `false` by default (which is done by a separate Tor Browser patch). This is a stopgap until at least the linkability concerns in #19417 are addressed. --- src/chrome/content/torbutton.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index eb73b8c..9f6233c 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -242,7 +242,6 @@ var torbutton_unique_pref_observer = case "gfx.font_rendering.opentype_svg.enabled": case "javascript.options.ion.content": case "javascript.options.typeinference": - case "javascript.options.asmjs": case "noscript.forbidMedia": case "media.webaudio.enabled": case "network.jar.block-remote-files": @@ -2337,7 +2336,6 @@ function torbutton_update_thirdparty_prefs() { var torbutton_sec_ml_bool_prefs = { "javascript.options.ion.content" : false, "javascript.options.typeinference" : false, - "javascript.options.asmjs" : false, "noscript.forbidMedia" : true, "media.webaudio.enabled" : false, "network.jar.block-remote-files" : true,

1 0

[torbutton/master] Bug 19417: Disable asmjs for now
by gk＠torproject.org 17 Jul '16

17 Jul '16

commit 621916d0f79336b95d7390c2e30e2c81c0d2a504 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 14 10:20:12 2016 +0000 Bug 19417: Disable asmjs for now We are exempting `javascript.options.asmjs` from the Security Slider for now and set it to `false` by default (which is done by a separate Tor Browser patch). This is a stopgap until at least the linkability concerns in #19417 are addressed. --- src/chrome/content/torbutton.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 6e874b5..3203cef 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -242,7 +242,6 @@ var torbutton_unique_pref_observer = case "gfx.font_rendering.opentype_svg.enabled": case "javascript.options.ion.content": case "javascript.options.typeinference": - case "javascript.options.asmjs": case "noscript.forbidMedia": case "media.webaudio.enabled": case "network.jar.block-remote-files": @@ -2344,7 +2343,6 @@ function torbutton_update_thirdparty_prefs() { var torbutton_sec_ml_bool_prefs = { "javascript.options.ion.content" : false, "javascript.options.typeinference" : false, - "javascript.options.asmjs" : false, "noscript.forbidMedia" : true, "media.webaudio.enabled" : false, "network.jar.block-remote-files" : true,

1 0

[torbutton/maint-1.9.5] Bug 19689: Plugin prompt is parented to wrong window
by gk＠torproject.org 17 Jul '16

17 Jul '16

commit f5fa0465dfa666b0bdbfc7e1d0cc51be68680245 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Jul 15 11:46:20 2016 -0400 Bug 19689: Plugin prompt is parented to wrong window When displaying the "Are you sure you want to enable plugins?" prompt, always use the top-most browser window as the parent window. This avoids problems caused by using the Privacy and Security Settings dialog, which is closing, as the parent. --- src/chrome/content/torbutton.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 539bd88..eb73b8c 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -710,7 +710,10 @@ function torbutton_confirm_plugins() { var askAgainText = torbutton_get_property_string("torbutton.popup.never_ask_again"); var askAgain = {value: false}; - var no_plugins = (prompts.confirmEx(null, "", message, flags, null, null, null, + var wm = Cc["@mozilla.org/appshell/window-mediator;1"] + .getService(Components.interfaces.nsIWindowMediator); + var win = wm.getMostRecentWindow("navigator:browser"); + var no_plugins = (prompts.confirmEx(win, "", message, flags, null, null, null, askAgainText, askAgain) == 1); m_tb_prefs.setBoolPref("extensions.torbutton.confirm_plugins", !askAgain.value);

1 0

[torbutton/master] Bug 19689: Plugin prompt is parented to wrong window
by gk＠torproject.org 17 Jul '16

17 Jul '16

commit 2146d7700159bb1d836be14a96f9f3b335398056 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Jul 15 11:46:20 2016 -0400 Bug 19689: Plugin prompt is parented to wrong window When displaying the "Are you sure you want to enable plugins?" prompt, always use the top-most browser window as the parent window. This avoids problems caused by using the Privacy and Security Settings dialog, which is closing, as the parent. --- src/chrome/content/torbutton.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index f69fd8a..6e874b5 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -710,7 +710,10 @@ function torbutton_confirm_plugins() { var askAgainText = torbutton_get_property_string("torbutton.popup.never_ask_again"); var askAgain = {value: false}; - var no_plugins = (prompts.confirmEx(null, "", message, flags, null, null, null, + var wm = Cc["@mozilla.org/appshell/window-mediator;1"] + .getService(Components.interfaces.nsIWindowMediator); + var win = wm.getMostRecentWindow("navigator:browser"); + var no_plugins = (prompts.confirmEx(win, "", message, flags, null, null, null, askAgainText, askAgain) == 1); m_tb_prefs.setBoolPref("extensions.torbutton.confirm_plugins", !askAgain.value);

1 0

[tor-browser/tor-browser-45.2.0esr-6.0-1] fixup! Bug 13252 - Do not store data in the app bundle
by gk＠torproject.org 15 Jul '16

15 Jul '16

commit 3cf0ed64dc038b41605bf6c9d5e59bdeddb9e9bc Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jun 22 15:58:14 2016 -0400 fixup! Bug 13252 - Do not store data in the app bundle Avoid compilation errors when MOZ_UPDATER is not defined. Fixes bug 19484. --- toolkit/xre/nsAppRunner.cpp | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 67bb2d3..1426d77 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -2712,7 +2712,10 @@ static bool gDoProfileReset = false; // 6) display the profile-manager UI static nsresult SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, - nsIFile *aAppDir, nsINativeAppSupport* aNative, +#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR + nsIFile *aAppDir, +#endif + nsINativeAppSupport* aNative, bool* aStartOffline, nsACString* aProfileName) { StartupTimeline::Record(StartupTimeline::SELECT_PROFILE); @@ -4303,10 +4306,19 @@ XREMain::XRE_mainStartup(bool* aExitFlag) } #endif +#if (defined(MOZ_UPDATER) && !defined(MOZ_WIDGET_ANDROID)) || defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR) + nsCOMPtr<nsIFile> exeFile, exeDir; + bool persistent; + rv = mDirProvider.GetFile(XRE_EXECUTABLE_FILE, &persistent, + getter_AddRefs(exeFile)); + NS_ENSURE_SUCCESS(rv, 1); + rv = exeFile->GetParent(getter_AddRefs(exeDir)); + NS_ENSURE_SUCCESS(rv, 1); +#endif + #if defined(MOZ_UPDATER) && !defined(MOZ_WIDGET_ANDROID) // Check for and process any available updates nsCOMPtr<nsIFile> updRoot; - bool persistent; rv = mDirProvider.GetFile(XRE_UPDATE_ROOT_DIR, &persistent, getter_AddRefs(updRoot)); // XRE_UPDATE_ROOT_DIR may fail. Fallback to appDir if failed @@ -4341,12 +4353,6 @@ XREMain::XRE_mainStartup(bool* aExitFlag) if (CheckArg("test-process-updates")) { SaveToEnv("MOZ_TEST_PROCESS_UPDATES=1"); } - nsCOMPtr<nsIFile> exeFile, exeDir; - rv = mDirProvider.GetFile(XRE_EXECUTABLE_FILE, &persistent, - getter_AddRefs(exeFile)); - NS_ENSURE_SUCCESS(rv, 1); - rv = exeFile->GetParent(getter_AddRefs(exeDir)); - NS_ENSURE_SUCCESS(rv, 1); #ifdef TOR_BROWSER_UPDATE nsAutoCString compatVersion(TOR_BROWSER_VERSION); #endif @@ -4395,7 +4401,10 @@ XREMain::XRE_mainStartup(bool* aExitFlag) return 1; } - rv = SelectProfile(getter_AddRefs(mProfileLock), mProfileSvc, exeDir, + rv = SelectProfile(getter_AddRefs(mProfileLock), mProfileSvc, +#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR + exeDir, +#endif mNativeApp, &mStartOffline, &mProfileName); if (rv == NS_ERROR_LAUNCHED_CHILD_PROCESS || rv == NS_ERROR_ABORT) {

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] fixup! Bug 13252 - Do not store data in the app bundle
by gk＠torproject.org 15 Jul '16

15 Jul '16

commit 1ca4e649547a905449f81f154fa3055a8364d1f3 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jun 22 15:58:14 2016 -0400 fixup! Bug 13252 - Do not store data in the app bundle Avoid compilation errors when MOZ_UPDATER is not defined. Fixes bug 19484. --- toolkit/xre/nsAppRunner.cpp | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 67bb2d3..1426d77 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -2712,7 +2712,10 @@ static bool gDoProfileReset = false; // 6) display the profile-manager UI static nsresult SelectProfile(nsIProfileLock* *aResult, nsIToolkitProfileService* aProfileSvc, - nsIFile *aAppDir, nsINativeAppSupport* aNative, +#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR + nsIFile *aAppDir, +#endif + nsINativeAppSupport* aNative, bool* aStartOffline, nsACString* aProfileName) { StartupTimeline::Record(StartupTimeline::SELECT_PROFILE); @@ -4303,10 +4306,19 @@ XREMain::XRE_mainStartup(bool* aExitFlag) } #endif +#if (defined(MOZ_UPDATER) && !defined(MOZ_WIDGET_ANDROID)) || defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR) + nsCOMPtr<nsIFile> exeFile, exeDir; + bool persistent; + rv = mDirProvider.GetFile(XRE_EXECUTABLE_FILE, &persistent, + getter_AddRefs(exeFile)); + NS_ENSURE_SUCCESS(rv, 1); + rv = exeFile->GetParent(getter_AddRefs(exeDir)); + NS_ENSURE_SUCCESS(rv, 1); +#endif + #if defined(MOZ_UPDATER) && !defined(MOZ_WIDGET_ANDROID) // Check for and process any available updates nsCOMPtr<nsIFile> updRoot; - bool persistent; rv = mDirProvider.GetFile(XRE_UPDATE_ROOT_DIR, &persistent, getter_AddRefs(updRoot)); // XRE_UPDATE_ROOT_DIR may fail. Fallback to appDir if failed @@ -4341,12 +4353,6 @@ XREMain::XRE_mainStartup(bool* aExitFlag) if (CheckArg("test-process-updates")) { SaveToEnv("MOZ_TEST_PROCESS_UPDATES=1"); } - nsCOMPtr<nsIFile> exeFile, exeDir; - rv = mDirProvider.GetFile(XRE_EXECUTABLE_FILE, &persistent, - getter_AddRefs(exeFile)); - NS_ENSURE_SUCCESS(rv, 1); - rv = exeFile->GetParent(getter_AddRefs(exeDir)); - NS_ENSURE_SUCCESS(rv, 1); #ifdef TOR_BROWSER_UPDATE nsAutoCString compatVersion(TOR_BROWSER_VERSION); #endif @@ -4395,7 +4401,10 @@ XREMain::XRE_mainStartup(bool* aExitFlag) return 1; } - rv = SelectProfile(getter_AddRefs(mProfileLock), mProfileSvc, exeDir, + rv = SelectProfile(getter_AddRefs(mProfileLock), mProfileSvc, +#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR + exeDir, +#endif mNativeApp, &mStartOffline, &mProfileName); if (rv == NS_ERROR_LAUNCHED_CHILD_PROCESS || rv == NS_ERROR_ABORT) {

1 0