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

[or-cvs] [torbutton/master] Update translations with new strings from pootle.



Author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Date: Wed, 16 Dec 2009 16:40:24 -0800
Subject: Update translations with new strings from pootle.
Commit: 28c07b1dddcbc7296ba295c9e9fb99d40265224e

---
 src/chrome/locale/af/torbutton.dtd           |    4 +
 src/chrome/locale/ar/torbutton.dtd           |   92 +++++++++---------
 src/chrome/locale/ar/torbutton.properties    |   36 ++++----
 src/chrome/locale/bg/torbutton.dtd           |    4 +
 src/chrome/locale/bms/torbutton.dtd          |    6 +-
 src/chrome/locale/bo/torbutton.dtd           |    4 +
 src/chrome/locale/ca/torbutton.dtd           |    4 +
 src/chrome/locale/cs/torbutton.dtd           |    4 +
 src/chrome/locale/da/torbutton.dtd           |    6 +-
 src/chrome/locale/de/torbutton.dtd           |    6 +-
 src/chrome/locale/el/torbutton.dtd           |    4 +
 src/chrome/locale/es/torbutton.dtd           |    8 +-
 src/chrome/locale/es/torbutton.properties    |    8 +-
 src/chrome/locale/eu/torbutton.dtd           |    4 +
 src/chrome/locale/fa/torbutton.dtd           |  132 +++++++++++++-------------
 src/chrome/locale/fa/torbutton.properties    |   48 +++++-----
 src/chrome/locale/fi/torbutton.dtd           |    4 +
 src/chrome/locale/fi/torbutton.properties    |   10 +-
 src/chrome/locale/fr/torbutton.dtd           |    6 +-
 src/chrome/locale/fur/torbutton.dtd          |    4 +
 src/chrome/locale/gl/torbutton.dtd           |    4 +
 src/chrome/locale/gu/torbutton.dtd           |    4 +
 src/chrome/locale/he/torbutton.dtd           |    4 +
 src/chrome/locale/hi/torbutton.dtd           |    4 +
 src/chrome/locale/hr/torbutton.dtd           |    4 +
 src/chrome/locale/hu/torbutton.dtd           |    4 +
 src/chrome/locale/id/torbutton.dtd           |    4 +
 src/chrome/locale/is/torbutton.dtd           |    4 +
 src/chrome/locale/it/torbutton.dtd           |    6 +-
 src/chrome/locale/ja/torbutton.dtd           |    4 +
 src/chrome/locale/ka/torbutton.dtd           |    4 +
 src/chrome/locale/km/torbutton.dtd           |    4 +
 src/chrome/locale/ko/torbutton.dtd           |    4 +
 src/chrome/locale/ku/torbutton.dtd           |    4 +
 src/chrome/locale/mt/torbutton.dtd           |    4 +
 src/chrome/locale/nb/torbutton.dtd           |    6 +-
 src/chrome/locale/nl/torbutton.dtd           |    4 +
 src/chrome/locale/pa/torbutton.dtd           |    4 +
 src/chrome/locale/pl/torbutton.dtd           |   14 ++-
 src/chrome/locale/pt-BR/torbutton.dtd        |    4 +
 src/chrome/locale/pt-BR/torbutton.properties |   30 +++---
 src/chrome/locale/pt/torbutton.dtd           |  112 +++++++++++-----------
 src/chrome/locale/pt/torbutton.properties    |   58 ++++++------
 src/chrome/locale/ro/torbutton.dtd           |    4 +
 src/chrome/locale/ru/torbutton.dtd           |   10 ++-
 src/chrome/locale/ru/torbutton.properties    |   10 +-
 src/chrome/locale/sl/torbutton.dtd           |    4 +
 src/chrome/locale/sq/torbutton.dtd           |    4 +
 src/chrome/locale/sv/torbutton.dtd           |   70 +++++++-------
 src/chrome/locale/sw/torbutton.dtd           |    4 +
 src/chrome/locale/th/torbutton.dtd           |    4 +
 src/chrome/locale/tr/torbutton.dtd           |    4 +
 src/chrome/locale/uk/torbutton.dtd           |   10 ++-
 src/chrome/locale/vi/torbutton.dtd           |    6 +-
 src/chrome/locale/zh-CN/torbutton.dtd        |   12 ++-
 src/chrome/locale/zh-CN/torbutton.properties |   18 ++--
 src/chrome/locale/zh-HK/torbutton.dtd        |    4 +
 src/chrome/locale/zh-TW/torbutton.dtd        |    4 +
 58 files changed, 528 insertions(+), 328 deletions(-)

diff --git a/src/chrome/locale/af/torbutton.dtd b/src/chrome/locale/af/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/af/torbutton.dtd
+++ b/src/chrome/locale/af/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd
index cd218dc..4f0aa70 100644
--- a/src/chrome/locale/ar/torbutton.dtd
+++ b/src/chrome/locale/ar/torbutton.dtd
@@ -1,13 +1,13 @@
-<!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.recommended_settings "استخدÙ? اÙ?إعدادات اÙ?Ù?Ù?ضÙ?Ø© Ù?Ù?سختÙ? Ù?Ù? Ù?اÙ?رÙ?Ù?Ù?س">
 <!ENTITY torbutton.prefs.use_privoxy "استخدÙ? برÙ?Ú¤Ù?Ù?سÙ?">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
+<!ENTITY torbutton.prefs.use_polipo "استخدÙ? بÙ?Ù?Ù?بÙ?">
 <!ENTITY torbutton.prefs.custom_settings "استخدÙ? إعدادات Ù?سÙ?Ø· Ù?عرÙ?Ù?Ø© ">
 <!ENTITY torbutton.prefs.proxy.host.http "Ù?سÙ?Ø· HTTP:">
 <!ENTITY torbutton.prefs.proxy.host.https "Ù?سÙ?Ø· SLL:">
@@ -15,44 +15,44 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Ù?سÙ?Ø· Gopher:">
 <!ENTITY torbutton.prefs.proxy.host.socks "Ù?ضÙ?Ù? SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "Ù?Ù?Ù?Ø°:">
-<!ENTITY torbutton.about.title "عÙ? تÙ?ربتÙ?">
-<!ENTITY torbutton.pref_connection.notice "عطÙ?Ù? تÙ?ربتÙ? Ù?تغÙ?Ù?ر Ù?Ø°Ù? اÙ?تضبÙ?طات.">
+<!ENTITY torbutton.about.title "عÙ? Ù?Ù?تاح تÙ?ر">
+<!ENTITY torbutton.pref_connection.notice "Ø£Ù?Ù?Ù? تÙ?عÙ?Ù? Ù?Ù?تاح تÙ?ر Ù?تغÙ?Ù?ر Ù?Ø°Ù? اÙ?إعدادات.">
 <!ENTITY torbutton.pref_connection.more_info "Ù?زÙ?د Ù?Ù? اÙ?Ù?عÙ?Ù?Ù?ات">
 <!ENTITY torbutton.pref_connection_more_info.title "Ù?ساعدة">
-<!ENTITY torbutton.pref_connection_more_info.text "تÙ?ربتÙ? حاÙ?Ù?ا Ù?Ù?عÙ?Ù?. Ø¥Ù? Ù?Ù?ت ترÙ?د تغÙ?Ù?ر تضبطÙ?ات Ù?سÙ?Ø· غÙ?ر تÙ?ر Ù?عطÙ? تÙ?ربتÙ? Ø£Ù?Ù?ا Ø«Ù? عد Ø¥Ù?Ù? Ù?Ù?ا. Ø¥Ù? Ù?Ù?ت ترÙ?د تعدÙ?Ù? تضبÙ?طات تÙ?ربتÙ? Ù?استخدÙ? Ù?اÙ?ذة Ø®Ù?ارات تÙ?ربتÙ?.">
-<!ENTITY torbutton.context_menu.toggle "اعÙ?س حاÙ?Ø© تÙ?ربتÙ?">
+<!ENTITY torbutton.pref_connection_more_info.text "Ù?Ù?تاح تÙ?ر حاÙ?Ù?ا Ù?Ù?عÙ?Ù?. Ø¥Ù? Ù?Ù?ت ترÙ?د تغÙ?Ù?ر إعدادات اÙ?برÙ?Ù?سÙ? غÙ?ر اÙ?Ù?تعÙ?Ù?Ø© بتÙ?ر Ø£Ù?Ù?Ù? تÙ?عÙ?Ù? Ù?Ù?تاح تÙ?ر Ø£Ù?Ù?اÙ? Ø«Ù? عد Ø¥Ù?Ù? Ù?Ù?ا. Ø¥Ù? Ù?Ù?ت ترÙ?د تعدÙ?Ù? إعدادات Ù?Ù?تاح تÙ?ر Ù?استخدÙ? Ù?اÙ?ذة تÙ?ضÙ?Ù?ات Ù?Ù?تاح تÙ?ر.">
+<!ENTITY torbutton.context_menu.toggle "اعÙ?س حاÙ?Ø© Ù?Ù?تاح تÙ?ر">
 <!ENTITY torbutton.context_menu.toggle.key "ت">
 <!ENTITY torbutton.context_menu.preferences "تÙ?ضÙ?Ù?اتâ?¦">
 <!ENTITY torbutton.context_menu.preferences.key "Ù?">
-<!ENTITY torbutton.context_menu.about "عÙ? تÙ?ربتÙ?â?¦">
-<!ENTITY torbutton.context_menu.about.key "ع">
-<!ENTITY torbutton.button.label "تÙ?ربتÙ?">
-<!ENTITY torbutton.button.tooltip "اÙ?Ù?ر Ù?استبداء تÙ?ربتÙ?">
-<!ENTITY torbutton.prefs.sec_settings "إعدادات اÙ?سرÙ?Ø©">
-<!ENTITY torbutton.prefs.block_thread "اÙ?Ù?ع Ù?راءة اÙ?تأرÙ?Ø® أثÙ?اء عÙ?Ù? تÙ?ر (أساسÙ?)">
-<!ENTITY torbutton.prefs.block_thwrite "اÙ?Ù?ع Ù?تابة اÙ?تأرÙ?Ø® أثÙ?اء عÙ?Ù? تÙ?ر (Ù?حبذ)">
-<!ENTITY torbutton.prefs.block_nthread "اÙ?Ù?ع Ù?راءة اÙ?تأرÙ?Ø® أثÙ?اء عدÙ? عÙ?Ù? تÙ?ر (اختÙ?ارÙ?)">
-<!ENTITY torbutton.prefs.block_nthwrite "اÙ?Ù?ع Ù?تابة اÙ?تأرÙ?Ø® أثÙ?اء عدÙ? عÙ?Ù? تÙ?ر (اختÙ?ارÙ?)">
-<!ENTITY torbutton.prefs.clear_history "Ø£Ù?سح اÙ?تأرÙ?Ø® عÙ?د تغÙ?ر حاÙ?Ø© تÙ?ر (اختÙ?ارÙ?)">
+<!ENTITY torbutton.context_menu.about "Ø­Ù?Ù? Ù?Ù?تاح تÙ?رâ?¦">
+<!ENTITY torbutton.context_menu.about.key "Ø­">
+<!ENTITY torbutton.button.label "Ù?Ù?تاح تÙ?ر">
+<!ENTITY torbutton.button.tooltip "اÙ?Ù?ر Ù?بدء Ù?Ù?تاح تÙ?ر">
+<!ENTITY torbutton.prefs.sec_settings "إعدادات اÙ?Ø£Ù?اÙ?">
+<!ENTITY torbutton.prefs.block_thread "اÙ?Ù?ع Ù?راءة تارÙ?Ø® اÙ?تصÙ?Ø­ أثÙ?اء عÙ?Ù? تÙ?ر (أساسÙ?)">
+<!ENTITY torbutton.prefs.block_thwrite "اÙ?Ù?ع Ù?تابة تارÙ?Ø® اÙ?تصÙ?Ø­ أثÙ?اء عÙ?Ù? تÙ?ر (Ù?حبذ)">
+<!ENTITY torbutton.prefs.block_nthread "اÙ?Ù?ع Ù?راءة تارÙ?Ø® اÙ?تصÙ?Ø­ أثÙ?اء تÙ?Ù?Ù? تÙ?ر (اختÙ?ارÙ?)">
+<!ENTITY torbutton.prefs.block_nthwrite "اÙ?Ù?ع Ù?تابة تارÙ?Ø® اÙ?تصÙ?Ø­ أثÙ?اء تÙ?Ù?Ù? تÙ?ر (اختÙ?ارÙ?)">
+<!ENTITY torbutton.prefs.clear_history "اÙ?سح تارÙ?Ø® اÙ?تصÙ?Ø­ عÙ?د تغÙ?ر حاÙ?Ø© تÙ?ر (اختÙ?ارÙ?)">
 <!ENTITY torbutton.prefs.clear_cache "اÙ?Ù?ع اÙ?Ù?Ù?اذ Ø¥Ù?Ù? Ù?خبئÙ?Ø© تÙ?ر عÙ?Ù? اÙ?Ù?رص Ù? أخÙ? Ù?Ù? اÙ?Ù?خبئÙ?Ø© عÙ?د تغÙ?ر حاÙ?Ø© تÙ?ر">
 <!ENTITY torbutton.prefs.block_cache "اÙ?Ù?ع اÙ?Ù?Ù?اذ Ø¥Ù?Ù? Ù?خبئÙ?Ø© تÙ?ر عÙ?Ù? اÙ?Ù?رص Ù? اÙ?ذاÙ?رة أثÙ?اء عÙ?Ù? تÙ?ر">
 <!ENTITY torbutton.prefs.cookie_jars "خزÙ? Ù?عÙ?ات غÙ?ر تÙ?ر Ù?Ù? جرة Ù?Ø­Ù?Ù?Ø©">
 <!ENTITY torbutton.prefs.mmm_cookies "سأدÙ?ر اÙ?Ù?عÙ?ات Ù?دÙ?Ù?ا (خطر)">
-<!ENTITY torbutton.prefs.clear_cookies "أخÙ? اÙ?Ù?عÙ?ات عÙ?د تغÙ?ر حاÙ?Ø© تÙ?ر">
+<!ENTITY torbutton.prefs.clear_cookies "اÙ?سح اÙ?Ù?عÙ?ات عÙ?د تغÙ?ر حاÙ?Ø© تÙ?ر">
 <!ENTITY torbutton.prefs.disable_plugins "اÙ?Ù?ع اÙ?Ù?Ù?Ø­Ù?ات أثÙ?اء عÙ?Ù? تÙ?ر (أساسÙ?)">
 <!ENTITY torbutton.prefs.kill_bad_js "اÙ?تÙ?Ø· جاÙ?اسرÙ?بت اÙ?خطر (أساسÙ?)">
