[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] [torbutton/master] Update translation strings from pootle.

To: or-cvs@xxxxxxxxxxxxx
Subject: [or-cvs] [torbutton/master] Update translation strings from pootle.
From: mikeperry@xxxxxxxx
Date: Fri, 4 Dec 2009 01:44:17 -0500 (EST)
Delivered-to: archiver@xxxxxxxx
Delivered-to: or-cvs-outgoing@xxxxxxxx
Delivered-to: or-cvs@xxxxxxxx
Delivery-date: Fri, 04 Dec 2009 01:44:58 -0500
Patch-author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Reply-to: or-dev@xxxxxxxxxxxxx
Sender: owner-or-cvs@xxxxxxxxxxxxx
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
Prev by Author: [or-cvs] [torbutton/master] Update design doc for 1.2.3.
Next by Author: [or-cvs] [torbutton/master] Fix popup regression introduced in fix for bug 1093.
Previous by thread: [or-cvs] [torbutton/master] Fix bugs 950 and 1085.
Next by thread: [or-cvs] [torbutton/master] Fix popup regression introduced in fix for bug 1093.
Index(es):
- Author
- Thread