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

[or-cvs] [torbutton/master] Update translation strings from pootle.



Author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Date: Tue, 1 Dec 2009 16:26:57 -0800
Subject: Update translation strings from pootle.
Commit: e537f6adfd396c7c03b33a2d671c1f0e731658b2

---
 src/chrome/locale/af/torbutton.dtd           |    1 +
 src/chrome/locale/af/torbutton.properties    |    5 +-
 src/chrome/locale/ar/torbutton.dtd           |    9 +-
 src/chrome/locale/ar/torbutton.properties    |   21 ++--
 src/chrome/locale/bg/torbutton.dtd           |    1 +
 src/chrome/locale/bg/torbutton.properties    |    5 +-
 src/chrome/locale/bms/torbutton.dtd          |  171 +++++++++++++-------------
 src/chrome/locale/bms/torbutton.properties   |   47 ++++----
 src/chrome/locale/bo/torbutton.dtd           |    1 +
 src/chrome/locale/bo/torbutton.properties    |    5 +-
 src/chrome/locale/ca/torbutton.dtd           |    1 +
 src/chrome/locale/ca/torbutton.properties    |    5 +-
 src/chrome/locale/cs/torbutton.dtd           |    1 +
 src/chrome/locale/cs/torbutton.properties    |    5 +-
 src/chrome/locale/da/torbutton.dtd           |  111 +++++++++--------
 src/chrome/locale/da/torbutton.properties    |   47 ++++----
 src/chrome/locale/de/torbutton.dtd           |    1 +
 src/chrome/locale/de/torbutton.properties    |    9 +-
 src/chrome/locale/el/torbutton.dtd           |    1 +
 src/chrome/locale/el/torbutton.properties    |    5 +-
 src/chrome/locale/es/torbutton.dtd           |   15 ++-
 src/chrome/locale/es/torbutton.properties    |    9 +-
 src/chrome/locale/eu/torbutton.dtd           |    1 +
 src/chrome/locale/eu/torbutton.properties    |    5 +-
 src/chrome/locale/fa/torbutton.dtd           |    1 +
 src/chrome/locale/fa/torbutton.properties    |    5 +-
 src/chrome/locale/fi/torbutton.dtd           |    1 +
 src/chrome/locale/fi/torbutton.properties    |    5 +-
 src/chrome/locale/fr/torbutton.dtd           |    1 +
 src/chrome/locale/fr/torbutton.properties    |    5 +-
 src/chrome/locale/fur/torbutton.dtd          |    1 +
 src/chrome/locale/fur/torbutton.properties   |    5 +-
 src/chrome/locale/gl/torbutton.dtd           |    1 +
 src/chrome/locale/gl/torbutton.properties    |    5 +-
 src/chrome/locale/gu/torbutton.dtd           |    1 +
 src/chrome/locale/gu/torbutton.properties    |    5 +-
 src/chrome/locale/he/torbutton.dtd           |    1 +
 src/chrome/locale/he/torbutton.properties    |    5 +-
 src/chrome/locale/hi/torbutton.dtd           |    1 +
 src/chrome/locale/hi/torbutton.properties    |    5 +-
 src/chrome/locale/hr/torbutton.dtd           |    1 +
 src/chrome/locale/hr/torbutton.properties    |    5 +-
 src/chrome/locale/hu/torbutton.dtd           |    1 +
 src/chrome/locale/hu/torbutton.properties    |    5 +-
 src/chrome/locale/id/torbutton.dtd           |    1 +
 src/chrome/locale/id/torbutton.properties    |    5 +-
 src/chrome/locale/is/torbutton.dtd           |    1 +
 src/chrome/locale/is/torbutton.properties    |    5 +-
 src/chrome/locale/it/torbutton.dtd           |   49 ++++----
 src/chrome/locale/it/torbutton.properties    |   29 +++--
 src/chrome/locale/ja/torbutton.dtd           |    1 +
 src/chrome/locale/ja/torbutton.properties    |    5 +-
 src/chrome/locale/ka/torbutton.dtd           |    1 +
 src/chrome/locale/ka/torbutton.properties    |    5 +-
 src/chrome/locale/km/torbutton.dtd           |    1 +
 src/chrome/locale/km/torbutton.properties    |    5 +-
 src/chrome/locale/ko/torbutton.dtd           |    1 +
 src/chrome/locale/ko/torbutton.properties    |    5 +-
 src/chrome/locale/ku/torbutton.dtd           |    1 +
 src/chrome/locale/ku/torbutton.properties    |    5 +-
 src/chrome/locale/mt/torbutton.dtd           |    1 +
 src/chrome/locale/mt/torbutton.properties    |    5 +-
 src/chrome/locale/nb/torbutton.dtd           |    1 +
 src/chrome/locale/nb/torbutton.properties    |    5 +-
 src/chrome/locale/nl/torbutton.dtd           |    1 +
 src/chrome/locale/nl/torbutton.properties    |    7 +-
 src/chrome/locale/pa/torbutton.dtd           |    1 +
 src/chrome/locale/pa/torbutton.properties    |    5 +-
 src/chrome/locale/pl/torbutton.dtd           |   35 +++---
 src/chrome/locale/pl/torbutton.properties    |   25 ++--
 src/chrome/locale/pt-BR/torbutton.dtd        |    3 +-
 src/chrome/locale/pt-BR/torbutton.properties |    5 +-
 src/chrome/locale/pt/torbutton.dtd           |    1 +
 src/chrome/locale/pt/torbutton.properties    |    5 +-
 src/chrome/locale/ro/torbutton.dtd           |   27 ++--
 src/chrome/locale/ro/torbutton.properties    |    7 +-
 src/chrome/locale/ru/torbutton.dtd           |   35 +++---
 src/chrome/locale/ru/torbutton.properties    |   27 ++--
 src/chrome/locale/sl/torbutton.dtd           |    1 +
 src/chrome/locale/sl/torbutton.properties    |    5 +-
 src/chrome/locale/sq/torbutton.dtd           |    1 +
 src/chrome/locale/sq/torbutton.properties    |    5 +-
 src/chrome/locale/sv/torbutton.dtd           |    1 +
 src/chrome/locale/sv/torbutton.properties    |    5 +-
 src/chrome/locale/sw/torbutton.dtd           |    1 +
 src/chrome/locale/sw/torbutton.properties    |    5 +-
 src/chrome/locale/th/torbutton.dtd           |    1 +
 src/chrome/locale/th/torbutton.properties    |    5 +-
 src/chrome/locale/tr/torbutton.dtd           |    1 +
 src/chrome/locale/tr/torbutton.properties    |    5 +-
 src/chrome/locale/uk/torbutton.dtd           |    1 +
 src/chrome/locale/uk/torbutton.properties    |    5 +-
 src/chrome/locale/vi/torbutton.dtd           |    1 +
 src/chrome/locale/vi/torbutton.properties    |    5 +-
 src/chrome/locale/zh-CN/torbutton.dtd        |  103 ++++++++--------
 src/chrome/locale/zh-CN/torbutton.properties |   35 +++---
 src/chrome/locale/zh-HK/torbutton.dtd        |    1 +
 src/chrome/locale/zh-HK/torbutton.properties |    5 +-
 src/chrome/locale/zh-TW/torbutton.dtd        |    1 +
 src/chrome/locale/zh-TW/torbutton.properties |    5 +-
 100 files changed, 578 insertions(+), 478 deletions(-)

diff --git a/src/chrome/locale/af/torbutton.dtd b/src/chrome/locale/af/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/af/torbutton.dtd
+++ b/src/chrome/locale/af/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/af/torbutton.properties b/src/chrome/locale/af/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/af/torbutton.properties
+++ b/src/chrome/locale/af/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd
index d57d25f..cd218dc 100644
--- a/src/chrome/locale/ar/torbutton.dtd
+++ b/src/chrome/locale/ar/torbutton.dtd
@@ -1,13 +1,14 @@
-<!ENTITY torbutton.prefs.title "تÙ?ضÙ?Ù?ات تÙ?ربتÙ?(Ù?Ù?اتÙ?Ø­ اÙ?تÙ?ر)">
+<!ENTITY torbutton.prefs.title "تÙ?ضÙ?Ù?ات Ù?Ù?تاح اÙ?تÙ?ر">
 <!ENTITY torbutton.prefs.display_settings "إعدادات اÙ?عرض">
 <!ENTITY torbutton.prefs.display_panel "أظÙ?ر حاÙ?Ø© Ù?سÙ?Ø· تÙ?ر Ù?Ù? شرÙ?Ø· اÙ?حاÙ?Ø©">
 <!ENTITY torbutton.prefs.panel_format "صÙ?غة عرض اÙ?حاÙ?Ø© Ù?Ù? اÙ?شرÙ?Ø·:">
 <!ENTITY torbutton.prefs.panel_text_format "Ù?صÙ?Ø©">
 <!ENTITY torbutton.prefs.panel_icon_format "Ø£Ù?Ù?Ù?Ù?Ø©">
-<!ENTITY torbutton.prefs.tor_settings "تضبطÙ?ات اÙ?Ù?سÙ?Ø·">
-<!ENTITY torbutton.prefs.recommended_settings "استخدÙ? اÙ?تضبطÙ?ات اÙ?Ù?حبذة Ù?إصدارتÙ? Ù?Ù? Ù?Ù?رÙ?Ù?س">
+<!ENTITY torbutton.prefs.tor_settings "إعدادات اÙ?Ù?سÙ?Ø·">
+<!ENTITY torbutton.prefs.recommended_settings "استخدÙ? اÙ?إعدادات اÙ?Ù?Ù?ضÙ?Ø© Ù?Ù?سختÙ? Ù?Ù? Ù?Ù?رÙ?Ù?Ù?س">
 <!ENTITY torbutton.prefs.use_privoxy "استخدÙ? برÙ?Ú¤Ù?Ù?سÙ?">
-<!ENTITY torbutton.prefs.custom_settings "استخدÙ? تضبÙ?طات Ù?سÙ?Ø· Ù?Ø·Ù?عة">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
+<!ENTITY torbutton.prefs.custom_settings "استخدÙ? إعدادات Ù?سÙ?Ø· Ù?عرÙ?Ù?Ø© ">
 <!ENTITY torbutton.prefs.proxy.host.http "Ù?سÙ?Ø· HTTP:">
 <!ENTITY torbutton.prefs.proxy.host.https "Ù?سÙ?Ø· SLL:">
 <!ENTITY torbutton.prefs.proxy.host.ftp "Ù?سÙ?Ø· SSL:">
diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties
index 5bbea1d..9496146 100644
--- a/src/chrome/locale/ar/torbutton.properties
+++ b/src/chrome/locale/ar/torbutton.properties
@@ -6,17 +6,17 @@ torbutton.panel.plugins.disabled = اÙ?Ù?ر Ù?تÙ?عÙ?Ù? اÙ?Ù?Ù?Ø­Ù?ات
 torbutton.panel.plugins.enabled = اÙ?Ù?ر Ù?تعطÙ?Ù? اÙ?Ù?Ù?Ø­Ù?ات
 torbutton.panel.label.disabled = تÙ?ر Ù?عطÙ?Ù?
 torbutton.panel.label.enabled = تÙ?ر Ù?Ù?عÙ?Ù?
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Ù?Ù?Ù?ر زرتÙ?ر زرا Ù?Ù?تحÙ?Ù? بسÙ?Ù?Ù?Ø© Ù?Ù? استخداÙ? Ù?Ù?رÙ?Ù?س Ù?Ù?سÙ?Ø· تÙ?ر
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Ù?Ù?Ù?ر Ù?Ù?تاح تÙ?ر تحÙ?Ù?ا سÙ?Ù?ا Ù?Ù? استخداÙ? Ù?Ù?رÙ?Ù?Ù?س Ù?Ù?سÙ?Ø· تÙ?ر
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\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 livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = تحتاج Ù?إعادة تشغÙ?Ù? اÙ?تÙ?ر حتÙ? تÙ?عÙ? اÙ?إعدادات اÙ?جدÙ?دة
-torbutton.popup.test.success = Ù?جاح تÙ?حص Ù?Ù?Ù?Ù? اÙ?تÙ?ر!
-torbutton.popup.test.failure = Ù?Ø´Ù? تÙ?حص Ù?Ù?Ù?Ù? اÙ?تÙ?ر! تأÙ?د Ù?Ù? إعدادات اÙ?Ù?سÙ?Ø· Ù?اÙ?Privoxy 
-torbutton.popup.test.confirm_toggle = أحدث تÙ?حص Ù?Ù?Ù?Ù?Ù? اÙ?تÙ?ر Ù?Ø´Ù?.\n\nÙ?Ù? Ø£Ù?ت Ù?تأÙ?د Ø£Ù?Ù? ترÙ?د تÙ?عÙ?Ù?Ù? عÙ?Ù? Ø£Ù? حاÙ?Ø?
-torbutton.popup.test.ff3_notice = إضغط Ù?Ù?تاح Ù?Ù?اÙ?Ù? Ù?تÙ?حص إعدادات Ù?Ù?Ù?Ù? اÙ?تÙ?ر. Ù?ذا اÙ?Ù?حص Ù?عÙ?Ù? Ù?Ù? اÙ?Ø®Ù?Ù?Ù?Ø©. رجاءاÙ? Ù?Ù? صبÙ?راÙ?.
-torbutton.panel.label.verified = تÙ? ضبط اÙ?تÙ?ر 
+torbutton.popup.plugin.warning = Ù?Ù?ع Ù?Ù?تاح تÙ?ر تحÙ?Ù?Ù?ا Ù?باشرا Ù?Ù?حتÙ?Ù? Ù?Ù?Ø­Ù?Ø©.\n\nاستخدÙ? 'احÙ?ظ باسÙ?' بدÙ?ا عÙ? Ù?ذا.\n\n
+torbutton.popup.confirm_ca_certs = Ù?Ù?احظة Ù?Ù?تاح تÙ?ر: بÙ?ا Ø£Ù?Ù?Ù? Ù?ا تÙ?Ù?Ù? Ù?Ù?ثاÙ? إصدار اÙ?Ø´Ù?ادة اÙ?رÙ?Ù?Ù?Ø? Ù?Ø­Ù?Ø« Ø£Ù?Ù? عÙ?Ù?Ù?Ø© Ù?حص Ù?ائÙ?Ø© Ù?صدر اÙ?Ø´Ù?ادة اÙ?رÙ?Ù?Ù? عÙ?Ù?Ù?Ø© بطÙ?ئة Ù?تسبب بطئا Ù?Ù? عÙ?Ù? Ù?Ù?تاح تÙ?رØ? Ù?Ù?Ù? ترغب Ù?Ù? تعطÙ?Ù? عÙ?Ù?Ù?Ø© عزÙ? Ø´Ù?ادات اÙ?إصدار اÙ?رÙ?Ù?Ù?Ø? (Ø¥Ù? Ù?Ù?ت Ù?ا تعÙ?Ù? اÙ? Ù?ا تÙ?Ù?Ù? Ù?عÙ?Ù? Ø°Ù?Ù?Ø? Ù?Ø¥Ù?Ù? Ù?Ù? اÙ?Ù?ستحسÙ? Ø£Ù? تختار Ø®Ù?ار اÙ?Ù?Ù?اÙ?Ù?Ø©) 
+torbutton.popup.ff3.warning = تحذÙ?ر! Ø¥Ù?Ù? Ù?Ù? اÙ?Ù?عرÙ?Ù? عÙ? عÙ?Ù? Ù?Ù?تاح تÙ?ر Ù?Ù? Ø®Ù?اÙ? برÙ?اÙ?ج Ù?اÙ?رÙ?Ù?Ù?س 3 Ø£Ù? Ù?Ù?Ù?Ù? بتسرÙ?ب Ù?عÙ?Ù?Ù?ات عÙ? اÙ?Ù?Ù?Ø·Ù?Ø© اÙ?زÙ?Ù?Ù?Ø© اÙ?تÙ? Ø£Ù?ت Ù?Ù?Ù?ا Ù?عÙ? اÙ?بÙ?د اÙ?Ø°Ù? تستخدÙ? اÙ?شبÙ?Ø© Ù?Ù?Ù?. Ù?Ù?Ù? ترغب باÙ?Ù?ضÙ? Ù?دÙ?ا عÙ?Ù? Ø£Ù?Ù?Ø© حاÙ?Ø? 
+torbutton.popup.toggle.warning = تحتاج Ù?إعادة تشغÙ?Ù? اÙ?تÙ?ر Ù?تÙ?عÙ?Ù? اÙ?إعدادات اÙ?جدÙ?دة
+torbutton.popup.test.success = تÙ?Ù? بÙ?جاح تÙ?حص Ù?Ù?Ù?Ù? اÙ?تÙ?ر!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = إضغط Ù?Ù?تاح Ù?Ù?اÙ?Ù? Ù?تÙ?حص إعدادات Ù?Ù?Ù?Ù? اÙ?تÙ?ر. عÙ?Ù?Ù?Ø© اÙ?تÙ?حص Ù?Ù? تعÙ?Ù? عÙ?Ù?Ù?. رجاءاÙ? Ù?Ù? صبÙ?راÙ?.
+torbutton.panel.label.verified = تÙ? اÙ?تحÙ?Ù? Ù?اÙ?Ù?صادÙ?Ø© عÙ?Ù? برÙ?اÙ?ج اÙ?تÙ?ر 
 torbutton.popup.test.auto_failed = اÙ?Ù?حص اÙ?Ø£Ù?Ù? Ù?Ù?Ù?Ù?Ù? اÙ?تÙ?ر Ù?Ø´Ù?.\n\nÙ?Ù? Ø£Ù?ت Ù?تأÙ?د اÙ?Ù? ترÙ?د تÙ?عÙ?Ù?Ù? عÙ?Ù? Ø£Ù? حاÙ?Ø?
 torbutton.prefs.recommended = (Ù?Ù?Ù?ضÙ?)
 torbutton.prefs.optional = (إختÙ?ارÙ?)
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/bg/torbutton.dtd b/src/chrome/locale/bg/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/bg/torbutton.dtd
+++ b/src/chrome/locale/bg/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/bg/torbutton.properties b/src/chrome/locale/bg/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/bg/torbutton.properties
+++ b/src/chrome/locale/bg/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/bms/torbutton.dtd b/src/chrome/locale/bms/torbutton.dtd
index cd4b386..51023de 100644
--- a/src/chrome/locale/bms/torbutton.dtd
+++ b/src/chrome/locale/bms/torbutton.dtd
@@ -1,93 +1,94 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
-<!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
-<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
+<!ENTITY torbutton.prefs.title "Tor Button á?¥á?®á?¸á??á?¬á?¸á?±á??á?¸á??á??á??á?¹á?»á??á??á?ºá??á?¹á??á?ºá?¬á?¸">
+<!ENTITY torbutton.prefs.display_settings "á?»á??á??á??á??á?¹ á??á?ºá?­á??á?¹á??á?­á??á??á?ºá??á?¹á??á?ºá?¬á?¸">
+<!ENTITY torbutton.prefs.display_panel "Tor proxy á??á?ºá?­á??á?¹á??á??á?­á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯ Status Bar á??á?¼á??á?¹ á?»á??á??á??á??á?¹">
+<!ENTITY torbutton.prefs.panel_format "Status bar á?»á??á??á??á?? á??á?¶á?¯á??á?¶">
+<!ENTITY torbutton.prefs.panel_text_format "á??á?¬á??á?¬á?¸">
+<!ENTITY torbutton.prefs.panel_icon_format "á?¡á?­á?¯á??á?¹á??á?¼á??á?¹ á??á?¯á??á?¹á??á?¶á?¯">
+<!ENTITY torbutton.prefs.tor_settings "Proxy á??á?ºá?­á??á?¹á??á??á?­á??á?ºá??á?¹á??á?ºá?¬á?¸">
+<!ENTITY torbutton.prefs.recommended_settings "á?¡á?¾á??á?¶á?»á??á?³ á?±á??á?¬á??á?¹á??á?¶á?±á??á?¬ proxy á??á?ºá?­á??á?¹á??á?­á??á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á??á?­á??á?­á?? Firefox version á??á?¼á??á?¹ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹">
+<!ENTITY torbutton.prefs.use_privoxy "Privoxy á??á?­á?¯ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
+<!ENTITY torbutton.prefs.custom_settings "proxy á??á?ºá?­á??á?¹á??á?­á??á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á??á?­á??á?¹á?¾á??á?­á?³á??á?¹á?»á??á?³á?»á??á??á?¹á?? á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹">
+<!ENTITY torbutton.prefs.proxy.host.http "HTTP á??á?±á??á?¬á?·á??á?® :">
+<!ENTITY torbutton.prefs.proxy.host.https "SSL á??á?±á??á?¬á?·á??á?® :">
+<!ENTITY torbutton.prefs.proxy.host.ftp "FTP á??á?±á??á?¬á?·á??á?® :">
+<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher á??á?±á??á?¬á?·á??á?®">
+<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host :">
+<!ENTITY torbutton.prefs.proxy.port "Port :">
+<!ENTITY torbutton.about.title "Torbutton á?¡á?±á?¾á??á?¬á??á?¹á?¸">
+<!ENTITY torbutton.pref_connection.notice "á??á??á?¹á?¸á??á?ºá?­á??á?¹á??á??á?­á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á??á?¹á?¡á??á?¼á??á?¹ Torbutton á??á?¯á?­ á??á?­á??á?¹á??á?¬á?¸á??á??á?¹">
+<!ENTITY torbutton.pref_connection.more_info "á??á?­á?¯á??á?¯á?­á?»á??á??á?¹á?·á??á?¶á?¯á?±á??á?¬ á??á??á??á?¹á?¸á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸á??á?­á?¯á??">
+<!ENTITY torbutton.pref_connection_more_info.title "á??á?°á??á?®á??á??á??á??á?°á??á??á?¹">
+<!ENTITY torbutton.pref_connection_more_info.text "Torbutton á??á?¯á?­ á??á??á?¹á??á?½á?­á??á?¼á??á?¹ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¯á?­á??á?¹á??á?«á??á??á?¹á?? Tor Proxy á??á??á?¯á??á?¹á?±á??á?¬ á??á?ºá?­á??á?¹á??á?­á??á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á?±á?»á??á?¬á??á?¹á?¸á??á?² á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¯á?­á??á?¹á??á??á?¹á?¡á??á?¼á??á?¹ Torbutton á??á?¯á?­ á?¡á??á?¶á?¯á?¸á??á?»á??á?³á??á?­á?¯á??á?¹á?±á?¡á?¬á??á?¹ á??á?­á??á?¹á?? á??á??á?¯á?±á??á??á?¬á??á?­á?¯á?? á?»á??á??á?¹á??á?¬á??á?«á?? Tor á??á?ºá?­á??á?¹á??á??á?­á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?­á?¯á??á?«á?? Torbutton á?¥á?®á?¸á??á?¬á?¸á?±á??á?¸á??á??á??á?¹á?»á??á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á??á?­á?¯ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?«á??">
+<!ENTITY torbutton.context_menu.toggle "Tor á?¡á?±á?»á??á?¡á?±á??á?¡á??á?ºá??á?¹á?»á??á??á??á??á?­á?¯ á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á??á?¹">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
+<!ENTITY torbutton.context_menu.preferences "á?¥á?®á?¸á??á?¬á?¸á?±á??á?¸ á??á??á??á?¹á?»á??á??á??á??á?ºá?¬á?¸">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
+<!ENTITY torbutton.context_menu.about "Torbutton á?¡á?±á?¾á??á?¬á??á?¹á?¸">
 <!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "Click to initialize 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">