-<!ENTITY torbutton.prefs.isolate_content "اعزÙ? اÙ?Ù?حتÙ?Ù? اÙ?دÙ?Ù?اÙ?Ù?Ù? Ù?صرا عÙ?Ù? حاÙ?Ø© تÙ?ر (أساسÙ?)">
-<!ENTITY torbutton.prefs.no_updates "Ø£Ù?Ù?Ù? اÙ?تحدÙ?Ø« Ø®Ù?اÙ? إستعÙ?اÙ? اÙ?تÙ?ر">
+<!ENTITY torbutton.prefs.isolate_content "اعزÙ? اÙ?Ù?حتÙ?Ù? اÙ?دÙ?Ù?اÙ?Ù?Ù?Ù? Ù?صرا عÙ?Ù? حاÙ?Ø© تÙ?ر (أساسÙ?)">
+<!ENTITY torbutton.prefs.no_updates "Ø£Ù?Ù?Ù? اÙ?تحدÙ?Ø« Ø®Ù?اÙ? إستعÙ?اÙ? تÙ?ر">
 <!ENTITY torbutton.prefs.set_uagent "اضبط عÙ?Ù?Ù? اÙ?Ù?ستخدÙ? Ù?عÙ?Ù? تÙ?ر (أساسÙ?)">
-<!ENTITY torbutton.prefs.dynamic "اÙ?Ù?حتÙ?Ù? اÙ?دÙ?Ù?اÙ?Ù?Ù?">
+<!ENTITY torbutton.prefs.dynamic "اÙ?Ù?حتÙ?Ù? اÙ?دÙ?Ù?اÙ?Ù?Ù?Ù?">
 <!ENTITY torbutton.prefs.cookies "اÙ?Ù?عÙ?ات">
 <!ENTITY torbutton.prefs.cache "اÙ?Ù?خبئÙ?Ø©">
 <!ENTITY torbutton.prefs.history "اÙ?تأرÙ?Ø®">
-<!ENTITY torbutton.prefs.no_search "اÙ?Ù?ع ترشÙ?حات اÙ?بحث أثÙ?اء عÙ?Ù? تÙ?ر (Ù?حبذ)">
+<!ENTITY torbutton.prefs.no_search "اÙ?Ù?ع اÙ?تراحات اÙ?بحث أثÙ?اء عÙ?Ù? تÙ?ر (Ù?حبذ)">
 <!ENTITY torbutton.prefs.shutdown "غÙ?Ù? اÙ?Ù?تصÙ?Ø­">
-<!ENTITY torbutton.prefs.tor_shutdown "أخÙ? اÙ?Ù?Ù?Ù?Ù?ز عÙ?د إغÙ?اÙ? اÙ?Ù?تصÙ?Ø­ أثÙ?اء عÙ?Ù? تÙ?ر">
-<!ENTITY torbutton.prefs.all_shutdown "أخÙ? اÙ?Ù?Ù?Ù?Ù?ز عÙ?د Ø£Ù? إغÙ?اÙ? Ù?Ù?Ù?تصÙ?Ø­">
-<!ENTITY torbutton.prefs.no_shutdown "Ù?ا تخÙ? اÙ?Ù?Ù?Ù?Ù?ز عÙ?د إغÙ?اÙ? اÙ?Ù?تصÙ?Ø­">
+<!ENTITY torbutton.prefs.tor_shutdown "اÙ?سح اÙ?Ù?Ù?Ù?Ù?ز عÙ?د إغÙ?اÙ? اÙ?Ù?تصÙ?Ø­ أثÙ?اء عÙ?Ù? تÙ?ر">
+<!ENTITY torbutton.prefs.all_shutdown "اÙ?سح اÙ?Ù?Ù?Ù?Ù?ز عÙ?د Ø£Ù? إغÙ?اÙ? Ù?Ù?Ù?تصÙ?Ø­">
+<!ENTITY torbutton.prefs.no_shutdown "Ù?ا تÙ?سح اÙ?Ù?Ù?Ù?Ù?ز عÙ?د إغÙ?اÙ? اÙ?Ù?تصÙ?Ø­">
 <!ENTITY torbutton.prefs.disable_sessionstore "عطÙ?Ù? Ø­Ù?ظ اÙ?جÙ?سة (Ù?حبذ)">
 <!ENTITY torbutton.prefs.headers "اÙ?ترÙ?Ù?سات">
 <!ENTITY torbutton.prefs.spoof_english "اÙ?تحÙ? Ù?تصÙ?حا Ø¥Ù?جÙ?Ù?زÙ?ا_Ø£Ù?رÙ?Ù?Ù?ا">
@@ -63,33 +63,37 @@
 <!ENTITY torbutton.prefs.block_ntforms "اÙ?Ù?ع Ø­Ù?ظ Ù?Ù?Ù?ات اÙ?سر Ù? Ù?دخÙ?ات اÙ?استÙ?ارات أثÙ?اء عدÙ? عÙ?Ù? تÙ?ر (اختÙ?ارÙ?)">
 <!ENTITY torbutton.prefs.tor "تÙ?ر">
 <!ENTITY torbutton.prefs.non_tor "غÙ?ر تÙ?ر">
-<!ENTITY torbutton.prefs.restore_tor "Ø®Ù?اÙ? بدء إستعادة اÙ?جÙ?سة, ضع حاÙ?Ø© اÙ?تÙ?ر Ø¥Ù?Ù?:">
+<!ENTITY torbutton.prefs.restore_tor "Ø®Ù?اÙ? بدء إستعادة اÙ?جÙ?سةØ? اضبط حاÙ?Ø© تÙ?ر Ø¥Ù?Ù?:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Ø­Ù?Ù? جرة اÙ?Ù?Ù?Ù?Ù?ز/أخÙ? اÙ?Ù?Ù?Ù?Ù?ز عÙ?د اÙ?Ù?Ù?ار Ù?Ù?رÙ?Ù?س (Ù?حبذ)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "احÙ?ظ Ù?Ù?ا Ù?Ù? Ù?Ù?Ù?Ù?ز تÙ?ر Ù? غÙ?ر تÙ?ر Ù?Ù? جرات Ø¢Ù?Ù?Ø© (خطر)">
-<!ENTITY torbutton.prefs.clear_http_auth "أخÙ? جÙ?سات HTTP auth (Ù?حبذ)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "احÙ?ظ Ù?Ù?ا Ù?Ù? Ù?Ù?Ù?Ù?ز تÙ?ر Ù? غÙ?ر تÙ?ر Ù?Ù? Ù?Ù?Ù?ات Ù?Ø­Ù?Ù?Ø© (خطر)">
+<!ENTITY torbutton.prefs.clear_http_auth "اÙ?سح جÙ?سات HTTP auth (Ù?حبذ)">
 <!ENTITY torbutton.prefs.block_js_history "اÙ?Ù?ع Ù?Ù?اذ جاÙ?اسÙ?ربت Ø¥Ù?Ù? تصÙ?Ø­ اÙ?تارÙ?Ø® (Ù?حبذ)">
-<!ENTITY torbutton.prefs.resize_on_toggle "أعد تحجÙ?Ù? اÙ?Ù?Ù?اÙ?Ø° Ø¥Ù?Ù? Ù?ضاعÙ?ات 50 عÙ?صÙ?رة عÙ?د تغÙ?ر اÙ?حاÙ?Ø© (Ù?حبذ)">
-<!ENTITY torbutton.prefs.close_tor "أغÙ?Ù? Ù?Ù? Ù?Ù?اÙ?Ø° Ù? Ø£Ù?سÙ?Ø© تÙ?ر عÙ?د اغÙ?ر اÙ?حاÙ?Ø© (اختÙ?ارÙ?)">
-<!ENTITY torbutton.prefs.close_nontor "أغÙ?Ù? Ù?Ù? Ù?Ù?اÙ?Ø° Ù? Ø£Ù?سÙ?Ø© غÙ?ر تÙ?ر عÙ?د اغÙ?ر اÙ?حاÙ?Ø© (اختÙ?ارÙ?)">
+<!ENTITY torbutton.prefs.resize_on_toggle "أعد تحجÙ?Ù? اÙ?Ù?Ù?اÙ?Ø° Ø¥Ù?Ù? Ù?ضاعÙ?ات 50 بÙ?Ù?سÙ? عÙ?د تغÙ?ر اÙ?حاÙ?Ø© (Ù?حبذ)">
+<!ENTITY torbutton.prefs.close_tor "أغÙ?Ù? Ù?Ù? Ù?Ù?اÙ?Ø° Ù?تبÙ?Ù?بات تÙ?ر عÙ?د تغÙ?Ù?ر اÙ?حاÙ?Ø© (اختÙ?ارÙ?)">
+<!ENTITY torbutton.prefs.close_nontor "أغÙ?Ù? Ù?Ù? Ù?Ù?اÙ?Ø° Ù? تبÙ?Ù?بات غÙ?ر تÙ?ر عÙ?د تغÙ?Ù?ر اÙ?حاÙ?Ø© (اختÙ?ارÙ?)">
 <!ENTITY torbutton.prefs.block_links "اÙ?Ù?ع Ù?Ù?ر اÙ?رÙ?ابط Ù? إعادة تحÙ?Ù?Ù? اÙ?صÙ?حات بÙ?Ù? حاÙ?ات تÙ?ر اÙ?Ù?ختÙ?Ù?Ø© (اختÙ?ارÙ?)">
 <!ENTITY torbutton.prefs.jar_certs "Ø­Ù?ظ بÙ?اÙ?ات SSL Ù?Ù? Ù?Ù?Ù?ات Ù?ختÙ?Ù?Ø© Ù?أجÙ? تÙ?ر/غÙ?ر تÙ?ر(Ù?حبÙ?Ø°) ">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "عطÙ? اÙ?Ù?Ù?اتÙ?Ø­ Ù?إختصارات اÙ?Ù?Ù?اتÙ?Ø­  Ù?تجÙ?ب اÙ?ضغط اÙ?خاطئ">
+<!ENTITY torbutton.prefs.jar_ca_certs "Ø­Ù?ظ بÙ?اÙ?ات CA Ù?Ù? Ù?Ù?Ù?ات Ù?ختÙ?Ù?Ø© Ù?أجÙ? تÙ?ر/غÙ?ر تÙ?ر(Ù?حبÙ?Ø°) ">
+<!ENTITY torbutton.prefs.locked_mode "عطÙ? اÙ?Ù?Ù?اتÙ?Ø­ Ù?إختصارات اÙ?Ù?Ù?اتÙ?Ø­  Ù?تجÙ?ب تغÙ?Ù?ر حاÙ?Ø© تÙ?ر باÙ?خطأ">
 <!ENTITY torbutton.prefs.startup_state "Ø®Ù?اÙ? عÙ?Ù?Ù?ات اÙ?بدء اÙ?عادÙ?Ø©, ضع حاÙ?Ø© اÙ?تÙ?ر:">
 <!ENTITY torbutton.prefs.shutdown_state "حاÙ?Ø© اÙ?تÙ?Ù?Ù?">
 <!ENTITY torbutton.prefs.startup "اÙ?بدء">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "اÙ?Ù?ع Ù?صÙ?Ù? غÙ?ر-اÙ?تÙ?ر Ø¥Ù?Ù? اÙ?شبÙ?Ø© Ù?Ù? Ù?سارات file:// urls">
+<!ENTITY torbutton.prefs.block_tor_file_net "اÙ?Ù?ع اÙ?Ù?Ù?اذ Ø¥Ù?Ù? اÙ?شبÙ?Ø© Ù?Ù? Ù?سارات file:// (Ù?حبÙ?Ø°)">
+<!ENTITY torbutton.prefs.block_nontor_file_net "اÙ?Ù?ع Ù?صÙ?Ù? غÙ?ر-تÙ?ر Ø¥Ù?Ù? اÙ?شبÙ?Ø© Ù?Ù? Ù?سارات file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "إستعادة اÙ?Ù?ضع اÙ?Ø¥Ù?تراضÙ?">
 <!ENTITY torbutton.prefs.test_settings "Ù?حص اÙ?إعدادات ">
-<!ENTITY torbutton.prefs.test_auto "Ø¥Ù?حص إعدادات اÙ?تÙ?ر بعد Ø£Ù?Ù? تشغÙ?Ù? Ù?Ù? Ù?رة Ù?تÙ? تشغÙ?Ù? اÙ?Ù?اÙ?رÙ?Ù?Ù?س">
-<!ENTITY torbutton.prefs.disable_livemarks "تعطÙ?Ù? اÙ?livemarks Ø®Ù?اÙ? إستعÙ?اÙ? اÙ?تÙ?ر">
-<!ENTITY torbutton.prefs.tor_memory_jar "Ù?ا تحÙ?ظ Ù?عÙ?ات اÙ?تÙ?ر Ù?Ù? اÙ?Ù?رص">
+<!ENTITY torbutton.prefs.test_auto "Ø¥Ù?حص إعدادات تÙ?ر بعد Ø£Ù?Ù? تشغÙ?Ù? Ù?Ù? Ù?رة Ù?تÙ? تشغÙ?Ù? اÙ?Ù?اÙ?رÙ?Ù?Ù?س">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
+<!ENTITY torbutton.prefs.tor_memory_jar "Ù?ا تحÙ?ظ Ù?عÙ?ات تÙ?ر Ù?Ù? اÙ?Ù?رص">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Ù?ا تحÙ?ظ اÙ?Ù?عÙ?ات اÙ?عادÙ?Ø© Ù?Ù? اÙ?Ù?رص">
-<!ENTITY torbutton.prefs.session_restore "Ù?Ù? تحتÙ?ظ اÙ?جÙ?سة Ù?تعÙ?د Ù?Ø°Ù? اÙ?تبÙ?Ù?بات:">
+<!ENTITY torbutton.prefs.session_restore "Ø­Ù?ظ اÙ?جÙ?سة Ù?استعادة Ù?Ø°Ù? Ù?Ø°Ù? اÙ?تبÙ?Ù?بات:">
 <!ENTITY torbutton.prefs.nontor_tabs "تبÙ?Ù?بات Ù?Ø­Ù?Ù?Ø© Ù?Ù? اÙ?Ù?ضع اÙ?عادÙ?">
