[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [torbutton/master] Switch to using the new git branches for translation imports.

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [torbutton/master] Switch to using the new git branches for translation imports.
From: mikeperry@xxxxxxxxxxxxxx
Date: Wed, 18 Sep 2013 20:09:40 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Wed, 18 Sep 2013 16:10:01 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Mike Perry <mikeperry-git@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 967800a452d79b79d10f34297e7d462fa8bb9f73
Author: Mike Perry <mikeperry-git@xxxxxxxxxxxxxx>
Date:   Wed Sep 18 12:01:07 2013 -0700

    Switch to using the new git branches for translation imports.
---
 trans_tools/import-translations.sh                 |   44 +
 trans_tools/mkmoz.sh                               |   20 -
 trans_tools/mkpo.sh                                |   20 -
 trans_tools/mvmoz.sh                               |    6 -
 trans_tools/new_tb_strings.sh                      |   20 -
 trans_tools/old/mkmoz.sh                           |   20 +
 trans_tools/old/mkpo.sh                            |   20 +
 trans_tools/old/mvmoz.sh                           |    6 +
 trans_tools/old/new_tb_strings.sh                  |   20 +
 trans_tools/old/validate.py                        |   94 +
 trans_tools/old/validate_all.sh                    |    7 +
 .../remove-english-placeholder-strings.diff        | 2066 --------------------
 trans_tools/validate.py                            |   94 -
 trans_tools/validate_all.sh                        |    7 -
 14 files changed, 211 insertions(+), 2233 deletions(-)

diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh
new file mode 100755
index 0000000..f95398e
--- /dev/null
+++ b/trans_tools/import-translations.sh
@@ -0,0 +1,44 @@
+#!/bin/sh -e
+
+# This var comes from the TBB locale list.
+# XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync
+BUNDLE_LOCALES="de es fa fr it ko nl pl pt ru vi zh-CN"
+
+if [ -d translation ];
+then
+  cd translation
+  git fetch origin
+  cd ..
+else
+  git clone https://git.torproject.org/translation.git
+fi
+
+cd translation
+for i in $BUNDLE_LOCALES
+do
+  UL="`echo $i|tr - _`"
+  mkdir -p ../../src/chrome/locale/$i/
+  git checkout abouttor-homepage
+  git merge origin/abouttor-homepage
+  cp $UL/aboutTor.dtd ../../src/chrome/locale/$i/
+
+  git checkout torbutton-torbuttondtd
+  git merge origin/torbutton-torbuttondtd
+  cp $UL/torbutton.dtd ../../src/chrome/locale/$i/
+
+  git checkout torbutton-branddtd
+  git merge origin/torbutton-branddtd
+  cp $UL/brand.dtd ../../src/chrome/locale/$i/
+
+  git checkout torbutton-torbuttonproperties
+  git merge origin/torbutton-torbuttonproperties
+  cp $UL/torbutton.properties ../../src/chrome/locale/$i/
+
+  git checkout torbutton-browserproperties
+  git merge origin/torbutton-browserproperties
+  cp $UL/browser.properties ../../src/chrome/locale/$i/
+
+  git checkout torbutton-brandproperties
+  git merge origin/torbutton-brandproperties
+  cp $UL/brand.properties ../../src/chrome/locale/$i/
+done
diff --git a/trans_tools/mkmoz.sh b/trans_tools/mkmoz.sh
deleted file mode 100755
index 1f2986b..0000000
--- a/trans_tools/mkmoz.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash -x
-#
-
-LOCALEDIR="../src/chrome/locale"
-
-poDir="po" 
-directories="`ls -1 ./$poDir|tr _ -`"
-mozDir="moz"
-input="en"
-template="torbutton.dtd"
-
-for dir in $directories
-do
-    pootleDir="`echo $dir|tr - _`";
-    echo "$pootleDir"
-    mkdir -p $mozDir/$dir/
-    po2moz -i $poDir/$pootleDir/ -t ${LOCALEDIR}/${input}/ -o $mozDir/$dir/ 
-    #po2moz -i $poDir/$pootleDir/ -t pootle/templates/ -o $mozDir/$dir/ 
-done
-
diff --git a/trans_tools/mkpo.sh b/trans_tools/mkpo.sh
deleted file mode 100755
index 5e06757..0000000
--- a/trans_tools/mkpo.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash -x
-#
-
-LOCALEDIR="../src/chrome/locale/"
-
-directories="ar de-DE es hr-HR nl-NL pt-BR sl-SI de-AT el-GR fa-IR it-IT pl-PL zh-CN de-CH fr-FR ru zh-TW"
-outdir="po"
-#input="en-US/torbutton.dtd"
-input="en"
-template="torbutton.dtd"
-
-for dir in $directories
-do
-    pootleDir="`echo $dir|tr - _`";
-    mkdir -p $outdir/$pootleDir/
-    #moz2po -i $dir/$template -t $input -o $outdir/$pootleDir/torbutton.po
-    moz2po -i $LOCALEDIR/$dir/ -t $LOCALEDIR/$input/ -o $outdir/$pootleDir/
-done
-
-
diff --git a/trans_tools/mvmoz.sh b/trans_tools/mvmoz.sh
deleted file mode 100755
index 64ff436..0000000
--- a/trans_tools/mvmoz.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-for locale in `ls -1 moz/`;
-do
-  mv -v moz/$locale/*.{dtd,properties} ../src/chrome/locale/$locale/
-done
diff --git a/trans_tools/new_tb_strings.sh b/trans_tools/new_tb_strings.sh
deleted file mode 100755
index b0b4e30..0000000
--- a/trans_tools/new_tb_strings.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-moz2po -P -i ../src/chrome/locale/en/ -o po/templates/
-
-for i in `ls -1 po`
-do
-   msgmerge -U ./po/$i/torbutton.dtd.po ./po/templates/torbutton.dtd.pot
-   msgmerge -U ./po/$i/torbutton.properties.po ./po/templates/torbutton.properties.pot
-   msgmerge -U ./po/$i/browser.dtd.po ./po/templates/browser.dtd.pot
-   msgmerge -U ./po/$i/browser.properties.po ./po/templates/browser.properties.pot
-done
-
-svn diff po
-svn commit po
-
-cd po
-tx push --source
-tx push --translation
-cd ..
-
diff --git a/trans_tools/old/mkmoz.sh b/trans_tools/old/mkmoz.sh
new file mode 100755
index 0000000..1f2986b
--- /dev/null
+++ b/trans_tools/old/mkmoz.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -x
+#
+
+LOCALEDIR="../src/chrome/locale"
+
+poDir="po" 
+directories="`ls -1 ./$poDir|tr _ -`"
+mozDir="moz"
+input="en"
+template="torbutton.dtd"
+
+for dir in $directories
+do
+    pootleDir="`echo $dir|tr - _`";
+    echo "$pootleDir"
+    mkdir -p $mozDir/$dir/
+    po2moz -i $poDir/$pootleDir/ -t ${LOCALEDIR}/${input}/ -o $mozDir/$dir/ 
+    #po2moz -i $poDir/$pootleDir/ -t pootle/templates/ -o $mozDir/$dir/ 
+done
+
diff --git a/trans_tools/old/mkpo.sh b/trans_tools/old/mkpo.sh
new file mode 100755
index 0000000..5e06757
--- /dev/null
+++ b/trans_tools/old/mkpo.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -x
+#
+
+LOCALEDIR="../src/chrome/locale/"
+
+directories="ar de-DE es hr-HR nl-NL pt-BR sl-SI de-AT el-GR fa-IR it-IT pl-PL zh-CN de-CH fr-FR ru zh-TW"
+outdir="po"
+#input="en-US/torbutton.dtd"
+input="en"
+template="torbutton.dtd"
+
+for dir in $directories
+do
+    pootleDir="`echo $dir|tr - _`";
+    mkdir -p $outdir/$pootleDir/
+    #moz2po -i $dir/$template -t $input -o $outdir/$pootleDir/torbutton.po
+    moz2po -i $LOCALEDIR/$dir/ -t $LOCALEDIR/$input/ -o $outdir/$pootleDir/
+done
+
+
diff --git a/trans_tools/old/mvmoz.sh b/trans_tools/old/mvmoz.sh
new file mode 100755
index 0000000..64ff436
--- /dev/null
+++ b/trans_tools/old/mvmoz.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+for locale in `ls -1 moz/`;
+do
+  mv -v moz/$locale/*.{dtd,properties} ../src/chrome/locale/$locale/
+done
diff --git a/trans_tools/old/new_tb_strings.sh b/trans_tools/old/new_tb_strings.sh
new file mode 100755
index 0000000..b0b4e30
--- /dev/null
+++ b/trans_tools/old/new_tb_strings.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+moz2po -P -i ../src/chrome/locale/en/ -o po/templates/
+
+for i in `ls -1 po`
+do
+   msgmerge -U ./po/$i/torbutton.dtd.po ./po/templates/torbutton.dtd.pot
+   msgmerge -U ./po/$i/torbutton.properties.po ./po/templates/torbutton.properties.pot
+   msgmerge -U ./po/$i/browser.dtd.po ./po/templates/browser.dtd.pot
+   msgmerge -U ./po/$i/browser.properties.po ./po/templates/browser.properties.pot
+done
+
+svn diff po
+svn commit po
+
+cd po
+tx push --source
+tx push --translation
+cd ..
+
diff --git a/trans_tools/old/validate.py b/trans_tools/old/validate.py
new file mode 100755
index 0000000..179e7b0
--- /dev/null
+++ b/trans_tools/old/validate.py
@@ -0,0 +1,94 @@
+#!/usr/bin/python
+
+from __future__ import unicode_literals, print_function
+
+import polib
+import sys
+import getopt
+
+symbols = [
+    '(', ')', '<', '>', '{',
+    '}', '[', ']', '\"', ';'
+    ]
+
+counts = {}
+
+def reset():
+  for s in symbols:
+    counts[s] = 0
+
+def parse_orig_string(string):
+  for ch in string:
+    if ch in symbols:
+      counts[ch] += 1
+
+def parse_trans_string(string):
+  for ch in string:
+    if ch in symbols:
+      counts[ch] -= 1
+
+def get_strings(file):
+  entries = []
+  po = polib.pofile(file, autodetect_encoding=True)
+
+  for entry in po:
+    entries.append((entry.msgid, entry.msgstr, 0))
+
+  return entries
+
+def warn():
+  for s in symbols:
+    if counts[s] < 0:
+      return True
+  return False
+
+def usage():
+  print("Usage: %s -i/--input=<file.po> -l/--logfile=<logfile>" % sys.argv[0])
+
+def log(string, file_to_check, log_file, linenum = -1):
+  f = log_file
+  if linenum == -1:
+    f.write(("%s: %s\n" % (file_to_check, string)).encode("utf-8"))
+  else:
+    f.write(("%s (%s): %s\n" % (file_to_check, linenum, string)).encode("utf-8"))
+  #f.close()
+
+def check(file_to_check, log_file):
+  errors = 0
+
+  strings = get_strings(file_to_check)
+  for (orig, trans, linenum) in strings:
+    reset()
+    parse_orig_string(orig)
+    parse_trans_string(trans)
+    if warn():
+      errors += 1
+      log(trans, file_to_check, log_file, linenum)
+
+  if errors != 0:
+    log("Total count of warnings %d\n" % errors, file_to_check, log_file)
+
+if __name__ == '__main__':
+  try:
+    opts, args = getopt.getopt(sys.argv[1:], "i:hl:", ["input=", "help", "logfile="])
+  except getopt.GetoptError, err:
+    print(str(err))
+    sys.exit(2)
+
+  file_to_check = None
+  log_file = sys.stdout
+
+  for opt, arg in opts:
+    if opt in ("-i", "--input"):
+      file_to_check = arg
+    elif opt in ("-h", "--help"):
+      usage()
+      sys.exit()
+    elif opt in ("-l", "--logfile"):
+      log_file = arg
+
+  if file_to_check is None or log_file is None:
+    print("ERROR: You need to specify both the input and the logfile")
+    sys.exit(2)
+
+  check(file_to_check, log_file)
diff --git a/trans_tools/old/validate_all.sh b/trans_tools/old/validate_all.sh
new file mode 100755
index 0000000..47bb6e6
--- /dev/null
+++ b/trans_tools/old/validate_all.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+for i in `ls -1 ./po`
+do
+  ./validate.py --input=./po/$i/torbutton.dtd.po
+  ./validate.py --input=./po/$i/torbutton.properties.po
+done
diff --git a/trans_tools/remove-english-placeholder-strings.diff b/trans_tools/remove-english-placeholder-strings.diff
deleted file mode 100644
index 65b6b3b..0000000
--- a/trans_tools/remove-english-placeholder-strings.diff
+++ /dev/null
@@ -1,2066 +0,0 @@
-Index: src/chrome/locale/zh-CN/torbutton.dtd
-===================================================================
---- src/chrome/locale/zh-CN/torbutton.dtd	(revision 15635)
-+++ src/chrome/locale/zh-CN/torbutton.dtd	(working copy)
-@@ -27,61 +27,60 @@
- <!ENTITY torbutton.context_menu.about.key "A">
- <!ENTITY torbutton.button.label "Torbutton">
- <!ENTITY torbutton.button.tooltip "ç?¹å?»å??å§?å?? Torbutton">
--<!ENTITY torbutton.prefs.sec_settings "Security Settings">
--<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
--<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
--<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
--<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
--<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
--<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
--<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
--<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
--<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
--<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
--<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
--<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
--<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
--<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
--<!ENTITY torbutton.prefs.cookies "Cookies">
--<!ENTITY torbutton.prefs.cache "Cache">
--<!ENTITY torbutton.prefs.history "History">
--<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
--<!ENTITY torbutton.prefs.shutdown "Shutdown">
--<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
--<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
--<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
--<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
--<!ENTITY torbutton.prefs.headers "Headers">
--<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
--<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
--<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
--<!ENTITY torbutton.prefs.forms "Forms">
--<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
--<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
--<!ENTITY torbutton.prefs.tor "Tor">
--<!ENTITY torbutton.prefs.non_tor "Non-Tor">
--<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
--<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
--<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
--<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
--<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
--<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
--<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
--<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
--<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
--<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
--<!ENTITY torbutton.prefs.startup "Startup">
--<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
--<!ENTITY torbutton.prefs.block_tor_file_net     "Block Tor access to network from file:// urls (recommended)">
--<!ENTITY torbutton.prefs.block_nontor_file_net     "Block Non-Tor access to network from file:// urls">
--<!ENTITY torbutton.prefs.restore_defaults             "Restore Defaults">
--<!ENTITY torbutton.prefs.test_settings             "Test Settings">
--<!ENTITY torbutton.prefs.test_auto             "Test my Tor settings after the first time I toggle on every Firefox start">
--<!ENTITY torbutton.prefs.disable_livemarks             "Disable livemarks updates during Tor usage">
-+<!ENTITY torbutton.prefs.sec_settings "">
-+<!ENTITY torbutton.prefs.block_thread "">
-+<!ENTITY torbutton.prefs.block_thwrite "">
-+<!ENTITY torbutton.prefs.block_nthread "">
-+<!ENTITY torbutton.prefs.block_nthwrite "">
-+<!ENTITY torbutton.prefs.clear_history "">
-+<!ENTITY torbutton.prefs.clear_cache "">
-+<!ENTITY torbutton.prefs.block_cache "">
-+<!ENTITY torbutton.prefs.cookie_jars "">
-+<!ENTITY torbutton.prefs.mmm_cookies "">
-+<!ENTITY torbutton.prefs.clear_cookies "">
-+<!ENTITY torbutton.prefs.disable_plugins "">
-+<!ENTITY torbutton.prefs.kill_bad_js "">
-+<!ENTITY torbutton.prefs.isolate_content "">
-+<!ENTITY torbutton.prefs.no_updates "">
-+<!ENTITY torbutton.prefs.set_uagent "">
-+<!ENTITY torbutton.prefs.dynamic "">
-+<!ENTITY torbutton.prefs.cookies "">
-+<!ENTITY torbutton.prefs.cache "">
-+<!ENTITY torbutton.prefs.history "">
-+<!ENTITY torbutton.prefs.no_search "">
-+<!ENTITY torbutton.prefs.shutdown "">
-+<!ENTITY torbutton.prefs.tor_shutdown "">
-+<!ENTITY torbutton.prefs.all_shutdown "">
-+<!ENTITY torbutton.prefs.no_shutdown "">
-+<!ENTITY torbutton.prefs.disable_sessionstore "">
-+<!ENTITY torbutton.prefs.headers "">
-+<!ENTITY torbutton.prefs.spoof_english "">
-+<!ENTITY torbutton.prefs.disable_referer "">
-+<!ENTITY torbutton.prefs.disable_domstorage "">
-+<!ENTITY torbutton.prefs.forms "">
-+<!ENTITY torbutton.prefs.block_tforms "">
-+<!ENTITY torbutton.prefs.block_ntforms "">
-+<!ENTITY torbutton.prefs.notor_sessionstore "">
-+<!ENTITY torbutton.prefs.tor "">
-+<!ENTITY torbutton.prefs.non_tor "">
-+<!ENTITY torbutton.prefs.restore_tor "">
-+<!ENTITY torbutton.prefs.reload_crashed_jar "">
-+<!ENTITY torbutton.prefs.dual_cookie_jars "">
-+<!ENTITY torbutton.prefs.clear_http_auth "">
-+<!ENTITY torbutton.prefs.block_js_history "">
-+<!ENTITY torbutton.prefs.resize_on_toggle "">
-+<!ENTITY torbutton.prefs.close_tor "">
-+<!ENTITY torbutton.prefs.close_nontor "">
-+<!ENTITY torbutton.prefs.jar_certs "">
-+<!ENTITY torbutton.prefs.jar_ca_certs "">
-+<!ENTITY torbutton.prefs.locked_mode "">
-+<!ENTITY torbutton.prefs.startup_state "">
-+<!ENTITY torbutton.prefs.shutdown_state "">
-+<!ENTITY torbutton.prefs.startup "">
-+<!ENTITY torbutton.prefs.nonontor_sessionstore "">
-+<!ENTITY torbutton.prefs.block_tor_file_net     "">
-+<!ENTITY torbutton.prefs.block_nontor_file_net     "">
-+<!ENTITY torbutton.prefs.restore_defaults             "">
-+<!ENTITY torbutton.prefs.test_settings             "">
-+<!ENTITY torbutton.prefs.test_auto             "">
-+<!ENTITY torbutton.prefs.disable_livemarks             "">
-Index: src/chrome/locale/zh-CN/torbutton.properties
-===================================================================
---- src/chrome/locale/zh-CN/torbutton.properties	(revision 15635)
-+++ src/chrome/locale/zh-CN/torbutton.properties	(working copy)
-@@ -7,17 +7,17 @@
- torbutton.panel.label.disabled = Tor è¢«ç¦?ç?¨
- torbutton.panel.label.enabled = Tor ä½¿ç?¨ä¸
- extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton æ??ä¾?ä¸?ä¸ªæ??é?®æ?¥æ?¹ä¾¿ç??ä½¿ç?¨æ??ç¦?ç?¨ Tor ä»£ç??
--torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
--torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
--torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
--torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
--torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
--torbutton.popup.test.success = Tor proxy test successful!
--torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy 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?
--torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
--torbutton.panel.label.verified = Tor Verified
--torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
--torbutton.prefs.recommended = (recommended)
--torbutton.prefs.optional = (optional)
--torbutton.prefs.crucial = (crucial)
-+torbutton.popup.history.warning =
-+torbutton.popup.plugin.warning =
-+torbutton.popup.confirm_ca_certs =
-+torbutton.popup.ff3.warning =
-+torbutton.popup.toggle.warning =
-+torbutton.popup.test.success =
-+torbutton.popup.test.failure =
-+torbutton.popup.test.confirm_toggle =
-+torbutton.popup.test.ff3_notice =
-+torbutton.panel.label.verified =
-+torbutton.popup.test.auto_failed =
-+torbutton.prefs.recommended =
-+torbutton.prefs.optional =
-+torbutton.prefs.crucial =
-Index: src/chrome/locale/de-CH/torbutton.dtd
-===================================================================
---- src/chrome/locale/de-CH/torbutton.dtd	(revision 15635)
-+++ src/chrome/locale/de-CH/torbutton.dtd	(working copy)
-@@ -27,61 +27,60 @@
- <!ENTITY torbutton.context_menu.about.key "A">
- <!ENTITY torbutton.button.label "Torbutton">
- <!ENTITY torbutton.button.tooltip "Hier klicken, um Torbutton einzurichten">
--<!ENTITY torbutton.prefs.sec_settings "Security Settings">
--<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
--<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
--<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
--<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
--<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
--<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
--<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
--<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
--<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
--<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
--<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
--<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
--<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
--<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
--<!ENTITY torbutton.prefs.cookies "Cookies">
--<!ENTITY torbutton.prefs.cache "Cache">
--<!ENTITY torbutton.prefs.history "History">
--<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
--<!ENTITY torbutton.prefs.shutdown "Shutdown">
--<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
--<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
--<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
--<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
--<!ENTITY torbutton.prefs.headers "Headers">
--<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
--<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
--<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
--<!ENTITY torbutton.prefs.forms "Forms">
--<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
--<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
--<!ENTITY torbutton.prefs.tor "Tor">
--<!ENTITY torbutton.prefs.non_tor "Non-Tor">
--<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
--<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
--<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
--<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
--<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
--<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
--<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
--<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
--<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
--<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
--<!ENTITY torbutton.prefs.startup "Startup">
--<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
--<!ENTITY torbutton.prefs.block_tor_file_net     "Block Tor access to network from file:// urls (recommended)">
--<!ENTITY torbutton.prefs.block_nontor_file_net     "Block Non-Tor access to network from file:// urls">
--<!ENTITY torbutton.prefs.restore_defaults             "Restore Defaults">
--<!ENTITY torbutton.prefs.test_settings             "Test Settings">
--<!ENTITY torbutton.prefs.test_auto             "Test my Tor settings after the first time I toggle on every Firefox start">
--<!ENTITY torbutton.prefs.disable_livemarks             "Disable livemarks updates during Tor usage">
-+<!ENTITY torbutton.prefs.sec_settings "">
-+<!ENTITY torbutton.prefs.block_thread "">
-+<!ENTITY torbutton.prefs.block_thwrite "">
-+<!ENTITY torbutton.prefs.block_nthread "">
-+<!ENTITY torbutton.prefs.block_nthwrite "">
-+<!ENTITY torbutton.prefs.clear_history "">
-+<!ENTITY torbutton.prefs.clear_cache "">
-+<!ENTITY torbutton.prefs.block_cache "">
-+<!ENTITY torbutton.prefs.cookie_jars "">
-+<!ENTITY torbutton.prefs.mmm_cookies "">
-+<!ENTITY torbutton.prefs.clear_cookies "">
-+<!ENTITY torbutton.prefs.disable_plugins "">
-+<!ENTITY torbutton.prefs.kill_bad_js "">
-+<!ENTITY torbutton.prefs.isolate_content "">
-+<!ENTITY torbutton.prefs.no_updates "">
-+<!ENTITY torbutton.prefs.set_uagent "">
-+<!ENTITY torbutton.prefs.dynamic "">
-+<!ENTITY torbutton.prefs.cookies "">
-+<!ENTITY torbutton.prefs.cache "">
-+<!ENTITY torbutton.prefs.history "">
-+<!ENTITY torbutton.prefs.no_search "">
-+<!ENTITY torbutton.prefs.shutdown "">
-+<!ENTITY torbutton.prefs.tor_shutdown "">
-+<!ENTITY torbutton.prefs.all_shutdown "">
-+<!ENTITY torbutton.prefs.no_shutdown "">
-+<!ENTITY torbutton.prefs.disable_sessionstore "">
-+<!ENTITY torbutton.prefs.headers "">
-+<!ENTITY torbutton.prefs.spoof_english "">
-+<!ENTITY torbutton.prefs.disable_referer "">
-+<!ENTITY torbutton.prefs.disable_domstorage "">
-+<!ENTITY torbutton.prefs.forms "">
-+<!ENTITY torbutton.prefs.block_tforms "">
-+<!ENTITY torbutton.prefs.block_ntforms "">
-+<!ENTITY torbutton.prefs.notor_sessionstore "">
-+<!ENTITY torbutton.prefs.tor "">
-+<!ENTITY torbutton.prefs.non_tor "">
-+<!ENTITY torbutton.prefs.restore_tor "">
-+<!ENTITY torbutton.prefs.reload_crashed_jar "">
-+<!ENTITY torbutton.prefs.dual_cookie_jars "">
-+<!ENTITY torbutton.prefs.clear_http_auth "">
-+<!ENTITY torbutton.prefs.block_js_history "">
-+<!ENTITY torbutton.prefs.resize_on_toggle "">
-+<!ENTITY torbutton.prefs.close_tor "">
-+<!ENTITY torbutton.prefs.close_nontor "">
-+<!ENTITY torbutton.prefs.jar_certs "">
-+<!ENTITY torbutton.prefs.jar_ca_certs "">
-+<!ENTITY torbutton.prefs.locked_mode "">
-+<!ENTITY torbutton.prefs.startup_state "">
-+<!ENTITY torbutton.prefs.shutdown_state "">
-+<!ENTITY torbutton.prefs.startup "">
-+<!ENTITY torbutton.prefs.nonontor_sessionstore "">
-+<!ENTITY torbutton.prefs.block_tor_file_net     "">
-+<!ENTITY torbutton.prefs.block_nontor_file_net     "">
-+<!ENTITY torbutton.prefs.restore_defaults             "">
-+<!ENTITY torbutton.prefs.test_settings             "">
-+<!ENTITY torbutton.prefs.test_auto             "">
-+<!ENTITY torbutton.prefs.disable_livemarks             "">
-Index: src/chrome/locale/de-CH/torbutton.properties
-===================================================================
---- src/chrome/locale/de-CH/torbutton.properties	(revision 15635)
-+++ src/chrome/locale/de-CH/torbutton.properties	(working copy)
-@@ -7,17 +7,17 @@
- torbutton.panel.label.disabled = Tor deaktiviert
- torbutton.panel.label.enabled = Tor aktiviert
- extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Dank Torbutton kÃ¶nnen Sie den Tor-Proxy mit einem Klick ein- und ausschalten
--torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
--torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
--torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
--torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
--torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
--torbutton.popup.test.success = Tor proxy test successful!
--torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy 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?
--torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
--torbutton.panel.label.verified = Tor Verified
--torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
--torbutton.prefs.recommended = (recommended)
--torbutton.prefs.optional = (optional)
--torbutton.prefs.crucial = (crucial)
-+torbutton.popup.history.warning =
-+torbutton.popup.plugin.warning =
-+torbutton.popup.confirm_ca_certs =
-+torbutton.popup.ff3.warning =
-+torbutton.popup.toggle.warning =
-+torbutton.popup.test.success =
-+torbutton.popup.test.failure =
-+torbutton.popup.test.confirm_toggle =
-+torbutton.popup.test.ff3_notice =
-+torbutton.panel.label.verified =
-+torbutton.popup.test.auto_failed =
-+torbutton.prefs.recommended =
-+torbutton.prefs.optional =
-+torbutton.prefs.crucial =
-Index: src/chrome/locale/hr-HR/torbutton.dtd
-===================================================================
---- src/chrome/locale/hr-HR/torbutton.dtd	(revision 15635)
-+++ src/chrome/locale/hr-HR/torbutton.dtd	(working copy)
-@@ -27,61 +27,60 @@
- <!ENTITY torbutton.context_menu.about.key "O">
- <!ENTITY torbutton.button.label "Torbutton">
- <!ENTITY torbutton.button.tooltip "Kliknite da biste pokrenuli Torbutton">
--<!ENTITY torbutton.prefs.sec_settings "Security Settings">
--<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
--<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
--<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
--<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
--<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
--<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
--<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
--<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
--<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
--<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
--<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
--<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
--<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
--<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
--<!ENTITY torbutton.prefs.cookies "Cookies">
--<!ENTITY torbutton.prefs.cache "Cache">
--<!ENTITY torbutton.prefs.history "History">
--<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
--<!ENTITY torbutton.prefs.shutdown "Shutdown">
--<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
--<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
--<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
--<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
--<!ENTITY torbutton.prefs.headers "Headers">
--<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
--<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
--<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
--<!ENTITY torbutton.prefs.forms "Forms">
--<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
--<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
--<!ENTITY torbutton.prefs.tor "Tor">
--<!ENTITY torbutton.prefs.non_tor "Non-Tor">
--<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
--<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
--<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
--<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
--<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
--<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
--<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
--<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
--<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
--<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
--<!ENTITY torbutton.prefs.startup "Startup">
--<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
--<!ENTITY torbutton.prefs.block_tor_file_net     "Block Tor access to network from file:// urls (recommended)">
--<!ENTITY torbutton.prefs.block_nontor_file_net     "Block Non-Tor access to network from file:// urls">
--<!ENTITY torbutton.prefs.restore_defaults             "Restore Defaults">
--<!ENTITY torbutton.prefs.test_settings             "Test Settings">
--<!ENTITY torbutton.prefs.test_auto             "Test my Tor settings after the first time I toggle on every Firefox start">
--<!ENTITY torbutton.prefs.disable_livemarks             "Disable livemarks updates during Tor usage">
-+<!ENTITY torbutton.prefs.sec_settings "">
-+<!ENTITY torbutton.prefs.block_thread "">
-+<!ENTITY torbutton.prefs.block_thwrite "">
-+<!ENTITY torbutton.prefs.block_nthread "">
-+<!ENTITY torbutton.prefs.block_nthwrite "">
-+<!ENTITY torbutton.prefs.clear_history "">
-+<!ENTITY torbutton.prefs.clear_cache "">
-+<!ENTITY torbutton.prefs.block_cache "">
-+<!ENTITY torbutton.prefs.cookie_jars "">
-+<!ENTITY torbutton.prefs.mmm_cookies "">
-+<!ENTITY torbutton.prefs.clear_cookies "">
-+<!ENTITY torbutton.prefs.disable_plugins "">
-+<!ENTITY torbutton.prefs.kill_bad_js "">
-+<!ENTITY torbutton.prefs.isolate_content "">
-+<!ENTITY torbutton.prefs.no_updates "">
-+<!ENTITY torbutton.prefs.set_uagent "">
-+<!ENTITY torbutton.prefs.dynamic "">
-+<!ENTITY torbutton.prefs.cookies "">
-+<!ENTITY torbutton.prefs.cache "">
-+<!ENTITY torbutton.prefs.history "">
-+<!ENTITY torbutton.prefs.no_search "">
-+<!ENTITY torbutton.prefs.shutdown "">
-+<!ENTITY torbutton.prefs.tor_shutdown "">
-+<!ENTITY torbutton.prefs.all_shutdown "">
-+<!ENTITY torbutton.prefs.no_shutdown "">
-+<!ENTITY torbutton.prefs.disable_sessionstore "">
-+<!ENTITY torbutton.prefs.headers "">
-+<!ENTITY torbutton.prefs.spoof_english "">
-+<!ENTITY torbutton.prefs.disable_referer "">
-+<!ENTITY torbutton.prefs.disable_domstorage "">
-+<!ENTITY torbutton.prefs.forms "">
-+<!ENTITY torbutton.prefs.block_tforms "">
-+<!ENTITY torbutton.prefs.block_ntforms "">
-+<!ENTITY torbutton.prefs.notor_sessionstore "">
-+<!ENTITY torbutton.prefs.tor "">
-+<!ENTITY torbutton.prefs.non_tor "">
-+<!ENTITY torbutton.prefs.restore_tor "">
-+<!ENTITY torbutton.prefs.reload_crashed_jar "">
-+<!ENTITY torbutton.prefs.dual_cookie_jars "">
-+<!ENTITY torbutton.prefs.clear_http_auth "">
-+<!ENTITY torbutton.prefs.block_js_history "">
-+<!ENTITY torbutton.prefs.resize_on_toggle "">
-+<!ENTITY torbutton.prefs.close_tor "">
-+<!ENTITY torbutton.prefs.close_nontor "">
-+<!ENTITY torbutton.prefs.jar_certs "">
-+<!ENTITY torbutton.prefs.jar_ca_certs "">
-+<!ENTITY torbutton.prefs.locked_mode "">
-+<!ENTITY torbutton.prefs.startup_state "">
-+<!ENTITY torbutton.prefs.shutdown_state "">
-+<!ENTITY torbutton.prefs.startup "">
-+<!ENTITY torbutton.prefs.nonontor_sessionstore "">
-+<!ENTITY torbutton.prefs.block_tor_file_net     "">
-+<!ENTITY torbutton.prefs.block_nontor_file_net     "">
-+<!ENTITY torbutton.prefs.restore_defaults             "">
-+<!ENTITY torbutton.prefs.test_settings             "">
-+<!ENTITY torbutton.prefs.test_auto             "">
-+<!ENTITY torbutton.prefs.disable_livemarks             "">
-Index: src/chrome/locale/hr-HR/torbutton.properties
-===================================================================
---- src/chrome/locale/hr-HR/torbutton.properties	(revision 15635)
-+++ src/chrome/locale/hr-HR/torbutton.properties	(working copy)
-@@ -7,17 +7,17 @@
- torbutton.panel.label.disabled = Tor onemoguÄ?en
- torbutton.panel.label.enabled = Tor omoguÄ?en
- extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton omoguÄ?ava gumb za lakÅ¡e omoguÄ?avanje ili onemoguÄ?avanje tor proxy-a
--torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
--torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
--torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
--torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
--torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
--torbutton.popup.test.success = Tor proxy test successful!
--torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy 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?
--torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
--torbutton.panel.label.verified = Tor Verified
--torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
--torbutton.prefs.recommended = (recommended)
--torbutton.prefs.optional = (optional)
--torbutton.prefs.crucial = (crucial)
-+torbutton.popup.history.warning =
-+torbutton.popup.plugin.warning =
-+torbutton.popup.confirm_ca_certs =
-+torbutton.popup.ff3.warning =
-+torbutton.popup.toggle.warning =
-+torbutton.popup.test.success =
-+torbutton.popup.test.failure =
-+torbutton.popup.test.confirm_toggle =
-+torbutton.popup.test.ff3_notice =
-+torbutton.panel.label.verified =
-+torbutton.popup.test.auto_failed =
-+torbutton.prefs.recommended =
-+torbutton.prefs.optional =
-+torbutton.prefs.crucial =
-Index: src/chrome/locale/nl-NL/torbutton.dtd
-===================================================================
---- src/chrome/locale/nl-NL/torbutton.dtd	(revision 15635)
-+++ src/chrome/locale/nl-NL/torbutton.dtd	(working copy)
-@@ -27,61 +27,60 @@
- <!ENTITY torbutton.context_menu.about.key "O">
- <!ENTITY torbutton.button.label "Torbutton">
- <!ENTITY torbutton.button.tooltip "Klik hier om Torbutton te initialiseren">
--<!ENTITY torbutton.prefs.sec_settings "Security Settings">
--<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
--<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
--<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
--<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
--<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
--<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
--<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
--<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
--<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
--<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
--<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
--<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
--<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
--<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
--<!ENTITY torbutton.prefs.cookies "Cookies">
--<!ENTITY torbutton.prefs.cache "Cache">
--<!ENTITY torbutton.prefs.history "History">
--<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
--<!ENTITY torbutton.prefs.shutdown "Shutdown">
--<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
--<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
--<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
--<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
--<!ENTITY torbutton.prefs.headers "Headers">
--<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
--<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
--<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
--<!ENTITY torbutton.prefs.forms "Forms">
--<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
--<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
--<!ENTITY torbutton.prefs.tor "Tor">
--<!ENTITY torbutton.prefs.non_tor "Non-Tor">
--<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
--<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
--<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
--<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
--<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
--<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
--<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
--<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
--<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
--<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
--<!ENTITY torbutton.prefs.startup "Startup">
--<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
--<!ENTITY torbutton.prefs.block_tor_file_net     "Block Tor access to network from file:// urls (recommended)">
--<!ENTITY torbutton.prefs.block_nontor_file_net     "Block Non-Tor access to network from file:// urls">
--<!ENTITY torbutton.prefs.restore_defaults             "Restore Defaults">
--<!ENTITY torbutton.prefs.test_settings             "Test Settings">
--<!ENTITY torbutton.prefs.test_auto             "Test my Tor settings after the first time I toggle on every Firefox start">
--<!ENTITY torbutton.prefs.disable_livemarks             "Disable livemarks updates during Tor usage">
-+<!ENTITY torbutton.prefs.sec_settings "">
-+<!ENTITY torbutton.prefs.block_thread "">
-+<!ENTITY torbutton.prefs.block_thwrite "">
-+<!ENTITY torbutton.prefs.block_nthread "">
-+<!ENTITY torbutton.prefs.block_nthwrite "">
-+<!ENTITY torbutton.prefs.clear_history "">
-+<!ENTITY torbutton.prefs.clear_cache "">
-+<!ENTITY torbutton.prefs.block_cache "">
-+<!ENTITY torbutton.prefs.cookie_jars "">
-+<!ENTITY torbutton.prefs.mmm_cookies "">
-+<!ENTITY torbutton.prefs.clear_cookies "">
-+<!ENTITY torbutton.prefs.disable_plugins "">
-+<!ENTITY torbutton.prefs.kill_bad_js "">
-+<!ENTITY torbutton.prefs.isolate_content "">
-+<!ENTITY torbutton.prefs.no_updates "">
-+<!ENTITY torbutton.prefs.set_uagent "">
-+<!ENTITY torbutton.prefs.dynamic "">
-+<!ENTITY torbutton.prefs.cookies "">
-+<!ENTITY torbutton.prefs.cache "">
-+<!ENTITY torbutton.prefs.history "">
-+<!ENTITY torbutton.prefs.no_search "">
-+<!ENTITY torbutton.prefs.shutdown "">
-+<!ENTITY torbutton.prefs.tor_shutdown "">
-+<!ENTITY torbutton.prefs.all_shutdown "">
-+<!ENTITY torbutton.prefs.no_shutdown "">
-+<!ENTITY torbutton.prefs.disable_sessionstore "">
-+<!ENTITY torbutton.prefs.headers "">
-+<!ENTITY torbutton.prefs.spoof_english "">
-+<!ENTITY torbutton.prefs.disable_referer "">
-+<!ENTITY torbutton.prefs.disable_domstorage "">
-+<!ENTITY torbutton.prefs.forms "">
-+<!ENTITY torbutton.prefs.block_tforms "">
-+<!ENTITY torbutton.prefs.block_ntforms "">
-+<!ENTITY torbutton.prefs.notor_sessionstore "">
-+<!ENTITY torbutton.prefs.tor "">
-+<!ENTITY torbutton.prefs.non_tor "">
-+<!ENTITY torbutton.prefs.restore_tor "">
-+<!ENTITY torbutton.prefs.reload_crashed_jar "">
-+<!ENTITY torbutton.prefs.dual_cookie_jars "">
-+<!ENTITY torbutton.prefs.clear_http_auth "">
-+<!ENTITY torbutton.prefs.block_js_history "">
-+<!ENTITY torbutton.prefs.resize_on_toggle "">
-+<!ENTITY torbutton.prefs.close_tor "">
-+<!ENTITY torbutton.prefs.close_nontor "">
-+<!ENTITY torbutton.prefs.jar_certs "">
-+<!ENTITY torbutton.prefs.jar_ca_certs "">
-+<!ENTITY torbutton.prefs.locked_mode "">
-+<!ENTITY torbutton.prefs.startup_state "">
-+<!ENTITY torbutton.prefs.shutdown_state "">
-+<!ENTITY torbutton.prefs.startup "">
-+<!ENTITY torbutton.prefs.nonontor_sessionstore "">
-+<!ENTITY torbutton.prefs.block_tor_file_net     "">
-+<!ENTITY torbutton.prefs.block_nontor_file_net     "">
-+<!ENTITY torbutton.prefs.restore_defaults             "">
-+<!ENTITY torbutton.prefs.test_settings             "">
-+<!ENTITY torbutton.prefs.test_auto             "">
-+<!ENTITY torbutton.prefs.disable_livemarks             "">
-Index: src/chrome/locale/nl-NL/torbutton.properties
-===================================================================
---- src/chrome/locale/nl-NL/torbutton.properties	(revision 15635)
-+++ src/chrome/locale/nl-NL/torbutton.properties	(working copy)
-@@ -7,17 +7,17 @@
- torbutton.panel.label.disabled = Tor uitgeschakeld
- torbutton.panel.label.enabled = Tor ingeschakeld
- extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton voorziet in een knop om eenvoudig de Tor proxy in- of uit te schakelen
--torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
--torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
--torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
--torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
--torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
--torbutton.popup.test.success = Tor proxy test successful!
--torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy 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?
--torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
--torbutton.panel.label.verified = Tor Verified
--torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
--torbutton.prefs.recommended = (recommended)
--torbutton.prefs.optional = (optional)
--torbutton.prefs.crucial = (crucial)
-+torbutton.popup.history.warning =
-+torbutton.popup.plugin.warning =
-+torbutton.popup.confirm_ca_certs =
-+torbutton.popup.ff3.warning =
-+torbutton.popup.toggle.warning =
-+torbutton.popup.test.success =
-+torbutton.popup.test.failure =
-+torbutton.popup.test.confirm_toggle =
-+torbutton.popup.test.ff3_notice =
-+torbutton.panel.label.verified =
-+torbutton.popup.test.auto_failed =
-+torbutton.prefs.recommended =
-+torbutton.prefs.optional =
-+torbutton.prefs.crucial =
-Index: src/chrome/locale/pl-PL/torbutton.dtd
-===================================================================
---- src/chrome/locale/pl-PL/torbutton.dtd	(revision 15635)
-+++ src/chrome/locale/pl-PL/torbutton.dtd	(working copy)
-@@ -27,61 +27,60 @@
- <!ENTITY torbutton.context_menu.about.key "T">
- <!ENTITY torbutton.button.label "Torbutton">
- <!ENTITY torbutton.button.tooltip "Kliknij tutaj, aby uruchomiÄ? Torbutton">
--<!ENTITY torbutton.prefs.sec_settings "Security Settings">
--<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
--<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
--<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
--<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
--<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
--<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
--<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
--<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
--<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
--<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
--<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
--<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
--<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
--<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
--<!ENTITY torbutton.prefs.cookies "Cookies">
--<!ENTITY torbutton.prefs.cache "Cache">
--<!ENTITY torbutton.prefs.history "History">
--<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
--<!ENTITY torbutton.prefs.shutdown "Shutdown">
--<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
--<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
--<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
--<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
--<!ENTITY torbutton.prefs.headers "Headers">
--<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
--<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
--<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
--<!ENTITY torbutton.prefs.forms "Forms">
--<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
--<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
--<!ENTITY torbutton.prefs.tor "Tor">
--<!ENTITY torbutton.prefs.non_tor "Non-Tor">
--<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
--<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
--<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
--<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
--<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
--<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
--<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
--<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
--<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
--<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
--<!ENTITY torbutton.prefs.startup "Startup">
--<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
--<!ENTITY torbutton.prefs.block_tor_file_net     "Block Tor access to network from file:// urls (recommended)">
--<!ENTITY torbutton.prefs.block_nontor_file_net     "Block Non-Tor access to network from file:// urls">
--<!ENTITY torbutton.prefs.restore_defaults             "Restore Defaults">
--<!ENTITY torbutton.prefs.test_settings             "Test Settings">
--<!ENTITY torbutton.prefs.test_auto             "Test my Tor settings after the first time I toggle on every Firefox start">
--<!ENTITY torbutton.prefs.disable_livemarks             "Disable livemarks updates during Tor usage">
-+<!ENTITY torbutton.prefs.sec_settings "">
-+<!ENTITY torbutton.prefs.block_thread "">
-+<!ENTITY torbutton.prefs.block_thwrite "">
-+<!ENTITY torbutton.prefs.block_nthread "">
-+<!ENTITY torbutton.prefs.block_nthwrite "">
-+<!ENTITY torbutton.prefs.clear_history "">
-+<!ENTITY torbutton.prefs.clear_cache "">
-+<!ENTITY torbutton.prefs.block_cache "">
-+<!ENTITY torbutton.prefs.cookie_jars "">
-+<!ENTITY torbutton.prefs.mmm_cookies "">
-+<!ENTITY torbutton.prefs.clear_cookies "">
-+<!ENTITY torbutton.prefs.disable_plugins "">
-+<!ENTITY torbutton.prefs.kill_bad_js "">
-+<!ENTITY torbutton.prefs.isolate_content "">
-+<!ENTITY torbutton.prefs.no_updates "">
-+<!ENTITY torbutton.prefs.set_uagent "">
-+<!ENTITY torbutton.prefs.dynamic "">
-+<!ENTITY torbutton.prefs.cookies "">
-+<!ENTITY torbutton.prefs.cache "">
-+<!ENTITY torbutton.prefs.history "">
-+<!ENTITY torbutton.prefs.no_search "">
-+<!ENTITY torbutton.prefs.shutdown "">
-+<!ENTITY torbutton.prefs.tor_shutdown "">
-+<!ENTITY torbutton.prefs.all_shutdown "">
-+<!ENTITY torbutton.prefs.no_shutdown "">
-+<!ENTITY torbutton.prefs.disable_sessionstore "">
-+<!ENTITY torbutton.prefs.headers "">
-+<!ENTITY torbutton.prefs.spoof_english "">
-+<!ENTITY torbutton.prefs.disable_referer "">
-+<!ENTITY torbutton.prefs.disable_domstorage "">
-+<!ENTITY torbutton.prefs.forms "">
-+<!ENTITY torbutton.prefs.block_tforms "">
-+<!ENTITY torbutton.prefs.block_ntforms "">
-+<!ENTITY torbutton.prefs.notor_sessionstore "">
-+<!ENTITY torbutton.prefs.tor "">
-+<!ENTITY torbutton.prefs.non_tor "">
-+<!ENTITY torbutton.prefs.restore_tor "">
-+<!ENTITY torbutton.prefs.reload_crashed_jar "">
-+<!ENTITY torbutton.prefs.dual_cookie_jars "">
-+<!ENTITY torbutton.prefs.clear_http_auth "">
-+<!ENTITY torbutton.prefs.block_js_history "">
-+<!ENTITY torbutton.prefs.resize_on_toggle "">
-+<!ENTITY torbutton.prefs.close_tor "">
-+<!ENTITY torbutton.prefs.close_nontor "">
-+<!ENTITY torbutton.prefs.jar_certs "">
-+<!ENTITY torbutton.prefs.jar_ca_certs "">
-+<!ENTITY torbutton.prefs.locked_mode "">
-+<!ENTITY torbutton.prefs.startup_state "">
-+<!ENTITY torbutton.prefs.shutdown_state "">
-+<!ENTITY torbutton.prefs.startup "">
-+<!ENTITY torbutton.prefs.nonontor_sessionstore "">
-+<!ENTITY torbutton.prefs.block_tor_file_net     "">
-+<!ENTITY torbutton.prefs.block_nontor_file_net     "">
-+<!ENTITY torbutton.prefs.restore_defaults             "">
-+<!ENTITY torbutton.prefs.test_settings             "">
-+<!ENTITY torbutton.prefs.test_auto             "">
-+<!ENTITY torbutton.prefs.disable_livemarks             "">
-Index: src/chrome/locale/pl-PL/torbutton.properties
-===================================================================
---- src/chrome/locale/pl-PL/torbutton.properties	(revision 15635)
-+++ src/chrome/locale/pl-PL/torbutton.properties	(working copy)
-@@ -7,17 +7,17 @@
- torbutton.panel.label.disabled = Tor wyÅ?Ä?czony
- torbutton.panel.label.enabled = Tor wÅ?Ä?czony
- extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Rozszerzenia dostarcza przycisk do Å?atwego wÅ?Ä?cznia/wyÅ?Ä?czania proxy Tor
--torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
--torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
--torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
--torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
--torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
--torbutton.popup.test.success = Tor proxy test successful!
--torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy 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?
--torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
--torbutton.panel.label.verified = Tor Verified
--torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
--torbutton.prefs.recommended = (recommended)
--torbutton.prefs.optional = (optional)
--torbutton.prefs.crucial = (crucial)
-+torbutton.popup.history.warning =
-+torbutton.popup.plugin.warning =
-+torbutton.popup.confirm_ca_certs =
-+torbutton.popup.ff3.warning =
-+torbutton.popup.toggle.warning =
-+torbutton.popup.test.success =
-+torbutton.popup.test.failure =
-+torbutton.popup.test.confirm_toggle =
-+torbutton.popup.test.ff3_notice =
-+torbutton.panel.label.verified =
-+torbutton.popup.test.auto_failed =
-+torbutton.prefs.recommended =
-+torbutton.prefs.optional =
-+torbutton.prefs.crucial =
-Index: src/chrome/locale/pt-BR/torbutton.dtd
-===================================================================
---- src/chrome/locale/pt-BR/torbutton.dtd	(revision 15635)
-+++ src/chrome/locale/pt-BR/torbutton.dtd	(working copy)
-@@ -27,61 +27,60 @@
- <!ENTITY torbutton.context_menu.about.key "A">
- <!ENTITY torbutton.button.label "Torbutton">
- <!ENTITY torbutton.button.tooltip "Clique para iniciar Torbutton">
--<!ENTITY torbutton.prefs.sec_settings "Security Settings">
--<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
--<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
--<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
--<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
--<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
--<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
--<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
--<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
--<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
--<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
--<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
--<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
--<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
--<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
--<!ENTITY torbutton.prefs.cookies "Cookies">
--<!ENTITY torbutton.prefs.cache "Cache">
--<!ENTITY torbutton.prefs.history "History">
--<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
--<!ENTITY torbutton.prefs.shutdown "Shutdown">
--<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
--<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
--<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
--<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
--<!ENTITY torbutton.prefs.headers "Headers">
--<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
--<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
--<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
--<!ENTITY torbutton.prefs.forms "Forms">
--<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
--<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
--<!ENTITY torbutton.prefs.tor "Tor">
--<!ENTITY torbutton.prefs.non_tor "Non-Tor">
--<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
--<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
--<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
--<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
--<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
--<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
--<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
--<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
--<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
--<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
--<!ENTITY torbutton.prefs.startup "Startup">
--<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
--<!ENTITY torbutton.prefs.block_tor_file_net     "Block Tor access to network from file:// urls (recommended)">
--<!ENTITY torbutton.prefs.block_nontor_file_net     "Block Non-Tor access to network from file:// urls">
--<!ENTITY torbutton.prefs.restore_defaults             "Restore Defaults">
--<!ENTITY torbutton.prefs.test_settings             "Test Settings">
--<!ENTITY torbutton.prefs.test_auto             "Test my Tor settings after the first time I toggle on every Firefox start">
--<!ENTITY torbutton.prefs.disable_livemarks             "Disable livemarks updates during Tor usage">
-+<!ENTITY torbutton.prefs.sec_settings "">
-+<!ENTITY torbutton.prefs.block_thread "">
-+<!ENTITY torbutton.prefs.block_thwrite "">
-+<!ENTITY torbutton.prefs.block_nthread "">
-+<!ENTITY torbutton.prefs.block_nthwrite "">
-+<!ENTITY torbutton.prefs.clear_history "">
-+<!ENTITY torbutton.prefs.clear_cache "">
-+<!ENTITY torbutton.prefs.block_cache "">
-+<!ENTITY torbutton.prefs.cookie_jars "">
-+<!ENTITY torbutton.prefs.mmm_cookies "">
-+<!ENTITY torbutton.prefs.clear_cookies "">
-+<!ENTITY torbutton.prefs.disable_plugins "">
-+<!ENTITY torbutton.prefs.kill_bad_js "">
-+<!ENTITY torbutton.prefs.isolate_content "">
-+<!ENTITY torbutton.prefs.no_updates "">
-+<!ENTITY torbutton.prefs.set_uagent "">
-+<!ENTITY torbutton.prefs.dynamic "">
-+<!ENTITY torbutton.prefs.cookies "">
-+<!ENTITY torbutton.prefs.cache "">
-+<!ENTITY torbutton.prefs.history "">
-+<!ENTITY torbutton.prefs.no_search "">
-+<!ENTITY torbutton.prefs.shutdown "">
-+<!ENTITY torbutton.prefs.tor_shutdown "">
-+<!ENTITY torbutton.prefs.all_shutdown "">
-+<!ENTITY torbutton.prefs.no_shutdown "">
-+<!ENTITY torbutton.prefs.disable_sessionstore "">
-+<!ENTITY torbutton.prefs.headers "">
-+<!ENTITY torbutton.prefs.spoof_english "">
-+<!ENTITY torbutton.prefs.disable_referer "">
-+<!ENTITY torbutton.prefs.disable_domstorage "">
-+<!ENTITY torbutton.prefs.forms "">
-+<!ENTITY torbutton.prefs.block_tforms "">
-+<!ENTITY torbutton.prefs.block_ntforms "">
-+<!ENTITY torbutton.prefs.notor_sessionstore "">
-+<!ENTITY torbutton.prefs.tor "">
-+<!ENTITY torbutton.prefs.non_tor "">
-+<!ENTITY torbutton.prefs.restore_tor "">
-+<!ENTITY torbutton.prefs.reload_crashed_jar "">
-+<!ENTITY torbutton.prefs.dual_cookie_jars "">
-+<!ENTITY torbutton.prefs.clear_http_auth "">
-+<!ENTITY torbutton.prefs.block_js_history "">
-+<!ENTITY torbutton.prefs.resize_on_toggle "">
-+<!ENTITY torbutton.prefs.close_tor "">
-+<!ENTITY torbutton.prefs.close_nontor "">
-+<!ENTITY torbutton.prefs.jar_certs "">
-+<!ENTITY torbutton.prefs.jar_ca_certs "">
-+<!ENTITY torbutton.prefs.locked_mode "">
-+<!ENTITY torbutton.prefs.startup_state "">
-+<!ENTITY torbutton.prefs.shutdown_state "">
-+<!ENTITY torbutton.prefs.startup "">
-+<!ENTITY torbutton.prefs.nonontor_sessionstore "">
-+<!ENTITY torbutton.prefs.block_tor_file_net     "">
-+<!ENTITY torbutton.prefs.block_nontor_file_net     "">
-+<!ENTITY torbutton.prefs.restore_defaults             "">
-+<!ENTITY torbutton.prefs.test_settings             "">
-+<!ENTITY torbutton.prefs.test_auto             "">
-+<!ENTITY torbutton.prefs.disable_livemarks             "">
-Index: src/chrome/locale/pt-BR/torbutton.properties
-===================================================================
---- src/chrome/locale/pt-BR/torbutton.properties	(revision 15635)
-+++ src/chrome/locale/pt-BR/torbutton.properties	(working copy)
-@@ -7,17 +7,17 @@
- torbutton.panel.label.disabled = Tor desabilitado
- torbutton.panel.label.enabled = Tor habilitado
- extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provÃª um Ãcone para habilitar ou desabilitar rapidamente o proxy Tor
--torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
--torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
--torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
--torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
--torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
--torbutton.popup.test.success = Tor proxy test successful!
--torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy 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?
--torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
--torbutton.panel.label.verified = Tor Verified
--torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
--torbutton.prefs.recommended = (recommended)
--torbutton.prefs.optional = (optional)
--torbutton.prefs.crucial = (crucial)
-+torbutton.popup.history.warning =
-+torbutton.popup.plugin.warning =
-+torbutton.popup.confirm_ca_certs =
-+torbutton.popup.ff3.warning =
-+torbutton.popup.toggle.warning =
-+torbutton.popup.test.success =
-+torbutton.popup.test.failure =
-+torbutton.popup.test.confirm_toggle =
-+torbutton.popup.test.ff3_notice =
-+torbutton.panel.label.verified =
-+torbutton.popup.test.auto_failed =
-+torbutton.prefs.recommended =
-+torbutton.prefs.optional =
-+torbutton.prefs.crucial =
-Index: src/chrome/locale/it-IT/torbutton.dtd
-===================================================================
---- src/chrome/locale/it-IT/torbutton.dtd	(revision 15635)
-+++ src/chrome/locale/it-IT/torbutton.dtd	(working copy)
-@@ -71,17 +71,16 @@
- <!ENTITY torbutton.prefs.resize_on_toggle "Ridimensiona la finestra a multipli di 40px all&apos;attivazione (consigliato)">
- <!ENTITY torbutton.prefs.close_tor "Chiudi tutte le finestre e schede Tor alla disattivazione (facoltativo)">
- <!ENTITY torbutton.prefs.close_nontor "Chiudi tutte le finestre e schede Non-Tor all&apos; attivazione (facoltativo)">
--<!ENTITY torbutton.prefs.block_links "Blocca i clic sui link e la ricarica delle pagine da stati Tor differenti (facoltativo)">
- <!ENTITY torbutton.prefs.jar_certs "Conserva i certificati SSL in depositi separati per Tor/Non-Tor (consigliato)">
- <!ENTITY torbutton.prefs.jar_ca_certs "Conserva i certificati delle CA in depositi separati per Tor/Non-Tor (consigliato)">
--<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
--<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
--<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
--<!ENTITY torbutton.prefs.startup "Startup">
--<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
--<!ENTITY torbutton.prefs.block_tor_file_net     "Block Tor access to network from file:// urls (recommended)">
--<!ENTITY torbutton.prefs.block_nontor_file_net     "Block Non-Tor access to network from file:// urls">
--<!ENTITY torbutton.prefs.restore_defaults             "Restore Defaults">
--<!ENTITY torbutton.prefs.test_settings             "Test Settings">
--<!ENTITY torbutton.prefs.test_auto             "Test my Tor settings after the first time I toggle on every Firefox start">
--<!ENTITY torbutton.prefs.disable_livemarks             "Disable livemarks updates during Tor usage">
-+<!ENTITY torbutton.prefs.locked_mode "">
-+<!ENTITY torbutton.prefs.startup_state "">
-+<!ENTITY torbutton.prefs.shutdown_state "">
-+<!ENTITY torbutton.prefs.startup "">
-+<!ENTITY torbutton.prefs.nonontor_sessionstore "">
-+<!ENTITY torbutton.prefs.block_tor_file_net     "">
-+<!ENTITY torbutton.prefs.block_nontor_file_net     "">
-+<!ENTITY torbutton.prefs.restore_defaults             "">
-+<!ENTITY torbutton.prefs.test_settings             "">
-+<!ENTITY torbutton.prefs.test_auto             "">
-+<!ENTITY torbutton.prefs.disable_livemarks             "">
-Index: src/chrome/locale/it-IT/torbutton.properties
-===================================================================
---- src/chrome/locale/it-IT/torbutton.properties	(revision 15635)
-+++ src/chrome/locale/it-IT/torbutton.properties	(working copy)
-@@ -11,13 +11,13 @@
- torbutton.popup.plugin.warning = Torbutton ha bloccato l&apos;attivazione dei plugin durante l'uso di Tor.\n\nUsa Salva Con Nome al suo posto.\n\n
- torbutton.popup.confirm_ca_certs = Avviso di Torbutton: sembra che tu non abbia delle tue proprie Certification Authority. L&apos;esame della lista delle Certification Authority &grave; un&apos;operazione lenta e rallenta ancora attivando/disattivando Tor. Vuoi disabilitare l'isolamento dei certificati delle Certification Authority? (Se non capisci questo avviso, puoi tranquillamente fare clic su OK)
- torbutton.popup.ff3.warning = Attenzione!\n\nTorbutton su Firefox 3 rivela il tuo fuso orario e i feed dei tuoi livemark durante l&apos;uso di Tor. Inoltre non &egrave; stato testato a fondo come Firefox 2 per verificare la sicurezza e usabilit&agrave; di Tor.\n\nVuoi continuare ugualmente?
--torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
--torbutton.popup.test.success = Tor proxy test successful!
--torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy 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?
--torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
--torbutton.panel.label.verified = Tor Verified
--torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
--torbutton.prefs.recommended = (recommended)
--torbutton.prefs.optional = (optional)
--torbutton.prefs.crucial = (crucial)
-+torbutton.popup.toggle.warning =
-+torbutton.popup.test.success =
-+torbutton.popup.test.failure =
-+torbutton.popup.test.confirm_toggle =
-+torbutton.popup.test.ff3_notice =
-+torbutton.panel.label.verified =
-+torbutton.popup.test.auto_failed =
-+torbutton.prefs.recommended =
-+torbutton.prefs.optional =
-+torbutton.prefs.crucial =
-Index: src/chrome/locale/ru/torbutton.dtd
-===================================================================
---- src/chrome/locale/ru/torbutton.dtd	(revision 15635)
-+++ src/chrome/locale/ru/torbutton.dtd	(working copy)
-@@ -71,17 +71,16 @@
- <!ENTITY torbutton.prefs.resize_on_toggle "Ð?Ð°Ñ?Ñ?Ñ?Ð°Ð±Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¾ÐºÐ½Ð° Ñ? Ð¼Ð½Ð¾Ð¶Ð¸Ñ?ÐµÐ»ÐµÐ¼ 40px Ð¿Ñ?Ð¸ Ð¿ÐµÑ?ÐµÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ð¸ Tor (Ð¶ÐµÐ»Ð°Ñ?ÐµÐ»Ñ?Ð½Ð¾)">
- <!ENTITY torbutton.prefs.close_tor "Ð?Ð°ÐºÑ?Ñ?Ð²Ð°Ñ?Ñ? Ð²Ñ?Ðµ Ð¾ÐºÐ½Ð° Ð¸ Ð²ÐºÐ»Ð°Ð´ÐºÐ¸ Tor Ð¿Ñ?Ð¸ Ð¿ÐµÑ?ÐµÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ð¸ Ñ?ÐµÐ¶Ð¸Ð¼Ð¾Ð² (Ð½ÐµÐ¾Ð±Ñ?Ð·.)">
- <!ENTITY torbutton.prefs.close_nontor "Ð?Ð°ÐºÑ?Ñ?Ð²Ð°Ñ?Ñ? Ð²Ñ?Ðµ Ð¾ÐºÐ½Ð° Ð¸ Ð²ÐºÐ»Ð°Ð´ÐºÐ¸ Ð½Ðµ-Tor Ð¿Ñ?Ð¸ Ð¿ÐµÑ?ÐµÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ð¸ Ñ?ÐµÐ¶Ð¸Ð¼Ð¾Ð² (Ð½ÐµÐ¾Ð±Ñ?Ð·.)">
--<!ENTITY torbutton.prefs.block_links "Ð?Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ñ?ÐµÐ»Ñ?ÐºÐ¸ Ð¿Ð¾ Ñ?Ñ?Ñ?Ð»ÐºÐ°Ð¼ Ð¸ Ð¿ÐµÑ?ÐµÐ·Ð°Ð³Ñ?Ñ?Ð·ÐºÑ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ? Ð¸Ð· Ñ?Ð°Ð·Ð½Ñ?Ñ? Ñ?ÐµÐ¶Ð¸Ð¼Ð¾Ð² Tor (Ð½ÐµÐ¾Ð±Ñ?Ð·.)">
--<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
--<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
--<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
--<!ENTITY torbutton.prefs.startup "Startup">
--<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
--<!ENTITY torbutton.prefs.block_tor_file_net     "Block Tor access to network from file:// urls (recommended)">
--<!ENTITY torbutton.prefs.block_nontor_file_net     "Block Non-Tor access to network from file:// urls">
--<!ENTITY torbutton.prefs.restore_defaults             "Restore Defaults">
--<!ENTITY torbutton.prefs.test_settings             "Test Settings">
--<!ENTITY torbutton.prefs.test_auto             "Test my Tor settings after the first time I toggle on every Firefox start">
--<!ENTITY torbutton.prefs.disable_livemarks             "Disable livemarks updates during Tor usage">
-+<!ENTITY torbutton.prefs.jar_certs "">
-+<!ENTITY torbutton.prefs.jar_ca_certs "">
-+<!ENTITY torbutton.prefs.locked_mode "">
-+<!ENTITY torbutton.prefs.startup_state "">
-+<!ENTITY torbutton.prefs.shutdown_state "">
-+<!ENTITY torbutton.prefs.startup "">
-+<!ENTITY torbutton.prefs.nonontor_sessionstore "">
-+<!ENTITY torbutton.prefs.block_tor_file_net     "">
-+<!ENTITY torbutton.prefs.block_nontor_file_net     "">
-+<!ENTITY torbutton.prefs.restore_defaults             "">
-+<!ENTITY torbutton.prefs.test_settings             "">
-+<!ENTITY torbutton.prefs.test_auto             "">
-+<!ENTITY torbutton.prefs.disable_livemarks             "">
-Index: src/chrome/locale/ru/torbutton.properties
-===================================================================
---- src/chrome/locale/ru/torbutton.properties	(revision 15635)
-+++ src/chrome/locale/ru/torbutton.properties	(working copy)
-@@ -2,22 +2,22 @@
- torbutton.button.tooltip.enabled = Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Tor
- torbutton.panel.tooltip.disabled = Ð?Ð°Ð¶Ð¼Ð¸Ñ?Ðµ, Ñ?Ñ?Ð¾Ð±Ñ? Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Tor
- torbutton.panel.tooltip.enabled = Ð?Ð°Ð¶Ð¼Ð¸Ñ?Ðµ, Ñ?Ñ?Ð¾Ð±Ñ? Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Tor
--torbutton.panel.plugins.disabled = Click to enable plugins
--torbutton.panel.plugins.enabled = Click to disable plugins
-+torbutton.panel.plugins.disabled =
-+torbutton.panel.plugins.enabled =
- torbutton.panel.label.disabled = Tor Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½
- torbutton.panel.label.enabled = Tor Ð²ÐºÐ»Ñ?Ñ?ÐµÐ½
- extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Ð?Ð½Ð¾Ð¿ÐºÐ° Ð²ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ?/Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð° Ðº Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÑ?ÐµÐ· Ñ?ÐµÑ?Ñ? Tor
- torbutton.popup.history.warning = Torbutton Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð» Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ð¸ Ñ? Ð¶Ñ?Ñ?Ð½Ð°Ð»Ð¾Ð¼.\n\nÐ¡Ð¼. Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð¶Ñ?Ñ?Ð½Ð°Ð»Ð°.\n\n
- torbutton.popup.plugin.warning = Torbutton Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð» Ð¿Ñ?Ñ?Ð¼Ñ?Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²ÐºÑ?  Ð¿Ð»Ð°Ð³Ð¸Ð½Ð¾Ð² Ñ?ÐµÑ?ÐµÐ· Tor.\n\nÐ?Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?Ð¹Ñ?Ðµ Ñ?Ð¿Ð¾Ñ?Ð¾Ð± Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? ÐºÐ°Ðº.\n\n
--torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
--torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
--torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
--torbutton.popup.test.success = Tor proxy test successful!
--torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy 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?
--torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
--torbutton.panel.label.verified = Tor Verified
--torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
--torbutton.prefs.recommended = (recommended)
--torbutton.prefs.optional = (optional)
--torbutton.prefs.crucial = (crucial)
-+torbutton.popup.confirm_ca_certs =
-+torbutton.popup.ff3.warning =
-+torbutton.popup.toggle.warning =
-+torbutton.popup.test.success =
-+torbutton.popup.test.failure =
-+torbutton.popup.test.confirm_toggle =
-+torbutton.popup.test.ff3_notice =
-+torbutton.panel.label.verified =
-+torbutton.popup.test.auto_failed =
-+torbutton.prefs.recommended =
-+torbutton.prefs.optional =
-+torbutton.prefs.crucial =
-Index: src/chrome/locale/en-US/torbutton.dtd
-===================================================================
---- src/chrome/locale/en-US/torbutton.dtd	(revision 15635)
-+++ src/chrome/locale/en-US/torbutton.dtd	(working copy)
-@@ -71,7 +71,6 @@
- <!ENTITY torbutton.prefs.resize_on_toggle       "Resize windows to multiples of 50px during Tor usage (recommended)">
- <!ENTITY torbutton.prefs.close_tor    "Close all Tor windows and tabs on toggle (optional)">
- <!ENTITY torbutton.prefs.close_nontor       "Close all Non-Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.block_links        "Block link clicks and page reloads from different Tor states (optional)">
- <!ENTITY torbutton.prefs.jar_certs        "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
- <!ENTITY torbutton.prefs.jar_ca_certs        "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
- <!ENTITY torbutton.prefs.locked_mode        "Disable Button and Hotkeys to prevent accidental toggle">
-Index: src/chrome/locale/sl-SI/torbutton.dtd
-===================================================================
---- src/chrome/locale/sl-SI/torbutton.dtd	(revision 15635)
-+++ src/chrome/locale/sl-SI/torbutton.dtd	(working copy)
-@@ -27,61 +27,60 @@
- <!ENTITY torbutton.context_menu.about.key "A">
- <!ENTITY torbutton.button.label "Torbutton">
- <!ENTITY torbutton.button.tooltip "Klikni za inicializiranje razÅ¡iritve Torbutton">
--<!ENTITY torbutton.prefs.sec_settings "Security Settings">
--<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
--<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
--<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
--<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
--<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
--<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
--<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
--<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
--<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
--<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
--<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
--<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
--<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
--<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
--<!ENTITY torbutton.prefs.cookies "Cookies">
--<!ENTITY torbutton.prefs.cache "Cache">
--<!ENTITY torbutton.prefs.history "History">
--<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
--<!ENTITY torbutton.prefs.shutdown "Shutdown">
--<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
--<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
--<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
--<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
--<!ENTITY torbutton.prefs.headers "Headers">
--<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
--<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
--<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
--<!ENTITY torbutton.prefs.forms "Forms">
--<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
--<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
--<!ENTITY torbutton.prefs.tor "Tor">
--<!ENTITY torbutton.prefs.non_tor "Non-Tor">
--<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
--<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
--<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
--<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
--<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
--<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
--<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
--<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
--<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
--<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
--<!ENTITY torbutton.prefs.startup "Startup">
--<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
--<!ENTITY torbutton.prefs.block_tor_file_net     "Block Tor access to network from file:// urls (recommended)">
--<!ENTITY torbutton.prefs.block_nontor_file_net     "Block Non-Tor access to network from file:// urls">
--<!ENTITY torbutton.prefs.restore_defaults             "Restore Defaults">
--<!ENTITY torbutton.prefs.test_settings             "Test Settings">
--<!ENTITY torbutton.prefs.test_auto             "Test my Tor settings after the first time I toggle on every Firefox start">
--<!ENTITY torbutton.prefs.disable_livemarks             "Disable livemarks updates during Tor usage">
-+<!ENTITY torbutton.prefs.sec_settings "">
-+<!ENTITY torbutton.prefs.block_thread "">
-+<!ENTITY torbutton.prefs.block_thwrite "">
-+<!ENTITY torbutton.prefs.block_nthread "">
-+<!ENTITY torbutton.prefs.block_nthwrite "">
-+<!ENTITY torbutton.prefs.clear_history "">
-+<!ENTITY torbutton.prefs.clear_cache "">
-+<!ENTITY torbutton.prefs.block_cache "">
-+<!ENTITY torbutton.prefs.cookie_jars "">
-+<!ENTITY torbutton.prefs.mmm_cookies "">
-+<!ENTITY torbutton.prefs.clear_cookies "">
-+<!ENTITY torbutton.prefs.disable_plugins "">
-+<!ENTITY torbutton.prefs.kill_bad_js "">
-+<!ENTITY torbutton.prefs.isolate_content "">
-+<!ENTITY torbutton.prefs.no_updates "">
-+<!ENTITY torbutton.prefs.set_uagent "">
-+<!ENTITY torbutton.prefs.dynamic "">
-+<!ENTITY torbutton.prefs.cookies "">
-+<!ENTITY torbutton.prefs.cache "">
-+<!ENTITY torbutton.prefs.history "">
-+<!ENTITY torbutton.prefs.no_search "">
-+<!ENTITY torbutton.prefs.shutdown "">
-+<!ENTITY torbutton.prefs.tor_shutdown "">
-+<!ENTITY torbutton.prefs.all_shutdown "">
-+<!ENTITY torbutton.prefs.no_shutdown "">
-+<!ENTITY torbutton.prefs.disable_sessionstore "">
-+<!ENTITY torbutton.prefs.headers "">
-+<!ENTITY torbutton.prefs.spoof_english "">
-+<!ENTITY torbutton.prefs.disable_referer "">
-+<!ENTITY torbutton.prefs.disable_domstorage "">
-+<!ENTITY torbutton.prefs.forms "">
-+<!ENTITY torbutton.prefs.block_tforms "">
-+<!ENTITY torbutton.prefs.block_ntforms "">
-+<!ENTITY torbutton.prefs.notor_sessionstore "">
-+<!ENTITY torbutton.prefs.tor "">
-+<!ENTITY torbutton.prefs.non_tor "">
-+<!ENTITY torbutton.prefs.restore_tor "">
-+<!ENTITY torbutton.prefs.reload_crashed_jar "">
-+<!ENTITY torbutton.prefs.dual_cookie_jars "">
-+<!ENTITY torbutton.prefs.clear_http_auth "">
-+<!ENTITY torbutton.prefs.block_js_history "">
-+<!ENTITY torbutton.prefs.resize_on_toggle "">
-+<!ENTITY torbutton.prefs.close_tor "">
-+<!ENTITY torbutton.prefs.close_nontor "">
-+<!ENTITY torbutton.prefs.jar_certs "">
-+<!ENTITY torbutton.prefs.jar_ca_certs "">
-+<!ENTITY torbutton.prefs.locked_mode "">
-+<!ENTITY torbutton.prefs.startup_state "">
-+<!ENTITY torbutton.prefs.shutdown_state "">
-+<!ENTITY torbutton.prefs.startup "">
-+<!ENTITY torbutton.prefs.nonontor_sessionstore "">
-+<!ENTITY torbutton.prefs.block_tor_file_net     "">
-+<!ENTITY torbutton.prefs.block_nontor_file_net     "">
-+<!ENTITY torbutton.prefs.restore_defaults             "">
-+<!ENTITY torbutton.prefs.test_settings             "">
-+<!ENTITY torbutton.prefs.test_auto             "">
-+<!ENTITY torbutton.prefs.disable_livemarks             "">
-Index: src/chrome/locale/sl-SI/torbutton.properties
-===================================================================
---- src/chrome/locale/sl-SI/torbutton.properties	(revision 15635)
-+++ src/chrome/locale/sl-SI/torbutton.properties	(working copy)
-@@ -7,17 +7,17 @@
- torbutton.panel.label.disabled = Anonimizacija izkljuÄ?ena
- torbutton.panel.label.enabled = Anonimizacija vkljuÄ?ena
- extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton razÅ¡iritev omogoÄ?a enostavno vkljuÄ?itev ali izkljuÄ?itev povezave preko anonimizacijskega omreÅ¾ja Tor
--torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
--torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
--torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
--torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
--torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
--torbutton.popup.test.success = Tor proxy test successful!
--torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy 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?
--torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
--torbutton.panel.label.verified = Tor Verified
--torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
--torbutton.prefs.recommended = (recommended)
--torbutton.prefs.optional = (optional)
--torbutton.prefs.crucial = (crucial)
-+torbutton.popup.history.warning =
-+torbutton.popup.plugin.warning =
-+torbutton.popup.confirm_ca_certs =
-+torbutton.popup.ff3.warning =
-+torbutton.popup.toggle.warning =
-+torbutton.popup.test.success =
-+torbutton.popup.test.failure =
-+torbutton.popup.test.confirm_toggle =
-+torbutton.popup.test.ff3_notice =
-+torbutton.panel.label.verified =
-+torbutton.popup.test.auto_failed =
-+torbutton.prefs.recommended =
-+torbutton.prefs.optional =
-+torbutton.prefs.crucial =
-Index: src/chrome/locale/de-AT/torbutton.dtd
-===================================================================
---- src/chrome/locale/de-AT/torbutton.dtd	(revision 15635)
-+++ src/chrome/locale/de-AT/torbutton.dtd	(working copy)
-@@ -27,61 +27,60 @@
- <!ENTITY torbutton.context_menu.about.key "A">
- <!ENTITY torbutton.button.label "Torbutton">
- <!ENTITY torbutton.button.tooltip "Hier klicken, um Torbutton einzurichten">
--<!ENTITY torbutton.prefs.sec_settings "Security Settings">
--<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
--<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
--<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
--<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
--<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
--<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
--<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
--<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
--<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
--<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
--<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
--<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
--<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
--<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
--<!ENTITY torbutton.prefs.cookies "Cookies">
--<!ENTITY torbutton.prefs.cache "Cache">
--<!ENTITY torbutton.prefs.history "History">
--<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
--<!ENTITY torbutton.prefs.shutdown "Shutdown">
--<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
--<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
--<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
--<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
--<!ENTITY torbutton.prefs.headers "Headers">
--<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
--<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
--<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
--<!ENTITY torbutton.prefs.forms "Forms">
--<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
--<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
--<!ENTITY torbutton.prefs.tor "Tor">
--<!ENTITY torbutton.prefs.non_tor "Non-Tor">
--<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
--<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
--<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
--<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
--<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
--<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
--<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
--<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
--<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
--<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
--<!ENTITY torbutton.prefs.startup "Startup">
--<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
--<!ENTITY torbutton.prefs.block_tor_file_net     "Block Tor access to network from file:// urls (recommended)">
--<!ENTITY torbutton.prefs.block_nontor_file_net     "Block Non-Tor access to network from file:// urls">
--<!ENTITY torbutton.prefs.restore_defaults             "Restore Defaults">
--<!ENTITY torbutton.prefs.test_settings             "Test Settings">
--<!ENTITY torbutton.prefs.test_auto             "Test my Tor settings after the first time I toggle on every Firefox start">
--<!ENTITY torbutton.prefs.disable_livemarks             "Disable livemarks updates during Tor usage">
-+<!ENTITY torbutton.prefs.sec_settings "">
-+<!ENTITY torbutton.prefs.block_thread "">
-+<!ENTITY torbutton.prefs.block_thwrite "">
-+<!ENTITY torbutton.prefs.block_nthread "">
-+<!ENTITY torbutton.prefs.block_nthwrite "">
-+<!ENTITY torbutton.prefs.clear_history "">
-+<!ENTITY torbutton.prefs.clear_cache "">
-+<!ENTITY torbutton.prefs.block_cache "">
-+<!ENTITY torbutton.prefs.cookie_jars "">
-+<!ENTITY torbutton.prefs.mmm_cookies "">
-+<!ENTITY torbutton.prefs.clear_cookies "">
-+<!ENTITY torbutton.prefs.disable_plugins "">
-+<!ENTITY torbutton.prefs.kill_bad_js "">
-+<!ENTITY torbutton.prefs.isolate_content "">
-+<!ENTITY torbutton.prefs.no_updates "">
-+<!ENTITY torbutton.prefs.set_uagent "">
-+<!ENTITY torbutton.prefs.dynamic "">
-+<!ENTITY torbutton.prefs.cookies "">
-+<!ENTITY torbutton.prefs.cache "">
-+<!ENTITY torbutton.prefs.history "">
-+<!ENTITY torbutton.prefs.no_search "">
-+<!ENTITY torbutton.prefs.shutdown "">
-+<!ENTITY torbutton.prefs.tor_shutdown "">
-+<!ENTITY torbutton.prefs.all_shutdown "">
-+<!ENTITY torbutton.prefs.no_shutdown "">
-+<!ENTITY torbutton.prefs.disable_sessionstore "">
-+<!ENTITY torbutton.prefs.headers "">
-+<!ENTITY torbutton.prefs.spoof_english "">
-+<!ENTITY torbutton.prefs.disable_referer "">
-+<!ENTITY torbutton.prefs.disable_domstorage "">
-+<!ENTITY torbutton.prefs.forms "">
-+<!ENTITY torbutton.prefs.block_tforms "">
-+<!ENTITY torbutton.prefs.block_ntforms "">
-+<!ENTITY torbutton.prefs.notor_sessionstore "">
-+<!ENTITY torbutton.prefs.tor "">
-+<!ENTITY torbutton.prefs.non_tor "">
-+<!ENTITY torbutton.prefs.restore_tor "">
-+<!ENTITY torbutton.prefs.reload_crashed_jar "">
-+<!ENTITY torbutton.prefs.dual_cookie_jars "">
-+<!ENTITY torbutton.prefs.clear_http_auth "">
-+<!ENTITY torbutton.prefs.block_js_history "">
-+<!ENTITY torbutton.prefs.resize_on_toggle "">
-+<!ENTITY torbutton.prefs.close_tor "">
-+<!ENTITY torbutton.prefs.close_nontor "">
-+<!ENTITY torbutton.prefs.jar_certs "">
-+<!ENTITY torbutton.prefs.jar_ca_certs "">
-+<!ENTITY torbutton.prefs.locked_mode "">
-+<!ENTITY torbutton.prefs.startup_state "">
-+<!ENTITY torbutton.prefs.shutdown_state "">
-+<!ENTITY torbutton.prefs.startup "">
-+<!ENTITY torbutton.prefs.nonontor_sessionstore "">
-+<!ENTITY torbutton.prefs.block_tor_file_net     "">
-+<!ENTITY torbutton.prefs.block_nontor_file_net     "">
-+<!ENTITY torbutton.prefs.restore_defaults             "">
-+<!ENTITY torbutton.prefs.test_settings             "">
-+<!ENTITY torbutton.prefs.test_auto             "">
-+<!ENTITY torbutton.prefs.disable_livemarks             "">
-Index: src/chrome/locale/de-AT/torbutton.properties
-===================================================================
---- src/chrome/locale/de-AT/torbutton.properties	(revision 15635)
-+++ src/chrome/locale/de-AT/torbutton.properties	(working copy)
-@@ -7,17 +7,17 @@
- torbutton.panel.label.disabled = Tor deaktiviert
- torbutton.panel.label.enabled = Tor aktiviert
- extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Dank Torbutton kÃ¶nnen Sie den Tor-Proxy mit einem Klick ein- und ausschalten
--torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
--torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
--torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
--torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
--torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
--torbutton.popup.test.success = Tor proxy test successful!
--torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy 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?
--torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
--torbutton.panel.label.verified = Tor Verified
--torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
--torbutton.prefs.recommended = (recommended)
--torbutton.prefs.optional = (optional)
--torbutton.prefs.crucial = (crucial)
-+torbutton.popup.history.warning =
-+torbutton.popup.plugin.warning =
-+torbutton.popup.confirm_ca_certs =
-+torbutton.popup.ff3.warning =
-+torbutton.popup.toggle.warning =
-+torbutton.popup.test.success =
-+torbutton.popup.test.failure =
-+torbutton.popup.test.confirm_toggle =
-+torbutton.popup.test.ff3_notice =
-+torbutton.panel.label.verified =
-+torbutton.popup.test.auto_failed =
-+torbutton.prefs.recommended =
-+torbutton.prefs.optional =
-+torbutton.prefs.crucial =
-Index: src/chrome/locale/fa-IR/torbutton.dtd
-===================================================================
---- src/chrome/locale/fa-IR/torbutton.dtd	(revision 15635)
-+++ src/chrome/locale/fa-IR/torbutton.dtd	(working copy)
-@@ -71,17 +71,16 @@
- <!ENTITY torbutton.prefs.resize_on_toggle "ØªØºÛ?Û?Ø±Ø§Ù?Ø¯Ø§Ø²Ù? Ø§Ø¨Ø¹Ø§Ø¯ Ù¾Ù?Ø¬Ø±Ù? Ø¨Ø§ Ù?Ø¶Ø±Ø¨Ù?Ø§Û? 40 ØªØµÙ?Û?Ø± Ø¯Ø§Ù?Ù? Ø¯Ø± Ø¶Ø§Ù?Ù? (ØªÙ?ØµÛ?Ù? Ø´Ø¯Ù?)">
- <!ENTITY torbutton.prefs.close_tor "Ø¨Ø³ØªÙ? Ù?Ù?Ù? Ù¾Ù?Ø¬Ø±Ù? Ù?Ø§Û? ØªÙ?Ø± Ø¯Ø± Ø¶Ø§Ù?Ù? (Ø§Ø®ØªÛ?Ø§Ø±Û?)">
- <!ENTITY torbutton.prefs.close_nontor "Ø¨Ø³ØªÙ? Ù?Ù?Ù? Ù¾Ù?Ø¬Ø±Ù? Ù?Ø§Û? ØºÛ?Ø±ØªÙ?Ø± Ø¯Ø± Ø¶Ø§Ù?Ù? (Ø§Ø®ØªÛ?Ø§Ø±Û?)">
--<!ENTITY torbutton.prefs.block_links "Ø¨Ø§Ø²Ø¯Ø§Ø´ØªÙ? Ù?Ø´Ø§Ø±Ø¯Ø§Ø¯Ù? Ù¾Û?Ù?Ù?Ø¯ Ù? Ø¨Ø§Ø²Ú¯Ø°Ø§Ø±Û? Ù?Ø¬Ø¯Ø¯ Ø¨Ø±Ú¯Ù? Ø§Ø² Ù?Ø¶Ø¹Û?Øª Ù?Ø§Û? Ù?Ø®ØªÙ?Ù? ØªÙ?Ø± (Ø§Ø®ØªÛ?Ø§Ø±Û?)">
--<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
--<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
--<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
--<!ENTITY torbutton.prefs.startup "Startup">
--<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
--<!ENTITY torbutton.prefs.block_tor_file_net     "Block Tor access to network from file:// urls (recommended)">
--<!ENTITY torbutton.prefs.block_nontor_file_net     "Block Non-Tor access to network from file:// urls">
--<!ENTITY torbutton.prefs.restore_defaults             "Restore Defaults">
--<!ENTITY torbutton.prefs.test_settings             "Test Settings">
--<!ENTITY torbutton.prefs.test_auto             "Test my Tor settings after the first time I toggle on every Firefox start">
--<!ENTITY torbutton.prefs.disable_livemarks             "Disable livemarks updates during Tor usage">
-+<!ENTITY torbutton.prefs.jar_certs "">
-+<!ENTITY torbutton.prefs.jar_ca_certs "">
-+<!ENTITY torbutton.prefs.locked_mode "">
-+<!ENTITY torbutton.prefs.startup_state "">
-+<!ENTITY torbutton.prefs.shutdown_state "">
-+<!ENTITY torbutton.prefs.startup "">
-+<!ENTITY torbutton.prefs.nonontor_sessionstore "">
-+<!ENTITY torbutton.prefs.block_tor_file_net     "">
-+<!ENTITY torbutton.prefs.block_nontor_file_net     "">
-+<!ENTITY torbutton.prefs.restore_defaults             "">
-+<!ENTITY torbutton.prefs.test_settings             "">
-+<!ENTITY torbutton.prefs.test_auto             "">
-+<!ENTITY torbutton.prefs.disable_livemarks             "">
-Index: src/chrome/locale/fa-IR/torbutton.properties
-===================================================================
---- src/chrome/locale/fa-IR/torbutton.properties	(revision 15635)
-+++ src/chrome/locale/fa-IR/torbutton.properties	(working copy)
-@@ -7,17 +7,17 @@
- torbutton.panel.label.disabled = ØªÙ?Ø± ØºÛ?Ø±Ù?Ø¹Ø§Ù? Ø´Ø¯
- torbutton.panel.label.enabled = ØªÙ?Ø± Ù?Ø¹Ø§Ù? Ø´Ø¯
- extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Ø¯Ú©Ù?Ù? ØªÙ?Ø± Ø¨Ù? Ø¢Ø³Ø§Ù?Û? Ø§Ù?Ú©Ø§Ù? Ù?Ø¹Ø§Ù? Ù? ØºÛ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? Ù¾Û?Ø´Ú©Ø§Ø± ØªÙ?Ø± Ø±Ø§ Ø¨Ú©Ù?Ú© Û?Ú© Ø¯Ú©Ù?Ù? Ù?Û? Ø¯Ù?Ø¯
--torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
--torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
--torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
--torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
--torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
--torbutton.popup.test.success = Tor proxy test successful!
--torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy 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?
--torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
--torbutton.panel.label.verified = Tor Verified
--torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
--torbutton.prefs.recommended = (recommended)
--torbutton.prefs.optional = (optional)
--torbutton.prefs.crucial = (crucial)
-+torbutton.popup.history.warning =
-+torbutton.popup.plugin.warning =
-+torbutton.popup.confirm_ca_certs =
-+torbutton.popup.ff3.warning =
-+torbutton.popup.toggle.warning =
-+torbutton.popup.test.success =
-+torbutton.popup.test.failure =
-+torbutton.popup.test.confirm_toggle =
-+torbutton.popup.test.ff3_notice =
-+torbutton.panel.label.verified =
-+torbutton.popup.test.auto_failed =
-+torbutton.prefs.recommended =
-+torbutton.prefs.optional =
-+torbutton.prefs.crucial =
-Index: src/chrome/locale/ar/torbutton.dtd
-===================================================================
---- src/chrome/locale/ar/torbutton.dtd	(revision 15635)
-+++ src/chrome/locale/ar/torbutton.dtd	(working copy)
-@@ -71,17 +71,16 @@
- <!ENTITY torbutton.prefs.resize_on_toggle "Ø£Ø¹Ø¯ ØªØØ¬Ù?Ù? Ø§Ù?Ù?Ù?Ø§Ù?Ø° Ø¥Ù?Ù? Ù?Ø¶Ø§Ø¹Ù?Ø§Øª 50 Ø¹Ù?ØµÙ?Ø±Ø© Ø¹Ù?Ø¯ ØªØºÙ?Ø± Ø§Ù?ØØ§Ù?Ø© (Ù?ØØ¨Ø°)">
- <!ENTITY torbutton.prefs.close_tor "Ø£ØºÙ?Ù? Ù?Ù? Ù?Ù?Ø§Ù?Ø° Ù? Ø£Ù?Ø³Ù?Ø© ØªÙ?Ø± Ø¹Ù?Ø¯ Ø§ØºÙ?Ø± Ø§Ù?ØØ§Ù?Ø© (Ø§Ø®ØªÙ?Ø§Ø±Ù?)">
- <!ENTITY torbutton.prefs.close_nontor "Ø£ØºÙ?Ù? Ù?Ù? Ù?Ù?Ø§Ù?Ø° Ù? Ø£Ù?Ø³Ù?Ø© ØºÙ?Ø± ØªÙ?Ø± Ø¹Ù?Ø¯ Ø§ØºÙ?Ø± Ø§Ù?ØØ§Ù?Ø© (Ø§Ø®ØªÙ?Ø§Ø±Ù?)">
--<!ENTITY torbutton.prefs.block_links "Ø§Ù?Ù?Ø¹ Ù?Ù?Ø± Ø§Ù?Ø±Ù?Ø§Ø¨Ø· Ù? Ø¥Ø¹Ø§Ø¯Ø© ØªØÙ?Ù?Ù? Ø§Ù?ØµÙ?ØØ§Øª Ø¨Ù?Ù? ØØ§Ù?Ø§Øª ØªÙ?Ø± Ø§Ù?Ù?Ø®ØªÙ?Ù?Ø© (Ø§Ø®ØªÙ?Ø§Ø±Ù?)">
--<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
--<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
--<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
--<!ENTITY torbutton.prefs.startup "Startup">
--<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
--<!ENTITY torbutton.prefs.block_tor_file_net     "Block Tor access to network from file:// urls (recommended)">
--<!ENTITY torbutton.prefs.block_nontor_file_net     "Block Non-Tor access to network from file:// urls">
--<!ENTITY torbutton.prefs.restore_defaults             "Restore Defaults">
--<!ENTITY torbutton.prefs.test_settings             "Test Settings">
--<!ENTITY torbutton.prefs.test_auto             "Test my Tor settings after the first time I toggle on every Firefox start">
--<!ENTITY torbutton.prefs.disable_livemarks             "Disable livemarks updates during Tor usage">
-+<!ENTITY torbutton.prefs.jar_certs "">
-+<!ENTITY torbutton.prefs.jar_ca_certs "">
-+<!ENTITY torbutton.prefs.locked_mode "">
-+<!ENTITY torbutton.prefs.startup_state "">
-+<!ENTITY torbutton.prefs.shutdown_state "">
-+<!ENTITY torbutton.prefs.startup "">
-+<!ENTITY torbutton.prefs.nonontor_sessionstore "">
-+<!ENTITY torbutton.prefs.block_tor_file_net     "">
-+<!ENTITY torbutton.prefs.block_nontor_file_net     "">
-+<!ENTITY torbutton.prefs.restore_defaults             "">
-+<!ENTITY torbutton.prefs.test_settings             "">
-+<!ENTITY torbutton.prefs.test_auto             "">
-+<!ENTITY torbutton.prefs.disable_livemarks             "">
-Index: src/chrome/locale/ar/torbutton.properties
-===================================================================
---- src/chrome/locale/ar/torbutton.properties	(revision 15635)
-+++ src/chrome/locale/ar/torbutton.properties	(working copy)
-@@ -9,15 +9,15 @@
- extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Ù?Ù?Ù?Ø± Ø²Ø±ØªÙ?Ø± Ø²Ø±Ø§ Ù?Ù?ØªØÙ?Ù? Ø¨Ø³Ù?Ù?Ù?Ø© Ù?Ù? Ø§Ø³ØªØ®Ø¯Ø§Ù? Ù?Ù?Ø±Ù?Ù?Ø³ Ù?Ù?Ø³Ù?Ø· ØªÙ?Ø±
- torbutton.popup.history.warning = Ù?Ù?Ø¹ ØªÙ?Ø±Ø¨ØªÙ? ØªØ¹Ø¯Ù?Ù? Ø§Ù?ØØ§Ù?Ø©-Ø§Ù?Ù?ØªØºÙ?Ø±Ø© Ù?Ù?ØªØ£Ø±Ù?Ø®.\n\nØ·Ø§Ù?Ø¹ ØªØ¶Ø¨Ù?Ø·Ø§Øª Ø§Ù?ØªØ£Ø±Ù?Ø® Ù?ØªØ³Ù?Ø Ø¨Ù?Ø°Ø§.\n\n
- torbutton.popup.plugin.warning = Ù?Ù?Ø¹ ØªÙ?Ø±Ø¨ØªÙ? ØªØÙ?Ù?Ù?Ø§ Ù?Ø¨Ø§Ø´Ø±Ø§ Ù?Ù?ØØªÙ?Ù? Ù?Ù?ØÙ?Ø©.\n\nØ§Ø³ØªØ®Ø¯Ù? 'Ø§ØÙ?Ø¸ Ø¨Ø§Ø³Ù?' Ø¨Ø¯Ù?Ø§ Ø¹Ù? Ù?Ø°Ø§.\n\n
--torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
--torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
--torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
--torbutton.popup.test.success = Tor proxy test successful!
--torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy 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?
--torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
--torbutton.panel.label.verified = Tor Verified
--torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
--torbutton.prefs.recommended = (recommended)
--torbutton.prefs.optional = (optional)
--torbutton.prefs.crucial = (crucial)
-+torbutton.popup.confirm_ca_certs =
-+torbutton.popup.ff3.warning =
-+torbutton.popup.toggle.warning =
-+torbutton.popup.test.success =
-+torbutton.popup.test.failure =
-+torbutton.popup.test.confirm_toggle =
-+torbutton.popup.test.ff3_notice =
-+torbutton.panel.label.verified =
-+torbutton.popup.test.auto_failed =
-+torbutton.prefs.recommended =
-+torbutton.prefs.optional =
-+torbutton.prefs.crucial =
-Index: src/chrome/locale/el-GR/torbutton.dtd
-===================================================================
---- src/chrome/locale/el-GR/torbutton.dtd	(revision 15635)
-+++ src/chrome/locale/el-GR/torbutton.dtd	(working copy)
-@@ -27,61 +27,60 @@
- <!ENTITY torbutton.context_menu.about.key "Î ">
- <!ENTITY torbutton.button.label "Torbutton">
- <!ENTITY torbutton.button.tooltip "Î?Î¬Î½Ï?Îµ ÎºÎ»Î¹Îº Î³Î¹Î± Î½Î± ÎµÎºÎºÎ¯Î½Î·Ï?Î· Ï?Î¿Ï? Torbutton">
--<!ENTITY torbutton.prefs.sec_settings "Security Settings">
--<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
--<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
--<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
--<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
--<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
--<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
--<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
--<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
--<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
--<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
--<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
--<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
--<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
--<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
--<!ENTITY torbutton.prefs.cookies "Cookies">
--<!ENTITY torbutton.prefs.cache "Cache">
--<!ENTITY torbutton.prefs.history "History">
--<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
--<!ENTITY torbutton.prefs.shutdown "Shutdown">
--<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
--<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
--<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
--<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
--<!ENTITY torbutton.prefs.headers "Headers">
--<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
--<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
--<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
--<!ENTITY torbutton.prefs.forms "Forms">
--<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
--<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
--<!ENTITY torbutton.prefs.tor "Tor">
--<!ENTITY torbutton.prefs.non_tor "Non-Tor">
--<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
--<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
--<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
--<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
--<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
--<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
--<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
--<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
--<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
--<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
--<!ENTITY torbutton.prefs.startup "Startup">
--<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
--<!ENTITY torbutton.prefs.block_tor_file_net     "Block Tor access to network from file:// urls (recommended)">
--<!ENTITY torbutton.prefs.block_nontor_file_net     "Block Non-Tor access to network from file:// urls">
--<!ENTITY torbutton.prefs.restore_defaults             "Restore Defaults">
--<!ENTITY torbutton.prefs.test_settings             "Test Settings">
--<!ENTITY torbutton.prefs.test_auto             "Test my Tor settings after the first time I toggle on every Firefox start">
--<!ENTITY torbutton.prefs.disable_livemarks             "Disable livemarks updates during Tor usage">
-+<!ENTITY torbutton.prefs.sec_settings "">
-+<!ENTITY torbutton.prefs.block_thread "">
-+<!ENTITY torbutton.prefs.block_thwrite "">
-+<!ENTITY torbutton.prefs.block_nthread "">
-+<!ENTITY torbutton.prefs.block_nthwrite "">
-+<!ENTITY torbutton.prefs.clear_history "">
-+<!ENTITY torbutton.prefs.clear_cache "">
-+<!ENTITY torbutton.prefs.block_cache "">
-+<!ENTITY torbutton.prefs.cookie_jars "">
-+<!ENTITY torbutton.prefs.mmm_cookies "">
-+<!ENTITY torbutton.prefs.clear_cookies "">
-+<!ENTITY torbutton.prefs.disable_plugins "">
-+<!ENTITY torbutton.prefs.kill_bad_js "">
-+<!ENTITY torbutton.prefs.isolate_content "">
-+<!ENTITY torbutton.prefs.no_updates "">
-+<!ENTITY torbutton.prefs.set_uagent "">
-+<!ENTITY torbutton.prefs.dynamic "">
-+<!ENTITY torbutton.prefs.cookies "">
-+<!ENTITY torbutton.prefs.cache "">
-+<!ENTITY torbutton.prefs.history "">
-+<!ENTITY torbutton.prefs.no_search "">
-+<!ENTITY torbutton.prefs.shutdown "">
-+<!ENTITY torbutton.prefs.tor_shutdown "">
-+<!ENTITY torbutton.prefs.all_shutdown "">
-+<!ENTITY torbutton.prefs.no_shutdown "">
-+<!ENTITY torbutton.prefs.disable_sessionstore "">
-+<!ENTITY torbutton.prefs.headers "">
-+<!ENTITY torbutton.prefs.spoof_english "">
-+<!ENTITY torbutton.prefs.disable_referer "">
-+<!ENTITY torbutton.prefs.disable_domstorage "">
-+<!ENTITY torbutton.prefs.forms "">
-+<!ENTITY torbutton.prefs.block_tforms "">
-+<!ENTITY torbutton.prefs.block_ntforms "">
-+<!ENTITY torbutton.prefs.notor_sessionstore "">
-+<!ENTITY torbutton.prefs.tor "">
-+<!ENTITY torbutton.prefs.non_tor "">
-+<!ENTITY torbutton.prefs.restore_tor "">
-+<!ENTITY torbutton.prefs.reload_crashed_jar "">
-+<!ENTITY torbutton.prefs.dual_cookie_jars "">
-+<!ENTITY torbutton.prefs.clear_http_auth "">
-+<!ENTITY torbutton.prefs.block_js_history "">
-+<!ENTITY torbutton.prefs.resize_on_toggle "">
-+<!ENTITY torbutton.prefs.close_tor "">
-+<!ENTITY torbutton.prefs.close_nontor "">
-+<!ENTITY torbutton.prefs.jar_certs "">
-+<!ENTITY torbutton.prefs.jar_ca_certs "">
-+<!ENTITY torbutton.prefs.locked_mode "">
-+<!ENTITY torbutton.prefs.startup_state "">
-+<!ENTITY torbutton.prefs.shutdown_state "">
-+<!ENTITY torbutton.prefs.startup "">
-+<!ENTITY torbutton.prefs.nonontor_sessionstore "">
-+<!ENTITY torbutton.prefs.block_tor_file_net     "">
-+<!ENTITY torbutton.prefs.block_nontor_file_net     "">
-+<!ENTITY torbutton.prefs.restore_defaults             "">
-+<!ENTITY torbutton.prefs.test_settings             "">
-+<!ENTITY torbutton.prefs.test_auto             "">
-+<!ENTITY torbutton.prefs.disable_livemarks             "">
-Index: src/chrome/locale/el-GR/torbutton.properties
-===================================================================
---- src/chrome/locale/el-GR/torbutton.properties	(revision 15635)
-+++ src/chrome/locale/el-GR/torbutton.properties	(working copy)
-@@ -7,17 +7,17 @@
- torbutton.panel.label.disabled = Î¤Î¿ Tor ÎµÎ¯Î½Î±Î¹ Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î¿
- torbutton.panel.label.enabled = Î¤Î¿ Tor ÎµÎ¯Î½Î±Î¹ ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î·Î¼ÎÎ½Î¿
- extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Î¤Î¿ Torbutton Ï?Ï?Î¿Ï?Î¸ÎÏ?ÎµÎ¹ ÎÎ½Î± ÎºÎ¿Ï?Î¼Ï?Î¯ Î³Î¹Î± ÎµÏ?ÎºÎ¿Î»Î· Î´Î¹Î±Ï?ÎµÎ¯Ï?Î¹Ï?Î· Ï?Î·Ï? Î±Î½Î±ÎºÎ±Ï?ÎµÏ?Î¸Ï?Î½Ï?Î·Ï? Ï?Î¿Ï? Firefox Ï?Ï?Î¿Î½ Î´Î¹Î±Î¼ÎµÏ?Î¿Î»Î±Î²Î·Ï?Î® Tor
--torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
--torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
--torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
--torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
--torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
--torbutton.popup.test.success = Tor proxy test successful!
--torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy 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?
--torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
--torbutton.panel.label.verified = Tor Verified
--torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
--torbutton.prefs.recommended = (recommended)
--torbutton.prefs.optional = (optional)
--torbutton.prefs.crucial = (crucial)
-+torbutton.popup.history.warning =
-+torbutton.popup.plugin.warning =
-+torbutton.popup.confirm_ca_certs =
-+torbutton.popup.ff3.warning =
-+torbutton.popup.toggle.warning =
-+torbutton.popup.test.success =
-+torbutton.popup.test.failure =
-+torbutton.popup.test.confirm_toggle =
-+torbutton.popup.test.ff3_notice =
-+torbutton.panel.label.verified =
-+torbutton.popup.test.auto_failed =
-+torbutton.prefs.recommended =
-+torbutton.prefs.optional =
-+torbutton.prefs.crucial =
-Index: src/chrome/locale/es/torbutton.dtd
-===================================================================
---- src/chrome/locale/es/torbutton.dtd	(revision 15635)
-+++ src/chrome/locale/es/torbutton.dtd	(working copy)
-@@ -71,17 +71,16 @@
- <!ENTITY torbutton.prefs.resize_on_toggle "Redimensionar ventanas a mÃºltiplos de 40px al cambiar el estado de Tor (recomendado)">
- <!ENTITY torbutton.prefs.close_tor "Cerrar las ventanas y pestaÃ±as de Tor al cambiar su estado (opcional)">
- <!ENTITY torbutton.prefs.close_nontor "Cerrar las ventanas y pestaÃ±as que no sean de Tor al cambiar el estado (opcional)">
--<!ENTITY torbutton.prefs.block_links "Bloquear clicks en vÃnculos y recargas de pÃ¡ginas desde distintos estados de Tor (opcional)">
--<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
--<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
--<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
--<!ENTITY torbutton.prefs.startup "Startup">
--<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
--<!ENTITY torbutton.prefs.block_tor_file_net     "Block Tor access to network from file:// urls (recommended)">
--<!ENTITY torbutton.prefs.block_nontor_file_net     "Block Non-Tor access to network from file:// urls">
--<!ENTITY torbutton.prefs.restore_defaults             "Restore Defaults">
--<!ENTITY torbutton.prefs.test_settings             "Test Settings">
--<!ENTITY torbutton.prefs.test_auto             "Test my Tor settings after the first time I toggle on every Firefox start">
--<!ENTITY torbutton.prefs.disable_livemarks             "Disable livemarks updates during Tor usage">
-+<!ENTITY torbutton.prefs.jar_certs "">
-+<!ENTITY torbutton.prefs.jar_ca_certs "">
-+<!ENTITY torbutton.prefs.locked_mode "">
-+<!ENTITY torbutton.prefs.startup_state "">
-+<!ENTITY torbutton.prefs.shutdown_state "">
-+<!ENTITY torbutton.prefs.startup "">
-+<!ENTITY torbutton.prefs.nonontor_sessionstore "">
-+<!ENTITY torbutton.prefs.block_tor_file_net     "">
-+<!ENTITY torbutton.prefs.block_nontor_file_net     "">
-+<!ENTITY torbutton.prefs.restore_defaults             "">
-+<!ENTITY torbutton.prefs.test_settings             "">
-+<!ENTITY torbutton.prefs.test_auto             "">
-+<!ENTITY torbutton.prefs.disable_livemarks             "">
-Index: src/chrome/locale/es/torbutton.properties
-===================================================================
---- src/chrome/locale/es/torbutton.properties	(revision 15635)
-+++ src/chrome/locale/es/torbutton.properties	(working copy)
-@@ -9,15 +9,15 @@
- extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provee un botÃ³n para activar y desactivar el proxy Tor de manera fÃ¡cil.
- torbutton.popup.history.warning = Torbutton bloqueÃ³ un intento de manipulaciÃ³n del Historial.\n\nVea las preferencias del Historial para permitirlo.\n\n
- torbutton.popup.plugin.warning = Torbutton bloqueÃ³ la carga directa de un plugin.\n\nUse Guardar como.\n\n
--torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
--torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
--torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
--torbutton.popup.test.success = Tor proxy test successful!
--torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy 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?
--torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
--torbutton.panel.label.verified = Tor Verified
--torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
--torbutton.prefs.recommended = (recommended)
--torbutton.prefs.optional = (optional)
--torbutton.prefs.crucial = (crucial)
-+torbutton.popup.confirm_ca_certs =
-+torbutton.popup.ff3.warning =
-+torbutton.popup.toggle.warning =
-+torbutton.popup.test.success =
-+torbutton.popup.test.failure =
-+torbutton.popup.test.confirm_toggle =
-+torbutton.popup.test.ff3_notice =
-+torbutton.panel.label.verified =
-+torbutton.popup.test.auto_failed =
-+torbutton.prefs.recommended =
-+torbutton.prefs.optional =
-+torbutton.prefs.crucial =
-Index: src/chrome/locale/zh-TW/torbutton.dtd
-===================================================================
---- src/chrome/locale/zh-TW/torbutton.dtd	(revision 15635)
-+++ src/chrome/locale/zh-TW/torbutton.dtd	(working copy)
-@@ -27,61 +27,60 @@
- <!ENTITY torbutton.context_menu.about.key "A">
- <!ENTITY torbutton.button.label "Torbutton">
- <!ENTITY torbutton.button.tooltip "é»?æ??ä»¥å??å§? Torbutton">
--<!ENTITY torbutton.prefs.sec_settings "Security Settings">
--<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
--<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
--<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
--<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
--<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
--<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
--<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
--<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
--<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
--<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
--<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
--<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
--<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
--<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
--<!ENTITY torbutton.prefs.cookies "Cookies">
--<!ENTITY torbutton.prefs.cache "Cache">
--<!ENTITY torbutton.prefs.history "History">
--<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
--<!ENTITY torbutton.prefs.shutdown "Shutdown">
--<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
--<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
--<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
--<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
--<!ENTITY torbutton.prefs.headers "Headers">
--<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
--<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
--<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
--<!ENTITY torbutton.prefs.forms "Forms">
--<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
--<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
--<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
--<!ENTITY torbutton.prefs.tor "Tor">
--<!ENTITY torbutton.prefs.non_tor "Non-Tor">
--<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
--<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
--<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
--<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
--<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
--<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
--<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
--<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
--<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
--<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
--<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
--<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
--<!ENTITY torbutton.prefs.startup "Startup">
--<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
--<!ENTITY torbutton.prefs.block_tor_file_net     "Block Tor access to network from file:// urls (recommended)">
--<!ENTITY torbutton.prefs.block_nontor_file_net     "Block Non-Tor access to network from file:// urls">
--<!ENTITY torbutton.prefs.restore_defaults             "Restore Defaults">
--<!ENTITY torbutton.prefs.test_settings             "Test Settings">
--<!ENTITY torbutton.prefs.test_auto             "Test my Tor settings after the first time I toggle on every Firefox start">
--<!ENTITY torbutton.prefs.disable_livemarks             "Disable livemarks updates during Tor usage">
-+<!ENTITY torbutton.prefs.sec_settings "">
-+<!ENTITY torbutton.prefs.block_thread "">
-+<!ENTITY torbutton.prefs.block_thwrite "">
-+<!ENTITY torbutton.prefs.block_nthread "">
-+<!ENTITY torbutton.prefs.block_nthwrite "">
-+<!ENTITY torbutton.prefs.clear_history "">
-+<!ENTITY torbutton.prefs.clear_cache "">
-+<!ENTITY torbutton.prefs.block_cache "">
-+<!ENTITY torbutton.prefs.cookie_jars "">
-+<!ENTITY torbutton.prefs.mmm_cookies "">
-+<!ENTITY torbutton.prefs.clear_cookies "">
-+<!ENTITY torbutton.prefs.disable_plugins "">
-+<!ENTITY torbutton.prefs.kill_bad_js "">
-+<!ENTITY torbutton.prefs.isolate_content "">
-+<!ENTITY torbutton.prefs.no_updates "">
-+<!ENTITY torbutton.prefs.set_uagent "">
-+<!ENTITY torbutton.prefs.dynamic "">
-+<!ENTITY torbutton.prefs.cookies "">
-+<!ENTITY torbutton.prefs.cache "">
-+<!ENTITY torbutton.prefs.history "">
-+<!ENTITY torbutton.prefs.no_search "">
-+<!ENTITY torbutton.prefs.shutdown "">
-+<!ENTITY torbutton.prefs.tor_shutdown "">
-+<!ENTITY torbutton.prefs.all_shutdown "">
-+<!ENTITY torbutton.prefs.no_shutdown "">
-+<!ENTITY torbutton.prefs.disable_sessionstore "">
-+<!ENTITY torbutton.prefs.headers "">
-+<!ENTITY torbutton.prefs.spoof_english "">
-+<!ENTITY torbutton.prefs.disable_referer "">
-+<!ENTITY torbutton.prefs.disable_domstorage "">
-+<!ENTITY torbutton.prefs.forms "">
-+<!ENTITY torbutton.prefs.block_tforms "">
-+<!ENTITY torbutton.prefs.block_ntforms "">
-+<!ENTITY torbutton.prefs.notor_sessionstore "">
-+<!ENTITY torbutton.prefs.tor "">
-+<!ENTITY torbutton.prefs.non_tor "">
-+<!ENTITY torbutton.prefs.restore_tor "">
-+<!ENTITY torbutton.prefs.reload_crashed_jar "">
-+<!ENTITY torbutton.prefs.dual_cookie_jars "">
-+<!ENTITY torbutton.prefs.clear_http_auth "">
-+<!ENTITY torbutton.prefs.block_js_history "">
-+<!ENTITY torbutton.prefs.resize_on_toggle "">
-+<!ENTITY torbutton.prefs.close_tor "">
-+<!ENTITY torbutton.prefs.close_nontor "">
-+<!ENTITY torbutton.prefs.jar_certs "">
-+<!ENTITY torbutton.prefs.jar_ca_certs "">
-+<!ENTITY torbutton.prefs.locked_mode "">
-+<!ENTITY torbutton.prefs.startup_state "">
-+<!ENTITY torbutton.prefs.shutdown_state "">
-+<!ENTITY torbutton.prefs.startup "">
-+<!ENTITY torbutton.prefs.nonontor_sessionstore "">
-+<!ENTITY torbutton.prefs.block_tor_file_net     "">
-+<!ENTITY torbutton.prefs.block_nontor_file_net     "">
-+<!ENTITY torbutton.prefs.restore_defaults             "">
-+<!ENTITY torbutton.prefs.test_settings             "">
-+<!ENTITY torbutton.prefs.test_auto             "">
-+<!ENTITY torbutton.prefs.disable_livemarks             "">
-Index: src/chrome/locale/zh-TW/torbutton.properties
-===================================================================
---- src/chrome/locale/zh-TW/torbutton.properties	(revision 15635)
-+++ src/chrome/locale/zh-TW/torbutton.properties	(working copy)
-@@ -7,17 +7,17 @@
- torbutton.panel.label.disabled = Tor å·²å??ç?¨
- torbutton.panel.label.enabled = Tor å·²å??ç?¨
- extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton æ??ä¾?ä¸?å??å??æ??å??ç?¨/å??ç?¨ Proxy ç??æ??é??
--torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
--torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
--torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
--torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
--torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
--torbutton.popup.test.success = Tor proxy test successful!
--torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy 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?
--torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
--torbutton.panel.label.verified = Tor Verified
--torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
--torbutton.prefs.recommended = (recommended)
--torbutton.prefs.optional = (optional)
--torbutton.prefs.crucial = (crucial)
-+torbutton.popup.history.warning =
-+torbutton.popup.plugin.warning =
-+torbutton.popup.confirm_ca_certs =
-+torbutton.popup.ff3.warning =
-+torbutton.popup.toggle.warning =
-+torbutton.popup.test.success =
-+torbutton.popup.test.failure =
-+torbutton.popup.test.confirm_toggle =
-+torbutton.popup.test.ff3_notice =
-+torbutton.panel.label.verified =
-+torbutton.popup.test.auto_failed =
-+torbutton.prefs.recommended =
-+torbutton.prefs.optional =
-+torbutton.prefs.crucial =
-Index: src/chrome/locale/fr-FR/torbutton.dtd
-===================================================================
---- src/chrome/locale/fr-FR/torbutton.dtd	(revision 15635)
-+++ src/chrome/locale/fr-FR/torbutton.dtd	(working copy)
-@@ -71,17 +71,16 @@
- <!ENTITY torbutton.prefs.resize_on_toggle "Redimensionner la fenÃªtre aux multiples de 50px Ã  l'activation/dÃ©sactivation (recommended)">
- <!ENTITY torbutton.prefs.close_tor "Fermer toutes les fenÃªtres et onglets Ã  l'activation/dÃ©sactivation (optionnel)">
- <!ENTITY torbutton.prefs.close_nontor "Fermer toutes les fenÃªtres et onglets Non-Tor Ã  l'activation/dÃ©sactivation (optionnel)">
--<!ENTITY torbutton.prefs.block_links "Bloquer les liens cliquables et le rechargement des pages depuis diffÃ©rents Ã©tats Tor (optionnel)">
- <!ENTITY torbutton.prefs.jar_certs "Sauver les certificats SSL dans des jars sÃ©parÃ©s Tor/Non-Tor (recommandÃ©)">
- <!ENTITY torbutton.prefs.jar_ca_certs "Sauver les certificats CA dans des jars sÃ©parÃ©s Tor/Non-Tor (recommandÃ©)">
--<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
--<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
--<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
--<!ENTITY torbutton.prefs.startup "Startup">
--<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
--<!ENTITY torbutton.prefs.block_tor_file_net     "Block Tor access to network from file:// urls (recommended)">
--<!ENTITY torbutton.prefs.block_nontor_file_net     "Block Non-Tor access to network from file:// urls">
--<!ENTITY torbutton.prefs.restore_defaults             "Restore Defaults">
--<!ENTITY torbutton.prefs.test_settings             "Test Settings">
--<!ENTITY torbutton.prefs.test_auto             "Test my Tor settings after the first time I toggle on every Firefox start">
--<!ENTITY torbutton.prefs.disable_livemarks             "Disable livemarks updates during Tor usage">
-+<!ENTITY torbutton.prefs.locked_mode "">
-+<!ENTITY torbutton.prefs.startup_state "">
-+<!ENTITY torbutton.prefs.shutdown_state "">
-+<!ENTITY torbutton.prefs.startup "">
-+<!ENTITY torbutton.prefs.nonontor_sessionstore "">
-+<!ENTITY torbutton.prefs.block_tor_file_net     "">
-+<!ENTITY torbutton.prefs.block_nontor_file_net     "">
-+<!ENTITY torbutton.prefs.restore_defaults             "">
-+<!ENTITY torbutton.prefs.test_settings             "">
-+<!ENTITY torbutton.prefs.test_auto             "">
-+<!ENTITY torbutton.prefs.disable_livemarks             "">
-Index: src/chrome/locale/fr-FR/torbutton.properties
-===================================================================
---- src/chrome/locale/fr-FR/torbutton.properties	(revision 15635)
-+++ src/chrome/locale/fr-FR/torbutton.properties	(working copy)
-@@ -11,13 +11,13 @@
- torbutton.popup.plugin.warning = Torbutton a bloquÃ© le chargement direct par Tor de contenu de plugin.\n\nUtiliser plutÃ´t la fonction Enregistrer sous.\n\n
- torbutton.popup.confirm_ca_certs = Info Torbutton: Vous n'avez pas de Certificat d'AutoritÃ©s personnalisÃ©. Examiner la liste des Certificats d'AutoritÃ© est une opÃ©ration lente qui ralentit la bascule vers Torn. Voulez vous desactiver l'isolations des Certificats d'AutoritÃ© ? (Si vous ne comprenez pas, il est bon de rÃ©pondre Oui)
- torbutton.popup.ff3.warning = Attention!\n\nTorbutton, sur Firefox 3, est connu is known laisser fuir votre fuseau horaire et les fluxs livemark durant l'utilisation de Tor. En outre, il n'a pas encore Ã©tÃ© intensivement testÃ© ,comme Firefox 2, pour la sÃ©curitÃ© de Tor et l'ergonomie.\n\nVoulez-vous nÃ©anmoins continuer?
--torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
--torbutton.popup.test.success = Tor proxy test successful!
--torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy 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?
--torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
--torbutton.panel.label.verified = Tor Verified
--torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
--torbutton.prefs.recommended = (recommended)
--torbutton.prefs.optional = (optional)
--torbutton.prefs.crucial = (crucial)
-+torbutton.popup.toggle.warning =
-+torbutton.popup.test.success =
-+torbutton.popup.test.failure =
-+torbutton.popup.test.confirm_toggle =
-+torbutton.popup.test.ff3_notice =
-+torbutton.panel.label.verified =
-+torbutton.popup.test.auto_failed =
-+torbutton.prefs.recommended =
-+torbutton.prefs.optional =
-+torbutton.prefs.crucial =
-Index: src/chrome/locale/de-DE/torbutton.dtd
-===================================================================
---- src/chrome/locale/de-DE/torbutton.dtd	(revision 15635)
-+++ src/chrome/locale/de-DE/torbutton.dtd	(working copy)
-@@ -71,17 +71,16 @@
- <!ENTITY torbutton.prefs.resize_on_toggle "VerÃ¤ndere die GrÃ¶Ã?e des Fensters zu einem Vielfachen von 50px wÃ¤hrend der Nutzung von Tor (empfohlen)">
- <!ENTITY torbutton.prefs.close_tor "SchlieÃ?e alle Tor-Fenster und -Tabs beim Wechsel (optional)">
- <!ENTITY torbutton.prefs.close_nontor "SchlieÃ?e alle Nicht-Tor-Fenster und -Tabs beim Wechsel (optional)">
--<!ENTITY torbutton.prefs.block_links "Sperre Klicks auf Links und Neuladen von Seiten von verschiedenen Tor-Stati (optional)">
- <!ENTITY torbutton.prefs.jar_certs "Speichere SSL-Zertifikate in verschiedenen Dateien fÃ¼r Tor/Nicht-Tor (empfohlen)">
- <!ENTITY torbutton.prefs.jar_ca_certs "Speichere CA-Zertifikate in verschiedenen Dateien fÃ¼r Tor/Nicht-Tor (empfohlen)">
--<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
--<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
--<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
--<!ENTITY torbutton.prefs.startup "Startup">
--<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">
--<!ENTITY torbutton.prefs.block_tor_file_net     "Block Tor access to network from file:// urls (recommended)">
--<!ENTITY torbutton.prefs.block_nontor_file_net     "Block Non-Tor access to network from file:// urls">
--<!ENTITY torbutton.prefs.restore_defaults             "Restore Defaults">
--<!ENTITY torbutton.prefs.test_settings             "Test Settings">
--<!ENTITY torbutton.prefs.test_auto             "Test my Tor settings after the first time I toggle on every Firefox start">
--<!ENTITY torbutton.prefs.disable_livemarks             "Disable livemarks updates during Tor usage">
-+<!ENTITY torbutton.prefs.locked_mode "">
-+<!ENTITY torbutton.prefs.startup_state "">
-+<!ENTITY torbutton.prefs.shutdown_state "">
-+<!ENTITY torbutton.prefs.startup "">
-+<!ENTITY torbutton.prefs.nonontor_sessionstore "">
-+<!ENTITY torbutton.prefs.block_tor_file_net     "">
-+<!ENTITY torbutton.prefs.block_nontor_file_net     "">
-+<!ENTITY torbutton.prefs.restore_defaults             "">
-+<!ENTITY torbutton.prefs.test_settings             "">
-+<!ENTITY torbutton.prefs.test_auto             "">
-+<!ENTITY torbutton.prefs.disable_livemarks             "">
-Index: src/chrome/locale/de-DE/torbutton.properties
-===================================================================
---- src/chrome/locale/de-DE/torbutton.properties	(revision 15635)
-+++ src/chrome/locale/de-DE/torbutton.properties	(working copy)
-@@ -11,13 +11,13 @@
- torbutton.popup.plugin.warning = Der Inhalt des Plugins konnte nicht direkt heruntergeladen werden, weil Torbutton dies verhinderte.\n\nBitte stattdessen "Speichern als" verwenden.\n
- torbutton.popup.confirm_ca_certs = Anmerkung: Es scheint, als seien keinerlei eigene ZertifikatsautoritÃ¤ten in Ihrer Konfiguration vorhanden. Die Auswertung der globalen ZertifikationsautoritÃ¤ten-Liste ist aufwÃ¤ndig und verlangsamt das schnelle An- und Abschalten von Tor. MÃ¶chten Sie die Isolation von ZertifikatsautoritÃ¤ten abschalten? (Wenn Sie nicht wissen, was gemeint ist, kÃ¶nnen Sie ruhig auf OK klicken)
- torbutton.popup.ff3.warning = Warnung!\n\nTorbutton unter Firefox 3 kann nicht verhindern, dass ihre Zeitzone und Livemark Feeds wÃ¤hrend der Benutzung von Tor an Dritte gelangen. Ausserdem wurde die Sicherheit und Benutzerfreundlichkeit von Tor nicht im selben Umfang wie fÃ¼r Firefox 2 getestet.\n\nMÃ¶chten Sie trotzdem weiter fortfahren?
--torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
--torbutton.popup.test.success = Tor proxy test successful!
--torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Privoxy 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?
--torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
--torbutton.panel.label.verified = Tor Verified
--torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
--torbutton.prefs.recommended = (recommended)
--torbutton.prefs.optional = (optional)
--torbutton.prefs.crucial = (crucial)
-+torbutton.popup.toggle.warning =
-+torbutton.popup.test.success =
-+torbutton.popup.test.failure =
-+torbutton.popup.test.confirm_toggle =
-+torbutton.popup.test.ff3_notice =
-+torbutton.panel.label.verified =
-+torbutton.popup.test.auto_failed =
-+torbutton.prefs.recommended =
-+torbutton.prefs.optional =
-+torbutton.prefs.crucial =
diff --git a/trans_tools/validate.py b/trans_tools/validate.py
deleted file mode 100755
index 179e7b0..0000000
--- a/trans_tools/validate.py
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/python
-
-from __future__ import unicode_literals, print_function
-
-import polib
-import sys
-import getopt
-
-symbols = [
-    '(', ')', '<', '>', '{',
-    '}', '[', ']', '\"', ';'
-    ]
-
-counts = {}
-
-def reset():
-  for s in symbols:
-    counts[s] = 0
-
-def parse_orig_string(string):
-  for ch in string:
-    if ch in symbols:
-      counts[ch] += 1
-
-def parse_trans_string(string):
-  for ch in string:
-    if ch in symbols:
-      counts[ch] -= 1
-
-def get_strings(file):
-  entries = []
-  po = polib.pofile(file, autodetect_encoding=True)
-
-  for entry in po:
-    entries.append((entry.msgid, entry.msgstr, 0))
-
-  return entries
-
-def warn():
-  for s in symbols:
-    if counts[s] < 0:
-      return True
-  return False
-
-def usage():
-  print("Usage: %s -i/--input=<file.po> -l/--logfile=<logfile>" % sys.argv[0])
-
-def log(string, file_to_check, log_file, linenum = -1):
-  f = log_file
-  if linenum == -1:
-    f.write(("%s: %s\n" % (file_to_check, string)).encode("utf-8"))
-  else:
-    f.write(("%s (%s): %s\n" % (file_to_check, linenum, string)).encode("utf-8"))
-  #f.close()
-
-def check(file_to_check, log_file):
-  errors = 0
-
-  strings = get_strings(file_to_check)
-  for (orig, trans, linenum) in strings:
-    reset()
-    parse_orig_string(orig)
-    parse_trans_string(trans)
-    if warn():
-      errors += 1
-      log(trans, file_to_check, log_file, linenum)
-
-  if errors != 0:
-    log("Total count of warnings %d\n" % errors, file_to_check, log_file)
-
-if __name__ == '__main__':
-  try:
-    opts, args = getopt.getopt(sys.argv[1:], "i:hl:", ["input=", "help", "logfile="])
-  except getopt.GetoptError, err:
-    print(str(err))
-    sys.exit(2)
-
-  file_to_check = None
-  log_file = sys.stdout
-
-  for opt, arg in opts:
-    if opt in ("-i", "--input"):
-      file_to_check = arg
-    elif opt in ("-h", "--help"):
-      usage()
-      sys.exit()
-    elif opt in ("-l", "--logfile"):
-      log_file = arg
-
-  if file_to_check is None or log_file is None:
-    print("ERROR: You need to specify both the input and the logfile")
-    sys.exit(2)
-
-  check(file_to_check, log_file)
diff --git a/trans_tools/validate_all.sh b/trans_tools/validate_all.sh
deleted file mode 100755
index 47bb6e6..0000000
--- a/trans_tools/validate_all.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-for i in `ls -1 ./po`
-do
-  ./validate.py --input=./po/$i/torbutton.dtd.po
-  ./validate.py --input=./po/$i/torbutton.properties.po
-done

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [torbutton/master] Add changelog entry and bump version for 1.6.2.
Next by Author: [tor-commits] [tor-launcher/master] Update strings from transifex.
Previous by thread: [tor-commits] [torbutton/master] Add changelog entry and bump version for 1.6.2.
Next by thread: [tor-commits] [tor-launcher/master] Update strings from transifex.
Index(es):
- Author
- Thread