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

mikeperry at seul.org mikeperry at seul.org
Wed Dec 2 20:16:18 UTC 2009


Author: Mike Perry <mikeperry-git at fscked.org>
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




More information about the tor-commits mailing list