-<!ENTITY torbutton.prefs.tor_tabs "تبÙ?Ù?بات Ù?Ø­Ù?Ù?Ø© Ù?اÙ?تÙ?ر Ù?عÙ?Ù?">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS اÙ?Ù?سخة 4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS اÙ?Ù?سخة 5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.tor_tabs "تبÙ?Ù?بات Ù?Ø­Ù?Ù?Ø© باستخداÙ? تÙ?ر">
+<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
+<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
+<!ENTITY torbutton.prefs.no_proxies_on "Ù?ا برÙ?Ù?سÙ?ات Ù?Ù?:_">
+<!ENTITY torbutton.prefs.no_proxy_warning "تحذÙ?ر: تجÙ?ب استخداÙ? Ø£Ù? Ù?Ù? أسÙ?اء اÙ?Ù?ضÙ?Ù? اÙ?Ù?Ø°Ù?Ù?رة أعÙ?اÙ?">
+<!ENTITY torbutton.prefs.disable_livemarks "تعطÙ?Ù? اÙ?livemarks Ø®Ù?اÙ? إستعÙ?اÙ? تÙ?ر">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties
index 9496146..80a40a9 100644
--- a/src/chrome/locale/ar/torbutton.properties
+++ b/src/chrome/locale/ar/torbutton.properties
@@ -7,24 +7,24 @@ torbutton.panel.plugins.enabled = اÙ?Ù?ر Ù?تعطÙ?Ù? اÙ?Ù?Ù?Ø­Ù?ات
 torbutton.panel.label.disabled = تÙ?ر Ù?عطÙ?Ù?
 torbutton.panel.label.enabled = تÙ?ر Ù?Ù?عÙ?Ù?
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Ù?Ù?Ù?ر Ù?Ù?تاح تÙ?ر تحÙ?Ù?ا سÙ?Ù?ا Ù?Ù? استخداÙ? Ù?Ù?رÙ?Ù?Ù?س Ù?Ù?سÙ?Ø· تÙ?ر
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. 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 = Ù?Ù?تاح تÙ?ر Ù?Ù?ع اÙ?تÙ?اعب بتغÙ?Ù?ر حاÙ?Ø© تارÙ?Ø® اÙ?تصÙ?Ø­. تÙ? Ù?ذا Ù?Ø­Ù? Ù?Ø´Ù?Ù?Ø© Ø£Ù?Ù?Ù?Ø© Ù?Ù? Ù?اÙ?رÙ?Ù?Ù?س.\n\nإضغط "إدخاÙ?" Ù?Ù? Ù?Ù?اÙ? اÙ?عÙ?Ù?اÙ? Ø£Ù? اÙ?تح صÙ?حة جدÙ?دة Ø£Ù? تبÙ?Ù?باÙ? جدÙ?داÙ? بدÙ?اÙ? عÙ? Ø°Ù?Ù?\n
 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.popup.ff3.warning = تحذÙ?ر! \n\nÙ?Ù? اÙ?Ù?عرÙ?Ù? Ø£Ù? Ù?Ù?تاح تÙ?ر Ù?Ù? برÙ?اÙ?ج Ù?اÙ?رÙ?Ù?Ù?س 3 Ù?Ù?Ù?Ù? بتسرÙ?ب Ù?عÙ?Ù?Ù?ات عÙ? اÙ?Ù?Ù?Ø·Ù?Ø© اÙ?زÙ?Ù?Ù?Ø© اÙ?تÙ? Ø£Ù?ت Ù?Ù?Ù?ا Ù?عÙ? صÙ?حاتÙ? اÙ?Ù?Ù?ضÙ?Ø© اÙ?Ø­Ù?Ø©. \n\nÙ?Ù? ترغب باÙ?Ù?تابعة عÙ?Ù? Ø£Ù?Ù? حاÙ?Ø? 
+torbutton.popup.toggle.warning = تحتاج Ù?إعادة تشغÙ?Ù? تÙ?ر Ù?تÙ?عÙ?Ù? اÙ?إعدادات اÙ?جدÙ?دة
+torbutton.popup.test.success = تÙ?Ù? تÙ?حص Ù?Ù?Ù?Ù? تÙ?ر بÙ?جاح!
+torbutton.popup.test.failure = Ù?Ø´Ù?ت عÙ?Ù?Ù?Ø© تÙ?حص Ù?Ù?Ù?Ù? تÙ?ر! تأÙ?د Ù?Ù? إعدادات اÙ?Ù?سÙ?Ø· Ù?إعدادات بÙ?Ù?Ù?بÙ?. 
+torbutton.popup.test.confirm_toggle = Ù?Ø´Ù? آخر تÙ?حص Ù?Ù?Ù?Ù?Ù? تÙ?ر باستخداÙ? تÙ?ر.\n\nÙ?Ù? Ø£Ù?ت Ù?تأÙ?د Ù?Ù? Ø£Ù?Ù? ترÙ?د تÙ?عÙ?Ù?Ù? عÙ?Ù? Ø£Ù? حاÙ?Ø?\n\nÙ?Ù?احظة: Ø¥Ù? Ù?Ù?ت Ù?د عاÙ?جت اÙ?Ù?Ø´Ù?Ù?Ø©Ø? Ù?Ù?Ù?Ù?Ù? إعادة إجراء اÙ?Ù?حص Ù?Ù? Ù?اÙ?ذة إعدادات Ù?Ù?Ù?Ù? Ù?Ù?تاح تÙ?ر حتÙ? Ù?ختÙ?Ù? Ù?ذا اÙ?تÙ?بÙ?Ù?.
+torbutton.popup.test.ff3_notice = إضغط "Ù?Ù?اÙ?Ù?" Ù?تÙ?حص إعدادات Ù?Ù?Ù?Ù? تÙ?ر. عÙ?Ù?Ù?Ø© اÙ?تÙ?حص ستتÙ? Ù?Ù? اÙ?Ø®Ù?Ù?Ù?Ø©. Ù?رجÙ? اÙ?اÙ?تظار.
+torbutton.panel.label.verified = تÙ? اÙ?تحÙ?Ù? Ù?اÙ?Ù?صادÙ?Ø© عÙ?Ù? تÙ?ر
+torbutton.popup.test.auto_failed = اÙ?Ù?حص اÙ?Ø¢Ù?Ù? Ù?Ù?Ù?Ù?Ù? تÙ?ر Ù?Ø´Ù?.\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?
+torbutton.prefs.crucial = (حرج)
+torbutton.popup.external.title = تحÙ?Ù?Ù? Ù?حتÙ?Ù? خارجÙ?Ø?
+torbutton.popup.external.app = Ù?Ù?اÙ? حاجة Ù?استخداÙ? تطبÙ?Ù? خارجÙ? Ù?Ù?تعاÙ?Ù? Ù?ع:\n\n
+torbutton.popup.external.note = \n\nÙ?Ù?احظة: اÙ?تطبÙ?Ù?ات اÙ?خارجÙ?Ø© Ù?Ù?ست Ø¢Ù?Ù?Ø© Ù?ع تÙ?ر بشÙ?Ù? اÙ?تراضÙ? Ù?Ù?Ù?Ù?Ù? Ø£Ù? تÙ?Ø´Ù? Ù?Ù?Ù?تÙ?!\n
+torbutton.popup.launch = إطÙ?اÙ? اÙ?تطبÙ?Ù?
+torbutton.popup.cancel = Ø¥Ù?غاء
+torbutton.popup.dontask = دائÙ?اÙ? أطÙ?Ù? اÙ?تطبÙ?Ù?ات ابتداءÙ? Ù?Ù? اÙ?Ø¢Ù?
+torbutton.popup.test.no_http_proxy = Ù?حص Ù?Ù?Ù?Ù? تÙ?ر: Ù?ا Ù?Ù?Ù?Ù? اÙ?Ù?صÙ?Ù? Ø¥Ù?Ù? Ù?Ù?Ù?Ù? HTTP اÙ?Ù?Ø­Ù?Ù?. Ù?Ù? بÙ?Ù?Ù?بÙ? Ù?عÙ?Ù? بشÙ?Ù? صحÙ?Ø­Ø?
diff --git a/src/chrome/locale/bg/torbutton.dtd b/src/chrome/locale/bg/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/bg/torbutton.dtd
+++ b/src/chrome/locale/bg/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/bms/torbutton.dtd b/src/chrome/locale/bms/torbutton.dtd
index 51023de..d12727b 100644
--- a/src/chrome/locale/bms/torbutton.dtd
+++ b/src/chrome/locale/bms/torbutton.dtd
@@ -83,7 +83,7 @@
 <!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.disable_livemarks "Disable livemarks updates during Tor usage">
 <!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 á??á?ºá?¬á?¸ :">
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á?±á??á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ livemarks á?¡á??á??á?¹á??á??á?¹á?·á??á?¼á??á?¹á?¸á??á??á??á?ºá?¬á?¸á??á?¯á?­ á??á?­á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/bo/torbutton.dtd b/src/chrome/locale/bo/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/bo/torbutton.dtd
+++ b/src/chrome/locale/bo/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/ca/torbutton.dtd
+++ b/src/chrome/locale/ca/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/cs/torbutton.dtd
+++ b/src/chrome/locale/cs/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd
index 8c2b704..0fcc185 100644
--- a/src/chrome/locale/da/torbutton.dtd
+++ b/src/chrome/locale/da/torbutton.dtd
@@ -83,7 +83,7 @@
 <!ENTITY torbutton.prefs.restore_defaults "Gendan Standarder">
 <!ENTITY torbutton.prefs.test_settings "Test Indstillinger">
 <!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.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Gem ikke 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:">
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Deaktiver opdatering af livemarks, når Tor kører">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd
index c64d459..5650e0f 100644
--- a/src/chrome/locale/de/torbutton.dtd
+++ b/src/chrome/locale/de/torbutton.dtd
@@ -83,7 +83,7 @@
 <!ENTITY torbutton.prefs.restore_defaults "Stelle Einstellungen zurück auf Standard">
 <!ENTITY torbutton.prefs.test_settings "Teste Einstellungen">
 <!ENTITY torbutton.prefs.test_auto "Teste meine Einstellungen nach dem ersten Umschalten bei jedem Firefox-Start">
-<!ENTITY torbutton.prefs.disable_livemarks "Deaktiviere Aktualisierungen der Livemarks während der Benutzung von Tor.">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Schreibe im Tor-Modus keine Cookies auf die Festplatte">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Schreibe im Nicht-Tor-Modus keine Cookies auf die Festplatte">
 <!ENTITY torbutton.prefs.session_restore "Der Sessionmanager soll diese Tabs sichern und wiederherstellen.">
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Deaktiviere Aktualisierungen der Livemarks während der Benutzung von Tor.">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd
index a0dde6c..1259b5b 100644
--- a/src/chrome/locale/el/torbutton.dtd
+++ b/src/chrome/locale/el/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd
index b55e231..0433883 100644
--- a/src/chrome/locale/es/torbutton.dtd
+++ b/src/chrome/locale/es/torbutton.dtd
@@ -83,7 +83,7 @@
 <!ENTITY torbutton.prefs.restore_defaults "Restablecer valores predeterminados">
 <!ENTITY torbutton.prefs.test_settings "Configuración de prueba">
 <!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.disable_livemarks "Disable livemarks updates during Tor usage">
 <!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">
 <!ENTITY torbutton.prefs.session_restore "Hacer que el almacenamiento de la sesión guarde y restablezca estas pestañas">
@@ -91,5 +91,9 @@
 <!ENTITY torbutton.prefs.tor_tabs "Pestañas cargadas en Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
+<!ENTITY torbutton.prefs.no_proxies_on "No hay proxies para:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Deshabilitar las marcas de actualizaciones durante el uso de Tor">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties
index 07c08ae..e498431 100644
--- a/src/chrome/locale/es/torbutton.properties
+++ b/src/chrome/locale/es/torbutton.properties
@@ -21,10 +21,10 @@ torbutton.popup.test.auto_failed = Las prueba automática del proxy Tor no pudo
 torbutton.prefs.recommended = (recomendado)
 torbutton.prefs.optional = (opcional)
 torbutton.prefs.crucial = (crucial)
-torbutton.popup.external.title = Load external content?
+torbutton.popup.external.title = Cargar contenido externo?
 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.launch = Iniciar la aplicación
+torbutton.popup.cancel = Cancelar
+torbutton.popup.dontask = A partir de ahora, siempre iniciar la aplicación
 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 9b18387..7183cca 100644
--- a/src/chrome/locale/eu/torbutton.dtd
+++ b/src/chrome/locale/eu/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd
index 1e50239..7dc6fb5 100644
--- a/src/chrome/locale/fa/torbutton.dtd
+++ b/src/chrome/locale/fa/torbutton.dtd
@@ -1,95 +1,99 @@
-<!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.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.use_privoxy "بکاربردÙ? پرÛ?Ù?کسÛ?">
+<!ENTITY torbutton.prefs.panel_icon_format "Ù?شاÙ?Ù?">
+<!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:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Ù¾Û?شکار FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Ù¾Û?شکار Gopher:">
+<!ENTITY torbutton.prefs.custom_settings "بکاربردÙ? تÙ?ظÛ?Ù?ات سÙ?ارشÛ? براÛ? پراکسÛ?">
+<!ENTITY torbutton.prefs.proxy.host.http "پراکسÛ? HTTP:">
+<!ENTITY torbutton.prefs.proxy.host.https "پراکسÛ? SSL:">
+<!ENTITY torbutton.prefs.proxy.host.ftp "پراکسÛ? FTP:">
+<!ENTITY torbutton.prefs.proxy.host.gopher "پراکسÛ? Gopher:">
 <!ENTITY torbutton.prefs.proxy.host.socks "Ù?Û?زباÙ? SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "درگاÙ?:">
 <!ENTITY torbutton.about.title "دربارÙ? دکÙ?Ù? تÙ?ر">
-<!ENTITY torbutton.pref_connection.notice "غÛ?رÙ?عاÙ? کردÙ? دکÙ?Ù? تÙ?ر Ù¾Û?Ø´ از تغÛ?Û?ر تÙ?ظÛ?Ù?ات.">
+<!ENTITY torbutton.pref_connection.notice "غÛ?رÙ?عاÙ? کردÙ? دکÙ?Ù? تÙ?ر جÙ?ت تغÛ?Û?ر دراÛ?Ù? تÙ?ظÛ?Ù?ات.">
 <!ENTITY torbutton.pref_connection.more_info "اطÙ?اعات بÛ?شتر">
-<!ENTITY torbutton.pref_connection_more_info.title "Ú©Ù?Ú©">
-<!ENTITY torbutton.pref_connection_more_info.text "دکÙ?Ù? تÙ?ر Ù?عاÙ? Ù?Ù? اکÙ?Ù?Ù? Ù?عاÙ? شد. اگر Ù?Û? Ø®Ù?اÙ?Û?د تÙ?ظÛ?Ù?ات Ù¾Û?شکار را Ú©Ù? بÙ? تÙ?ر اعÙ?اÙ? Ù?Ù?Û? Ø´Ù?د تغÛ?Û?ر دÙ?Û?د, دکÙ?Ù? تÙ?ر را غÛ?رÙ?عاÙ? Ú©Ù?Û?د Ù? بÙ? اÛ?Ù?جا برگردÛ?د. اگر Ù?Û? Ø®Ù?اÙ?Û?د تÙ?ظÛ?Ù?ات تÙ?ر را تغÛ?Û?ر دÙ?Û?د, Ù¾Ù?جرÙ? تÙ?ظÛ?Ù?ات دکÙ?Ù? تÙ?ر را بکارببرÛ?د.">
+<!ENTITY torbutton.pref_connection_more_info.title "راÙ?Ù?Ù?ا">
+<!ENTITY torbutton.pref_connection_more_info.text "دکÙ?Ù? تÙ?رÙ?Ù? اکÙ?Ù?Ù? Ù?عاÙ? شد.اگر Ù?Û?Ø®Ù?اÙ?Û?د تÙ?ظÛ?Ù?ات پراکسÛ? غÛ?ر از تÙ?ر Ø®Ù?د را عÙ?ض Ú©Ù?Û?دØ? Ù?Ø·Ù?ا دکÙ?Ù? تÙ?ر را غÛ?رÙ?عاÙ? Ú©Ù?Û?د Ù? دÙ?بارÙ? بازگردÛ?د. اگر Ù?Û?Ø®Ù?اÙ?Û?د تÙ?ظÛ?Ù?ات تÙ?ررا عÙ?ض Ú©Ù?Û?دØ? از Ù¾Ù?جرÙ? تÙ?ظÛ?Ù?ات دکÙ?Ù? تÙ?ر استÙ?ادÙ? Ú©Ù?Û?د.">
 <!ENTITY torbutton.context_menu.toggle "Ù?عاÙ?/غÛ?رÙ?عاÙ? کردÙ? تÙ?ر">