-<!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.button.tooltip "Torbutton á??á??á??á?¹á??á??á?¹ á??á??á??á?¹á??á?¯á??á?¹á??á?«">
+<!ENTITY torbutton.prefs.sec_settings "á??á?¶á?¯á?»á??á?¶á?³á??á??á?¡á??á?¼á??á?¹ á??á?ºá?­á??á?¹á??á?­á??á??á?ºá??á?¹á??á?ºá?¬á?¸">
+<!ENTITY torbutton.prefs.block_thread "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ history á??á??á?¹á??á??á?»á??á??á?¹á?¸á??á?­á?¯ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?¡á?±á??á?¸á?¾á??á?®á?¸á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.block_thwrite "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ history á?±á??á?¸á?»á??á??á?¹á?¸á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.block_nthread "Tor á?¡á??á?¶á?¯á?¸á??á?»á??á?³á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ history á??á??á?¹á?»á??á??á?¹á?¸á??á?­á?¯ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?±á??á?¼á?¸á??á?ºá??á?¹á??á?­á?¯á??á?¹á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.block_nthwrite "Tor á?¡á??á?¶á?¯á?¸á??á?»á??á?³á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ history á?±á??á?¸á?»á??á??á?¹á?¸á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.clear_history "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³/á??á?»á??á?³ á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?ºá?­á??á?¹á??á?¼á??á?¹ history á??á?¯á?­ á??á?½á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹ (á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.clear_cache "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³/á??á?»á??á?³ á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?ºá?­á??á?¹á??á?¼á??á?¹ Disk cache á?»á??á?³á??á?¯á??á?¹á??á??á??á?½á??á?¹á?· cache á??á?½á??á?¹á?¸á??á??á?¹á?¸á??á??á??á?ºá?¬á?¸á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹">
+<!ENTITY torbutton.prefs.block_cache "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ disk á??á?½á??á?¹á?· memory cache á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á??á?­á?¯ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹">
+<!ENTITY torbutton.prefs.cookie_jars "Tor á??á??á?¯á??á?¹á?±á??á?¬ cookies á??á?ºá?¬á?¸á??á?­á?¯ á??á?¬á??á?¼á??á?¹á??á?¬á?¸á??á??á?¹á?· jar á??á?²á??á?¼á??á?¹ á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á?¬á?¸á??á??á?¹">
+<!ENTITY torbutton.prefs.mmm_cookies "á??á?­á??á?­á??á?¬á??á?¬ cookies á??á?ºá?¬á?¸á??á?¯á?­ á??á?®á??á?¥á?¹á??á??á?»á??á?³á??á?¯á??á?¹á??á?«á??á??á?¹á?? (á?¡á??á?±á??á??á?¹ á??á?½á?­á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.clear_cookies "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³/á??á?»á??á?³ á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?ºá?­á??á?¹á??á?¼á??á?¹ cookies á??á?ºá?¬á?¸á??á?¯á?­ á??á?½á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹">
+<!ENTITY torbutton.prefs.disable_plugins "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á??á?½á?­á?±á??á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ plugins á??á?ºá?¬á?¸á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?¡á?±á??á?¸á?¾á??á?®á?¸á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.kill_bad_js "á?¡á??á?±á??á??á?¹á??á?½á?­á?±á??á?¬ javascript á??á?ºá?¬á?¸á??á?¯á?­ hook á??á?ºá?­á??á?¹á?»á??á??á?¹á?·á??á?­á??á?¹á?¸á??á?ºá?³á??á?¹á??á?¬á?¸á??á??á?¹ á??á?¯á??á?¹á??á?¬á?¸á??á??á?¹ (á?¡á?±á??á?¸á?¾á??á?®á?¸á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.isolate_content "Tor á?¡á?±á?»á??á?¡á?±á??á??á?¼á??á?¹ dynamic content á??á?ºá?¬á?¸á??á?­á?¯ á??á?®á?¸á?»á??á?¬á?¸ á??á?²á?¼á??á?¬á?¸á??á??á?¹ (á?¡á?±á??á?¸á?¾á??á?®á?¸á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.no_updates "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á?±á??á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ update á?¡á??á??á?¹á??á??á?·á?¹á??á?¼á??á?¹á?¸á??á??á??á?ºá?¬á?¸á??á?­á?¯ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹">
+<!ENTITY torbutton.prefs.set_uagent "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¡á??á?¼á??á?¹ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?° á??á?¯á?­á??á?¹á??á?¬á?¸á??á?½á??á?¹á??á?­á?¯ á??á??á?¹á??á?½á??á?¹á??á??á?¹ (á?¡á?±á??á?¸á?¾á??á?®á?¸á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.dynamic "á?±á?»á??á?¬á??á?¹á?¸á??á?²á?±á??á?±á??á?¬ á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸">
+<!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.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!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.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.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
+<!ENTITY torbutton.prefs.history "á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?? á??á?½á??á?¹á??á??á?¹á?¸á??á?¥á?¹á??á?ºá?¬á?¸">
+<!ENTITY torbutton.prefs.no_search "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ á??á?½á?¬á?±á??á?¼á??á??á?¹ á?¡á?¾á??á?¶á?»á??á?³á??á??á??á?ºá?¬á?¸á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.shutdown "á??á??á?¹á??á?¬á?¸á??á?­á??á?¹á??á?­á??á?¹á?¸á??á??á?¹">
+<!ENTITY torbutton.prefs.tor_shutdown "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¯á?­á??á?¹á?±á??á?¬ browser á??á?¯á?­ á??á?­á??á?¹á?±á??á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ Tor Cookies á??á?ºá?¬á?¸á??á?­á?¯ á??á?½á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹">
+<!ENTITY torbutton.prefs.all_shutdown "á??á??á?¹á??á??á?¹á?·  browser á??á?¯á?­ á??á??á?¯á?­ á??á?­á??á?¹á?±á??á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ Cookies á??á?ºá?¬á?¸á??á?­á?¯ á??á?½á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹">
+<!ENTITY torbutton.prefs.no_shutdown "á??á?­á??á?¹á??á?­á??á?¹á?¸á??á?½á?ºá??á?¹ cookies á??á?ºá?¬á?¸á??á?¯á?­ á??á??á?½á??á?¹á?¸á??á??á?¹á?¸á??á?«á??á?½á??á?¹á?·">
+<!ENTITY torbutton.prefs.disable_sessionstore "á??á?­á??á?¹á?¸á??á??á?¹á?¸á?±á??á??á?¥á?¹ Session á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.headers "á?±á??á?«á??á?¹á?¸á??á??á?¹á?¸á??á?ºá?¬á?¸">
+<!ENTITY torbutton.prefs.spoof_english "US á?¡á??á?¤á??á?­á??á?¹ browser á??á?¯á?­ Spoof á??á?¯á??á?¹á??á??á?¹">
+<!ENTITY torbutton.prefs.disable_referer "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á?±á??á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ á??á??á?¹á??á??á??á?¹á?¸á??á?°á??á?­á?¯ á?±á??á?¸á??á?­á?¯á??á?»á??á??á?¹á?¸ á??á?»á??á?³á??á??á?¹ (á?¡á??á?ºá?­á?³á?? á??á?¯á?­á??á?¹á??á?ºá?¬á?¸á??á?­á?¯ á?»á??á??á?¹á?±á??á?¬á??á?¹á?±á??á??á?¯á?­á??á?¹á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.disable_domstorage "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ DOM á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á??á??á?­á?¯ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?¡á?±á??á?¸á?¾á??á?®á?¸á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.forms "á?»á??á??á?·á?¹á??á?¼á??á?¹á??á?¶á?¯á??á?¶á??á?¼á??á?¹á??á?ºá?¬á?¸">
+<!ENTITY torbutton.prefs.block_tforms "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ á??á??á?¬á?¸á??á?½á??á?¹ á??á?½á??á?¹á?· á?»á??á??á?·á?¹á??á?¼á??á?¹á??á?¶á?¯á??á?¶á??á?ºá?¬á?¸ á??á?­á??á?¹á?¸á??á??á?¹á?¸á?»á??á??á?¹á?¸á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.block_ntforms "Tor á?¡á??á?¶á?¯á?¸á??á?»á??á?³á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ á??á??á?¬á?¸á??á?½á??á?¹ á??á?½á??á?¹á?· á?»á??á??á?·á?¹á??á?¼á??á?¹á??á?¶á?¯á??á?¶á??á?ºá?¬á?¸ á??á?­á??á?¹á?¸á??á??á?¹á?¸á?»á??á??á?¹á?¸á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.tor "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³">
+<!ENTITY torbutton.prefs.non_tor "Tor á?¡á??á?¶á?¯á?¸á??á?»á??á?³">
+<!ENTITY torbutton.prefs.restore_tor "Session á?»á??á??á?¹á??á??á?¹á??á??á??á?¹á??á?½á?ºá??á?¹á?? Tor á?¡á?±á?»á??á?¡á?±á??á??á?­á?¯ á??á??á?¹á??á?½á??á?¹á??á??á?¹ :">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Firefox á??á?½á?¬á?¸á??á?¼á??á?¹á?¸á??á??á?¹á??á??á?¹á??á??á?¼á?¬á?¸á??á?½á?ºá??á?¹ cookie jar á??á?¯á?­ á?»á??á??á?¹á??á??á?¹ á??á??á?¹á??á?­á?¯á??á??á?°á??á??á?¹/ á??á?½á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹ (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Tor á??á?½á??á?¹á?· Tor á??á??á?¯á??á?¹á?±á??á?¬ cookies á??á?ºá?¬á?¸á??á?¯á?­ á??á?¬á??á?¼á??á?¹á??á?¬á?¸á?±á??á?¬ jars á??á?ºá?¬á?¸á??á?²á??á?¼á??á?¹ á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á?¬á?¸á??á??á?¹">
+<!ENTITY torbutton.prefs.clear_http_auth "HTTP á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?? á??á??á?¹á?±á??á?¸á?±á??á?¬ á??á??á??á?ºá?¬á?¸á??á?­á?¯ á??á?½á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹ (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.block_js_history "Tor á?¡á?±á?»á??á?¡á?±á??á??á?­á?¯á?? history á??á?½á?¬á?±á??á?¼á??á?¼á?¬á?¸á??á?¬á??á?? á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?·á??á?­á?¯ á??á?®á?¸á?»á??á?¬á?¸ á??á?²á?¼á?»á??á?¬á?¸ á??á?¬á?¸á??á??á?¹ (á?¡á?±á??á?¸á?¾á??á?®á?¸á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á?±á??á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ windows á??á?¯á?­ 50 px á??á?­á?¯á?? á?¡á??á?¼á??á?¹á?¡á??á?¬á?¸ á??á?¬á?¸á??á?½á?­á??á??á?¹ (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.close_tor "á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?? á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ Tor windows á??á?ºá?¬á?¸á??á?½á??á?¹á?· tabs á??á?ºá?¬á?¸ á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?¯á?­ á??á?­á??á?¹á??á?­á??á?¹á?¸á??á??á?¹ (á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.close_nontor "á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?? á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ Tor á??á??á?¯á??á?¹á?±á??á?¬ windows á??á?ºá?¬á?¸á??á?½á??á?¹á?· tabs á??á?ºá?¬á?¸ á?¡á?¬á?¸á??á?¶á?¯á?¸á??á?¯á?­ á??á?­á??á?¹á??á?­á??á?¹á?¸á??á??á?¹ (á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.block_links "á??á??á?°á??á?®á?±á??á?¬ Tor á?¡á?±á?»á??á?¡á?±á??á??á?ºá?¬á?¸á??á?¼á??á?¹ á??á?ºá?­á??á?¹á??á??á?¹á??á??á?¹á?·á??á?¹á??á?ºá?¬á?¸á??á?¯á?­ á??á?¯á?­ á??á??á??á?¹á??á?¯á??á?¹á?»á??á??á?¹á?¸á??á?½á??á?¹á?· á??á?¬á??á?ºá??á?¹á??á?½á?¬á??á?ºá?¬á?¸ á?»á??á??á?¹á??á??á?¹ á?±á??á??á??á?°á?»á??á??á?¹á?¸á??á?­á?¯ á??á?­á??á?¹á??á??á?¹á??á??á?¹ (á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.jar_certs "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á?±á??á?¬ á??á?­á?¯á??á??á??á?¯á??á?¹ Tor á?¡á??á?¶á?¯á?¸á??á?»á??á?³á?±á??á?¬ á?¡á?±á?»á??á?¡á?±á??á??á?¼á??á?¹ SSL certs á??á?ºá?¬á?¸á??á?¯á?­ á??á?®á?¸á?»á??á?¬á?¸ jars á??á?ºá?¬á?¸á??á?¼á??á?¹ á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹ (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á?±á??á?¬ á??á?­á?¯á??á??á??á?¯á??á?¹ Tor á?¡á??á?¶á?¯á?¸á??á?»á??á?³á?±á??á?¬ á?¡á?±á?»á??á?¡á?±á??á??á?¼á??á?¹ CA certs á??á?ºá?¬á?¸á??á?¯á?­ á??á?®á?¸á?»á??á?¬á?¸ jars á??á?ºá?¬á?¸á??á?¼á??á?¹ á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹ (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.locked_mode "á??á?±á??á?¬á?¹á??á?? á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?? á??á?»á??á??á?¹á?±á??á??á??á?¹ Button á??á?½á??á?¹á?· Hotkeys á??á?ºá?¬á?¸á??á?­á?¯ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹">
+<!ENTITY torbutton.prefs.startup_state "á??á?¶á?¯á??á?½á??á?¹ á??á??á??á?¹á??á??á??á?ºá?¬á?¸á??á?¼á??á?¹ Tor á?¡á?±á?»á??á?¡á?±á??á??á?¯á?­ á??á??á?¹á??á?½á??á?¹á??á??á?¹ :">
+<!ENTITY torbutton.prefs.shutdown_state "á??á??á?¹á??á??á?¹á??á??á?­á??á?¹á??á?­á??á?¹á?¸á??á?? á?¡á?±á?»á??á?¡á?±á??">
+<!ENTITY torbutton.prefs.startup "á??á??á??á?¹á??á??">
+<!ENTITY torbutton.prefs.block_tor_file_net "Network á??á?¯á?­á?? Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á??á?¹ file:// urls (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.block_nontor_file_net "Network á??á?­á?¯á?? Tor á??á??á?¯á??á?¹á?±á??á?¬ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á??á?¹ file:// urls">
+<!ENTITY torbutton.prefs.restore_defaults "á??á?°á??á?¡á?±á?»á??á?¡á?±á??á??á?­á?¯á?? á?»á??á??á?¹á??á??á?¹ á??á??á?·á?¹á??á?¼á??á?¹á?¸á??á??á?¹">
+<!ENTITY torbutton.prefs.test_settings "á??á?ºá?­á??á?¹á??á?­á??á??á??á??á?ºá?¬á?¸á??á?­á?¯ á??á??á?¹á?¸á??á??á?¹á??á??á?¹">
+<!ENTITY torbutton.prefs.test_auto "Firefox á??á??á??á?¹á?»á??á?®á?¸ á??á??á??á??á?¶á?¯á?¸ á?±á?»á??á?¬á??á?¹á?¸á??á?²á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?»á??á?®á?¸á??á?½á?ºá??á?¹ á??á?­á??á?­á?? Tor á??á?ºá?­á??á?¹á??á?­á??á??á??á??á?ºá?¬á?¸á??á?­á?¯ á?»á??á??á?¹á??á??á?¹ á??á??á?¹á?¸á??á??á?¹á??á??á?¹">
+<!ENTITY torbutton.prefs.disable_livemarks "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á?±á??á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ livemarks á?¡á??á??á?¹á??á??á?¹á?·á??á?¼á??á?¹á?¸á??á??á??á?ºá?¬á?¸á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹">
+<!ENTITY torbutton.prefs.tor_memory_jar "Tor cookies á??á?ºá?¬á?¸á??á?­á?¯ disk á?¡á??á?¼á??á?¹á?¸á??á?¯á?­á?? á?±á??á?¸á??á?¬á?¸á?»á??á??á?¹á?¸ á??á?»á??á?³á??á??á?¹">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Tor á??á??á?¯á??á?¹á?±á??á?¬ cookies á??á?ºá?¬á?¸á??á?¯á?­ disk á?¡á??á?¼á??á?¹á?¸á??á?­á?¯á?? á?±á??á?¸á??á?¬á?¸á?»á??á??á?¹á?¸ á??á?»á??á?³á??á??á?¹">
+<!ENTITY torbutton.prefs.session_restore "session á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á??á?¡á??á?¼á??á?¹ á??á?­á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹ á??á??á?¹á??á?½á??á?¹á?· á?»á??á??á?¹á??á??á?¹ á??á??á?¹á??á?°á??á??á?¹ tabs á??á?ºá?¬á?¸ :">
+<!ENTITY torbutton.prefs.nontor_tabs "Tor á?¡á??á?¶á?¯á?¸á??á?»á??á?³á?±á??á?¬ á??á??á?¹á??á?°á??á?¬á?¸á??á??á?¹á?· tabs á??á?ºá?¬á?¸">
+<!ENTITY torbutton.prefs.tor_tabs "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³ á??á??á?¹á??á?°á??á?¬á?¸á??á??á?¹á?· tabs á??á?ºá?¬á?¸">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
diff --git a/src/chrome/locale/bms/torbutton.properties b/src/chrome/locale/bms/torbutton.properties
index da7e5de..184b31d 100644
--- a/src/chrome/locale/bms/torbutton.properties
+++ b/src/chrome/locale/bms/torbutton.properties
@@ -1,29 +1,30 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
-torbutton.panel.tooltip.disabled = Click to enable Tor
-torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
-torbutton.panel.label.disabled = Tor Disabled
-torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\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 livemarks via Tor.\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.button.tooltip.disabled = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?·á?»á??á?³á??á??á?¹
+torbutton.button.tooltip.enabled = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?· á??á?­á??á?¹á??á??á?¹á??á??á?¹
+torbutton.panel.tooltip.disabled = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?· á?»á??á?³á??á?¯á?­á??á?¹á??á??á?¹ á??á??á??á?¹á??á?¯á??á?¹á??á?«
+torbutton.panel.tooltip.enabled = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?· á??á?­á??á?¹á??á??á?¹á??á??á?¹ á??á??á??á?¹á??á?¯á??á?¹á??á?«
+torbutton.panel.plugins.disabled = Plugins á??á?ºá?¬á?¸ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¯á?­á??á?¹á??á??á?¹ á??á??á??á?¹á??á?¯á??á?¹á??á?«
+torbutton.panel.plugins.enabled = Plugins á??á?ºá?¬á?¸ á??á?­á??á?¹á??á??á?¹á??á??á?¹ á??á??á??á?¹á??á?¯á??á?¹á??á?«
+torbutton.panel.label.disabled = Tor á?¡á??á?¶á?¯á?¸á??á?»á??á?³á??á?¯á?­á??á?¹á??á?«
+torbutton.panel.label.enabled = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¯á?­á??á?¹á??á?«á??á??á?¹á??
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Tor proxy á??á?¯á?­ Firefox á??á?¼á??á?¹ á?¡á??á?¼á??á?¹á??á??á?° á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?· á?»á??á?³á??á??á?¹/ á??á?»á??á?³á??á??á?¹ Torbutton á??á?½ á??á??á?¯á??á?¹á??á??á?¹á??á?¯á??á?¯á?­ á??á??á?¹á?·á??á?¼á??á?¹á?¸á??á?¬á?¸á??á?«á??á??á?¹
+torbutton.popup.history.warning = á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?? á?¡á?±á?»á??á?¡á?±á?? History á??á?¯á?­á??á?¹á??á?¼á??á?¹á??á?­á??á?¹á?¸á??á?­á??á?¹á?¸á??á?? á??á?¯á?­ Torbutton á??á?½ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á?«á??á??á?¹á??Firefox á??á?¶á?¯á?»á??á?¶á?³á??á?? bug á??á?¼á??á?¹ á?¡á??á?¯á??á?¹á??á?¯á??á?¹á??á?³á?­á??á?¹á??á??á?¹ á?»á??á??á?¹á??á?«á??á??á?¹á?? \n\nlocation box á?±á??á??á?¬á??á?¼á??á?¹ enter á??á?¯á?­ á??á?½á?­á??á?¹á??á?« á??á?­á?¯á??á??á??á?¯á??á?¹ window  á?¡á??á??á?¹á??á??á?¹á??á?¯ á??á?­á?¯á??á??á??á?¯á??á?¹ tab á??á??á?¹á??á?¯ á?¡á??á?¬á?¸á??á?­á?¯á?¸ á??á?¼á??á?¹á?·á??á?½á??á?¹á??á?«á?? \n\n
+torbutton.popup.plugin.warning = plugin á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸á??á?¯á?­ Tor á??á?½ á??á?¯á?­á??á?¹á??á?¯á?­á??á?¹ á??á??á?¹á??á?°á?»á??á??á?¹á?¸á??á?¯á?­ Torbutton á??á?½ á??á?­á??á?¹á??á??á?¹á??á?«á??á??á?¹á?? \n\nSave-As á??á?­á?¯ á?¡á??á?¬á?¸á??á?¯á?­á?¸ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?«á?? \n\n
+torbutton.popup.confirm_ca_certs = Torbutton á??á?½á??á?¹á??á?ºá??á?¹: á??á??á?¹á?·á?¡á??á?¼á??á?¹  á?»á??á?³á??á?¯á??á?¹á??á?¬á?¸á?±á??á?¬ Certificate Authorities á??á?±á??á?¬á?¹á?»á??á??á?¬á?¸á??á?«á?? Certificate Authority á??á?¬á??á??á?¹á?¸ á??á??á?¹á?±á??á?¸á??á?½á?¬á?±á??á?¼á?»á??á??á?¹á?¸á??á??á?¹ Tor á?±á?»á??á?¬á??á?¹á?¸á??á?² á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á??á?­á?¯ á?±á??á?½á?¸á?±á??á?¼á?¸á?±á??á??á?¯á?­á??á?¹á?»á??á?®á?¸ á?¡á??á?¯á??á?¹á??á?¯á??á?¹á??á?¬á??á?¼á??á?¹ á?±á??á?½á?¸á?±á??á?¼á?¸á?±á??á??á?¯á?­á??á?¹á??á?«á??á??á?¹á?? Certificate Authority certificates á??á?ºá?¬á?¸ á??á?²á?¼á?»á??á?¬á?¸á??á?¬á?¸á??á?½á?­á?»á??á??á?¹á?¸á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á?­á?¯á??á?«á??á??á?¬á?¸ ? (á??á??á?¹ á??á?¯á?­á?¡á?±á?¾á??á?¬á??á?¹á?¸á?¡á??á?¬á??á?¯á?­ á??á?¬á?¸á??á??á?¹á?»á??á??á?¹á?¸ á??á??á?½á?­á??á?«á??á?½á?ºá??á?¹ OK á??á?¯á?­ á??á??á??á?¹á??á?½á?­á??á?¹á?»á??á??á?¹á?¸á?»á??á??á?¹á?· á??á?¶á?¯á?»á??á?¶á?³á??á?­á??á?¹á??á?ºá??á?¯á?­á??á?¹á??á?«á??á??á?¹)
+torbutton.popup.ff3.warning = á??á??á?­á?±á??á?¸á??á?ºá??á?¹!\n\ná??á??á?¹á?? á?¡á??á?ºá?­á??á?¹á?±á??á??á??á?¯á??á?¹á??á?½á??á?¹á?· livemarks á??á?ºá?¬á?¸ á?±á??á?«á??á?¹á?¾á??á?¬á?¸á?»á??á??á?¹á?¸á??á?­á?¯ Firefox 3 á??á?¼á??á?¹ Torbutton á??á??á?¹ Tor á??á?½á??á??á??á?¹á?· á?»á??á??á?¹á?±á??á??á?±á??á??á?¯á?­á??á?¹á??á?«á??á??á?¹á?? \n\ná??á??á?¹á??á?¯á?­á??á??á??á?¹á?»á??á??á?¹á?±á?? á?±á??á?½á??á??á?­á?¯á?? á??á??á?¹á??á??á?¹á??á?¯á??á?¹á?±á??á?¬á??á?¹ á??á?¯á?­á??á?«á??á??á?¬á?¸ ?
+torbutton.popup.toggle.warning = á??á?ºá?­á??á?­á??á??á??á??á?ºá?¬á?¸ á?¡á??á?ºá?­á?³á?¸á??á??á?¹á?±á??á?¬á??á?¹á??á?? á??á?½á?­á?±á??á??á??á?¹ Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á??á?½á??á?¹á?· á?¡á??á?¶á?¯á?¸á??á?»á??á?³á??á?? á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á??á?¹ á??á?­á?¯á??á??á??á?¯á??á?¹ á?»á??á??á?¹á??á??á?¹á??á??á??á?¹á??á??á?¹ á??á?­á?¯á?¡á??á?¹á??á?«á??á??á?¹
+torbutton.popup.test.success = Tor proxy á??á??á?¹á?¸á??á??á?¹á??á?? á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?«á??á??á?¹ !
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Tor proxy á??á?ºá?­á??á?¹á??á?­á??á??á??á??á?ºá?¬á?¸á??á?¯á?­ á??á??á?¹á?¸á??á??á?¹á??á??á?¹ OK á??á?¯á?­ á??á??á??á?¹á??á?½á?­á??á?¹á??á?«á?? á??á??á?¹á?¸á??á??á?¹á??á??á??á??á?¹ á?±á??á?¬á??á?¹á??á?¼á??á?¹á??á?¼á??á?¹ á?»á??á?³á??á?¯á??á?¹á??á?«á??á??á?¹á?? á?±á??á?ºá?¸á??á?°á?¸á?»á??á?³á?? á??á??á?¹á?¸á??á?¶á?±á??á?¬á??á?¹á?·á??á?¯á?­á??á?¹á?¸á?±á??á?¸á??á?«á??á??á?¹á??
+torbutton.panel.label.verified = Tor á??á?½á??á?¹á??á??á?¹á?±á?¾á??á?¬á??á?¹á?¸ á?¡á??á??á?¹á?»á??á?³á??á?«á??á??á?¹
+torbutton.popup.test.auto_failed = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹ á?¡á??á?­á?¯á?¡á?±á??á?ºá?¬á??á?¹ Tor proxy á??á??á?¹á?±á??á?¸á??á?? á??á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?«á?? \n\ná??á??á?¹á??á?­á?¯á??á??á??á?¹á?»á??á??á?¹á?±á?? á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?·á?»á??á?³á??á??á?¹ á?±á??á??á?ºá?¬á??á?«á??á??á?¬á?¸ ?
+torbutton.prefs.recommended = (á?¡á?¾á??á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)
+torbutton.prefs.optional = (á?±á??á?¼á?¸á??á?ºá??á?¹á??á?¯á?­á??á?¹á??á?«á??á??á?¹)
+torbutton.prefs.crucial = (á?¡á?±á??á?¸á?¾á??á?®á?¸á??á?«á??á??á?¹)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/bo/torbutton.dtd b/src/chrome/locale/bo/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/bo/torbutton.dtd
+++ b/src/chrome/locale/bo/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/bo/torbutton.properties b/src/chrome/locale/bo/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/bo/torbutton.properties
+++ b/src/chrome/locale/bo/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/ca/torbutton.dtd
+++ b/src/chrome/locale/ca/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/ca/torbutton.properties b/src/chrome/locale/ca/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/ca/torbutton.properties
+++ b/src/chrome/locale/ca/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/cs/torbutton.dtd
+++ b/src/chrome/locale/cs/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/cs/torbutton.properties b/src/chrome/locale/cs/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/cs/torbutton.properties
+++ b/src/chrome/locale/cs/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd
index 5be67e5..8c2b704 100644
--- a/src/chrome/locale/da/torbutton.dtd
+++ b/src/chrome/locale/da/torbutton.dtd
@@ -1,12 +1,13 @@
-<!ENTITY torbutton.prefs.title "Torbutton Præferencer">
-<!ENTITY torbutton.prefs.display_settings "Skærmindstillinger">
-<!ENTITY torbutton.prefs.display_panel "Vis Tor proxy-indstillingen i statuslinjen">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
+<!ENTITY torbutton.prefs.title "Torbutton Indstillinger">
+<!ENTITY torbutton.prefs.display_settings "Visnings Indstillinger">
+<!ENTITY torbutton.prefs.display_panel "Vis Tor proxy-indstilling i statuslinjen">
+<!ENTITY torbutton.prefs.panel_format "Vis i Statusbar som:">
 <!ENTITY torbutton.prefs.panel_text_format "Tekst">
 <!ENTITY torbutton.prefs.panel_icon_format "Ikon">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Indstillinger">
-<!ENTITY torbutton.prefs.recommended_settings "Brug den anbefalede proxyindstillinger for din version af Firefox">
+<!ENTITY torbutton.prefs.recommended_settings "Brug de anbefalede proxyindstillinger til min version af Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Brug Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Brug brugerdefinerede proxyindstillinger">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
@@ -15,79 +16,79 @@
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
 <!ENTITY torbutton.about.title "Om Torbutton">
-<!ENTITY torbutton.pref_connection.notice "Deaktiver Torbutton at ændre disse indstillinger.">
+<!ENTITY torbutton.pref_connection.notice "Deaktiver Torbutton for at ændre disse indstillinger.">
 <!ENTITY torbutton.pref_connection.more_info "Mere Information">
 <!ENTITY torbutton.pref_connection_more_info.title "Hjælp">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton er i øjeblikket aktiveret. Hvis du vil ændre din non-Tor proxyindstillinger, skal du deaktivere Torbutton og vende tilbage her. Hvis du vil ændre din Tor, kan du bruge Torbutton præference vinduet.">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
+<!ENTITY torbutton.pref_connection_more_info.text "Torbutton er i øjeblikket aktiveret. Hvis du vil ændre dine ikke-Tor proxyindstillinger, skal du deaktivere Torbutton og vende tilbage hertil. Hvis du vil ændre dine Tor indstillinger, kan du benytte Torbuttons Indstillingsvindue.">
+<!ENTITY torbutton.context_menu.toggle "Skift Tor status">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "Præferencer...">
+<!ENTITY torbutton.context_menu.preferences "Indstillinger...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Om Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "Klik for at initialisere Torbutton">
+<!ENTITY torbutton.button.tooltip "Klik for at starte Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Sikkerhedsindstillinger">
-<!ENTITY torbutton.prefs.block_thread "Bloker historie læses under Tor (afgørende)">
-<!ENTITY torbutton.prefs.block_thwrite "Bloker historie skriver under Tor (anbefales)">
-<!ENTITY torbutton.prefs.block_nthread "Bloker historie læsning under Non-Tor (valgfrit)">
-<!ENTITY torbutton.prefs.block_nthwrite "Bloker historie skriver under Non-Tor (valgfrit)">
-<!ENTITY torbutton.prefs.clear_history "Fjern historie om Tor toggle (valgfrit)">
-<!ENTITY torbutton.prefs.clear_cache "Bloker Tor disk cache og slet alle cache på Tor toggle">
+<!ENTITY torbutton.prefs.block_thread "Bloker for historik læsninger under Tor (afgørende)">
+<!ENTITY torbutton.prefs.block_thwrite "Bloker for historik skrivninger under Tor (anbefales)">
+<!ENTITY torbutton.prefs.block_nthread "Bloker for historik læsninger uden for Tor (valgfrit)">
+<!ENTITY torbutton.prefs.block_nthwrite "Bloker for historik skrivninger uden for Tor (valgfrit)">
+<!ENTITY torbutton.prefs.clear_history "Ryd historien ved skift af Tor status (valgfrit)">
+<!ENTITY torbutton.prefs.clear_cache "Bloker Tor disk cache og ryd alt cache ved ændring af Tor status">
 <!ENTITY torbutton.prefs.block_cache "Bloker disk og hukommelse cache adgang under Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Gem Non-Tor cookies i en beskyttet jar">
+<!ENTITY torbutton.prefs.cookie_jars "Gem Ikke-Tor cookies i en beskyttet krukke">
 <!ENTITY torbutton.prefs.mmm_cookies "Jeg vil manuelt administrere mine cookies (farligt)">
-<!ENTITY torbutton.prefs.clear_cookies "Ryd cookies på Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Deaktiver plugins under Tor anvendelse (afgørende)">
+<!ENTITY torbutton.prefs.clear_cookies "Ryd cookies ved skift af Tor status">
+<!ENTITY torbutton.prefs.disable_plugins "Deaktiver plugins når Tor kører (afgørende)">
 <!ENTITY torbutton.prefs.kill_bad_js '"Hook" farlige javascript (afgørende)'>
-<!ENTITY torbutton.prefs.isolate_content "Isolere dynamisk indhold til Tor tilstand (afgørende)">
-<!ENTITY torbutton.prefs.no_updates "Deaktiver opdateringer under brug af Tor">
+<!ENTITY torbutton.prefs.isolate_content "Isoler dynamisk indhold til Tor tilstand (afgørende)">
+<!ENTITY torbutton.prefs.no_updates "Deaktiver opdateringer når Tor kører">
 <!ENTITY torbutton.prefs.set_uagent "Indstil bruger agent for Tor anvendelse (afgørende)">
-<!ENTITY torbutton.prefs.dynamic "Dynamisk indhold">
+<!ENTITY torbutton.prefs.dynamic "Dynamisk Indhold">
 <!ENTITY torbutton.prefs.cookies "Cookies">
 <!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "Historie">
-<!ENTITY torbutton.prefs.no_search "Deaktiver søgeforslag under Tor (anbefales)">
+<!ENTITY torbutton.prefs.history "Historik">
+<!ENTITY torbutton.prefs.no_search "Deaktiver søgeforslag når Tor kører (anbefales)">
 <!ENTITY torbutton.prefs.shutdown "Luk ned">
-<!ENTITY torbutton.prefs.tor_shutdown "Ryd Tor cookies under Tor-enabled browser nedlukning">
-<!ENTITY torbutton.prefs.all_shutdown "Ryd cookies i enhver browser nedlukning">
-<!ENTITY torbutton.prefs.no_shutdown "Fjern ikke nogen cookies ved nedluning">
-<!ENTITY torbutton.prefs.disable_sessionstore "Deaktiver sessions lagring (anbefales)">
+<!ENTITY torbutton.prefs.tor_shutdown "Ryd Tor cookies, når browseren lukkes mens Tor kører">
+<!ENTITY torbutton.prefs.all_shutdown "Ryd cookies under enhver browser nedlukning">
+<!ENTITY torbutton.prefs.no_shutdown "Ryd ikke mine cookies ved nedlukning">
+<!ENTITY torbutton.prefs.disable_sessionstore "Deaktiver Sessions Lagring (anbefales)">
 <!ENTITY torbutton.prefs.headers "Hoveder">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US Engelsk Browser">
-<!ENTITY torbutton.prefs.disable_referer "Send ikke referencer under brug af Tor (kan lukke ned nogle steder)">
-<!ENTITY torbutton.prefs.disable_domstorage "Deaktiver DOM Storage under Tor anvendelse (afgørende)">
-<!ENTITY torbutton.prefs.forms "Skemaer">
-<!ENTITY torbutton.prefs.block_tforms "Bloker password+form saving under Tor (anbefales)">
-<!ENTITY torbutton.prefs.block_ntforms "Bloker password+form saving under Non-Tor (valgfri)">
+<!ENTITY torbutton.prefs.disable_referer "Send ikke henviser ved brug af Tor (kan ødelægge visse sider)">
+<!ENTITY torbutton.prefs.disable_domstorage "Deaktiver DOM Lager når Tor kører (afgørende)">
+<!ENTITY torbutton.prefs.forms "Formulare">
+<!ENTITY torbutton.prefs.block_tforms "Bloker kodeord+formulare for at gemme, når Tor kører (anbefales)">
+<!ENTITY torbutton.prefs.block_ntforms "Bloker password+form for at gemme, uden for Tor (valgfri)">
 <!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "På session genoprettelses startprocessen, sæt Tor tilstanden:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Genindlæs cookie jar/ryd cookies på Firefox crash (anbefales)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Gem både Tor og Non-Tor cookies i beskyttede jars (farlige)">
-<!ENTITY torbutton.prefs.clear_http_auth "Ryd HTTP auth session (anbefales)">
-<!ENTITY torbutton.prefs.block_js_history "Isolere adgang til historie navigation til Tor tilstand (kritisk)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Luk alle Tor vinduer og faner på toggle (valgfrit)">
-<!ENTITY torbutton.prefs.close_nontor "Luk alle Non-Tor vinduer og faner på toggle (valgfrit)">
-<!ENTITY torbutton.prefs.block_links "Block link klik og side genindlæser fra forskellige Tor stater (valgfrit)">
-<!ENTITY torbutton.prefs.jar_certs "Gem SSL certs separat fra Tor og Non-Tor (Anbefalet)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Gem CA CERT i separate jars for Tor/Ikke-Tor (anbefales)">
-<!ENTITY torbutton.prefs.locked_mode "Deaktiver Button og Genvejstaster til at hindre utilsigtet toggle">
-<!ENTITY torbutton.prefs.startup_state "Ved normale opstart skal Tor:">
+<!ENTITY torbutton.prefs.non_tor "Ikke-Tor">
+<!ENTITY torbutton.prefs.restore_tor "Ved session genoprettelses start, sæt Tor tilstanden til:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Genindlæs cookie jar/ryd cookies ved Firefox crash (anbefales)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Gem både Tor og Ikke-Tor cookies i beskyttede krukker (farlige)">
+<!ENTITY torbutton.prefs.clear_http_auth "Ryd HTTP auth sessioner (anbefales)">
+<!ENTITY torbutton.prefs.block_js_history "Isolere adgang til historik navigation til Tor tilstand (kritisk)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Skaler vinduer til mange på 50px når Tor bruges (Anbefalet)">
+<!ENTITY torbutton.prefs.close_tor "Luk alle Tor-vinduer og faner ved skift af Tor status (valgfrit)">
+<!ENTITY torbutton.prefs.close_nontor "Luk alle Ikke-Tor vinduer og faner ved skift af Tor status (valgfrit)">
+<!ENTITY torbutton.prefs.block_links "Bloker linkklik og sidegenindlæsninger fra forskellige Tor tilstande (valgfrit)">
+<!ENTITY torbutton.prefs.jar_certs "Gem SSL certifikater separat under Tor/uden for Tor (Anbefalet)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Gem CA certifikater separat under Tor/uden for Tor (anbefales)">
+<!ENTITY torbutton.prefs.locked_mode "Deaktiver Knapper og Genvejstaster for at forhindre uheldige skift af status">
+<!ENTITY torbutton.prefs.startup_state "Ved normale opstart skal Tors status være:">
 <!ENTITY torbutton.prefs.shutdown_state "Nedluknings tilstand">
 <!ENTITY torbutton.prefs.startup "Opstart">
-<!ENTITY torbutton.prefs.block_tor_file_net "Bloker Tor adgang til netværket fra file:// URL'er (anbefales)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Bloker Non-Tor adgang til netværket fra file:// URL'er">
-<!ENTITY torbutton.prefs.restore_defaults "Gendan standarder">
+<!ENTITY torbutton.prefs.block_tor_file_net "Bloker Tor adgang til netværket fra file:// URL'er (anbefalet)">
+<!ENTITY torbutton.prefs.block_nontor_file_net "Bloker Ikke-Tor adgang til netværket fra file:// URL'er">
+<!ENTITY torbutton.prefs.restore_defaults "Gendan Standarder">
 <!ENTITY torbutton.prefs.test_settings "Test Indstillinger">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
-<!ENTITY torbutton.prefs.disable_livemarks "Deaktiver livemarks opdateringer under brugen af Tor">
+<!ENTITY torbutton.prefs.test_auto "Test mine Tor indstillinger efter første statusændring ved hver start af Firefox">
+<!ENTITY torbutton.prefs.disable_livemarks "Deaktiver opdatering af livemarks, når Tor kører">
 <!ENTITY torbutton.prefs.tor_memory_jar "Gem ikke Tor Cookies til harddisken">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Gem ikke Non-Tor Cookies til harddisken">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Gem ikke Ikke-Tor Cookies til harddisken">
 <!ENTITY torbutton.prefs.session_restore "Gem sessionen og gendanne disse faner:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs blev indlæst i Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs blev indlæst i Tor">
+<!ENTITY torbutton.prefs.nontor_tabs "Faner indlæst uden for Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Faner blev indlæst i Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
diff --git a/src/chrome/locale/da/torbutton.properties b/src/chrome/locale/da/torbutton.properties
index da7e5de..093314c 100644
--- a/src/chrome/locale/da/torbutton.properties
+++ b/src/chrome/locale/da/torbutton.properties
@@ -1,29 +1,30 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
-torbutton.panel.tooltip.disabled = Click to enable Tor
-torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
-torbutton.panel.label.disabled = Tor Disabled
-torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\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 livemarks via Tor.\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.button.tooltip.disabled = Aktiver Tor
+torbutton.button.tooltip.enabled = Deaktiver Tor
+torbutton.panel.tooltip.disabled = Klik for at aktivere Tor
+torbutton.panel.tooltip.enabled = Klik for at deaktivere Tor
+torbutton.panel.plugins.disabled = Klik for at aktivere plugins
+torbutton.panel.plugins.enabled = Klik for at deaktivere plugins
+torbutton.panel.label.disabled = Tor Deaktiveret
+torbutton.panel.label.enabled = Tor Aktiveret
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton gør det nemt at aktivere og deaktivere Tor Proxyen ved brug af Firefox
+torbutton.popup.history.warning = Torbutton har blokeret historik skift manipulation. Dette er for at omgå en Firefox sikkerheds fejl.\n\nTryk på 'return' i adresse boksen eller åben en ny fane eller browservindue i stedet.\n\n
+torbutton.popup.plugin.warning = Torbutton blokerede for direkte indlæsning af Tor plugin indhold.\n\nBrug 'Gem som' i stedet.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Bemærkning: Det ser ud til du ikke har nogen brugerdefinerede nøglecentre. Analysen af den globale godkendelsesmyndighedsliste er langsom og sløver skift Tor status. Vil du deaktiverer isolationen af nøglecentre certifikater? (Hvis du ikke forstår dette, er det sikkert at trykke OK)
+torbutton.popup.ff3.warning = Advarsel!\n\nTorbutton er på Firefox kendt for at lække informationer om din tidszone og livemarks via Tor.\n\n�nsker du at fortsætte alligevel?
+torbutton.popup.toggle.warning = Du skal ændre Tor status eller genstarte for at dine ændringer træder i kraft.
+torbutton.popup.test.success = Tor proxy test lykkedes!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Klik på OK for at teste Tor proxyindstillinger. Denne test vil køre i baggrunden. Vær venligst tålmodig.
+torbutton.panel.label.verified = Tor Verificeret
+torbutton.popup.test.auto_failed = Det mislykkedes den automatiske Tor proxy test at benytte Tor.\n\nEr du sikker på du vil aktivere alligevel?
+torbutton.prefs.recommended = (anbefalet)
+torbutton.prefs.optional = (valgfri)
+torbutton.prefs.crucial = (afgørende)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd
index 6f3ef6d..c64d459 100644
--- a/src/chrome/locale/de/torbutton.dtd
+++ b/src/chrome/locale/de/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy-Einstellungen">
 <!ENTITY torbutton.prefs.recommended_settings "Benutze die empfohlenen Proxy-Einstellungen für meine Firefox-Version">
 <!ENTITY torbutton.prefs.use_privoxy "Privoxy verwenden">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Individuelle Proxy-Einstellungen verwenden">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP-Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL-Proxy:">
diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties
index c0a922e..9d27c53 100644
--- a/src/chrome/locale/de/torbutton.properties
+++ b/src/chrome/locale/de/torbutton.properties
@@ -11,13 +11,13 @@ torbutton.popup.history.warning = Torbutton blocked changed-state history manipu
 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\nEs ist bekannt, dass Torbutton auf Firefox 3 deine Zeitzone und Livemarks via Tor mitteilt.\n\nWillst du trotzem fortfahren?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.toggle.warning = Die Einstellungen werden erst nach einem Neustart von Tor wirksam
 torbutton.popup.test.success = Tor-Proxy Test erfolgreich!
-torbutton.popup.test.failure = Tor-Proxy Test FEHLGESCHLAGEN! �berprüfe deine Proxy- und Privoxyeinstellungen.
-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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Klicke OK zum Testen der Proxyeinstellungen. Dieser Test arbeitet im Hintergrund. Bitte warte einen Augenblick.
 torbutton.panel.label.verified = Tor überprüft
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.popup.test.auto_failed = Der automatische Tor Proxy Test ist fehlgeschlagen.\n\nBist du dir sicher ihn trozdem zu aktivieren?
 torbutton.prefs.recommended = (empfohlen)
 torbutton.prefs.optional = (optional)
 torbutton.prefs.crucial = (kritisch)
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd
index 0122c13..a0dde6c 100644
--- a/src/chrome/locale/el/torbutton.dtd
+++ b/src/chrome/locale/el/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "ΡÏ?θμίÏ?ειÏ? διαμεÏ?ολαβηÏ?ή">
 <!ENTITY torbutton.prefs.recommended_settings "ΧÏ?ήÏ?η Ï?Ï?ν Ï?Ï?οÏ?εινÏ?μενÏ?ν Ï?Ï?θμίÏ?εÏ?ν για Ï?ην Ï?Ï?έÏ?οÏ?Ï?α έκδοÏ?η Ï?οÏ? Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "ΧÏ?ήÏ?η Ï?οÏ? Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "ΧÏ?ήÏ?η Ï?Ï?οÏ?αÏ?μοÏ?μένÏ?ν Ï?Ï?θμίÏ?εÏ?ν διαμεÏ?ολαβηÏ?ή">
 <!ENTITY torbutton.prefs.proxy.host.http "Î?ιαμεÏ?ολαβηÏ?ήÏ? HTTP :">
 <!ENTITY torbutton.prefs.proxy.host.https "Î?ιαμεÏ?ολαβηÏ?ήÏ? SSL :">
diff --git a/src/chrome/locale/el/torbutton.properties b/src/chrome/locale/el/torbutton.properties
index a4dec2d..c1e28c2 100644
--- a/src/chrome/locale/el/torbutton.properties
+++ b/src/chrome/locale/el/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = ΣημείÏ?Ï?η Torbutton: ΦαίνεÏ?αι
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd
index 2a118aa..b55e231 100644
--- a/src/chrome/locale/es/torbutton.dtd
+++ b/src/chrome/locale/es/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Configuración del Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Usar la configuración de proxy recomendada para mi versión de Firefox.">
 <!ENTITY torbutton.prefs.use_privoxy "Usar Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Usar una configuración de proxy personalizada">
 <!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
 <!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
@@ -15,10 +16,10 @@
 <!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "Puerto:">
 <!ENTITY torbutton.about.title "Acerca de Torbutton">
-<!ENTITY torbutton.pref_connection.notice "Desactivar Torbutton para cambiar esta configuración.">
+<!ENTITY torbutton.pref_connection.notice "Desactive Torbutton para cambiar esta configuración.">
 <!ENTITY torbutton.pref_connection.more_info "Más información">
 <!ENTITY torbutton.pref_connection_more_info.title "Ayuda">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton está actualmente activado.  Si desea cambiar la configuración de su proxy (no Tor), desactive Torbutton y regrese a este diálogo.  Si desea cambiar la configuración de Tor, use la ventana de preferencias de Torbutton.">
+<!ENTITY torbutton.pref_connection_more_info.text "Torbutton está activo.  Si desea cambiar la configuración de su proxy (no Tor), desactive Torbutton y regrese a este diálogo.  Si desea cambiar la configuración de Tor, use la ventana de preferencias de Torbutton.">
 <!ENTITY torbutton.context_menu.toggle "Cambiar estado de Tor">
 <!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferencias...">
@@ -62,7 +63,7 @@
 <!ENTITY torbutton.prefs.block_ntforms "Bloquear el almacenamiento de contraseñas y formularios al no usar Tor (opcional)">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Sin Tor">
-<!ENTITY torbutton.prefs.restore_tor "En el arranque de la restauración de la sesión, establezca el estado de Tor a:">
+<!ENTITY torbutton.prefs.restore_tor "En el arranque de la restauración de la sesión, establecer el estado de Tor a:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Recargar jar de cookies/eliminar cookies al fallar Firefox (recomendado)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Almacenar cookies con Tor y sin Tor en jars protegidos (peligroso)">
 <!ENTITY torbutton.prefs.clear_http_auth "Eliminar sesiones de autenticación HTTP (recomendado)">
@@ -71,17 +72,17 @@
 <!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 los clic en vínculos y recargas de páginas desde distintos estados de Tor (opcional)">
-<!ENTITY torbutton.prefs.jar_certs "Guardar certificados SSL en jarras separadas para Tor/No Tor (recomendado)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Guardar certificados CA en jarras separadas para Tor/No Tor (recomendado)">
+<!ENTITY torbutton.prefs.jar_certs "Guardar certificados SSL en jars separadas para Tor/No Tor (recomendado)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Guardar certificados CA en jars separadas para Tor/No Tor (recomendado)">
 <!ENTITY torbutton.prefs.locked_mode "Deshabilitar el botón y las teclas directas para evitar cambios accidentales">
 <!ENTITY torbutton.prefs.startup_state "En el arranque normal, establezca el estado de Tor en:">
 <!ENTITY torbutton.prefs.shutdown_state "Estado de apagado">
 <!ENTITY torbutton.prefs.startup "Arranque">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
+<!ENTITY torbutton.prefs.block_tor_file_net "Bloquear el acceso de Tor a la red desde archivos en direcciones archivo:// url (recomendado)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Bloquear el acceso sin Tor a la red desde archivos en direcciones archivo:// url">
 <!ENTITY torbutton.prefs.restore_defaults "Restablecer valores predeterminados">
 <!ENTITY torbutton.prefs.test_settings "Configuración de prueba">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
+<!ENTITY torbutton.prefs.test_auto "Probar configuración Tor en cada inicio de Firefox a partir de la primera a activación">
 <!ENTITY torbutton.prefs.disable_livemarks "Deshabilitar las marcas de actualizaciones durante el uso de Tor">
 <!ENTITY torbutton.prefs.tor_memory_jar "No escribir en el disco las cookies de Tor">
 <!ENTITY torbutton.prefs.nontor_memory_jar "No escribir en el disco las cookies que no sean de Tor">
diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties
index 3420759..07c08ae 100644
--- a/src/chrome/locale/es/torbutton.properties
+++ b/src/chrome/locale/es/torbutton.properties
@@ -10,11 +10,11 @@ extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton propor
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
 torbutton.popup.plugin.warning = Torbutton bloqueó la carga directa por Tor del contenido de un componente.\n\nUse la alternativa de â??Guardar Comoâ??.\n\n
 torbutton.popup.confirm_ca_certs = Nota de Torbutton: Parece que usted no tiene Autoridades de Certificado personalizadas. Examinar el listado de Autoridades de Certificado es una operación lenta y hace más lento el conmutador Tor. ¿Desea deshabilitar el aislamiento de los certificados de Autoridades de Certificado? (Si no entiende esto, se más seguro hacer clic en Aceptar)
-torbutton.popup.ff3.warning = ¡Advertencia!\nSe ha detectado que el Torbutton de Firefox 3 perdió su zona horaria y la marcas a través de Tor.\n\n¿Desea continuar de todos modos?\n
-torbutton.popup.toggle.warning = Tiene que conmutar a Tor o reiniciar para que sus preferencias entre en efecto.\n. \n
+torbutton.popup.ff3.warning = ¡Advertencia!\\nSe ha detectado que el Torbutton de Firefox 3 perdió su zona horaria y la marcas a través de Tor.\\n\\n¿Desea continuar de todos modos?\n
+torbutton.popup.toggle.warning = Tiene que conmutar a Tor o reiniciar para que sus preferencias entre en efecto.\\n. \n
 torbutton.popup.test.success = ¡La prueba del proxy Tor finalizó con éxito!
-torbutton.popup.test.failure = ¡La prueba del proxy Tor FALL�! Revise las preferencias de su Proxy y de Privoxy.
-torbutton.popup.test.confirm_toggle = La prueba más reciente del proxy Tor no tuvo éxito al emplear el Tor.\n ¿Está seguro de que desea habilitarlo de todos modos?
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Haga clic en Aceptar para probar las preferencias del proxy Tor. Esta prueba se hará en segundo plano. Por favor, tenga paciencia.
 torbutton.panel.label.verified = El Tor se verificó
 torbutton.popup.test.auto_failed = Las prueba automática del proxy Tor no pudo usar el Tor.\n ¿Está seguro de que desea habilitarlo de todos modos?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/eu/torbutton.dtd
+++ b/src/chrome/locale/eu/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/eu/torbutton.properties
+++ b/src/chrome/locale/eu/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd
index 4a31f8d..1e50239 100644
--- a/src/chrome/locale/fa/torbutton.dtd
+++ b/src/chrome/locale/fa/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "تÙ?ظÛ?Ù?ات Ù¾Û?شکار">
 <!ENTITY torbutton.prefs.recommended_settings "بکاربردÙ? تÙ?ظÛ?Ù?ات Ù¾Û?Ø´Ù?Ù?ادÛ? براÛ? Ù?سخÙ? Ù?اÛ?رÙ?اکس Ù?Ù?">
 <!ENTITY torbutton.prefs.use_privoxy "بکاربردÙ? پرÛ?Ù?کسÛ?">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "بکاربردÙ? تÙ?ظÛ?Ù?ات سÙ?ارشÛ? براÛ? Ù¾Û?شکار">
 <!ENTITY torbutton.prefs.proxy.host.http "Ù¾Û?شکار HTTP:">
 <!ENTITY torbutton.prefs.proxy.host.https "Ù¾Û?شکار SSL:">
diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties
index bcc29ef..93e4fd2 100644
--- a/src/chrome/locale/fa/torbutton.properties
+++ b/src/chrome/locale/fa/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Û?ادداشت دکÙ?Ù? تÙ?ر: بÙ?ظر Ù?Û?
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/fi/torbutton.dtd b/src/chrome/locale/fi/torbutton.dtd
index 9de43ba..e4f195d 100644
--- a/src/chrome/locale/fi/torbutton.dtd
+++ b/src/chrome/locale/fi/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Välityspalvelin Asetukset">
 <!ENTITY torbutton.prefs.recommended_settings "Käytä suositeltuja välityspalvelin asetuksia minun Firefox versiolleni.">
 <!ENTITY torbutton.prefs.use_privoxy "Käytä Privoxyä">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Aseta välityspalvelinasetukset käsin">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP-välityspalvelin:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL-välityspalvelin:">
diff --git a/src/chrome/locale/fi/torbutton.properties b/src/chrome/locale/fi/torbutton.properties
index 0e08eec..3250b59 100644
--- a/src/chrome/locale/fi/torbutton.properties
+++ b/src/chrome/locale/fi/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd
index 0985db6..78c0332 100644
--- a/src/chrome/locale/fr/torbutton.dtd
+++ b/src/chrome/locale/fr/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Paramètres du proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Utiliser les paramètres de proxy recommandés pour ma version de Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Utiliser Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Utiliser des paramètres de proxy personnalisés">
 <!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
 <!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties
index ffb9150..072ad79 100644
--- a/src/chrome/locale/fr/torbutton.properties
+++ b/src/chrome/locale/fr/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Info Torbutton: Vous n'avez pas de Certificat
 torbutton.popup.ff3.warning = Attention!\n\nTorbutton sur Firefox 3 est connu pour laisser échapper votre fuseau horaire et vos livemarks par Tor.\n\nVoulez vous continuer malgré tout?
 torbutton.popup.toggle.warning = Vous devez activer/désactiver Tor ou redémarrer pour que vos changements soient pris en compte.
 torbutton.popup.test.success = Test du proxy Tor réussi !
-torbutton.popup.test.failure = ECHEC du test du proxy Tor ! Vérifiez votre configuration de proxy et de Privoxy.
-torbutton.popup.test.confirm_toggle = Le dernier test de proxy Tor n'a pas réussi à utiliser Tor.\n\n�tes-vous sûr de vouloir tout de même l'activer ?
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Cliquez sur OK pour tester vos paramètres de proxy Tor. Ce test s'effectuera en tâche de fond. Merci de votre patience.
 torbutton.panel.label.verified = Tor Vérifié
 torbutton.popup.test.auto_failed = Le test automatique du proxy Tor n'a pas réussi à utiliser Tor.\n\n�tes vous sûr de vouloir tout de même l'activer ?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/fur/torbutton.dtd b/src/chrome/locale/fur/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/fur/torbutton.dtd
+++ b/src/chrome/locale/fur/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/fur/torbutton.properties b/src/chrome/locale/fur/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/fur/torbutton.properties
+++ b/src/chrome/locale/fur/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/gl/torbutton.dtd b/src/chrome/locale/gl/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/gl/torbutton.dtd
+++ b/src/chrome/locale/gl/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/gl/torbutton.properties b/src/chrome/locale/gl/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/gl/torbutton.properties
+++ b/src/chrome/locale/gl/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/gu/torbutton.dtd b/src/chrome/locale/gu/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/gu/torbutton.dtd
+++ b/src/chrome/locale/gu/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/gu/torbutton.properties b/src/chrome/locale/gu/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/gu/torbutton.properties
+++ b/src/chrome/locale/gu/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/he/torbutton.dtd
+++ b/src/chrome/locale/he/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/he/torbutton.properties b/src/chrome/locale/he/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/he/torbutton.properties
+++ b/src/chrome/locale/he/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/hi/torbutton.dtd b/src/chrome/locale/hi/torbutton.dtd
index 054e31c..8ea8deb 100644
--- a/src/chrome/locale/hi/torbutton.dtd
+++ b/src/chrome/locale/hi/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "प�र���स� स�����">
 <!ENTITY torbutton.prefs.recommended_settings "म�र� �ायर �ा��स �थन �� लिय� स��ाय� प�र���स� स��ि�� �पय�� �र� ">
 <!ENTITY torbutton.prefs.use_privoxy "प�रिव���स� �ा �पय�� �र�">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "व�यवाहारि� प�र���स� स��ि�� �ा �पय�� �र�">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP प�र���स�:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL प�र���स�:">
diff --git a/src/chrome/locale/hi/torbutton.properties b/src/chrome/locale/hi/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/hi/torbutton.properties
+++ b/src/chrome/locale/hi/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/hr/torbutton.dtd b/src/chrome/locale/hr/torbutton.dtd
index 2481440..0f2cbfc 100644
--- a/src/chrome/locale/hr/torbutton.dtd
+++ b/src/chrome/locale/hr/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Postavke">
 <!ENTITY torbutton.prefs.recommended_settings "Koristi preporuÄ?ene proxy postavke za moju inaÄ?icu Firefoxa">
 <!ENTITY torbutton.prefs.use_privoxy "Koristi Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Koristi prilagoÄ?ene proxy postavke">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/hr/torbutton.properties b/src/chrome/locale/hr/torbutton.properties
index 75e075a..9e59561 100644
--- a/src/chrome/locale/hr/torbutton.properties
+++ b/src/chrome/locale/hr/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/hu/torbutton.dtd
+++ b/src/chrome/locale/hu/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/hu/torbutton.properties b/src/chrome/locale/hu/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/hu/torbutton.properties
+++ b/src/chrome/locale/hu/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/id/torbutton.dtd
+++ b/src/chrome/locale/id/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/id/torbutton.properties b/src/chrome/locale/id/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/id/torbutton.properties
+++ b/src/chrome/locale/id/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/is/torbutton.dtd
+++ b/src/chrome/locale/is/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/is/torbutton.properties b/src/chrome/locale/is/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/is/torbutton.properties
+++ b/src/chrome/locale/is/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd
index 0c24bc8..40903c0 100644
--- a/src/chrome/locale/it/torbutton.dtd
+++ b/src/chrome/locale/it/torbutton.dtd
@@ -5,9 +5,10 @@
 <!ENTITY torbutton.prefs.panel_text_format "Testo">
 <!ENTITY torbutton.prefs.panel_icon_format "Icona">
 <!ENTITY torbutton.prefs.tor_settings "Configurazione del proxy">
-<!ENTITY torbutton.prefs.recommended_settings "Utilizza le impostazioni proxy consigliate per questa versione corrente">
+<!ENTITY torbutton.prefs.recommended_settings "Usa le impostazioni proxy consigliate per questa versione di Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Usa Privoxy">
-<!ENTITY torbutton.prefs.custom_settings "Usa le impostazioni proxy personalizzate">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
+<!ENTITY torbutton.prefs.custom_settings "Usa delle impostazioni proxy personalizzate">
 <!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
 <!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
 <!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:">
@@ -26,14 +27,14 @@
 <!ENTITY torbutton.context_menu.about "Informazioni su Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "I">
 <!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "Fare clic per avviare Torbutton">
+<!ENTITY torbutton.button.tooltip "Fai clic per avviare Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Impostazioni di sicurezza">
 <!ENTITY torbutton.prefs.block_thread "Blocca la lettura della cronologia durante l'uso di Tor (essenziale)">
 <!ENTITY torbutton.prefs.block_thwrite "Blocca la scrittura della cronologia durante l'uso di Tor (consigliato)">
 <!ENTITY torbutton.prefs.block_nthread "Blocca la lettura della cronologia quando non si usa Tor (facoltativo)">
 <!ENTITY torbutton.prefs.block_nthwrite "Blocca la scrittura della cronologia quando non si usa Tor (facoltativo)">
 <!ENTITY torbutton.prefs.clear_history "Cancella la cronologia di navigazione attivando o disattivando Tor (facoltativo)">
-<!ENTITY torbutton.prefs.clear_cache "Blocca l'uso della cache disco durante Tor e cancellala attivando o disattivando Tor">
+<!ENTITY torbutton.prefs.clear_cache "Blocca l'uso della cache disco durante l'uso di Tor e cancellala attivando o disattivando Tor">
 <!ENTITY torbutton.prefs.block_cache "Blocca l'accesso alla cache sul disco e in memoria durante l'uso di Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Conserva i cookie non-Tor in un deposito protetto">
 <!ENTITY torbutton.prefs.mmm_cookies "Gestisco da me i miei cookie (pericoloso)">
@@ -41,7 +42,7 @@
 <!ENTITY torbutton.prefs.disable_plugins "Disabilita i plugin usando Tor (essenziale)">
 <!ENTITY torbutton.prefs.kill_bad_js "Blocca i javascript pericolosi (essenziale)">
 <!ENTITY torbutton.prefs.isolate_content "Confina i contenuti dinamici allo stato di Tor (essenziale)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
+<!ENTITY torbutton.prefs.no_updates "Disabilita gli aggiornamenti durante l'uso di Tor">
 <!ENTITY torbutton.prefs.set_uagent "Imposta l'user agent usando Tor (essenziale)">
 <!ENTITY torbutton.prefs.dynamic "Contenuti dinamici">
 <!ENTITY torbutton.prefs.cookies "Cookie">
@@ -58,36 +59,36 @@
 <!ENTITY torbutton.prefs.disable_referer "Non inviare i referer usando Tor (alcuni siti potrebbero non funzionare)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disabilita DOM Storage quando si usa Tor (essenziale)">
 <!ENTITY torbutton.prefs.forms "Moduli">
-<!ENTITY torbutton.prefs.block_tforms "Blocca il salvataggio di password nei moduli usando Tor (consigliato)">
-<!ENTITY torbutton.prefs.block_ntforms "Blocca il salvataggio di password nei moduli quando non si usa Tor (facoltativo)">
+<!ENTITY torbutton.prefs.block_tforms "Blocca il salvataggio di password e dei dati nei moduli usando Tor (consigliato)">
+<!ENTITY torbutton.prefs.block_ntforms "Blocca il salvataggio di password e dei dati nei moduli quando non si usa Tor (facoltativo)">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.restore_tor "All'avvio di una sessione ripristinata, imposta lo stato di Tor così:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Ricarica il deposito dei cookie/cancella i cookie a un crash di Firefox (consigliato)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Conserva sia i cookie Tor sia quelli Non-Tor in depositi protetti (pericoloso)">
 <!ENTITY torbutton.prefs.clear_http_auth "Cancella le sessioni HTTP autenticate (consigliato)">
-<!ENTITY torbutton.prefs.block_js_history "Confina l'accesso alla cronologia di navigazione Tor (essenziale)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Ridimensiona la finestra a multipli di 40px all'attivazione di Tor (consigliato)">
+<!ENTITY torbutton.prefs.block_js_history "Confina l'accesso alla cronologia di navigazione nello stato di Tor (essenziale)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Ridimensiona la finestra a multipli di 50px durante l'uso di Tor (consigliato)">
 <!ENTITY torbutton.prefs.close_tor "Chiudi tutte le finestre e schede Tor quando si disattiva Tor (facoltativo)">
 <!ENTITY torbutton.prefs.close_nontor "Chiudi tutte le finestre e schede Non-Tor quando si attiva Tor (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.locked_mode "Disabilita il pulsante e le scorciatoie da tastiera per evitare di attivare/disattivare Tor per sbaglio">
+<!ENTITY torbutton.prefs.startup_state "All'avvio imposta lo stato di Tor così:">
+<!ENTITY torbutton.prefs.shutdown_state "Stato alla chiusura">
+<!ENTITY torbutton.prefs.startup "Avvio">
 <!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.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
+<!ENTITY torbutton.prefs.block_nontor_file_net "Blocca l'accesso non-Tor alla rete da indirizzi di tipo file:// (consigliato)">
+<!ENTITY torbutton.prefs.restore_defaults "Reimposta i valori di default">
+<!ENTITY torbutton.prefs.test_settings "Fai un test delle impostazioni">
+<!ENTITY torbutton.prefs.test_auto "Verifica le mie impostazioni Tor dopo la prima volta che lo attivo o disattivo ad ogni avvio di Firefox">
+<!ENTITY torbutton.prefs.disable_livemarks "Disabilita gli aggiornamenti dei livemarks durante l'uso di Tor">
+<!ENTITY torbutton.prefs.tor_memory_jar "Non scrivere cookie Tor sul disco">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Non scrivere cookie non-Tor sul disco">
+<!ENTITY torbutton.prefs.session_restore "Fai che il session store salvi e ripristini queste schede:">
+<!ENTITY torbutton.prefs.nontor_tabs "Schede caricate in non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Schede caricate in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties
index e6d0679..3a64f8b 100644
--- a/src/chrome/locale/it/torbutton.properties
+++ b/src/chrome/locale/it/torbutton.properties
@@ -6,24 +6,25 @@ torbutton.panel.plugins.disabled = Fai clic per attivare i plugin
 torbutton.panel.plugins.enabled = Fai clic per disattivare i plugin
 torbutton.panel.label.disabled = Tor disattivato
 torbutton.panel.label.enabled = Tor attivato
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = L'estensione mette a disposizione un pulsante per attivare e disattivare facilmente l'uso del proxy Tor in Firefox
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = L'estensione Torbutton fornisce un pulsante per attivare e disattivare facilmente l'uso del proxy Tor in Firefox
+torbutton.popup.history.warning = Torbutton ha bloccato la modifica della cronologia fatta in stati diversi. Questo serve ad aggirare un baco di sicurezza di Firefox.\n\nFai clic su 'invio' nella barra degli indirizzi oppure apri una nuova finestra od una nuova scheda.\n\n
 torbutton.popup.plugin.warning = Torbutton ha bloccato l'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'esame della lista delle Certification Authority è un'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 = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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 = Avviso di Torbutton: sembra che tu non abbia delle Certification Authority personalizzate. L'esame della lista delle Certification Authority è un'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 divulga il tuo fuso orario ed i tuoi livemark via Tor.\n\nVuoi continuare ugualmente?
+torbutton.popup.toggle.warning = Devi attivare7disattivare Tor o riavviare in modo che le tue impostazioni abbiano effetto.
+torbutton.popup.test.success = Il test del proxy Tor ha avuto successo!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Fai clic su OK per testare le impostazioni del proxy Tor. Questo test avverrà in background. Sii paziente.
+torbutton.panel.label.verified = Tor verificato
+torbutton.popup.test.auto_failed = Il test automatico del proxy Tor non è riuscito ad usare Tor.\n\nSei sicuro di volerlo abilitare ugualmente?
+torbutton.prefs.recommended = (raccomandato)
+torbutton.prefs.optional = (facoltativo)
+torbutton.prefs.crucial = (essenziale)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/ja/torbutton.dtd
+++ b/src/chrome/locale/ja/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/ja/torbutton.properties
+++ b/src/chrome/locale/ja/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/ka/torbutton.dtd
+++ b/src/chrome/locale/ka/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/ka/torbutton.properties b/src/chrome/locale/ka/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/ka/torbutton.properties
+++ b/src/chrome/locale/ka/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/km/torbutton.dtd b/src/chrome/locale/km/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/km/torbutton.dtd
+++ b/src/chrome/locale/km/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/km/torbutton.properties b/src/chrome/locale/km/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/km/torbutton.properties
+++ b/src/chrome/locale/km/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/ko/torbutton.dtd
+++ b/src/chrome/locale/ko/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/ko/torbutton.properties
+++ b/src/chrome/locale/ko/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/ku/torbutton.dtd b/src/chrome/locale/ku/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/ku/torbutton.dtd
+++ b/src/chrome/locale/ku/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/ku/torbutton.properties b/src/chrome/locale/ku/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/ku/torbutton.properties
+++ b/src/chrome/locale/ku/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/mt/torbutton.dtd b/src/chrome/locale/mt/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/mt/torbutton.dtd
+++ b/src/chrome/locale/mt/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/mt/torbutton.properties b/src/chrome/locale/mt/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/mt/torbutton.properties
+++ b/src/chrome/locale/mt/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd
index b4b7ab8..cbf82a9 100644
--- a/src/chrome/locale/nb/torbutton.dtd
+++ b/src/chrome/locale/nb/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxyinnstillinger">
 <!ENTITY torbutton.prefs.recommended_settings "Bruk anbefalte proxyinnstillinger for min versjon av Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Bruk Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Bruk egne proxyinnstillinger">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP-proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL-proxy:">
diff --git a/src/chrome/locale/nb/torbutton.properties b/src/chrome/locale/nb/torbutton.properties
index 4db19e2..d06b675 100644
--- a/src/chrome/locale/nb/torbutton.properties
+++ b/src/chrome/locale/nb/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Advarsel!\n\nTorbutton i Firefox 3 er kjent for å lekke tidssone og live-bokmerker via Tor.\n\n�nsker du å fortsette allikevel?
 torbutton.popup.toggle.warning = Du må toggle (deaktivere+aktivere) Tor eller starte nettleseren på nytt for at endringene skal tre i kraft.
 torbutton.popup.test.success = Tor proxy-test vellykket!
-torbutton.popup.test.failure = Tor proxy-test feilet! Sjekk proxy- og Privoxy-innstillingene dine.
-torbutton.popup.test.confirm_toggle = Den nyeste Tor proxy-testen klarte ikke bruke Tor.\n\nEr du sikker på at du vil aktivere allikevel?
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Klikk OK for å teste Tor proxy-innstillinger. Denne testen vil kjøre i bakgrunnen. Vær tålmodig.
 torbutton.panel.label.verified = Tor verifisert
 torbutton.popup.test.auto_failed = Den automatiske Tor proxy-testen klarte ikke bruke Tor.\n\nEr du sikker på at du ønsker å aktivere allikevel?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd
index 8085a6e..ca4e276 100644
--- a/src/chrome/locale/nl/torbutton.dtd
+++ b/src/chrome/locale/nl/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy-instellingen">
 <!ENTITY torbutton.prefs.recommended_settings "De aanbevolen proxy-instellingen voor mijn versie van Firefox gebruiken">
 <!ENTITY torbutton.prefs.use_privoxy "Privoxy gebruiken">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Aangepaste proxy-instellingen gebruiken">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL proxy:">
diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties
index e7b9c60..7e9ded1 100644
--- a/src/chrome/locale/nl/torbutton.properties
+++ b/src/chrome/locale/nl/torbutton.properties
@@ -1,5 +1,5 @@
 torbutton.button.tooltip.disabled = Tor inschakelen
-torbutton.button.tooltip.enabled = Tot uitschakelen
+torbutton.button.tooltip.enabled = Tor uitschakelen
 torbutton.panel.tooltip.disabled = Klik hier om Tor in te schakelen
 torbutton.panel.tooltip.enabled = Klik hier om Tor uit te schakelen
 torbutton.panel.plugins.disabled = Click to enable plugins
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/pa/torbutton.dtd b/src/chrome/locale/pa/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/pa/torbutton.dtd
+++ b/src/chrome/locale/pa/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/pa/torbutton.properties b/src/chrome/locale/pa/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/pa/torbutton.properties
+++ b/src/chrome/locale/pa/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd
index c2f03f7..55d2327 100644
--- a/src/chrome/locale/pl/torbutton.dtd
+++ b/src/chrome/locale/pl/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Ustawienia proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Użyj zalecanych ustawieÅ? proxy dla tej wersji Firefoksa">
 <!ENTITY torbutton.prefs.use_privoxy "Użyj Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Użyj ustawieÅ? proxy użytkownika">
 <!ENTITY torbutton.prefs.proxy.host.http "Serwer proxy HTTP:">
 <!ENTITY torbutton.prefs.proxy.host.https "Serwer proxy SSL:">
@@ -41,7 +42,7 @@
 <!ENTITY torbutton.prefs.disable_plugins "WyÅ?Ä?cz wtyczki podczas użycia Tor (krytyczne)">
 <!ENTITY torbutton.prefs.kill_bad_js "Nadzoruj niebezpieczne skrypty (krytyczne)">
 <!ENTITY torbutton.prefs.isolate_content "Izoluj treÅ?Ä? dynamicznÄ? (krytyczne)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
+<!ENTITY torbutton.prefs.no_updates "WyÅ?Ä?cz uaktualnienia podczas używanie Tora">
 <!ENTITY torbutton.prefs.set_uagent "Ustaw identyfikacjÄ? przeglÄ?darki podczas używania Tora (ważne)">
 <!ENTITY torbutton.prefs.dynamic "ZawartoÅ?Ä? dynamiczna">
 <!ENTITY torbutton.prefs.cookies "Ciasteczka">
@@ -62,7 +63,7 @@
 <!ENTITY torbutton.prefs.block_ntforms "Blokuj zapamiÄ?tywanie haseÅ? z formularzy gdy Tor nieaktywny (opcjonalnie)">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "bez Tora">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.restore_tor "Po przywróceniu sesji, ustaw stan Tora na:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "UsuÅ? ciasteczka z magazynów przy nieoczekiwanym zamkniÄ?ciu Firefoxa (zalecane)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Zapisuj wszystkie ciasteczka w zabezpieczonych magazynach(niebezpieczne)">
 <!ENTITY torbutton.prefs.clear_http_auth "CzyÅ?Ä? sesje autentykacji HTTP (zalecane)">
@@ -73,21 +74,21 @@
 <!ENTITY torbutton.prefs.block_links "Blokuj klikanie na Å?Ä?cza i przeÅ?adowania strony gdy zmieniÅ? siÄ? status Tora (opcjonalnie)">
 <!ENTITY torbutton.prefs.jar_certs "Zapisuj cetryfikaty SSL w osobnych magazynach, w każdym trybie (zalecane)">
 <!ENTITY torbutton.prefs.jar_ca_certs "Zapisuj certyfikaty CA w osobnych magazynach, w każdym trybie (zalecane)">
-<!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.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.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
+<!ENTITY torbutton.prefs.locked_mode "Zablokuj przycisk i gorÄ?ce klawisze aby uniknÄ?Ä? przypadkowego przeÅ?Ä?czenia">
+<!ENTITY torbutton.prefs.startup_state "Podczas normalnego uruchomienia, ustaw stan Tora na:">
+<!ENTITY torbutton.prefs.shutdown_state "Stan przy wyÅ?Ä?czeniu">
+<!ENTITY torbutton.prefs.startup "Uruchomienie">
+<!ENTITY torbutton.prefs.block_tor_file_net "Blokuj dostÄ?p do sieci z odnoÅ?ników file:// (zalecane)">
+<!ENTITY torbutton.prefs.block_nontor_file_net "Blokuj dostÄ?p do sieci z odnoÅ?ników file:// (gdy Tor jest wyÅ?Ä?czony)">
+<!ENTITY torbutton.prefs.restore_defaults "Ustawienia domyÅ?lne">
+<!ENTITY torbutton.prefs.test_settings "Testuj ustawienia">
+<!ENTITY torbutton.prefs.test_auto "Testuj moje ustawienia podczas pierwszego wÅ?Ä?czenia Tora po starcie Firefoxa">
+<!ENTITY torbutton.prefs.disable_livemarks "WyÅ?Ä?cz uaktualnienia livemarks podczas używania Tora">
+<!ENTITY torbutton.prefs.tor_memory_jar "Nie zapisuj ciasteczek Tora na dysk">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Nie zapisuj ciasteczek na dysk (tryb bez Tora)">
+<!ENTITY torbutton.prefs.session_restore "Niech sesja zapamiÄ?tuje i przywraca te zakÅ?adki:">
+<!ENTITY torbutton.prefs.nontor_tabs "ZakÅ?adki otwarte w trybie bez Tora">
+<!ENTITY torbutton.prefs.tor_tabs "ZakÅ?adki otwarte w trybie Tora">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties
index 004181a..9a91d76 100644
--- a/src/chrome/locale/pl/torbutton.properties
+++ b/src/chrome/locale/pl/torbutton.properties
@@ -7,23 +7,24 @@ torbutton.panel.plugins.enabled = Kliknij aby wyÅ?Ä?czyÄ? wtyczki
 torbutton.panel.label.disabled = Tor wyÅ?Ä?czony
 torbutton.panel.label.enabled = Tor wÅ?Ä?czony
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Rozszerzenie posiada przycisk do Å?atwego wÅ?Ä?czania/wyÅ?Ä?czania proxy Tor
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+torbutton.popup.history.warning = Torbutton zablokowaÅ? manipulowanie historiÄ?, aby zaÅ?ataÄ? niebezpiecznÄ? lukÄ? w Firefoxie.\n\nNaciÅ?nij 'Enter' w polu adresu lub otwórz nowÄ? zakÅ?adkÄ? lub okno.\n\n
 torbutton.popup.plugin.warning = Torbutton zablokowaÅ? bezpoÅ?rednie odwoÅ?anie do Sieci przez plugin.\n\nUżyj Zapisz jako.\n\n
 torbutton.popup.confirm_ca_certs = Informacja Torbutton: WyglÄ?da na to, że nie posiadasz dodatkowych wpisów OÅ?rodków CertyfikujÄ?cych. Posiadanie takiej listy spowalnia przeÅ?Ä?czanie trybów Tora. Czy chciaÅ?byÅ? wyÅ?Ä?czyÄ? sprawdzanie OÅ?rodków CertyfikujÄ?cych? (jeÅ?li tego nie rozumiesz, możesz bezpiecznie kliknÄ?Ä? OK)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.ff3.warning = Uwaga!\n\nTorbutton na Firefox-ie 3 ujawnia TwojÄ? strefÄ? czasowÄ? oraz livemarks.\n\nCzy mimo to chcesz kontynuowaÄ??
+torbutton.popup.toggle.warning = Musisz ponownie wÅ?Ä?czyÄ? Tora aby ustawienia odniosÅ?y skutek.
+torbutton.popup.test.success = Test proxy zakoÅ?czony pomyÅ?lnie!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Kliknij OK aby przetestowaÄ? ustawienia proxy. Testowanie odbywa siÄ? w tle. Prosimy o cierpliwoÅ?Ä?.
+torbutton.panel.label.verified = Tor obecny
+torbutton.popup.test.auto_failed = Automatyczny test proxy Tora zakoÅ?czyÅ? siÄ? niepowodzeniem.\n\nCzy mimo to chcesz kontynuowaÄ??
+torbutton.prefs.recommended = (zalecane)
+torbutton.prefs.optional = (opcjonalnie)
+torbutton.prefs.crucial = (wymagane)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd
index 3a98dea..3a4de25 100644
--- a/src/chrome/locale/pt-BR/torbutton.dtd
+++ b/src/chrome/locale/pt-BR/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Configurações Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Usar as cinfigurações recomendadas de proxy para minha versão de Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Usar Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Usar configurações padrão de proxy">
 <!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
 <!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
@@ -80,7 +81,7 @@
 <!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_settings "Testar configurações">
 <!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.tor_memory_jar "Do not write Tor cookies to disk">
diff --git a/src/chrome/locale/pt-BR/torbutton.properties b/src/chrome/locale/pt-BR/torbutton.properties
index 4f8ed96..4b778e1 100644
--- a/src/chrome/locale/pt-BR/torbutton.properties
+++ b/src/chrome/locale/pt-BR/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton: Você não possui nenhum Certifica
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd
index 9a4266f..0a12d8c 100644
--- a/src/chrome/locale/pt/torbutton.dtd
+++ b/src/chrome/locale/pt/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Configurações Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Usar as cinfigurações recomendadas de proxy para minha versão de Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Usar Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Usar configurações padrão de proxy">
 <!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
 <!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties
index 4f8ed96..4b778e1 100644
--- a/src/chrome/locale/pt/torbutton.properties
+++ b/src/chrome/locale/pt/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton: Você não possui nenhum Certifica
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/ro/torbutton.dtd b/src/chrome/locale/ro/torbutton.dtd
index cd4b386..74c46ef 100644
--- a/src/chrome/locale/ro/torbutton.dtd
+++ b/src/chrome/locale/ro/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
@@ -16,18 +17,18 @@
 <!ENTITY torbutton.prefs.proxy.port "Port:">
 <!ENTITY torbutton.about.title "About Torbutton">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
+<!ENTITY torbutton.pref_connection.more_info "Informatii suplimentare">
+<!ENTITY torbutton.pref_connection_more_info.title "Ajutor">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
+<!ENTITY torbutton.context_menu.toggle "Comutarea starii Tor">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
+<!ENTITY torbutton.context_menu.preferences "Preferinte">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
+<!ENTITY torbutton.context_menu.about "Despre Butonul Tor">
 <!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.button.label "Butonul Tor">
+<!ENTITY torbutton.button.tooltip "Click pentru initializarea Butonului Tor">
+<!ENTITY torbutton.prefs.sec_settings "Setari de securitate">
 <!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)">
@@ -43,12 +44,12 @@
 <!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
 <!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
 <!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.dynamic "Conţinut dinamic ">
 <!ENTITY torbutton.prefs.cookies "Cookies">
 <!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.history "Cronologie (istorie)">
 <!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.shutdown "Inchide">
 <!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">
@@ -60,8 +61,8 @@
 <!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.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
+<!ENTITY torbutton.prefs.tor "Tor-DA">
+<!ENTITY torbutton.prefs.non_tor "Tor-NU">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
 <!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)">
diff --git a/src/chrome/locale/ro/torbutton.properties b/src/chrome/locale/ro/torbutton.properties
index 4486d74..c51d069 100644
--- a/src/chrome/locale/ro/torbutton.properties
+++ b/src/chrome/locale/ro/torbutton.properties
@@ -12,9 +12,9 @@ torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin con
 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 livemarks via Tor.\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 = Test proxy Tor cu success!
-torbutton.popup.test.failure = Testul proxy Tor EÅ?UAT! VerificaÅ£i setÄ?rile proxy Å?i Privoxy.
-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.success = Test proxy Tor cu succes!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = ApasÄ? OK pentru a testa setÄ?rile proxy Tor. Acest test se va efectua în spate. VÄ? rugÄ?m sÄ? aveÅ£i rÄ?bdare.
 torbutton.panel.label.verified = Verificat Tor
 torbutton.popup.test.auto_failed = Testul automat pentru proxy Tor a eÅ?uat la folosirea Tor.\n\nSunteÅ£i sigur cÄ? vreÅ£i sÄ? permiteÅ£i oricum?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd
index 66844b3..ba67a3f 100644
--- a/src/chrome/locale/ru/torbutton.dtd
+++ b/src/chrome/locale/ru/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Ð?аÑ?Ñ?Ñ?ойки пÑ?окÑ?и">
 <!ENTITY torbutton.prefs.recommended_settings "Ð?Ñ?полÑ?зоваÑ?Ñ? паÑ?амеÑ?Ñ?Ñ? пÑ?окÑ?и, Ñ?екомендованнÑ?е длÑ? данной веÑ?Ñ?ии Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Ð?Ñ?полÑ?зоваÑ?Ñ? Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "УÑ?Ñ?ановиÑ?Ñ? паÑ?амеÑ?Ñ?Ñ? пÑ?окÑ?и вÑ?Ñ?Ñ?нÑ?Ñ?">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP-пÑ?окÑ?и:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL-пÑ?окÑ?и:">
@@ -41,7 +42,7 @@
 <!ENTITY torbutton.prefs.disable_plugins "Ð?Ñ?клÑ?Ñ?аÑ?Ñ? плагинÑ? пÑ?и иÑ?полÑ?зовании Tor (важно)">
 <!ENTITY torbutton.prefs.kill_bad_js "Ð?еÑ?еÑ?ваÑ?Ñ?ваÑ?Ñ? опаÑ?нÑ?й код javascript (важно)">
 <!ENTITY torbutton.prefs.isolate_content "Ð?гÑ?аниÑ?иÑ?Ñ? динамиÑ?еÑ?кое Ñ?одеÑ?жание Ñ?екÑ?Ñ?им Ñ?ежимом Tor (важно)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
+<!ENTITY torbutton.prefs.no_updates "Ð?Ñ?клÑ?Ñ?иÑ?Ñ? обновлениÑ? во вÑ?емÑ? иÑ?полÑ?зованиÑ? Tor">
 <!ENTITY torbutton.prefs.set_uagent "Ð?аÑ?киÑ?оваÑ?Ñ? полÑ?зоваÑ?елÑ? пÑ?и иÑ?полÑ?зовании Tor (важно)">
 <!ENTITY torbutton.prefs.dynamic "СодеÑ?жание">
 <!ENTITY torbutton.prefs.cookies "Cookies">
@@ -62,7 +63,7 @@
 <!ENTITY torbutton.prefs.block_ntforms "Ð?локиÑ?оваÑ?Ñ? Ñ?оÑ?Ñ?анение паÑ?олей и даннÑ?Ñ? Ñ?оÑ?м пÑ?и оÑ?клÑ?Ñ?енном Tor (необÑ?з.)">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "не-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.restore_tor "Ð?о вÑ?емÑ? запÑ?Ñ?ка, еÑ?ли воÑ?Ñ?Ñ?анавливаеÑ?Ñ?Ñ? Ñ?еÑ?Ñ?иÑ?, Ñ?Ñ?Ñ?ановиÑ?Ñ? Ñ?оÑ?Ñ?оÑ?ние Tor в:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Ð?оÑ?Ñ?Ñ?анавливаÑ?Ñ?/оÑ?иÑ?аÑ?Ñ? cookies поÑ?ле аваÑ?ии Firefox (желаÑ?елÑ?но)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Ð¥Ñ?аниÑ?Ñ? вÑ?е cookies в заÑ?иÑ?еннÑ?Ñ? Ñ?айлаÑ? (опаÑ?но)">
 <!ENTITY torbutton.prefs.clear_http_auth "Ð?Ñ?иÑ?аÑ?Ñ? Ñ?еÑ?Ñ?ии аÑ?Ñ?енÑ?иÑ?икаÑ?ии HTTP (желаÑ?елÑ?но)">
@@ -73,21 +74,21 @@
 <!ENTITY torbutton.prefs.block_links "Ð?локиÑ?оваÑ?Ñ? Ñ?елÑ?ки по Ñ?Ñ?Ñ?лкам и пеÑ?езагÑ?Ñ?зкÑ? Ñ?Ñ?Ñ?аниÑ? из Ñ?азнÑ?Ñ? Ñ?ежимов Tor (необÑ?з.)">
 <!ENTITY torbutton.prefs.jar_certs "Ð¥Ñ?аниÑ?Ñ? SSL Ñ?еÑ?Ñ?иÑ?икаÑ?Ñ? в Ñ?азделÑ?нÑ?Ñ? jar-Ñ?айлаÑ? длÑ? Tor/не-Tor (желаÑ?елÑ?но)">
 <!ENTITY torbutton.prefs.jar_ca_certs "Ð¥Ñ?аниÑ?Ñ? CA Ñ?еÑ?Ñ?иÑ?икаÑ?Ñ? в Ñ?азделÑ?нÑ?Ñ? jar-Ñ?айлаÑ? длÑ? Tor/не-Tor (желаÑ?елÑ?но)">
-<!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.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.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
+<!ENTITY torbutton.prefs.locked_mode 'Ð?Ñ?клÑ?Ñ?иÑ?Ñ? "Ð?нопкÑ?" и "Ð?оÑ?Ñ?Ñ?ие Ð?лавиÑ?и" длÑ? пеÑ?доÑ?вÑ?аÑ?енÑ? Ñ?лÑ?Ñ?айного пеÑ?еклÑ?Ñ?ениÑ? Ñ?ежима'>
+<!ENTITY torbutton.prefs.startup_state "Ð?Ñ?и ноÑ?малÑ?ном запÑ?Ñ?ке (без воÑ?Ñ?Ñ?ановлениÑ? Ñ?еÑ?Ñ?ии), Ñ?Ñ?Ñ?анавливаÑ?Ñ? Ñ?оÑ?Ñ?оÑ?ние Tor в:">
+<!ENTITY torbutton.prefs.shutdown_state "Ð?Ñ?клÑ?Ñ?еное Ñ?оÑ?Ñ?оÑ?ние">
+<!ENTITY torbutton.prefs.startup "Ð?апÑ?Ñ?к">
+<!ENTITY torbutton.prefs.block_tor_file_net "Ð?локиÑ?оваÑ?Ñ? доÑ?Ñ?Ñ?п к Ñ?еÑ?и в Ñ?ежиме Tor, оÑ? адÑ?еÑ?ов Ñ?ипа file:// (Ñ?екомендÑ?еÑ?Ñ?Ñ?)">
+<!ENTITY torbutton.prefs.block_nontor_file_net "Ð?локиÑ?оваÑ?Ñ? доÑ?Ñ?Ñ?п к Ñ?еÑ?и в Ñ?ежиме Ð?е-Tor, оÑ? адÑ?еÑ?ов Ñ?ипа file://">
+<!ENTITY torbutton.prefs.restore_defaults "Ð?оÑ?Ñ?Ñ?ановиÑ?Ñ? знаÑ?ениÑ? по Ñ?молÑ?аниÑ?">
+<!ENTITY torbutton.prefs.test_settings "Ð?Ñ?овеÑ?иÑ?Ñ? наÑ?Ñ?Ñ?ойки">
+<!ENTITY torbutton.prefs.test_auto "Ð?Ñ?овеÑ?Ñ?Ñ?Ñ? наÑ?Ñ?Ñ?ойки Tor, каждÑ?й Ñ?аз когда Ñ? вклÑ?Ñ?аÑ? Ñ?Ñ?оÑ? Ñ?ежим пÑ?и каждом запÑ?Ñ?ке Firefox">
+<!ENTITY torbutton.prefs.disable_livemarks "Ð?Ñ?клÑ?Ñ?иÑ?Ñ? обновление livemarks во вÑ?емÑ? Ñ?абоÑ?Ñ? в Tor">
+<!ENTITY torbutton.prefs.tor_memory_jar "Ð?е пиÑ?аÑ?Ñ? cookies на диÑ?к в Ñ?ежиме Tor">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Ð?е пиÑ?аÑ?Ñ? cookies на диÑ?к в Ñ?ежиме Ð?е-Tor">
+<!ENTITY torbutton.prefs.session_restore "Ð?ожеÑ? ли Ñ?Ñ?аниÑ?Ñ?Ñ?Ñ? Ñ?оÑ?Ñ?анÑ?Ñ?Ñ?Ñ?Ñ? и воÑ?Ñ?анавливаÑ?Ñ?Ñ?Ñ? Ñ?еÑ?Ñ?иÑ? Ñ?о Ñ?ледÑ?Ñ?Ñ?ими вкладками:">
+<!ENTITY torbutton.prefs.nontor_tabs "Ð?кладки загÑ?Ñ?женÑ?е вне Ñ?ежима Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Ð?кладки загÑ?Ñ?женÑ?е в Ñ?ежиме Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties
index 40764d5..c725e8e 100644
--- a/src/chrome/locale/ru/torbutton.properties
+++ b/src/chrome/locale/ru/torbutton.properties
@@ -7,23 +7,24 @@ 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 blocked changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
+torbutton.popup.history.warning = Torbutton блокиÑ?Ñ?еÑ? Ñ?абоÑ?Ñ? Ñ? иÑ?Ñ?оÑ?ией бÑ?оÑ?зеÑ?а. ЭÑ?о позволÑ?еÑ? Ñ?Ñ?Ñ?Ñ?аниÑ?Ñ? оÑ?ибкÑ? в безопаÑ?ноÑ?Ñ?и Firefox.\n\nÐ?ажмиÑ?е 'enter' в адÑ?еÑ?ной Ñ?Ñ?Ñ?оке либо оÑ?кÑ?ойÑ?е новÑ?Ñ? вкладкÑ? или окно.\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 livemarks via Tor.\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 = Ð?Ñ?имеÑ?аение: Ð?Ñ?евидно Ñ? ваÑ? неÑ? индивидÑ?алÑ?нÑ?Ñ? СеÑ?Ñ?иÑ?икаÑ?ов Ð?вÑ?оÑ?изаÑ?ии. Ð?Ñ?овеÑ?ка Ñ?пиÑ?ка СеÑ?Ñ?иÑ?икаÑ?ов Ð?вÑ?оÑ?изаÑ?ии медленнаÑ? опеÑ?аÑ?иÑ? и замедлÑ?еÑ? пеÑ?еклÑ?Ñ?ение Tor. ХоÑ?иÑ?е оÑ?клÑ?Ñ?иÑ?Ñ? изолÑ?Ñ?иÑ? СеÑ?Ñ?иÑ?икаÑ?ов Ð?вÑ?оÑ?изаÑ?ии? (Ð?Ñ?ли Ð?Ñ? не понимаеÑ?е о Ñ?ем Ñ?еÑ?Ñ?, безопаÑ?ней нажаÑ?Ñ? OK)
+torbutton.popup.ff3.warning = Ð?нимание!\n\nTorbutton в Firefox 3 как извеÑ?Ñ?но оÑ?кÑ?Ñ?ваеÑ? возможноÑ?Ñ?Ñ? Ñ?Ñ?еÑ?ки даннÑ?Ñ? о ваÑ?ей вÑ?еменной зоне и livemarks поÑ?Ñ?едÑ?Ñ?вом Tor.\n\nÐ?Ñ?е еÑ?Ñ? Ñ?оÑ?иÑ?е пÑ?одолжиÑ?Ñ? ?
+torbutton.popup.toggle.warning = Ð?лÑ? Ñ?ого Ñ?Ñ?обÑ? изменениÑ? вÑ?Ñ?Ñ?пили в Ñ?илÑ?. Ð?ам необÑ?одимо вÑ?клÑ?Ñ?иÑ?Ñ? и пеÑ?езапÑ?Ñ?Ñ?иÑ?Ñ? Tor.
+torbutton.popup.test.success = Tor proxy Ñ?еÑ?Ñ? Ñ?Ñ?пеÑ?но пÑ?ойден!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Ð?ажмиÑ?е OK длÑ? пÑ?овеÑ?ки наÑ?Ñ?Ñ?оек Tor. ЭÑ?оÑ? Ñ?еÑ?Ñ? вÑ?полнÑ?еÑ?Ñ?Ñ? в Ñ?оне. Ð?ожалÑ?йÑ?Ñ?а бÑ?дÑ?Ñ?е Ñ?еÑ?пеливÑ?.Ð?ождиÑ?еÑ?Ñ? Ñ?езÑ?лÑ?Ñ?аÑ?ов.
+torbutton.panel.label.verified = Tor Ð?Ñ?овеÑ?ен
+torbutton.popup.test.auto_failed = Ð?вÑ?омаÑ?иÑ?еÑ?кий Ñ?еÑ?Ñ? Tor proxy не можеÑ? иÑ?полÑ?зоваÑ?Ñ? Tor Ñ?еÑ?Ñ?.\n\nÐ?Ñ? Ñ?веÑ?енÑ? Ñ?Ñ?о Ñ?оÑ?иÑ?е вклÑ?Ñ?иÑ?Ñ? Tor не Ñ?моÑ?Ñ?Ñ? на пÑ?овал Ñ?еÑ?Ñ?а?
+torbutton.prefs.recommended = (Ñ?екомендÑ?еÑ?Ñ?Ñ?)
+torbutton.prefs.optional = (по желаниÑ?)
+torbutton.prefs.crucial = (кÑ?иÑ?иÑ?но)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/sl/torbutton.dtd b/src/chrome/locale/sl/torbutton.dtd
index 2cd4d24..5f4ec2c 100644
--- a/src/chrome/locale/sl/torbutton.dtd
+++ b/src/chrome/locale/sl/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Nastavitve posredniškega (proxy) strežnika">
 <!ENTITY torbutton.prefs.recommended_settings "Uporabi priporoÄ?ene nastavitve posredniÅ¡kega strežnika za mojo razliÄ?ico Firefoxa">
 <!ENTITY torbutton.prefs.use_privoxy "Uporabi tudi povezavo preko Privoxy-a">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Uporabi nastavitve proxy strežnika po meri">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP posredniški strežnik:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL posredniški strežnik:">
diff --git a/src/chrome/locale/sl/torbutton.properties b/src/chrome/locale/sl/torbutton.properties
index 6a5b2e6..0e2d37d 100644
--- a/src/chrome/locale/sl/torbutton.properties
+++ b/src/chrome/locale/sl/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/sq/torbutton.dtd b/src/chrome/locale/sq/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/sq/torbutton.dtd
+++ b/src/chrome/locale/sq/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/sq/torbutton.properties b/src/chrome/locale/sq/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/sq/torbutton.properties
+++ b/src/chrome/locale/sq/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/sv/torbutton.dtd
+++ b/src/chrome/locale/sv/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/sv/torbutton.properties
+++ b/src/chrome/locale/sv/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/sw/torbutton.dtd b/src/chrome/locale/sw/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/sw/torbutton.dtd
+++ b/src/chrome/locale/sw/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/sw/torbutton.properties b/src/chrome/locale/sw/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/sw/torbutton.properties
+++ b/src/chrome/locale/sw/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/th/torbutton.dtd b/src/chrome/locale/th/torbutton.dtd
index 7d82465..75ada49 100644
--- a/src/chrome/locale/th/torbutton.dtd
+++ b/src/chrome/locale/th/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "�ำห����า Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "�ำ���า Proxy �ี��หมาะสมมา����ั� Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "�ำ Privoxy มา���">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "�ำ Proxy �ี��ำห��มา���">
 <!ENTITY torbutton.prefs.proxy.host.http "��า HTTP Proxy :">
 <!ENTITY torbutton.prefs.proxy.host.https "��า SSL Proxy :">
diff --git a/src/chrome/locale/th/torbutton.properties b/src/chrome/locale/th/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/th/torbutton.properties
+++ b/src/chrome/locale/th/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/tr/torbutton.dtd
+++ b/src/chrome/locale/tr/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties
index 1efcc32..0ab4f18 100644
--- a/src/chrome/locale/tr/torbutton.properties
+++ b/src/chrome/locale/tr/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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 testi bÅ?arıyla gerçekleÅ?ti
-torbutton.popup.test.failure = Proxy testi baÅ?arısız oldu!Lütfen proxyinizi ve ayarlarını kontrol ediniz.
-torbutton.popup.test.confirm_toggle = En son yapmıÅ? olduÄ?unuz proxy testi baÅ?arısız oldu.\n
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Tamama tıklayarak proxy ayarlarını test edin. Test arkaplanda gerçekleÅ?iyor.Lütfen bekleyin.
 torbutton.panel.label.verified = Tor doÄ?ruladı
 torbutton.popup.test.auto_failed = Otomatik gerçekleÅ?en proxy testi baÅ?arız oldu.\n
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/uk/torbutton.dtd b/src/chrome/locale/uk/torbutton.dtd
index 0f5a162..59fb224 100644
--- a/src/chrome/locale/uk/torbutton.dtd
+++ b/src/chrome/locale/uk/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Ð?лаÑ?Ñ?ивоÑ?Ñ?Ñ? пÑ?окÑ?Ñ?">
 <!ENTITY torbutton.prefs.recommended_settings "Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и Ñ?екомендованÑ? знаÑ?еннÑ? длÑ? моÑ?Ñ? веÑ?Ñ?Ñ?Ñ? ФÑ?Ñ?еÑ?оÑ?Ñ?">
 <!ENTITY torbutton.prefs.use_privoxy "Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и незвиÑ?нÑ? налаÑ?Ñ?Ñ?ваннÑ? пÑ?окÑ?Ñ?">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP пÑ?окÑ?Ñ?:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL пÑ?окÑ?Ñ?:">
diff --git a/src/chrome/locale/uk/torbutton.properties b/src/chrome/locale/uk/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/uk/torbutton.properties
+++ b/src/chrome/locale/uk/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd
index eabd97e..8e75c16 100644
--- a/src/chrome/locale/vi/torbutton.dtd
+++ b/src/chrome/locale/vi/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Thiết lập Proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Dùng thiết lập proxy Ä?ã khuyến nghá»? cho Firefox của tôi">
 <!ENTITY torbutton.prefs.use_privoxy "Dùng Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Dùng thiết lập proxy tùy biến">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties
index 156fdb7..3bbb32c 100644
--- a/src/chrome/locale/vi/torbutton.properties
+++ b/src/chrome/locale/vi/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Lưu ý Torbutton: Có vẻ bạn không có
 torbutton.popup.ff3.warning = Cảnh báo!\n\nTorbutton trên Firefox 3 làm lá»? múi giá»? và Ä?ánh-dấu-Ä?á»?ng của bạn thông qua Tor.\n\nBạn có còn muá»?n tiếp tục không?
 torbutton.popup.toggle.warning = Bạn cần bật tắt Tor hoặc khá»?i Ä?á»?ng lại Ä?á»? thiết lập có hiá»?u lá»±c.
 torbutton.popup.test.success = Thử nghi�m Tor thành công!
-torbutton.popup.test.failure = Thử nghi�m Tor THẤT BẠI! Hãy ki�m tra thiết lập proxy và Privoxy của bạn.
-torbutton.popup.test.confirm_toggle = Thá»­ nghiá»?m proxy Tor gần Ä?ây nhất Ä?ã bá»? thất bại.\n\nBạn có chắc là bạn vẫn muá»?n bật không?
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Nhấn OK Ä?á»? thá»­ nghiá»?m thiết lập proxy Tor. Thá»­ nghiá»?m này sẽ diá»?n ra trong hậu cảnh. Xin hãy kiên nhẫn.
 torbutton.panel.label.verified = Tor Ä?ã Ä?ược phê chuẩn
 torbutton.popup.test.auto_failed = Thá»­ nghiá»?m proxy Tor tá»± Ä?á»?ng Ä?ã bá»? thất bại.\n\nBạn có chắc là bạn vẫn muá»?n bật không?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd
index 1bbe87b..ca56727 100644
--- a/src/chrome/locale/zh-CN/torbutton.dtd
+++ b/src/chrome/locale/zh-CN/torbutton.dtd
@@ -5,8 +5,9 @@
 <!ENTITY torbutton.prefs.panel_text_format "æ??æ?¬">
 <!ENTITY torbutton.prefs.panel_icon_format "��">
 <!ENTITY torbutton.prefs.tor_settings "代ç??设置">
-<!ENTITY torbutton.prefs.recommended_settings "使ç?¨ä¸ºæ??ç?? Firefox ç??æ?¨è??代ç??设置">
+<!ENTITY torbutton.prefs.recommended_settings "为该ç??æ?¬ Firefox 使ç?¨æ?¨è??ç??代ç??设置">
 <!ENTITY torbutton.prefs.use_privoxy "使� Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "使ç?¨è?ªå®?ä¹?代ç??设置">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP 代ç??ï¼?">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL 代ç??ï¼?">
@@ -21,73 +22,73 @@
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton ç?®å??使ç?¨ä¸­ã??å¦?æ??æ?¨æ?³æ?¹å??é?? Tor 代ç??设置ï¼?请ç¦?ç?¨ Torbutton å??å??å?°è¿?é??ã??å¦?æ??æ?¨æ?³æ?¹å?? Tor 代ç??设置ï¼?请使ç?¨ Torbutton å??好设置ã??">
 <!ENTITY torbutton.context_menu.toggle "转æ?¢ Tor ç?¶æ??">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "å??好...">
+<!ENTITY torbutton.context_menu.preferences "设置...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "�� Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "ç?¹å?»å??å§?å?? Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "å®?å?¨é??项">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Torè¿?è¡?æ?¶ç¦?æ­¢å??å?¥å??å?²(æ?¨è??)">
-<!ENTITY torbutton.prefs.block_nthread "Torç¦?ç?¨æ?¶ç¦?止读å??å??å?²(å?¯é??)">
-<!ENTITY torbutton.prefs.block_nthwrite "Torç¦?ç?¨æ?¶ç¦?æ­¢å??å?¥å??å?²(å?¯é??)">
+<!ENTITY torbutton.prefs.block_thread "使ç?¨ Tor æ?¶ç¦?止读å??å??å?²(é??è¦?)">
+<!ENTITY torbutton.prefs.block_thwrite "使ç?¨ Tor æ?¶ç¦?æ­¢å??å?¥å??å?²(æ?¨è??)">
+<!ENTITY torbutton.prefs.block_nthread "ä¸?ç?¨ Tor æ?¶ç¦?止读å??å??å?²(å?¯é??)">
+<!ENTITY torbutton.prefs.block_nthwrite "ä¸?ç?¨ Tor æ?¶ç¦?æ­¢å??å?¥å??å?²(å?¯é??)">
 <!ENTITY torbutton.prefs.clear_history "å??æ?¢ Tor æ?¶æ¸?é?¤å??å?²(å?¯é??)">
-<!ENTITY torbutton.prefs.clear_cache "ç¦?ç?¨ Tor 硬ç??ç¼?å­?并å?¨å??æ?¢ Tor æ?¶æ¸?é?¤ç¼?å­?">
-<!ENTITY torbutton.prefs.block_cache "Tor è¿?è¡?æ?¶ç¦?止访é?®ç¡¬ç??ç¼?å­?å??å??å­?ç¼?å­?">
-<!ENTITY torbutton.prefs.cookie_jars "å?¨å??ä¿?æ?¤ç??jaræ??件中ä¿?å­?é?? Tor ä¸? cookies">
-<!ENTITY torbutton.prefs.mmm_cookies "æ??è¦?è?ªå·±æ??å?¨ç®¡ç??æ??ç?? cookies (å?±é?©)">
+<!ENTITY torbutton.prefs.clear_cache "使ç?¨ Tor æ?¶ç¦?ç?¨ç¡¬ç??ç¼?å­?并å?¨å??æ?¢æ?¶æ¸?é?¤ç¼?å­?">
+<!ENTITY torbutton.prefs.block_cache "使ç?¨ Tor æ?¶ç¦?止访é?®ç¡¬ç??ç¼?å­?å??å??å­?ç¼?å­?">
+<!ENTITY torbutton.prefs.cookie_jars "å?¨å??ä¿?æ?¤ç??jar中ä¿?å­?ä¸?ç?¨ Tor æ?¶ç??cookie">
+<!ENTITY torbutton.prefs.mmm_cookies "æ??è¦?è?ªå·±æ??å?¨ç®¡ç?? cookies (å?±é?©)">
 <!ENTITY torbutton.prefs.clear_cookies "å??æ?¢ Tor æ?¶æ¸?é?¤ cookies">
 <!ENTITY torbutton.prefs.disable_plugins "使ç?¨ Tor æ?¶ç¦?ç?¨æ??件(é??è¦?)">
-<!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">
-<!ENTITY torbutton.prefs.set_uagent "使ç?¨ Tor æ?¶è®¾ç½® user-agent (é??è¦?)">
-<!ENTITY torbutton.prefs.dynamic "å?¨æ??å??容">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook å?±é?©ç?? JavaScript (é??è¦?)">
+<!ENTITY torbutton.prefs.isolate_content "æ ¹æ?® Tor ç?¶æ??é??离å?¨æ??ç½?页å??容 (é??è¦?)">
+<!ENTITY torbutton.prefs.no_updates "使� Tor ��止�����">
+<!ENTITY torbutton.prefs.set_uagent "使ç?¨ Tor æ?¶ä¿®æ?¹ user-agent (é??è¦?)">
+<!ENTITY torbutton.prefs.dynamic "å?¨æ??ç½?页å??容">
 <!ENTITY torbutton.prefs.cookies "Cookies">
 <!ENTITY torbutton.prefs.cache "ç¼?å­?">
 <!ENTITY torbutton.prefs.history "å??å?²">
 <!ENTITY torbutton.prefs.no_search "使ç?¨ Tor æ?¶ç¦?ç?¨æ??索建议(æ?¨è??)">
 <!ENTITY torbutton.prefs.shutdown "��">
-<!ENTITY torbutton.prefs.tor_shutdown "å?³é?­å?¯ç?¨ Tor ç??æµ?è§?å?¨æ?¶æ¸?é?¤ Tor cookies">
-<!ENTITY torbutton.prefs.all_shutdown "å?³é?­ä»»æ??æµ?è§?å?¨æ?¶æ¸?é?¤ cookies">
+<!ENTITY torbutton.prefs.tor_shutdown "æ?´ Tor å?³é?­æµ?è§?å?¨æ?¶æ¸?é?¤ç?¨ Tor æµ?è§?产ç??ç?? Cookies">
+<!ENTITY torbutton.prefs.all_shutdown "ä»»ä½?æ?¶å??å?³é?­æµ?è§?å?¨é?½æ¸?é?¤ cookies">
 <!ENTITY torbutton.prefs.no_shutdown "������ cookies">
-<!ENTITY torbutton.prefs.disable_sessionstore "ç¦?ç?¨è¿?ç¨?ä¿?å­?(æ?¨è??)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.spoof_english "欺éª?è?±æ??æµ?è§?å?¨">
-<!ENTITY torbutton.prefs.disable_referer "使ç?¨ Tor æ?¶ä¸?å??é??å¼?ç?¨(Referer)ä¿¡æ?¯(å°?å½±å??å°?é?¨å??ç«?ç?¹ç??å??è?½)">
-<!ENTITY torbutton.prefs.disable_domstorage "使ç?¨ Tor æ?¶ç¦?æ­¢å?¨å­? DOM (é??è¦?)">
+<!ENTITY torbutton.prefs.disable_sessionstore "ç¦?ç?¨Firefoxç??è¿?ç¨?ä¿?å­? (æ?¨è??)">
+<!ENTITY torbutton.prefs.headers "Header">
+<!ENTITY torbutton.prefs.spoof_english "伪����语�为���语">
+<!ENTITY torbutton.prefs.disable_referer "使ç?¨ Tor æ?¶ä¸?å??é?? Referer (å?¯è?½å½±å??æ??äº?ç«?ç?¹ç??访é?®)">
+<!ENTITY torbutton.prefs.disable_domstorage "使ç?¨ Tor æ?¶ç¦?ç?¨æµ?è§?å?¨ç?? DOMå?¨å­? (é??è¦?)">
 <!ENTITY torbutton.prefs.forms "表å??">
-<!ENTITY torbutton.prefs.block_tforms "使ç?¨ Tor æ?¶ç¦?ç?¨å¯?ç ?ä¿?å­?(æ?¨è??)">
-<!ENTITY torbutton.prefs.block_ntforms "æ?ªä½¿ç?¨ Tor æ?¶ç¦?ç?¨å¯?ç ?ä¿?å­?(å?¯é??)">
-<!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "�� Tor �">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "å?¨ Firefox å´©æº?æ?¶é??è½½ cookie jar/æ¸?é?¤ cookie(æ?¨è??)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "å?¨å??ä¿?æ?¤ç??jaræ??件中ä¿?å­?使ç?¨ Tor å??æ?ªä½¿ç?¨ Tor æ?¶ç?? cookies(å?±é?©)">
+<!ENTITY torbutton.prefs.block_tforms "使ç?¨ Tor æ?¶ç¦?ç?¨å¯?ç ?ä¿?å­?ä¸?表å??è®°å¿?(æ?¨è??)">
+<!ENTITY torbutton.prefs.block_ntforms "ä¸?ç?¨ Tor æ?¶ç¦?ç?¨å¯?ç ?ä¿?å­?ä¸?表å??è®°å¿?(å?¯é??)">
+<!ENTITY torbutton.prefs.tor "使�Tor">
+<!ENTITY torbutton.prefs.non_tor "��Tor">
+<!ENTITY torbutton.prefs.restore_tor "æµ?è§?å?¨æ?¢å¤?è¿?ç¨?æ?¶ï¼?设置 Tor ç??ç?¶æ??为">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Firefox å´©æº?å??é??è½½ cookie jar/æ¸?é?¤ cookie(æ?¨è??)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "å?¨å??ä¿?æ?¤ç??jaræ??件中å??æ?¶ä¿?å­?使ç?¨Torå??ä¸?ç?¨Toræ?¶ç?? cookies(å?±é?©)">
 <!ENTITY torbutton.prefs.clear_http_auth "æ¸?é?¤ HTTP 认è¯?è¿?ç¨?(æ?¨è??)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "使ç?¨ Tor æ?¶è°?æ?´çª?å?£å¤§å°?为 50 å??ç´ å??æ?°(æ?¨è??)">
-<!ENTITY torbutton.prefs.close_tor "å??æ?¢ Tor æ?¶å?³é?­æ??æ??使ç?¨ Tor ç??çª?å?£å??æ ?ç­¾(å?¯é??)">
-<!ENTITY torbutton.prefs.close_nontor "å??æ?¢ Tor æ?¶å?³é?­æ??æ??æ?ªä½¿ç?¨ Tor ç??çª?å?£å??æ ?ç­¾(å?¯é??)">
-<!ENTITY torbutton.prefs.block_links "ç¦?æ­¢å?¨ä¸?å?? Tor ç?¶æ??é?´æ??å¼?é?¾æ?¥æ??å?·æ?°é¡µé?¢(å?¯é??)">
-<!ENTITY torbutton.prefs.jar_certs "å­?å?¨ SSL è¯?书å?°å??ç?¬ç?? Tor/é?? Tor jar(æ?¨è??)">
-<!ENTITY torbutton.prefs.jar_ca_certs "å­?å?¨ CA è¯?书å?°å??ç?¬ç?? Tor/é?? Tor jar(æ?¨è??)">
-<!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.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.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
+<!ENTITY torbutton.prefs.block_js_history "Tor ç?¶æ??å??å??å??é??å?¶å?¨å??å??ç?¶æ??ä¸?å·²æµ?è§?ç??ç½?页é?´è¿?è¡?跳转 (é??è¦?)">
+<!ENTITY torbutton.prefs.resize_on_toggle "使ç?¨ Tor æ?¶è°?æ?´çª?å?£å¤§å°?为50å??ç´ ç??å??æ?°(æ?¨è??)">
+<!ENTITY torbutton.prefs.close_tor "å??æ?¢æ?¶å?³é?­æ??æ??使ç?¨ Tor ç??çª?å?£å??æ ?ç­¾(å?¯é??)">
+<!ENTITY torbutton.prefs.close_nontor "å??æ?¢æ?¶å?³é?­æ??æ??ä¸?ç?¨ Tor ç??çª?å?£å??æ ?ç­¾(å?¯é??)">
+<!ENTITY torbutton.prefs.block_links "Tor ç?¶æ??å??ç??æ?¹å??ç??页é?¢ä¸­æ?¦æ?ªé?¾æ?¥ç?¹å?»å??页é?¢å?·æ?°(å?¯é??)">
+<!ENTITY torbutton.prefs.jar_certs "å°?使ç?¨Tor/ä¸?ç?¨Toræ?¶ç??SSLè¯?书å??å¼?å­?æ?¾(æ?¨è??)">
+<!ENTITY torbutton.prefs.jar_ca_certs "å°?使ç?¨Tor/ä¸?ç?¨Toræ?¶ç??CAè¯?书å??å¼?å­?æ?¾(æ?¨è??)">
+<!ENTITY torbutton.prefs.locked_mode "ç¦?ç?¨å·¥å?·æ ?æ??é?®ä¸?é?®ç??å¿«æ?·é?®é?²æ­¢è¯¯å??æ?¢">
+<!ENTITY torbutton.prefs.startup_state "正常å?¯å?¨æ?¶ï¼?设置Torç??ç?¶æ??为ï¼?">
+<!ENTITY torbutton.prefs.shutdown_state "��次�����">
+<!ENTITY torbutton.prefs.startup "��">
+<!ENTITY torbutton.prefs.block_tor_file_net "ç¦?æ­¢æ?¬å?°é?¾æ?¥(file://)使ç?¨Tor访é?®ç½?ç»?(æ?¨è??)">
+<!ENTITY torbutton.prefs.block_nontor_file_net "�止����(file://)��Tor访���">
+<!ENTITY torbutton.prefs.restore_defaults "���认设置">
+<!ENTITY torbutton.prefs.test_settings "æµ?è¯?代ç??设置">
+<!ENTITY torbutton.prefs.test_auto "æ¯?次å?¯å?¨Firefoxå??å?¨ç¬¬ä¸?次å??æ?¢ Tor æ?¶è?ªå?¨éª?è¯? Tor 设置">
+<!ENTITY torbutton.prefs.disable_livemarks "使� Tor ��� Livemark(RSS书签) ��">
+<!ENTITY torbutton.prefs.tor_memory_jar "使ç?¨Toræµ?è§?æ?¶ä¸?è¦?å°?Cookieå­?å?¥ç£?ç??">
+<!ENTITY torbutton.prefs.nontor_memory_jar "ä¸?ç?¨Toræµ?è§?æ?¶ä¸?è¦?å°?Cookieå­?å?¥ç£?ç??">
+<!ENTITY torbutton.prefs.session_restore "让Firefoxè¿?ç¨?ä¿?å­?å??è?½ä¿?å­?并æ?¢å¤?å¦?ä¸?æ ?签页ï¼?">
+<!ENTITY torbutton.prefs.nontor_tabs "ä¸?ç?¨Torç??æ ?签页">
+<!ENTITY torbutton.prefs.tor_tabs "使ç?¨Torç??æ ?签页">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties
index 4b82bd4..9f3e03e 100644
--- a/src/chrome/locale/zh-CN/torbutton.properties
+++ b/src/chrome/locale/zh-CN/torbutton.properties
@@ -4,26 +4,27 @@ torbutton.panel.tooltip.disabled = ���� Tor
 torbutton.panel.tooltip.enabled = ���� Tor
 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 = Torbutton æ??ä¾?ä¸?个æ??é?®æ?¥æ?¹ä¾¿ç??å?¯ç?¨æ??ç¦?ç?¨ Tor 代ç??
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. This is to work around a Firefox security bug.\n\nHit 'enter' in the location box or open a new window or tab instead.\n\n
-torbutton.popup.plugin.warning = Torbutton ç?´æ?¥é?»æ­¢äº? Tor å? è½½æ??件å??容.\n\n使ç?¨å?¦å­?为代æ?¿.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton 注æ??ï¼?ç??èµ·æ?¥ä½ æ²¡æ??è?ªå®?ä¹?ç??CA(å®?å?¨è¯?书根æ?ºæ??)ã??æ£?æ?¥CAå??表æ?¯ä¸?项å¾?æ?¢ç??æ??ä½?ï¼?ä¼?å??ç¼?Torç??å??æ?¢é??度ã??ä½ æ?¯ä¸?æ?¯æ?¿æ??ç¦?ç?¨å­¤ç«?ç??CAæ?ºæ??å?¢ï¼?(å¦?æ??ä½ ä¸?ç?¥é??该æ??ä¹?å??ï¼?ç?¹â??ç¡®å®?â??æ?¯å®?å?¨ç??)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.panel.label.disabled = Tor 已��
+torbutton.panel.label.enabled = Tor 已��
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = é??è¿? Torbutton æ??é?®å?¯ä»¥æ?¹ä¾¿å?°è®© Firefoxå??ç?¨æ??使ç?¨ Tor ä½?为代ç??ã??
+torbutton.popup.history.warning = 为äº?解å?³ Firefox ç??å®?å?¨æ¼?æ´?ï¼?Torbutton é?»æ­¢äº?模å¼?æ?¹å??å??ï¼?å?¨å·²æµ?è§?ç½?页é?´ç??跳转æ??ä½?ã??\n\n请å?¨å?°å??æ ?中æ??å??车æ??æ??å¼?æ?°çª?å?£æ??æ?°æ ?签页è¿?è¡?æµ?è§?ã??\n\n
+torbutton.popup.plugin.warning = Torbutton é?»æ­¢äº?æµ?è§?å?¨æ?´ Tor æ?¶ç?´æ?¥å? è½½é??è¦?æ??件æ?¯æ??ç??å??容ã??\n\n请使ç?¨â??å?¦å­?为â??ï¼?ä¿?å­?å??æµ?è§?ï¼?ã??\n\n
+torbutton.popup.confirm_ca_certs = Torbutton 注æ??ï¼?æµ?è§?å?¨ä¼¼ä¹?缺å°?è?ªå®?ä¹?ç??CA(è¯?书é¢?å??æ?ºæ??)ã??æ£?æ?¥CAå??表æ?¯ä¸?项è??æ?¶ç??æ??ä½?ï¼?é??ç¢?Torç??å??æ?¢ã??æ?¨æ?¯å?¦å¸?æ??ç¦?ç?¨å¯¹CAè¯?书ç??é??离ï¼?)å¦?æ??æ?¨ä¸?æ??ï¼?å?¯ä»¥é??æ?©â??ç¡®å®?â??)
+torbutton.popup.ff3.warning = è­¦å??ï¼?\n\nFirefox 3 ä¼?é??è¿? Tor æ³?é?²æ?¨ç??æ?¶å?ºå??Livemarkï¼?书签æ ?ç??RSSé?¾æ?¥ï¼?ï¼?Torbutton 对此æ? è?½ä¸ºå??ã??\n\næ?¨æ?¯å?¦è¦?继续ï¼?
+torbutton.popup.toggle.warning = æ?¨é??è¦?å??æ?¢ Tor æ??é??æ?°å?¯å?¨æ?¨ç??设置æ??ä¼?ç??æ??ã??
+torbutton.popup.test.success = Tor 代ç??æµ?è¯?æ??å??ï¼?
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = å??å?» ç¡®å®? æµ?è¯? Tor ç??代ç??设置ã??æµ?è¯?å°?å?¨å??å?°è¿?è¡?ã??请è??å¿?ç­?å¾?ã??
+torbutton.panel.label.verified = Tor éª?è¯?é??è¿?
+torbutton.popup.test.auto_failed = Tor æ?ªé??è¿?è?ªå?¨ä»£ç??æµ?è¯?ã??\n\næ?¨ç¡®å®?è¦?继续å?¯ç?¨å??ï¼?
+torbutton.prefs.recommended = (æ?¨è??)
+torbutton.prefs.optional = (å?¯é??)
+torbutton.prefs.crucial = (é??è¦?)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/zh-HK/torbutton.dtd b/src/chrome/locale/zh-HK/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/zh-HK/torbutton.dtd
+++ b/src/chrome/locale/zh-HK/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/zh-HK/torbutton.properties b/src/chrome/locale/zh-HK/torbutton.properties
index da7e5de..ef6c42a 100644
--- a/src/chrome/locale/zh-HK/torbutton.properties
+++ b/src/chrome/locale/zh-HK/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd
index 23486ec..4e7e07f 100644
--- a/src/chrome/locale/zh-TW/torbutton.dtd
+++ b/src/chrome/locale/zh-TW/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy 設�">
 <!ENTITY torbutton.prefs.recommended_settings "å?¨Firefox 使ç?¨å»ºè­°ç?? Proxy 設å®?">
 <!ENTITY torbutton.prefs.use_privoxy "使� Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "使ç?¨è?ªè¨?ç??Proxy 設å®?">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/zh-TW/torbutton.properties b/src/chrome/locale/zh-TW/torbutton.properties
index f1be4b2..eeef493 100644
--- a/src/chrome/locale/zh-TW/torbutton.properties
+++ b/src/chrome/locale/zh-TW/torbutton.properties
@@ -13,8 +13,8 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\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.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.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?
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
 torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-- 
1.5.6.5