-<!ENTITY torbutton.context_menu.toggle.key "I">
+<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "تÙ?ظÛ?Ù?ات...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "دربارÙ? دکÙ?Ù? تÙ?ر...">
-<!ENTITY torbutton.context_menu.about.key "O">
+<!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.button.label "دکÙ?Ù? تÙ?ر">
-<!ENTITY torbutton.button.tooltip "Ù?شاردادÙ? براÛ? Ù?Ù?دار دÙ?Û? آغازÛ?Ù? در دکÙ?Ù? تÙ?ر">
-<!ENTITY torbutton.prefs.sec_settings "تÙ?ظÛ?Ù?ات اÙ?Ù?Û?ت">
-<!ENTITY torbutton.prefs.block_thread "بازداشتÙ? Ø®Ù?اÙ?دÙ? تارÛ?Ø®Ú?Ù? Ù?Ù?گاÙ? تÙ?ر (بسÛ?ار Ù?Ù?Ù?)">
-<!ENTITY torbutton.prefs.block_thwrite "بازداشتÙ? Ù?Ù?شتÙ? تارÛ?Ø®Ú?Ù? Ù?Ù?گاÙ? تÙ?ر (تÙ?صÛ?Ù? شدÙ?)">
-<!ENTITY torbutton.prefs.block_nthread "بازداشتÙ? Ø®Ù?اÙ?دÙ? تارÛ?Ø®Ú?Ù? Ù?Ù?گاÙ? غÛ?رتÙ?ر (اختÛ?ارÛ?)">
-<!ENTITY torbutton.prefs.block_nthwrite "بازداشتÙ? Ù?Ù?شتÙ? تارÛ?Ø®Ú?Ù? Ù?Ù?گاÙ? غÛ?ر تÙ?ر (اختÛ?ارÛ?)">
-<!ENTITY torbutton.prefs.clear_history "پاک کردÙ? تارÛ?Ø®Ú?Ù? در ضاÙ?Ù? تÙ?ر (اختÛ?ارÛ?)">
-<!ENTITY torbutton.prefs.clear_cache "بازداشتÙ? Ù?Ù?اÙ? گاÙ? دÛ?سک تÙ?ر Ù? پاک کردÙ? Ù?Ù?اÙ? گاÙ? در ضاÙ?Ù? تÙ?ر">
-<!ENTITY torbutton.prefs.block_cache "بازداشتÙ? دسترسÛ? بÙ? Ù?Ù?اÙ? گاÙ? حاÙ?ظÙ? Ù? دÛ?سک Ù?Ù?گاÙ? تÙ?ر">
-<!ENTITY torbutton.prefs.cookie_jars "ذخÛ?رÙ? کردÙ? Ú©Ù?Ú©Û? Ù?اÛ? غÛ?ر تÙ?ر در Û?Ú© Ù?اÙ? jar Ø­Ù?اظت شدÙ?">
-<!ENTITY torbutton.prefs.mmm_cookies "Ù?دÛ?رÛ?ت Ú©Ù?Ú©Û? Ù?ا بÙ? Ú¯Ù?Ù?Ù? دستÛ? (خطرÙ?اک)">
-<!ENTITY torbutton.prefs.clear_cookies "پاک کردÙ? Ú©Ù?Ú©Û? Ù?ا در ضاÙ?Ù? تÙ?ر">
+<!ENTITY torbutton.button.tooltip "جÙ?ت شرÙ?ع تÙ?رکÙ?Û?Ú© Ú©Ù?Û?د">
+<!ENTITY torbutton.prefs.sec_settings "تÙ?ظÛ?Ù?ات اÙ?Ù?Û?تÛ?">
+<!ENTITY torbutton.prefs.block_thread "جÙ?Ù?Ú¯Û?رÛ? ازخÙ?اÙ?دÙ? تارÛ?Ø®Ú?Ù? در Ù?Ù?گاÙ? تÙ?ر (بسÛ?ار Ù?Ù?Ù?)">
+<!ENTITY torbutton.prefs.block_thwrite "جÙ?Ù?Ú¯Û?رÛ? از Ù?Ù?شتÙ? تارÛ?Ø®Ú?Ù? در Ù?Ù?گاÙ? تÙ?ر (تÙ?صÛ?Ù? شدÙ?)">
+<!ENTITY torbutton.prefs.block_nthread "جÙ?Ù?Ú¯Û?رÛ? از Ø®Ù?اÙ?دÙ? تارÛ?Ø®Ú?Ù? در زÙ?اÙ? Ù?بÙ?دÙ? تÙ?ر (اختÛ?ارÛ?)">
+<!ENTITY torbutton.prefs.block_nthwrite "جÙ?Ù?Ú¯Û?رÛ? از Ù?Ù?شتÙ? تارÛ?Ø®Ú?Ù? در زÙ?اÙ? Ù?بÙ?دÙ? تÙ?ر (اختÛ?ارÛ?)">
+<!ENTITY torbutton.prefs.clear_history "پاک کردÙ? تارÛ?Ø®Ú?Ù? در زÙ?اÙ? Ù?عاÙ?/غÛ?رÙ?عاÙ? کردÙ? تÙ?ر (اختÛ?ارÛ?)">
+<!ENTITY torbutton.prefs.clear_cache "بازداشتÙ? Ù?خزÙ? دÛ?سک تÙ?ر Ù? پاک کردÙ? Ù?خزÙ? در زÙ?اÙ? Ù?عاÙ?/غÛ?رÙ?عاÙ? کردÙ? تÙ?ر">
+<!ENTITY torbutton.prefs.block_cache "بازداشتÙ? دسترسÛ? بÙ? Ù?خزÙ? حاÙ?ظÙ? Ù? دÛ?سک در Ù?Ù?گاÙ? تÙ?ر">
+<!ENTITY torbutton.prefs.cookie_jars "ذخÛ?رÙ? کردÙ? Ú©Ù?Ú©Û? Ù?اÛ? غÛ?ر تÙ?ر در Û?Ú© Ù?اÛ?Ù? Ø­Ù?اظت شدÙ? jar">
+<!ENTITY torbutton.prefs.mmm_cookies "Ù?دÛ?رÛ?ت دستÛ? Ú©Ù?Ú©Û? Ù?ا(خطرÙ?اک)">
+<!ENTITY torbutton.prefs.clear_cookies "پاک کردÙ? Ú©Ù?Ú©Û? Ù?ا در Ù?Ù?گاÙ? Ù?عاÙ?/غÛ?رÙ?عاÙ? کردÙ? تÙ?ر">
 <!ENTITY torbutton.prefs.disable_plugins "غÛ?رÙ?عاÙ? کردÙ? Ù¾Ù?اگÛ?Ù? Ù?ا Ù?Ù?گاÙ? استÙ?ادÙ? تÙ?ر (بسÛ?ار Ù?Ù?Ù?)">
-<!ENTITY torbutton.prefs.kill_bad_js "Ú¯Û?راÙ?داختÙ? جاÙ?ااسکرÛ?پت خطرÙ?اک (بسÛ?ار Ù?Ù?Ù?)">
-<!ENTITY torbutton.prefs.isolate_content "Ù?جزاکردÙ? Ù?حتÙ?Û? Ù¾Ù?Û?ا Ù?ضعÛ?ت تÙ?ر (بسÛ?ار Ù?Ù?Ù?)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Ù?شاÙ?دÙ? عاÙ?Ù? کاربر براÛ? استÙ?ادÙ? تÙ?ر (بسÛ?ار Ù?Ù?Ù?)">
+<!ENTITY torbutton.prefs.kill_bad_js "بÙ? داÙ? اÙ?داختÙ? جاÙ?ااسکرÛ?پت Ù?اÛ? خطرÙ?اک (بسÛ?ار Ù?Ù?Ù?)">
+<!ENTITY torbutton.prefs.isolate_content "Ù?جزاکردÙ? Ù?حتÙ?Û? Ù¾Ù?Û?ا براÛ? Ù?ضعÛ?ت تÙ?ر (بسÛ?ار Ù?Ù?Ù?)">
+<!ENTITY torbutton.prefs.no_updates "غÛ?رÙ?عاÙ? کردÙ? برÙ?ز رساÙ?Û? در Ù?Ù?گاÙ? استÙ?ادÙ? ازتÙ?ر">
+<!ENTITY torbutton.prefs.set_uagent "تÙ?ظÛ?Ù? Ù?اÙ? Ù?رÙ?رگر Ù?ب براÛ? استÙ?ادÙ? تÙ?ر (بسÛ?ار Ù?Ù?Ù?)">
 <!ENTITY torbutton.prefs.dynamic "Ù?حتÙ?اÛ? Ù¾Ù?Û?ا">
 <!ENTITY torbutton.prefs.cookies "Ú©Ù?Ú©Û? Ù?ا">
-<!ENTITY torbutton.prefs.cache "Ù?Ù?اÙ? گاÙ?">
+<!ENTITY torbutton.prefs.cache "Ù?خزÙ?">
 <!ENTITY torbutton.prefs.history "تارÛ?Ø®Ú?Ù?">
 <!ENTITY torbutton.prefs.no_search "غÛ?رÙ?عاÙ? کردÙ? Ù¾Û?Ø´Ù?Ù?ادÙ?اÛ? جستجÙ? Ù?Ù?گاÙ? تÙ?ر (تÙ?صÛ?Ù? شدÙ?)">
 <!ENTITY torbutton.prefs.shutdown "بستÙ?">
-<!ENTITY torbutton.prefs.tor_shutdown "پاک کردÙ? Ú©Ù?Ú©Û? Ù?اÛ? تÙ?ر Ù?Ù?گاÙ? بستÙ? شدÙ? Ù?رÙ?رگر Ù?ادر تÙ?ر">
-<!ENTITY torbutton.prefs.all_shutdown "پاک کردÙ? Ú©Ù?Ú©Û? Ù?ا Ù?Ù?گاÙ? بستÙ? Ù?رÙ?رگر">
+<!ENTITY torbutton.prefs.tor_shutdown "پاک کردÙ? Ú©Ù?Ú©Û? Ù?اÛ? تÙ?ردرÙ?Ù?گاÙ? بستÙ? شدÙ? Ù?رÙ?رگرÛ? با تÙ?ظÛ?Ù?ات تÙ?ر Ù?عاÙ?">
+<!ENTITY torbutton.prefs.all_shutdown "پاک کردÙ? Ú©Ù?Ú©Û? Ù?ا Ù?Ù?گاÙ? بستÙ? Ù?رÙ?رگربÙ? Ù?ر Ø´Ú©Ù?">
 <!ENTITY torbutton.prefs.no_shutdown "پاک Ù?کردÙ? Ú©Ù?Ú©Û? Ù?ا Ù?Ù?گاÙ? بستÙ?">
-<!ENTITY torbutton.prefs.disable_sessionstore "غÛ?رÙ?عاÙ? کردÙ? ذخÛ?رÙ? Ù?شست (تÙ?صÛ?Ù? شدÙ?)">
+<!ENTITY torbutton.prefs.disable_sessionstore "غÛ?رÙ?عاÙ? کردÙ? ذخÛ?رÙ? کردÙ? Ù?شست Ù?ا (تÙ?صÛ?Ù? شدÙ?)">
 <!ENTITY torbutton.prefs.headers "سرآÛ?Ù?دÙ?ا">
-<!ENTITY torbutton.prefs.spoof_english "Ù¾Û?رÙ?Û? کردÙ? از Û?Ú© Ù?رÙ?رگر Ø¢Ù?رÛ?کاÛ?Û? (اÙ?Ú¯Ù?Û?سÛ? Ø¢Ù?رÛ?کا)">
-<!ENTITY torbutton.prefs.disable_referer "Ù?Ù?رستادÙ? referer Ù?Ù?گاÙ? استÙ?ادÙ? تÙ?ر (Ù?Ù?جب شکستÙ? برخÛ? از ساÛ?ت Ù?ا Ù?Û? Ø´Ù?د)">
+<!ENTITY torbutton.prefs.spoof_english "جعÙ? Ù?Ù?Û?ت بÙ? Û?Ú© Ù?رÙ?رگر Ø¢Ù?رÛ?کاÛ?Û?">
+<!ENTITY torbutton.prefs.disable_referer " referer را Ù?Ù?گاÙ? استÙ?ادÙ? تÙ?ر Ù?Ù?رست (Ù?Ù?Ú©Ù? است برخÛ? ساÛ?ت Ù?ا بÙ? درستÛ? عÙ?Ù? Ù?Ú©Ù?Ù?د)">
 <!ENTITY torbutton.prefs.disable_domstorage "غÛ?رغعاÙ? کردÙ? ذخÛ?رÙ? گاÙ? DOM Ù?Ù?گاÙ? استÙ?ادÙ? تÙ?ر (بسÛ?ار Ù?Ù?Ù?)">
 <!ENTITY torbutton.prefs.forms "Ù?رÙ? Ù?ا">
-<!ENTITY torbutton.prefs.block_tforms "بازداشتÙ? ذخÛ?رÙ? اسÙ? رÙ?ز + Ù?رÙ? Ù?Ù?گاÙ? تÙ?ر (تÙ?صÛ?Ù? شدÙ?)">
-<!ENTITY torbutton.prefs.block_ntforms "بازداشتÙ? ذخÛ?رÙ? اسÙ? رÙ?ز + Ù?رÙ? Ù?Ù?گاÙ? غÛ?ر تÙ?ر (اختÛ?ارÛ?)">
+<!ENTITY torbutton.prefs.block_tforms "بازداشتÙ? ذخÛ?رÙ? اسÙ? رÙ?ز + Ù?رÙ? Ù?Ù?گاÙ? Ù?عاÙ? بÙ?دÙ? تÙ?ر (تÙ?صÛ?Ù? شدÙ?)">
+<!ENTITY torbutton.prefs.block_ntforms "بازداشتÙ? ذخÛ?رÙ? اسÙ? رÙ?ز + Ù?رÙ? Ù?Ù?گاÙ? غÛ?ر Ù?عاÙ? بÙ?دÙ? تÙ?ر (اختÛ?ارÛ?)">
 <!ENTITY torbutton.prefs.tor "تÙ?ر">
 <!ENTITY torbutton.prefs.non_tor "غÛ?رتÙ?ر">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "بازگذارÛ? Ù?جدد Ú©Ù?Ú©Û? jar/پاک کردÙ? Ú©Ù?Ú©Û? Ù?ا در Ù?رÙ?پاشÛ? Ù?اÛ?رÙ?اکس (تÙ?صÛ?Ù? شدÙ?)">
+<!ENTITY torbutton.prefs.restore_tor "در صÙ?رت بازگشتÙ? Ù?شستØ? Ù?ضعÛ?ت تÙ?ر را بÙ? اÛ?Ù? صÙ?رت تÙ?ظÛ?Ù? Ú©Ù?:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "بار گذارÛ? Ù?جدد Ú©Ù?Ú©Û? jar/پاک کردÙ? Ú©Ù?Ú©Û? Ù?ا در Ù?Ù?گاÙ? از کا اÙ?تادÙ? Ù?اÛ?رÙ?اکس (تÙ?صÛ?Ù? شدÙ?)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "ذخÛ?رÙ? Ú©Ù?Ú©Û? Ù?اÛ? تÙ?ر Ù? غÛ?رتÙ?ر در jarÙ?اÛ? Ø­Ù?اظت شدÙ? (خطرÙ?اک)">
 <!ENTITY torbutton.prefs.clear_http_auth "پاک کردÙ? Ù?شست Ù?اÛ? احرازÙ?Ù?Û?ت HTTP (تÙ?صÛ?Ù? شدÙ?)">
-<!ENTITY torbutton.prefs.block_js_history "Ù?جزاکردÙ? دسترسÛ? بÙ? تارÛ?Ø®Ú?Ù? Ù?اÙ?Ø´ Ù?ضعÛ?ت تÙ?ر (بسÛ?ار Ù?Ù?Ù?)">
-<!ENTITY torbutton.prefs.resize_on_toggle "تغÛ?Û?راÙ?دازÙ? ابعاد Ù¾Ù?جرÙ? با Ù?ضربÙ?اÛ? 40 تصÙ?Û?ر داÙ?Ù? در ضاÙ?Ù? (تÙ?صÛ?Ù? شدÙ?)">
-<!ENTITY torbutton.prefs.close_tor "بستÙ? Ù?Ù?Ù? Ù¾Ù?جرÙ? Ù?اÛ? تÙ?ر در ضاÙ?Ù? (اختÛ?ارÛ?)">
-<!ENTITY torbutton.prefs.close_nontor "بستÙ? Ù?Ù?Ù? Ù¾Ù?جرÙ? Ù?اÛ? غÛ?رتÙ?ر در ضاÙ?Ù? (اختÛ?ارÛ?)">
-<!ENTITY torbutton.prefs.block_links "بازداشتÙ? Ù?شاردادÙ? Ù¾Û?Ù?Ù?د Ù? بازگذارÛ? Ù?جدد برگÙ? از Ù?ضعÛ?ت Ù?اÛ? Ù?ختÙ?Ù? تÙ?ر (اختÛ?ارÛ?)">
+<!ENTITY torbutton.prefs.block_js_history "Ù?جزاکردÙ? دسترسÛ? بÙ? تارÛ?Ø®Ú?Ù? Ù?رÙ?ر صÙ?حات بÙ? Ù?ضعÛ?ت تÙ?ر (بسÛ?ار Ù?Ù?Ù?)">
+<!ENTITY torbutton.prefs.resize_on_toggle "تغÛ?Û?راÙ?دازÙ? ابعاد Ù¾Ù?جرÙ? با Ù?ضربÙ?اÛ? 40 در Ù?Ù?گاÙ? استÙ?ادÙ? از تÙ?ر(تÙ?صÛ?Ù? شدÙ?)">
+<!ENTITY torbutton.prefs.close_tor "بستÙ? Ù?Ù?Ù? Ù¾Ù?جرÙ? Ù?اÛ? تÙ?ر در Ù?Ù?گاÙ? Ù?عاÙ?/غÛ?رÙ?عاÙ? شدÙ?(اختÛ?ارÛ?)">
+<!ENTITY torbutton.prefs.close_nontor "بستÙ? Ù?Ù?Ù? Ù¾Ù?جرÙ? Ù?اÛ? غÛ?رتÙ?ر درÙ?Ù?گاÙ? Ù?عاÙ?/غÛ?رÙ?عاÙ? شدÙ? (اختÛ?ارÛ?)">
+<!ENTITY torbutton.prefs.block_links "بازداشتÙ? Ú©Ù?Û?Ú© کردÙ? بر رÙ?Û? Ù¾Û?Ù?Ù?د Ù? بارگذارÛ? Ù?جدد صÙ?حات از Ù?ضعÛ?ت Ù?اÛ? Ù?ختÙ?Ù? تÙ?ر (اختÛ?ارÛ?)">
 <!ENTITY torbutton.prefs.jar_certs "ذخÛ?رÙ? کردÙ? Ú¯Ù?اÙ?Û? Ù?اÛ? SSL در Ù?اÛ?Ù? Ù?اÛ? jar Ù?جزا براÛ? تÙ?ر/غÛ?ر تÙ?ر (تÙ?صÛ?Ù? شدÙ?)">
 <!ENTITY torbutton.prefs.jar_ca_certs "ذخÛ?رÙ? کردÙ? Ú¯Ù?اÙ?Û? Ù?اÛ? CA در Ù?اÛ?Ù? Ù?اÛ? 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.locked_mode "غبر Ù?عاÙ? کردÙ? دکÙ?Ù? Ù? Ú©Ù?Û?د Ù?اÛ? Ù?Û?اÙ?بر جÙ?ت جÙ?Ù?Ú¯Û?رÛ? از Ù?عاÙ?/غÛ?رÙ?عاÙ? سازÛ? Ù?اÛ? تصادÙ?Û?">
+<!ENTITY torbutton.prefs.startup_state "در Ù?Ù?گاÙ? شرÙ?ع عادÛ?Ø? Ù?ضعÛ?ت تÙ?ر را تÙ?ظÛ?Ù? Ú©Ù? بÙ?:">
+<!ENTITY torbutton.prefs.shutdown_state "Ù?ضعÛ?ت بستÙ?">
+<!ENTITY torbutton.prefs.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.block_nontor_file_net "بازداشتÙ? دسترسÛ? بÙ? شبکÙ? ازÙ?شاÙ?Û? Ù?اÛ? Ù?ب file:// در حاÙ?ت غÛ?رتÙ?ر">
+<!ENTITY torbutton.prefs.restore_defaults "بازگرداÙ?دÙ? تÙ?ظÛ?Ù?ات Ù¾Û?Ø´Ù?رض">
+<!ENTITY torbutton.prefs.test_settings "آزÙ?Ù?دÙ? تÙ?ظÛ?Ù?ات">
+<!ENTITY torbutton.prefs.test_auto "با شرÙ?ع Ù?اÛ?رÙ?اکس بعد از Ù?ر Ù?عاÙ?/غÛ?رÙ?عاÙ? کردÙ? تÙ?ظÛ?Ù?ات تÙ?ر را آزÙ?اÛ?Ø´ Ú©Ù?">
 <!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.tor_memory_jar "Ú©Ù?Ú©Û? Ù?اÛ? تÙ?ر را بر رÙ?Û? دÛ?سک Ù?Ù?Ù?Û?س">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Ú©Ù?Ú©Û? Ù?اÛ? غÛ?ر تÙ?ر را بر رÙ?Û? دÛ?سک Ù?Ù?Ù?Û?س">
+<!ENTITY torbutton.prefs.session_restore "Ø¢Û?ا Ù?گاÙ? دارÙ?دÙ? Ù?شست Ù?ا اÛ?Ù? برگÙ? Ù?ا را ذخÛ?رÙ? Ù? بازگرداÙ?Û? کردÙ? است:">
+<!ENTITY torbutton.prefs.nontor_tabs "برگÙ? Ù?ا در حاÙ?ت غÛ?ر تÙ?ر بازگزارÛ? شدÙ? اÙ?د">
+<!ENTITY torbutton.prefs.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: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.socks_vfive "SOCK v5">
+<!ENTITY torbutton.prefs.no_proxies_on "بدÙ?Ù? پراکسÛ? براÛ?:">
+<!ENTITY torbutton.prefs.no_proxy_warning "خطر: از استÙ?ادÙ? کردÙ? از hostname در باÙ?ا بپرÙ?Û?زÛ?د">
+<!ENTITY torbutton.prefs.disable_livemarks "اضاÙ?Ù? کردÙ? بÙ? bookmark را در Ø­Û?Ù? استÙ?ادÙ? از تÙ?ر غÛ?ر Ù?عاÙ? Ú©Ù?">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties
index 93e4fd2..b435815 100644
--- a/src/chrome/locale/fa/torbutton.properties
+++ b/src/chrome/locale/fa/torbutton.properties
@@ -1,30 +1,30 @@
 torbutton.button.tooltip.disabled = Ù?عاÙ? کردÙ? تÙ?ر
 torbutton.button.tooltip.enabled = غÛ?رÙ?عاÙ? کردÙ? تÙ?ر
-torbutton.panel.tooltip.disabled = Ù?شاردادÙ? براÛ? Ù?عاÙ? کردÙ? تÙ?ر
-torbutton.panel.tooltip.enabled = Ù?شاردادÙ? براÛ? غÛ?رÙ?عاÙ? کردÙ? تÙ?ر
-torbutton.panel.plugins.disabled = Ù?شاردادÙ? براÛ? Ù?عاÙ? کردÙ? Ù¾Ù?اگÛ?Ù? Ù?ا
-torbutton.panel.plugins.enabled = Ù?شاردادÙ? براÛ? غÛ?رÙ?عاÙ? کردÙ? Ù¾Ù?اگÛ?Ù? Ù?ا
-torbutton.panel.label.disabled = تÙ?ر غÛ?رÙ?عاÙ? شد
+torbutton.panel.tooltip.disabled = براÛ? Ù?عاÙ? کردÙ? تÙ?رکÙ?Û?Ú© Ú©Ù?Û?د
+torbutton.panel.tooltip.enabled = براÛ? غÛ?رÙ?عاÙ? کردÙ? تÙ?ر Ú©Ù?Û?Ú© Ú©Ù?Û?د
+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.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 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?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (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?
+torbutton.popup.ff3.warning = Ù?شدار!\n\nدکÙ?Ù? تÙ?ر در Ù?اÛ?رÙ?اکس 3 Ù?حدÙ?دÙ? زÙ?اÙ?Û? Ù? بÙ?Ú© Ù?ارک Ù?ا را از طرÛ?Ù? تÙ?راÙ?شا Ù?Û?Ú©Ù?د.\n\nØ¢Û?ا در Ù?ر صÙ?رت Ù?اÛ?Ù? بÙ? اداÙ?Ù? Ù?ستÛ?دØ?
+torbutton.popup.toggle.warning = Ø´Ù?ا باÛ?د تÙ?ر را Ù?عاÙ?/غÛ?ر Ù?عاÙ? Ù? Û?ا Ù?اÛ?رÙ?اکس را دÙ?بارÙ? راÙ? اÙ?دازÛ? Ú©Ù?Û?د تا تغÛ?Û?رات اÙ?جاÙ? Ø´Ù?د.
+torbutton.popup.test.success = تÙ?ربا Ù?Ù?Ù?Ù?Û?ت آزÙ?اÛ?Ø´ را سپرÛ? کرد!
+torbutton.popup.test.failure = آزÙ?اÛ?Ø´ تÙ?ر Ù?Ù?Ù?Ù?Û?ت Ø¢Ù?Û?ز Ù?بÙ?د! تÙ?ظÛ?Ù?ات پراکسÛ? Ù? Ù¾Ù?Ù?Û?Ù¾Ù? را بررسÛ? Ú©Ù?Û?د.
+torbutton.popup.test.confirm_toggle = آخÛ?رÙ? تغÛ?Û?رات اÙ?جاÙ? شدÙ? در تÙ?ر پراکسÛ? Ù?Ù?Ù?Ù?Û?ت Ø¢Ù?Û?ز Ù?بÙ?د.\n\nØ¢Û?ا Ù?Ø·Ù?ئÙ? Ù?ستÛ?د Ú©Ù? Ù?Û?Ø®Ù?اÙ?Û?د در Ù?ر صÙ?رت Ø¢Ù?Ù?ا را Ù?عاÙ? Ú©Ù?Û?دØ?\n\nÙ?کتÙ?: اگرÙ?Ø´Ú©Ù?ات Ù?Ù?جÙ?د را Ø­Ù? کردÛ?دØ? Ù?Û?تÙ?اÙ?Û?د دÙ?بارÙ? آزÙ?Ù?Ù? بررسÛ? را در Ù¾Ù?جرÙ? تÙ?ظÛ?Ù?ات پراکسÛ? دکÙ?Ù? تÙ?راÙ?جاÙ? دÙ?Û?د تا دÛ?گر اÛ?Ù? اخطار را درÛ?اÙ?ت Ù?Ú©Ù?Û?د.
+torbutton.popup.test.ff3_notice = بر رÙ?Û? OK Ú©Ù?Û?Ú© Ú©Ù?Û?د تا تÙ?ظÛ?Ù?ات پراکسÛ? تÙ?ر آزÙ?اÛ?Ø´ Ø´Ù?د. اÛ?Ù? آزÙ?اÛ?Ø´ در پس ضÙ?Û?Ù?Ù? اتÙ?اÙ? Ù?Û?اÙ?تد. Ù?Ø·Ù?ا صبÙ?ر باشÛ?د.
+torbutton.panel.label.verified = تÙ?رتاÛ?Û?د شد
+torbutton.popup.test.auto_failed = آزÙ?Ù?Ù? Ø®Ù?دکارپراکسÛ? تÙ?ربا اخطار Ù?Ù?اجÙ? شد.\n\nØ¢Û?ا Ù?Ø·Ù?ئÙ? Ù?ستÛ?د Ú©Ù? در Ù?ر صÙ?رت Ù?Û?Ø®Ù?اÙ?Û?د Ø¢Ù? را Ù?عاÙ? Ú©Ù?Û?دØ?
+torbutton.prefs.recommended = (تÙ?صÙ?Ù? شدÙ?)
+torbutton.prefs.optional = (اختÛ?ارÛ?)
+torbutton.prefs.crucial = (بسÛ?ار Ù?Ù?Ù?)
+torbutton.popup.external.title = Ù?حتÙ?Û?ات خارجÛ? بارگزارÛ? Ø´Ù?Ù?دØ?
+torbutton.popup.external.app = Û?Ú© برÙ?اÙ?Ù? خارجÛ? باÛ?د Ù?ارد عÙ?Ù? Ø´Ù?د:\n\n
+torbutton.popup.external.note = \n\nÙ?کتÙ?: برÙ?اÙ?Ù? Ù?اÛ? خارجÛ? تÙ?سط تÙ?ر بÙ? Ø·Ù?ر Ù¾Û?Ø´Ù?رض اÙ?Ù? Ù?شدÙ? اÙ?د Ù? Ù?Ù?Ú©Ù? است Ù?Ù?Û?ت اصÙ?Û? Ø´Ù?ا را آشکار Ú©Ù?Ù?د!\n
+torbutton.popup.launch = اجراÛ? برÙ?اÙ?Ù?
+torbutton.popup.cancel = Ù?غÙ?
+torbutton.popup.dontask = از حاÙ?ا بÙ? بعد Ù?ر برÙ?اÙ?Ù? اÛ? را اجرا Ú©Ù?
+torbutton.popup.test.no_http_proxy = آزÙ?Ù?Ù? پراکسÛ? تÙ?ر: پراکسÛ? HTTP Ù?Ø­Ù?Û? Ù?ابÙ? دسترسÛ? Ù?Û?ست. Ø¢Û?ا Ù¾Ù?Ù?Û?Ù¾Ù? بÙ? درستÛ? اجرا شدÙ? استØ?
diff --git a/src/chrome/locale/fi/torbutton.dtd b/src/chrome/locale/fi/torbutton.dtd
index e4f195d..0a2427e 100644
--- a/src/chrome/locale/fi/torbutton.dtd
+++ b/src/chrome/locale/fi/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/fi/torbutton.properties b/src/chrome/locale/fi/torbutton.properties
index 3250b59..90db0fb 100644
--- a/src/chrome/locale/fi/torbutton.properties
+++ b/src/chrome/locale/fi/torbutton.properties
@@ -1,11 +1,11 @@
-torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.disabled = Ota Tor käyttöön
 torbutton.button.tooltip.enabled = Poista Tor käytöstä.
 torbutton.panel.tooltip.disabled = Käynnistä Tor napsauttamalla.
 torbutton.panel.tooltip.enabled = Poista Tor käytöstä napsauttamalla.
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
-torbutton.panel.label.disabled = Tor Pois Käytöstä.
-torbutton.panel.label.enabled = Tor Käytössä.
+torbutton.panel.plugins.disabled = Salli lisäosat napsauttamalla
+torbutton.panel.plugins.enabled = Estä lisäosat napsauttamalla
+torbutton.panel.label.disabled = Tor pois käytöstä.
+torbutton.panel.label.enabled = Tor käytössä.
 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
diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd
index 78c0332..8873a64 100644
--- a/src/chrome/locale/fr/torbutton.dtd
+++ b/src/chrome/locale/fr/torbutton.dtd
@@ -83,7 +83,7 @@
 <!ENTITY torbutton.prefs.restore_defaults "Valeurs par défaut">
 <!ENTITY torbutton.prefs.test_settings "Tester les paramètres">
 <!ENTITY torbutton.prefs.test_auto "Tester mes paramètres Tor lors de la première activation/désactivation suivant chaque démarrage de Firefox">
-<!ENTITY torbutton.prefs.disable_livemarks "Désactiver les marques-pages dynamiques durant l'utilisation de Tor">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Ne pas écrire les cookies de Tor sur le disque">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Ne pas écrire les cookies Non-Tor sur le disque">
 <!ENTITY torbutton.prefs.session_restore "Permettre à la session de sauver et restaurer ces onglets:">
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Désactiver les marques-pages dynamiques durant l'utilisation de Tor">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/fur/torbutton.dtd b/src/chrome/locale/fur/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/fur/torbutton.dtd
+++ b/src/chrome/locale/fur/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/gl/torbutton.dtd b/src/chrome/locale/gl/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/gl/torbutton.dtd
+++ b/src/chrome/locale/gl/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/gu/torbutton.dtd b/src/chrome/locale/gu/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/gu/torbutton.dtd
+++ b/src/chrome/locale/gu/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/he/torbutton.dtd
+++ b/src/chrome/locale/he/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/hi/torbutton.dtd b/src/chrome/locale/hi/torbutton.dtd
index 8ea8deb..a6c9984 100644
--- a/src/chrome/locale/hi/torbutton.dtd
+++ b/src/chrome/locale/hi/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/hr/torbutton.dtd b/src/chrome/locale/hr/torbutton.dtd
index 0f2cbfc..2858c5c 100644
--- a/src/chrome/locale/hr/torbutton.dtd
+++ b/src/chrome/locale/hr/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/hu/torbutton.dtd
+++ b/src/chrome/locale/hu/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/id/torbutton.dtd
+++ b/src/chrome/locale/id/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/is/torbutton.dtd
+++ b/src/chrome/locale/is/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd
index 40903c0..48c6241 100644
--- a/src/chrome/locale/it/torbutton.dtd
+++ b/src/chrome/locale/it/torbutton.dtd
@@ -83,7 +83,7 @@
 <!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.disable_livemarks "Disable livemarks updates during Tor usage">
 <!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:">
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disabilita gli aggiornamenti dei livemarks durante l'uso di Tor">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/ja/torbutton.dtd
+++ b/src/chrome/locale/ja/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/ka/torbutton.dtd
+++ b/src/chrome/locale/ka/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/km/torbutton.dtd b/src/chrome/locale/km/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/km/torbutton.dtd
+++ b/src/chrome/locale/km/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/ko/torbutton.dtd
+++ b/src/chrome/locale/ko/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/ku/torbutton.dtd b/src/chrome/locale/ku/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/ku/torbutton.dtd
+++ b/src/chrome/locale/ku/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/mt/torbutton.dtd b/src/chrome/locale/mt/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/mt/torbutton.dtd
+++ b/src/chrome/locale/mt/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd
index cbf82a9..28c0566 100644
--- a/src/chrome/locale/nb/torbutton.dtd
+++ b/src/chrome/locale/nb/torbutton.dtd
@@ -83,7 +83,7 @@
 <!ENTITY torbutton.prefs.restore_defaults "Gjenopprett standard">
 <!ENTITY torbutton.prefs.test_settings "Test innstillinger">
 <!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 oppdateringer av live-bokmerker under Tor">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Ikke skriv Tor-infokapsler til disk">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Ikke skriv ikke-Tor-infokapsler til disk">
 <!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Deaktiver oppdateringer av live-bokmerker under Tor">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd
index ca4e276..3327fd1 100644
--- a/src/chrome/locale/nl/torbutton.dtd
+++ b/src/chrome/locale/nl/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/pa/torbutton.dtd b/src/chrome/locale/pa/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/pa/torbutton.dtd
+++ b/src/chrome/locale/pa/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd
index 55d2327..57d52e1 100644
--- a/src/chrome/locale/pl/torbutton.dtd
+++ b/src/chrome/locale/pl/torbutton.dtd
@@ -8,7 +8,7 @@
 <!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.custom_settings "Użyj spersonalizowanych ustawieÅ? proxy.">
 <!ENTITY torbutton.prefs.proxy.host.http "Serwer proxy HTTP:">
 <!ENTITY torbutton.prefs.proxy.host.https "Serwer proxy SSL:">
 <!ENTITY torbutton.prefs.proxy.host.ftp "Serwer proxy FTP:">
@@ -16,7 +16,7 @@
 <!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
 <!ENTITY torbutton.about.title "O Torbutton">
-<!ENTITY torbutton.pref_connection.notice "Aby zmieniÄ? te ustawienia wyÅ?Ä?cz Torbutton">
+<!ENTITY torbutton.pref_connection.notice "Aby zmieniÄ? te ustawienia wyÅ?Ä?cz Torbutton.">
 <!ENTITY torbutton.pref_connection.more_info "WiÄ?cej informacji">
 <!ENTITY torbutton.pref_connection_more_info.title "Pomoc">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton jest wÅ?Ä?czony. JeÅ?li chcesz zmieniÄ? inne ustawienia proxy musisz wyÅ?Ä?czyÄ? Torbutton i powróciÄ? tutaj. JeÅ?li chcesz zmieniÄ? ustawienia proxy Tor, zrób to tutaj.">
@@ -48,7 +48,7 @@
 <!ENTITY torbutton.prefs.cookies "Ciasteczka">
 <!ENTITY torbutton.prefs.cache "PamiÄ?Ä? podrÄ?czna">
 <!ENTITY torbutton.prefs.history "Historia">
-<!ENTITY torbutton.prefs.no_search "WyÅ?Ä?cz sugestie przy wyszukiwaniu podczas trybu Tor (zalecane)">
+<!ENTITY torbutton.prefs.no_search "WyÅ?Ä?cz sugerowane zapytania wyszukiwania podczas trybu Tor (zalecane)">
 <!ENTITY torbutton.prefs.shutdown "WyÅ?Ä?czenie">
 <!ENTITY torbutton.prefs.tor_shutdown "UsuÅ? ciasteczka Tora gdy nastÄ?puje wyÅ?Ä?czenie w trybie z wÅ?Ä?czonym Torem">
 <!ENTITY torbutton.prefs.all_shutdown "UsuÅ? ciasteczka zawsze przy wyÅ?Ä?czaniu przeglÄ?darki">
@@ -60,7 +60,7 @@
 <!ENTITY torbutton.prefs.disable_domstorage "Blokuj zapisywanie DOM podczas używania Tora (krytyczne)">
 <!ENTITY torbutton.prefs.forms "Formularze">
 <!ENTITY torbutton.prefs.block_tforms "Blokuj zapamiÄ?tywanie haseÅ? z formularzy (zalecane)">
-<!ENTITY torbutton.prefs.block_ntforms "Blokuj zapamiÄ?tywanie haseÅ? z formularzy gdy Tor nieaktywny (opcjonalnie)">
+<!ENTITY torbutton.prefs.block_ntforms "Blokuj zapamiÄ?tywanie haseÅ? oraz zawartoÅ?ci formularzy gdy Tor jest nieaktywny (opcjonalnie)">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "bez Tora">
 <!ENTITY torbutton.prefs.restore_tor "Po przywróceniu sesji, ustaw stan Tora na:">
@@ -83,7 +83,7 @@
 <!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.disable_livemarks "Disable livemarks updates during Tor usage">
 <!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:">
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "WyÅ?Ä?cz uaktualnienia livemarks podczas używania Tora">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd
index 3a4de25..c8f8e8d 100644
--- a/src/chrome/locale/pt-BR/torbutton.dtd
+++ b/src/chrome/locale/pt-BR/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/pt-BR/torbutton.properties b/src/chrome/locale/pt-BR/torbutton.properties
index 4b778e1..b0e6e14 100644
--- a/src/chrome/locale/pt-BR/torbutton.properties
+++ b/src/chrome/locale/pt-BR/torbutton.properties
@@ -10,21 +10,21 @@ extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provê
 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 bloqueou carregamento do plugin de conteúdo do TOR.\n\nUse o Salvar como.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton: Você não possui nenhum Certificado de Autenticação. Verificar a lista de Certificado de Autenticação pode ser uma operação lenta para oo TOR. Gostaria de desabilitar o modo de isolamento de Certificado de Autenticação? (Se você não entendeu, o mais seguro é clicar 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.ff3.warning = Aviso!\n\nTorbutton no Firefox 3 é conhecido por divulgar seu fuso-horário e  o livemarks via Tor.\n\nVocê realmente deseja prosseguir?
 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 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?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
+torbutton.popup.test.success = O teste do proxy Tor foi feito com sucesso.
+torbutton.popup.test.failure = O teste do proxy FALHOU! Verifique seu proxy e as configurações do Polipo.
+torbutton.popup.test.confirm_toggle = O test do proxy Tor mais recente falhou ao usar o Tor.\n\nVocê tem certeza que deseja habilitar assim mesmo?\n\nNota: Se você tiver arrumado o problema, você pode retornar ao teste na janela Torbutton Proxy Preferences para eliminar este aviso.
+torbutton.popup.test.ff3_notice = Clique OK para testar as configurações do proxy Tor. Este teste acontecerá em segundo plano. Por favor seja paciente.
+torbutton.panel.label.verified = Tor verificado.
+torbutton.popup.test.auto_failed = O teste automático do Tor proxy falhou ao usar o Tor.\n\nVocê tem certeza que deseja habilitar assim mesmo?
+torbutton.prefs.recommended = (recomendado)
+torbutton.prefs.optional = (opcional)
 torbutton.prefs.crucial = (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.external.title = Carregar conteúdo externo?
+torbutton.popup.external.app = Uma aplicação externa é necessária para manipular:\n\n
+torbutton.popup.external.note = \n\nNOTA: Aplicações externas N�O são seguras por padrão e podem desmascarar você!\n
+torbutton.popup.launch = Rode a aplicação
+torbutton.popup.cancel = Cancelado
 torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.test.no_http_proxy = Teste do Tor proxy: HTTP Proxy local está inacessível. Polipo está rodando devidamente?
diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd
index 0a12d8c..bfd307d 100644
--- a/src/chrome/locale/pt/torbutton.dtd
+++ b/src/chrome/locale/pt/torbutton.dtd
@@ -1,95 +1,99 @@
 <!ENTITY torbutton.prefs.title "Preferências Torbutton">
 <!ENTITY torbutton.prefs.display_settings "Mostrar configurações">
-<!ENTITY torbutton.prefs.display_panel "Mostrar configurações do proxy Tor na barra de status">
-<!ENTITY torbutton.prefs.panel_format "Formato de amostra da barra de status">
+<!ENTITY torbutton.prefs.display_panel "Mostrar configurações do proxy Tor na barra de estado">
+<!ENTITY torbutton.prefs.panel_format "Formato de visualização na barra de estado:">
 <!ENTITY torbutton.prefs.panel_text_format "Texto">
 <!ENTITY torbutton.prefs.panel_icon_format "Ã?cone">
-<!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.tor_settings "Configurações do Proxy">
+<!ENTITY torbutton.prefs.recommended_settings "Utilizar as configurações recomendadas do proxy para minha versão do Firefox">
+<!ENTITY torbutton.prefs.use_privoxy "Utilizar Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Utilizar Privoxy">
+<!ENTITY torbutton.prefs.custom_settings "Utilizar configurações padrão do proxy">
 <!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
 <!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
 <!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:">
 <!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:">
 <!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Porta:">
-<!ENTITY torbutton.about.title "Sobre Torbutton">
-<!ENTITY torbutton.pref_connection.notice "Desabilitar Torbutton para mudar essas configurações.">
+<!ENTITY torbutton.prefs.proxy.port "Porto:">
+<!ENTITY torbutton.about.title "Sobre o Torbutton">
+<!ENTITY torbutton.pref_connection.notice "Desactivar o Torbutton para mudar estas configurações.">
 <!ENTITY torbutton.pref_connection.more_info "Mais informações">
 <!ENTITY torbutton.pref_connection_more_info.title "Ajuda">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton está habilitado. Se você deseja mudar as configurações de Proxy que não sejam do Tor, por favor desabilite Torbutton e retorne aqui. Se você deseja mudar as configurações do Tor, por favor, use a janela de preferência do Torbutton.">
+<!ENTITY torbutton.pref_connection_more_info.text "Torbutton está activo. Se deseja mudar as configurações de Proxy que não sejam do Tor, por favor desactive o Torbutton e volte aqui. Se deseja alterar as configurações do Tor, por favor, use a janela de preferências do Torbutton.">
 <!ENTITY torbutton.context_menu.toggle "Alterar Status Tor">
 <!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferências...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Sobre Torbutton...">
+<!ENTITY torbutton.context_menu.about "Sobre o Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "Clique para iniciar Torbutton">
+<!ENTITY torbutton.button.tooltip "Clique para iniciar o Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Configurações de Segurança">
-<!ENTITY torbutton.prefs.block_thread "Bloquear leitura do histórico durante a utilização do TOR (importante)">
-<!ENTITY torbutton.prefs.block_thwrite "Bloquear escrita no histórico durante a utilização do TOR (recomendado)">
-<!ENTITY torbutton.prefs.block_nthread "Bloquear leitura do histórico durante a não utilização do TOR (opcional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Bloquear escrita no histórico durante a não utilização do TOR (opcional)">
-<!ENTITY torbutton.prefs.clear_history "Limpar histórico ao alternar o uso do TOR (opcional)">
-<!ENTITY torbutton.prefs.clear_cache "Bloquear o cache de disco e limpar todos os caches ao alterar o uso do TOR">
-<!ENTITY torbutton.prefs.block_cache "Bloquear cache de memória e disco durante o uso do TOR">
-<!ENTITY torbutton.prefs.cookie_jars "Armazenar todos os cookies não-Tor num contêiner protegido">
-<!ENTITY torbutton.prefs.mmm_cookies "I manualmente gerenciarei meus cookies (atenção)">
-<!ENTITY torbutton.prefs.clear_cookies "Limpar cookies quando alternar TOR">
-<!ENTITY torbutton.prefs.disable_plugins "Desabilitar plugins durante o uso do TOR (importante)">
-<!ENTITY torbutton.prefs.kill_bad_js "Deter os scripts perigosos de java (crucial)">
+<!ENTITY torbutton.prefs.block_thread "Bloquear leitura do histórico durante a utilização do Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Bloquear escrita no histórico durante a utilização do Tor (recomendado)">
+<!ENTITY torbutton.prefs.block_nthread "Bloquear leitura do histórico durante a não utilização do Tor (opcional)">
+<!ENTITY torbutton.prefs.block_nthwrite "Bloquear escrita no histórico durante a não utilização do Tor (opcional)">
+<!ENTITY torbutton.prefs.clear_history "Limpar histórico ao alterar o uso do Tor (opcional)">
+<!ENTITY torbutton.prefs.clear_cache "Bloquear a cópia local e limpar todos as cópias ao alterar o uso do Tor">
+<!ENTITY torbutton.prefs.block_cache "Bloquear cache de memória e disco durante o uso do Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Armazenar todos os cookies não-Tor num local protegido">
+<!ENTITY torbutton.prefs.mmm_cookies "Eu manualmente administrarei os meus cookies (perigoso)">
+<!ENTITY torbutton.prefs.clear_cookies "Limpar cookies quando alterar a utilização do Tor">
+<!ENTITY torbutton.prefs.disable_plugins "Desactivar plugins durante a utilização do Tor (importante)">
+<!ENTITY torbutton.prefs.kill_bad_js "Bloquear os scripts perigosos de Java (crucial)">
 <!ENTITY torbutton.prefs.isolate_content "Isolar os conteúdos dinâmicos no arquivo de estado de Tor (crucial)">
 <!ENTITY torbutton.prefs.no_updates "Desactivar actualizações durante a utilização do Tor">
-<!ENTITY torbutton.prefs.set_uagent "Mascarar user agent durante utilização de TOR (importante)">
+<!ENTITY torbutton.prefs.set_uagent "Mascarar User Agent durante utilização de Tor (crucial)">
 <!ENTITY torbutton.prefs.dynamic "Conteúdo Dinâmico">
 <!ENTITY torbutton.prefs.cookies "Cookies">
 <!ENTITY torbutton.prefs.cache "Cache">
 <!ENTITY torbutton.prefs.history "Histórico">
-<!ENTITY torbutton.prefs.no_search "Desabilitar sugestões de pesquisa durante o uso do TOR (recomendado)">
+<!ENTITY torbutton.prefs.no_search "Desactivar sugestões de pesquisa durante a utilização do Tor (recomendado)">
 <!ENTITY torbutton.prefs.shutdown "Desligar">
-<!ENTITY torbutton.prefs.tor_shutdown "Limpar cookies quando o TOR estiver habilitado e o navegador for fechado">
+<!ENTITY torbutton.prefs.tor_shutdown "Limpar cookies quando o Tor estiver activo e o navegador for fechado">
 <!ENTITY torbutton.prefs.all_shutdown "Limpar cookies quando qualquer navegador for fechado">
 <!ENTITY torbutton.prefs.no_shutdown "Não limpar meus cookies ao desligar">
-<!ENTITY torbutton.prefs.disable_sessionstore "Desabilitar função de salvar sessão (recomendado)">
+<!ENTITY torbutton.prefs.disable_sessionstore "Desactivar a função de salvar sessão (recomendado)">
 <!ENTITY torbutton.prefs.headers "Cabeçalho">
-<!ENTITY torbutton.prefs.spoof_english "Mimetizar o navegador para Inglês US">
-<!ENTITY torbutton.prefs.disable_referer "Não enviar referer headers durante o uso de Tor (pode truncar alguns sites)">
-<!ENTITY torbutton.prefs.disable_domstorage "Desabilitar armazenamento DOM durante o uso do TOR (importante)">
+<!ENTITY torbutton.prefs.spoof_english "Mimetizar o navegador para Inglês dos EUA">
+<!ENTITY torbutton.prefs.disable_referer "Não enviar informação sobre o referente durante a utilização do Tor (pode bloquear alguns sites)">
+<!ENTITY torbutton.prefs.disable_domstorage "Desactivar o armazenamento DOM durante o uso do Tor (crucial)">
 <!ENTITY torbutton.prefs.forms "Formulários">
-<!ENTITY torbutton.prefs.block_tforms "Bloquear senhas + informações de formulários durante o uso do TOR (recomendado)">
-<!ENTITY torbutton.prefs.block_ntforms "Bloquear senhas + informações de formulários quando não usar o TOR (opcional)">
+<!ENTITY torbutton.prefs.block_tforms "Bloquear senhas + informações de formulários durante o uso do Tor (recomendado)">
+<!ENTITY torbutton.prefs.block_ntforms "Bloquear senhas + informações de formulários quando não usar o Tor (opcional)">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Não-Tor">
 <!ENTITY torbutton.prefs.restore_tor "Na sessão restaurada, ajustar o estado do Tor para:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Recarregar cookie/limpar cookies em uma falha do Firefox (recomendado)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Armazene os cookies, sejam ou não de Tor, em recipientes protegidos (Perigoso)">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Recarregar cookies/limpar cookies em caso de falha do Firefox (recomendado)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Armazene os cookies, sejam ou não do Tor, em recipientes protegidos (perigoso)">
 <!ENTITY torbutton.prefs.clear_http_auth "Limpar as sessões HTTP autenticadas (recomendado)">
 <!ENTITY torbutton.prefs.block_js_history "Isolar o acesso ao histórico de navegação ao arquivo de estado de Tor (crucial)">
 <!ENTITY torbutton.prefs.resize_on_toggle "Alterar o tamanho das páginas em múltiplos de 50px durante o uso de Tor (recomendado)">
-<!ENTITY torbutton.prefs.close_tor "Fechar todas as páginas e abas abertas com Tor ao comutar (opcional)">
-<!ENTITY torbutton.prefs.close_nontor "Fechar todas as páginas e abas não-Tor ao comutar (opcional)">
-<!ENTITY torbutton.prefs.block_links "Bloquear os link clicks e as recarga de páginas desde diferentes arquivos de estado de Tor (opcional)">
-<!ENTITY torbutton.prefs.jar_certs "Armazene certificados SSL em arquivos de estado de Tor separados para páginas Tor e não-Tor (recomendado)">
+<!ENTITY torbutton.prefs.close_tor "Fechar todas as páginas e abas abertas com Tor ao clicar no ícone do Torbutton (opcional)">
+<!ENTITY torbutton.prefs.close_nontor "Fechar todas as páginas e abas não-Tor ao clicar no ícone do Torbutton (opcional)">
+<!ENTITY torbutton.prefs.block_links "Bloquear os cliques em endereços e as recarga de páginas de diferentes arquivos de estado de Tor (opcional)">
+<!ENTITY torbutton.prefs.jar_certs "Armazene certificados SSL em arquivos de estado do Tor separados para páginas Tor e não-Tor (recomendado)">
 <!ENTITY torbutton.prefs.jar_ca_certs "Armazene certificados CA em arquivos de estado separados para páginas Tor e não-Tor (recomendado)">
-<!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.locked_mode "Desactivar botão e atalhos para prevenir a activação/desactivação por engano">
+<!ENTITY torbutton.prefs.startup_state "Na inicialização normal, definir o estado do Tor para:">
 <!ENTITY torbutton.prefs.shutdown_state "Desligar estado">
 <!ENTITY torbutton.prefs.startup "Iniciar">
-<!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.block_tor_file_net "Bloquear o acesso à rede de URLs tipo file:// (recomendado)">
+<!ENTITY torbutton.prefs.block_nontor_file_net "Bloquear o acesso Não-Tor à rede de URLs tipo file://">
+<!ENTITY torbutton.prefs.restore_defaults "Restaurar definições ">
+<!ENTITY torbutton.prefs.test_settings "Testar configurações">
+<!ENTITY torbutton.prefs.test_auto "Testar as minhas configurações sempre que o Firefox iniciar, após a primeira activação do Torbutton">
 <!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.tor_memory_jar "Não escrever cookies Tor para o disco">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Não escrever cookies não-Tor para o disco">
+<!ENTITY torbutton.prefs.session_restore "Salvar e restaurar estas abas:">
+<!ENTITY torbutton.prefs.nontor_tabs "Abas carregadas em estado não-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Abas carregas em estado Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.no_proxies_on "Nenhum proxy para: ">
+<!ENTITY torbutton.prefs.no_proxy_warning "Evite utilizar o nome da máquina no campo a cima">
+<!ENTITY torbutton.prefs.disable_livemarks "Desactivar actualizações durante a utilização do Tor">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties
index 4b778e1..e53ec9d 100644
--- a/src/chrome/locale/pt/torbutton.properties
+++ b/src/chrome/locale/pt/torbutton.properties
@@ -1,30 +1,30 @@
-torbutton.button.tooltip.disabled = Habilitar Tor
-torbutton.button.tooltip.enabled = Desabilitar Tor
-torbutton.panel.tooltip.disabled = Clique para habilitar Tor
-torbutton.panel.tooltip.enabled = Clique para desabilitar Tor
-torbutton.panel.plugins.disabled = Clique para habilitar plugins
-torbutton.panel.plugins.enabled = Clique para desabilitar plugins
-torbutton.panel.label.disabled = Tor desabilitado
-torbutton.panel.label.enabled = Tor habilitado
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provê um ícone para habilitar ou desabilitar rapidamente o proxy Tor
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation. 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 bloqueou carregamento do plugin de conteúdo do TOR.\n\nUse o Salvar como.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton: Você não possui nenhum Certificado de Autenticação. Verificar a lista de Certificado de Autenticação pode ser uma operação lenta para oo TOR. Gostaria de desabilitar o modo de isolamento de Certificado de Autenticação? (Se você não entendeu, o mais seguro é clicar 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 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?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
+torbutton.button.tooltip.disabled = Activar Tor
+torbutton.button.tooltip.enabled = Desactivar Tor
+torbutton.panel.tooltip.disabled = Clique para activar Tor
+torbutton.panel.tooltip.enabled = Clique para desactivar Tor
+torbutton.panel.plugins.disabled = Clique para activar plugins
+torbutton.panel.plugins.enabled = Clique para desactivar plugins
+torbutton.panel.label.disabled = Tor desactivado
+torbutton.panel.label.enabled = Tor activado
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton fornece um ícone para activar ou desactivar rapidamente o proxy Tor
+torbutton.popup.history.warning = O Torbutton bloqueou a alteração de histórico desta página. Isto é uma resolução de um problema de segurança conhecido.\n\nPressione 'enter' na barra de endereços ou abra uma nova aba.\n\n
+torbutton.popup.plugin.warning = Torbutton bloqueou o carregamento do plugin de conteúdo do Tor.\n\nUtilize o Salvar Como.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton: Você não possui nenhum Certificado de Autenticação. Verificar a lista de Certificados de Autenticação pode ser uma operação lenta para o Tor. Gostaria de desactivar o modo de isolamento de Certificados de Autenticação? (Se você não percebeu esta mensagem, o mais seguro é pressionar OK)
+torbutton.popup.ff3.warning = Aviso!\n\nO Torbutton no Firefox 3 é conhecido por dar a conhecer o seu fuso horário e os seus Live Marks, através da rede Tor.\n\nTem a certeza que deseja continuar?
+torbutton.popup.toggle.warning = Tem que pressionar o ícone do Torbutton ou reiniciar o navegador para as alterações terem efeito.
+torbutton.popup.test.success = Teste ao proxy Tor concluído com sucesso!
+torbutton.popup.test.failure = O teste ao proxy Tor FALHOU! Verifique as propriedades do proxy e do Polipo.
+torbutton.popup.test.confirm_toggle = O mais recente teste de utilização de Tor falhou.\n\nTem a certeza que deseja continuar mesmo assim?\n\nNota: Se já resolveu o problema, é recomendado voltar a testar a ligação nas Preferências do Torbutton para remover este aviso.
+torbutton.popup.test.ff3_notice = Pressione OK para testar as configurações do proxy Tor. Este teste é realizado em plano de fundo. Por favor seja paciente.
+torbutton.panel.label.verified = Tor Verificado
+torbutton.popup.test.auto_failed = O teste automático ao proxy Tor falhou.\n\nDeseja activar mesmo assim?
+torbutton.prefs.recommended = (recomendado)
+torbutton.prefs.optional = (opcional)
 torbutton.prefs.crucial = (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?
+torbutton.popup.external.title = Carregar conteúdo externo?
+torbutton.popup.external.app = Uma aplicação externa é necessário para abrir:\n\n
+torbutton.popup.external.note = \n\nNota: Aplicações externas ao Tor N�O são seguras, e podem dar a conhecer a sua origem!\n
+torbutton.popup.launch = Correr aplicação
+torbutton.popup.cancel = Cancelar
+torbutton.popup.dontask = Sempre correr aplicações daqui para a frente
+torbutton.popup.test.no_http_proxy = Teste ao proxy Tor: Erro na ligação ao proxy HTTP local. O Polipo está em execução?
diff --git a/src/chrome/locale/ro/torbutton.dtd b/src/chrome/locale/ro/torbutton.dtd
index 74c46ef..dd2ff42 100644
--- a/src/chrome/locale/ro/torbutton.dtd
+++ b/src/chrome/locale/ro/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd
index ba67a3f..9404272 100644
--- a/src/chrome/locale/ru/torbutton.dtd
+++ b/src/chrome/locale/ru/torbutton.dtd
@@ -83,7 +83,7 @@
 <!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.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Ð?е пиÑ?аÑ?Ñ? cookies на диÑ?к в Ñ?ежиме Tor">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Ð?е пиÑ?аÑ?Ñ? cookies на диÑ?к в Ñ?ежиме Ð?е-Tor">
 <!ENTITY torbutton.prefs.session_restore "Ð?ожеÑ? ли Ñ?Ñ?аниÑ?Ñ?Ñ?Ñ? Ñ?оÑ?Ñ?анÑ?Ñ?Ñ?Ñ?Ñ? и воÑ?Ñ?анавливаÑ?Ñ?Ñ?Ñ? Ñ?еÑ?Ñ?иÑ? Ñ?о Ñ?ледÑ?Ñ?Ñ?ими вкладками:">
@@ -91,5 +91,9 @@
 <!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: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.no_proxies_on "Ð?еÑ? пÑ?окÑ?и длÑ?">
+<!ENTITY torbutton.prefs.no_proxy_warning "Ð?нимание: Ð?е вноÑ?иÑ?е никакиÑ? имен доменов в поле вÑ?Ñ?е">
+<!ENTITY torbutton.prefs.disable_livemarks "Ð?Ñ?клÑ?Ñ?иÑ?Ñ? обновление livemarks во вÑ?емÑ? Ñ?абоÑ?Ñ? в Tor">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties
index c725e8e..bdac9fc 100644
--- a/src/chrome/locale/ru/torbutton.properties
+++ b/src/chrome/locale/ru/torbutton.properties
@@ -22,9 +22,9 @@ 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.app = Ð?неÑ?нÑ?Ñ? пÑ?икладнаÑ? пÑ?огÑ?амма необÑ?одима длÑ? обÑ?абоÑ?ки:\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?
+torbutton.popup.launch = Ð?апÑ?Ñ?Ñ?иÑ?Ñ? пÑ?иложение
+torbutton.popup.cancel = Ð?Ñ?мениÑ?Ñ?
+torbutton.popup.dontask = Ð?Ñ?нане вÑ?егда запÑ?Ñ?каÑ?Ñ? пÑ?иложениÑ?
+torbutton.popup.test.no_http_proxy = Tor пÑ?окÑ?и-Ñ?еÑ?Ñ?: Ð?еÑ?Ñ?нÑ?е HTTP-пÑ?окÑ?и недоÑ?Ñ?Ñ?пнÑ?. РабоÑ?аеÑ?-ли Polipo  должнÑ?м обÑ?азом?
diff --git a/src/chrome/locale/sl/torbutton.dtd b/src/chrome/locale/sl/torbutton.dtd
index 5f4ec2c..eeaa841 100644
--- a/src/chrome/locale/sl/torbutton.dtd
+++ b/src/chrome/locale/sl/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/sq/torbutton.dtd b/src/chrome/locale/sq/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/sq/torbutton.dtd
+++ b/src/chrome/locale/sq/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd
index 9b18387..715bf29 100644
--- a/src/chrome/locale/sv/torbutton.dtd
+++ b/src/chrome/locale/sv/torbutton.dtd
@@ -1,46 +1,46 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
+<!ENTITY torbutton.prefs.title "Inställningar för Torbutton">
 <!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
+<!ENTITY torbutton.prefs.display_panel "Visa inställningar för Tor proxy i statusraden">
 <!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.use_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
+<!ENTITY torbutton.prefs.panel_icon_format "Ikon">
+<!ENTITY torbutton.prefs.tor_settings "Inställningar för proxy">
+<!ENTITY torbutton.prefs.recommended_settings "Använd dom inställningar som rekommenderas för min version av Firefox för att ställa in proxyn">
+<!ENTITY torbutton.prefs.use_privoxy "Använd Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Använd Polipo">
+<!ENTITY torbutton.prefs.custom_settings "Använd egen inställning för proxyn">
+<!ENTITY torbutton.prefs.proxy.host.http "Proxy för HTTP:">
+<!ENTITY torbutton.prefs.proxy.host.https "Proxy för SSL:">
+<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy för FTP:">
+<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy för Gopher:">
+<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS-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.about.title "Om Torbutton">
+<!ENTITY torbutton.pref_connection.notice "Avaktivera Torbutton för att ändra dessa inställningar.">
+<!ENTITY torbutton.pref_connection.more_info "Mer information">
+<!ENTITY torbutton.pref_connection_more_info.title "Hjälp">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton 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 "Slå på/av Tor">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
+<!ENTITY torbutton.context_menu.preferences "Inställningar...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
+<!ENTITY torbutton.context_menu.about "Om 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.button.tooltip "Klicka för att installera Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "Säkerhetsinställningar">
+<!ENTITY torbutton.prefs.block_thread "Blockera läsning av historik medan Tor är aktiverat (kritiskt)">
+<!ENTITY torbutton.prefs.block_thwrite "Blockera lagring av historik medan Tor är aktiverat (rekommenderat)">
+<!ENTITY torbutton.prefs.block_nthread "Blockera läsning av historik medan Tor är avaktiverat (valfritt)">
+<!ENTITY torbutton.prefs.block_nthwrite "Blockera lagring av historik medan Tor är avaktiverat (valfritt)">
+<!ENTITY torbutton.prefs.clear_history "Rensa historik vid på/avslagning av Tor (valfritt)">
+<!ENTITY torbutton.prefs.clear_cache "Rensa diskcache vid på/avslagning av Tor">
+<!ENTITY torbutton.prefs.block_cache "Blockera åtkomst till disk- och minnescache medan Tor är aktiverat">
 <!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.mmm_cookies "Jag sköter cookies manuellt (farligt)">
+<!ENTITY torbutton.prefs.clear_cookies "Rensa cookies vid på/avaktivering av Tor">
+<!ENTITY torbutton.prefs.disable_plugins "Avaktivera plugins när Tor används (kritiskt)">
+<!ENTITY torbutton.prefs.kill_bad_js "FÃ¥nga farligt javascript (kritiskt)">
 <!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)">
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/sw/torbutton.dtd b/src/chrome/locale/sw/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/sw/torbutton.dtd
+++ b/src/chrome/locale/sw/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/th/torbutton.dtd b/src/chrome/locale/th/torbutton.dtd
index 75ada49..f790890 100644
--- a/src/chrome/locale/th/torbutton.dtd
+++ b/src/chrome/locale/th/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/tr/torbutton.dtd
+++ b/src/chrome/locale/tr/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/uk/torbutton.dtd b/src/chrome/locale/uk/torbutton.dtd
index 59fb224..d154c21 100644
--- a/src/chrome/locale/uk/torbutton.dtd
+++ b/src/chrome/locale/uk/torbutton.dtd
@@ -1,5 +1,5 @@
 <!ENTITY torbutton.prefs.title "Ð?алаÑ?Ñ?Ñ?ваннÑ? Torbutton">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
+<!ENTITY torbutton.prefs.display_settings "Ð?оказаÑ?и опÑ?Ñ?Ñ?">
 <!ENTITY torbutton.prefs.display_panel "Ð?оказÑ?ваÑ?и Ñ?Ñ?ан пÑ?окÑ?Ñ? Tor Ñ? Ñ?Ñ?дкÑ? Ñ?Ñ?анÑ?">
 <!ENTITY torbutton.prefs.panel_format "ФоÑ?маÑ? полÑ? Ñ? Ñ?Ñ?дкÑ? Ñ?Ñ?анÑ?">
 <!ENTITY torbutton.prefs.panel_text_format "ТекÑ?Ñ?">
@@ -8,7 +8,7 @@
 <!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.custom_settings "Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и звиÑ?айнÑ? налаÑ?Ñ?Ñ?ваннÑ? пÑ?окÑ?Ñ?">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP пÑ?окÑ?Ñ?:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL пÑ?окÑ?Ñ?:">
 <!ENTITY torbutton.prefs.proxy.host.ftp "FTP пÑ?окÑ?Ñ?:">
@@ -67,7 +67,7 @@
 <!ENTITY torbutton.prefs.reload_crashed_jar "Ð?еÑ?еванÑ?ажиÑ?и кÑ?ки/оÑ?иÑ?Ñ?иÑ?и кÑ?ки пÑ?и падÑ?ннÑ? ФÑ?Ñ?еÑ?оÑ?Ñ? (Ñ?екомендовано)">
 <!ENTITY torbutton.prefs.dual_cookie_jars "Ð?беÑ?Ñ?гаÑ?и Ñ?к Tor, Ñ?ак Ñ? не-Tor кÑ?ки Ñ? заÑ?иÑ?еномÑ? Ñ?Ñ?анÑ? (небезпеÑ?но)">
 <!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.block_js_history "Ð?идÑ?лиÑ?и доÑ?Ñ?Ñ?п до Ñ?Ñ?Ñ?оÑ?Ñ?Ñ? навÑ?гаÑ?Ñ?Ñ? до Tor (важливо)">
 <!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)">
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd
index 8e75c16..6ee1972 100644
--- a/src/chrome/locale/vi/torbutton.dtd
+++ b/src/chrome/locale/vi/torbutton.dtd
@@ -83,7 +83,7 @@
 <!ENTITY torbutton.prefs.restore_defaults "Khôi phục Mặc Ä?á»?nh">
 <!ENTITY torbutton.prefs.test_settings "Thiết lập Thử nghi�m">
 <!ENTITY torbutton.prefs.test_auto "Thá»­ nghiá»?m thiết lập Tor của tôi sau lần bật/tắt Ä?ầu tiên má»?i khi khá»?i Ä?á»?ng Firefox">
-<!ENTITY torbutton.prefs.disable_livemarks "Vô hiá»?u hóa viá»?c cập nhật Ä?ánh-dấu-Ä?á»?ng trong quá trình dùng Tor">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Không ghi cookie Tor vào Ä?Ä©a">
 <!ENTITY torbutton.prefs.nontor_memory_jar "Không ghi cookie Không-Tor vào Ä?Ä©a">
 <!ENTITY torbutton.prefs.session_restore "Ä?á»? phiên lÆ°u trữ và khôi phục các thẻ sau:">
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Vô hiá»?u hóa viá»?c cập nhật Ä?ánh-dấu-Ä?á»?ng trong quá trình dùng Tor">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd
index ca56727..a76874b 100644
--- a/src/chrome/locale/zh-CN/torbutton.dtd
+++ b/src/chrome/locale/zh-CN/torbutton.dtd
@@ -7,7 +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.use_polipo "使� Polipo">
 <!ENTITY torbutton.prefs.custom_settings "使ç?¨è?ªå®?ä¹?代ç??设置">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP 代ç??ï¼?">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL 代ç??ï¼?">
@@ -83,7 +83,7 @@
 <!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.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "使ç?¨Toræµ?è§?æ?¶ä¸?è¦?å°?Cookieå­?å?¥ç£?ç??">
 <!ENTITY torbutton.prefs.nontor_memory_jar "ä¸?ç?¨Toræµ?è§?æ?¶ä¸?è¦?å°?Cookieå­?å?¥ç£?ç??">
 <!ENTITY torbutton.prefs.session_restore "让Firefoxè¿?ç¨?ä¿?å­?å??è?½ä¿?å­?并æ?¢å¤?å¦?ä¸?æ ?签页ï¼?">
@@ -91,5 +91,9 @@
 <!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: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.no_proxies_on "ä¸?使ç?¨ä»£ç??ç??å?°å??:">
+<!ENTITY torbutton.prefs.no_proxy_warning "è­¦å??ï¼?请ä¸?è¦?使ç?¨ä¸?è¿°ä»»ä½?主æ?ºå??ã??">
+<!ENTITY torbutton.prefs.disable_livemarks "使� Tor ��� Livemark(RSS书签) ��">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties
index 9f3e03e..34ee24d 100644
--- a/src/chrome/locale/zh-CN/torbutton.properties
+++ b/src/chrome/locale/zh-CN/torbutton.properties
@@ -13,18 +13,18 @@ torbutton.popup.confirm_ca_certs = Torbutton 注æ??ï¼?æµ?è§?å?¨ä¼¼ä¹?缺å°?è?ª
 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.failure = Tor 代ç??æµ?è¯?失败ï¼?请æ£?æ?¥æ?¨ç??代ç??å??Polipo 设置ã??
+torbutton.popup.test.confirm_toggle = ä¸?ä¸?次Tor代ç??æµ?è¯?失败ã??\n\næ?¨è¿?è¦?å?¯ç?¨ä»£ç??å??ï¼?\n\n注æ??ï¼?å¦?æ??æ?¨å·²ç»?解å?³äº?代ç??é?®é¢?ï¼?请æ??å¼?Torbutton代ç??设置çª?å?£ï¼?æ¶?é?¤æ­¤è­¦å??ã??
 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?
+torbutton.popup.external.title = è½½å?¥å¤?é?¨å??容ï¼?
+torbutton.popup.external.app = é??è¦?å¤?é?¨ç¨?åº?æ?¥å¤?ç??:\n\n
+torbutton.popup.external.note = \n\n注æ??ï¼?å¤?é?¨ç¨?åº?使ç?¨Tor并ä¸?å®?å?¨å?¯è?½æ³?é?²æ?¨ç??身份ï¼?\n
+torbutton.popup.launch = ����
+torbutton.popup.cancel = å??æ¶?
+torbutton.popup.dontask = æ­¤å??æ?»æ?¯å?¯å?¨ç¨?åº?
+torbutton.popup.test.no_http_proxy = Tor代ç??æµ?è¯?ï¼?æ?¬å?°HTTP代ç??ä¸?å?¯è¾¾ï¼?æ?¨ç??Polipo正常å?¯å?¨äº?å??ï¼?
diff --git a/src/chrome/locale/zh-HK/torbutton.dtd b/src/chrome/locale/zh-HK/torbutton.dtd
index 9b18387..7183cca 100644
--- a/src/chrome/locale/zh-HK/torbutton.dtd
+++ b/src/chrome/locale/zh-HK/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd
index 4e7e07f..5893363 100644
--- a/src/chrome/locale/zh-TW/torbutton.dtd
+++ b/src/chrome/locale/zh-TW/torbutton.dtd
@@ -93,3 +93,7 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-- 
1.5.6.5