[or-cvs] r15310: Our first major pootle merge with torbutton. Hopefully mike (in torbutton/trunk/src/chrome/locale: ar de-AT de-CH de-DE el-GR es fa-IR fr-FR hr-HR it-IT nl-NL pl-PL pt-BR ru sl-SI zh-CN zh-TW)

[ioerror at seul.org]

Author: ioerror
Date: 2008-06-16 14:59:50 -0400 (Mon, 16 Jun 2008)
New Revision: 15310

Modified:
   torbutton/trunk/src/chrome/locale/ar/torbutton.dtd
   torbutton/trunk/src/chrome/locale/ar/torbutton.properties
   torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd
   torbutton/trunk/src/chrome/locale/de-AT/torbutton.properties
   torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd
   torbutton/trunk/src/chrome/locale/de-CH/torbutton.properties
   torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd
   torbutton/trunk/src/chrome/locale/de-DE/torbutton.properties
   torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/el-GR/torbutton.properties
   torbutton/trunk/src/chrome/locale/es/torbutton.dtd
   torbutton/trunk/src/chrome/locale/es/torbutton.properties
   torbutton/trunk/src/chrome/locale/fa-IR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/fa-IR/torbutton.properties
   torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/fr-FR/torbutton.properties
   torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/hr-HR/torbutton.properties
   torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd
   torbutton/trunk/src/chrome/locale/it-IT/torbutton.properties
   torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd
   torbutton/trunk/src/chrome/locale/nl-NL/torbutton.properties
   torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd
   torbutton/trunk/src/chrome/locale/pl-PL/torbutton.properties
   torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd
   torbutton/trunk/src/chrome/locale/pt-BR/torbutton.properties
   torbutton/trunk/src/chrome/locale/ru/torbutton.dtd
   torbutton/trunk/src/chrome/locale/ru/torbutton.properties
   torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd
   torbutton/trunk/src/chrome/locale/sl-SI/torbutton.properties
   torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd
   torbutton/trunk/src/chrome/locale/zh-CN/torbutton.properties
   torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd
   torbutton/trunk/src/chrome/locale/zh-TW/torbutton.properties
Log:
Our first major pootle merge with torbutton. Hopefully mike is OK with this. Mike?


Modified: torbutton/trunk/src/chrome/locale/ar/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/ar/torbutton.dtd	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/ar/torbutton.dtd	2008-06-16 18:59:50 UTC (rev 15310)
@@ -1,80 +1,82 @@
-<!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.use_privoxy                    "استخدم بريڤوكسي">
-<!ENTITY torbutton.prefs.custom_settings                "استخدم تضبيطات وسيط مطوعة">
-<!ENTITY torbutton.prefs.proxy.host.http                "وسيط HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https               "وسيط SLL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp                 "وسيط SSL:">
-<!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.more_info            "مزيد من المعلومات">
-<!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              "ت">
-<!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.prefs.clear_cache        "امنع النفاذ إلى مخبئية تور على القرص و أخل كل المخبئية عند تغير حالة تور">
-<!ENTITY torbutton.prefs.block_cache        "امنع النفاذ إلى مخبئية تور على القرص و الذاكرة أثناء عمل تور">
-<!ENTITY torbutton.prefs.cookie_jars        "خزن كعكات غير تور في جرة محمية">
-<!ENTITY torbutton.prefs.mmm_cookies        "سأدير الكعكات يدويا (خطر)">
-<!ENTITY torbutton.prefs.clear_cookies      "أخل الكعكات عند تغير حالة تور">
-<!ENTITY torbutton.prefs.disable_plugins    "امنع الملحقات أثناء عمل تور (أساسي)">
-<!ENTITY torbutton.prefs.kill_bad_js        "التقط جافاسركبت الخطر (أساسي)">
-<!ENTITY torbutton.prefs.isolate_content    "اعزل المحتوى الديناميّ قصرا على حالة تور (أساسي)">
-<!ENTITY torbutton.prefs.no_updates         "امنع التحديثات أثناء عمل تور (محبذ)">
-<!ENTITY torbutton.prefs.set_uagent         "اضبط عميل المستخدم لعمل تور (أساسي)">
-<!ENTITY torbutton.prefs.dynamic              "المحتوى الديناميّ">
-<!ENTITY torbutton.prefs.cookies              "الكعكات">
-<!ENTITY torbutton.prefs.cache                "المخبئية">
-<!ENTITY torbutton.prefs.history             "التأريخ">
-<!ENTITY torbutton.prefs.no_search           "امنع ترشيحات البحث أثناء عمل تور (محبذ)">
-<!ENTITY torbutton.prefs.shutdown              "غلق المتصفح">
-<!ENTITY torbutton.prefs.tor_shutdown          "أخل الكوكيز عند إغلاق المتصفح أثناء عمل تور">
-<!ENTITY torbutton.prefs.all_shutdown          "أخل الكوكيز عند أي إغلاق للمتصفح">
-<!ENTITY torbutton.prefs.no_shutdown           "لا تخل الكوكيز عند إغلاق المتصفح">
-<!ENTITY torbutton.prefs.disable_sessionstore  "عطّل حفظ الجلسة (محبذ)">
-<!ENTITY torbutton.prefs.headers               "الترويسات">
-<!ENTITY torbutton.prefs.spoof_english         "انتحل متصفحا إنجليزيا_أمريكيا">
-<!ENTITY torbutton.prefs.disable_referer       "لا ترسل المحيل أثناء عمل تور (قد يعطل بعض المواقع)">
-<!ENTITY torbutton.prefs.disable_domstorage    "عطّل تخزين DOM أثناء عمل تور (أساسي)">
-<!ENTITY torbutton.prefs.forms            "الاستمارات">
-<!ENTITY torbutton.prefs.block_tforms       "امنع حفظ كلمات السر و مدخلات الاستمارات أثناء عمل تور (محبذ)">
-<!ENTITY torbutton.prefs.block_ntforms       "امنع حفظ كلمات السر و مدخلات الاستمارات أثناء عدم عمل تور (اختياري)">
-<!ENTITY torbutton.prefs.notor_sessionstore    "امنع حافظ الجلسة من حفظ الألسنة المفتوحة أثناء عمل تور (محبذ)">
-<!ENTITY torbutton.prefs.tor    "تور">
-<!ENTITY torbutton.prefs.non_tor    "غير تور">
-<!ENTITY torbutton.prefs.restore_tor   "عند الانهيار استرجع الجلسة المحفوظة بطريق:">
-<!ENTITY torbutton.prefs.reload_crashed_jar   "حمل جرة الكوكيز/أخل الكوكيز عند انهيار فيرفكس (محبذ)">
-<!ENTITY torbutton.prefs.dual_cookie_jars        "احفظ كلا من كوكيز تور و غير تور في جرات آمنة (خطر)">
-<!ENTITY torbutton.prefs.clear_http_auth        "أخل جلسات 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.block_file_net     "امنع النفاذ إلى الشبكة من مسارات file:// (محبّذ)">
-<!ENTITY torbutton.prefs.block_links        "امنع نقر الروابط و إعادة تحميل الصفحات بين حالات تور المختلفة (اختياري)">
-<!ENTITY torbutton.prefs.locked_mode        "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state      "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state      "Shutdown state">
-<!ENTITY torbutton.prefs.startup             "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore    "Prevent session store from saving Non-Tor loaded tabs">
+<!ENTITY torbutton.prefs.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.use_privoxy "استخدم بريڤوكسي">
+<!ENTITY torbutton.prefs.custom_settings "استخدم تضبيطات وسيط مطوعة">
+<!ENTITY torbutton.prefs.proxy.host.http "وسيط HTTP:">
+<!ENTITY torbutton.prefs.proxy.host.https "وسيط SLL:">
+<!ENTITY torbutton.prefs.proxy.host.ftp "وسيط SSL:">
+<!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.more_info "مزيد من المعلومات">
+<!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 "ت">
+<!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.prefs.clear_cache "امنع النفاذ إلى مخبئية تور على القرص و أخل كل المخبئية عند تغير حالة تور">
+<!ENTITY torbutton.prefs.block_cache "امنع النفاذ إلى مخبئية تور على القرص و الذاكرة أثناء عمل تور">
+<!ENTITY torbutton.prefs.cookie_jars "خزن كعكات غير تور في جرة محمية">
+<!ENTITY torbutton.prefs.mmm_cookies "سأدير الكعكات يدويا (خطر)">
+<!ENTITY torbutton.prefs.clear_cookies "أخل الكعكات عند تغير حالة تور">
+<!ENTITY torbutton.prefs.disable_plugins "امنع الملحقات أثناء عمل تور (أساسي)">
+<!ENTITY torbutton.prefs.kill_bad_js "التقط جافاسركبت الخطر (أساسي)">
+<!ENTITY torbutton.prefs.isolate_content "اعزل المحتوى الديناميّ قصرا على حالة تور (أساسي)">
+<!ENTITY torbutton.prefs.no_updates "امنع التحديثات أثناء عمل تور (محبذ)">
+<!ENTITY torbutton.prefs.set_uagent "اضبط عميل المستخدم لعمل تور (أساسي)">
+<!ENTITY torbutton.prefs.dynamic "المحتوى الديناميّ">
+<!ENTITY torbutton.prefs.cookies "الكعكات">
+<!ENTITY torbutton.prefs.cache "المخبئية">
+<!ENTITY torbutton.prefs.history "التأريخ">
+<!ENTITY torbutton.prefs.no_search "امنع ترشيحات البحث أثناء عمل تور (محبذ)">
+<!ENTITY torbutton.prefs.shutdown "غلق المتصفح">
+<!ENTITY torbutton.prefs.tor_shutdown "أخل الكوكيز عند إغلاق المتصفح أثناء عمل تور">
+<!ENTITY torbutton.prefs.all_shutdown "أخل الكوكيز عند أي إغلاق للمتصفح">
+<!ENTITY torbutton.prefs.no_shutdown "لا تخل الكوكيز عند إغلاق المتصفح">
+<!ENTITY torbutton.prefs.disable_sessionstore "عطّل حفظ الجلسة (محبذ)">
+<!ENTITY torbutton.prefs.headers "الترويسات">
+<!ENTITY torbutton.prefs.spoof_english "انتحل متصفحا إنجليزيا_أمريكيا">
+<!ENTITY torbutton.prefs.disable_referer "لا ترسل المحيل أثناء عمل تور (قد يعطل بعض المواقع)">
+<!ENTITY torbutton.prefs.disable_domstorage "عطّل تخزين DOM أثناء عمل تور (أساسي)">
+<!ENTITY torbutton.prefs.forms "الاستمارات">
+<!ENTITY torbutton.prefs.block_tforms "امنع حفظ كلمات السر و مدخلات الاستمارات أثناء عمل تور (محبذ)">
+<!ENTITY torbutton.prefs.block_ntforms "امنع حفظ كلمات السر و مدخلات الاستمارات أثناء عدم عمل تور (اختياري)">
+<!ENTITY torbutton.prefs.notor_sessionstore "امنع حافظ الجلسة من حفظ الألسنة المفتوحة أثناء عمل تور (محبذ)">
+<!ENTITY torbutton.prefs.tor "تور">
+<!ENTITY torbutton.prefs.non_tor "غير تور">
+<!ENTITY torbutton.prefs.restore_tor "عند الانهيار استرجع الجلسة المحفوظة بطريق:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "حمل جرة الكوكيز/أخل الكوكيز عند انهيار فيرفكس (محبذ)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "احفظ كلا من كوكيز تور و غير تور في جرات آمنة (خطر)">
+<!ENTITY torbutton.prefs.clear_http_auth "أخل جلسات 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.block_file_net "امنع النفاذ إلى الشبكة من مسارات file:// (محبّذ)">
+<!ENTITY torbutton.prefs.block_links "امنع نقر الروابط و إعادة تحميل الصفحات بين حالات تور المختلفة (اختياري)">
+<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
+<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
+<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">

Modified: torbutton/trunk/src/chrome/locale/ar/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/ar/torbutton.properties	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/ar/torbutton.properties	2008-06-16 18:59:50 UTC (rev 15310)
@@ -9,5 +9,5 @@
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = يوفر زرتور زرا للتحكم بسهولة في استخدام فيرفكس لوسيط تور
 torbutton.popup.history.warning = منع توربتن تعديل الحالة-المتغيرة للتأريخ.\n\nطالع تضبيطات التأريخ لتسمح بهذا.\n\n
 torbutton.popup.plugin.warning = منع توربتن تحميلا مباشرا لمحتوى ملحقة.\n\nاستخدم 'احفظ باسم' بدلا عن هذا.\n\n
-
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd	2008-06-16 18:59:50 UTC (rev 15310)
@@ -27,54 +27,56 @@
 <!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Hier klicken, um Torbutton einzurichten">
-<!ENTITY torbutton.prefs.sec_settings        "Security Settings">
-<!ENTITY torbutton.prefs.block_thread        "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite       "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread       "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite      "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history       "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache        "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache        "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars        "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies        "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies      "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins    "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js        "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content    "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates         "Disable updates during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.set_uagent         "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic              "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies              "Cookies">
-<!ENTITY torbutton.prefs.cache                "Cache">
-<!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown              "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers               "Headers">
-<!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer       "Don't send referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.disable_domstorage    "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms            "Forms">
-<!ENTITY torbutton.prefs.block_tforms       "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms       "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore    "Prevent session store from saving Tor-loaded tabs (recommended)">
-<!ENTITY torbutton.prefs.tor    "Tor">
-<!ENTITY torbutton.prefs.non_tor    "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
-<!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history       "Isolate access of history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">
-<!ENTITY torbutton.prefs.close_tor    "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor       "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_file_net     "Block access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_links        "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.locked_mode        "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state      "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state      "Shutdown state">
-<!ENTITY torbutton.prefs.startup             "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore    "Prevent session store from saving Non-Tor loaded tabs">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.forms "Forms">
+<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
+<!ENTITY torbutton.prefs.tor "Tor">
+<!ENTITY torbutton.prefs.non_tor "Non-Tor">
+<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
+<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
+<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
+<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
+<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
+<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">

Modified: torbutton/trunk/src/chrome/locale/de-AT/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/de-AT/torbutton.properties	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/de-AT/torbutton.properties	2008-06-16 18:59:50 UTC (rev 15310)
@@ -1,10 +1,13 @@
-torbutton.button.tooltip.disabled=Tor aktivieren
-torbutton.button.tooltip.enabled=Tor deaktivieren
-torbutton.panel.tooltip.disabled=Klicken, um Tor zu aktivieren
-torbutton.panel.tooltip.enabled=Klicken, um Tor zu deaktivieren
-torbutton.panel.label.disabled=Tor deaktiviert
-torbutton.panel.label.enabled=Tor aktiviert
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Dank Torbutton können Sie den Tor-Proxy mit einem Klick ein- und ausschalten
+torbutton.button.tooltip.disabled = Tor aktivieren
+torbutton.button.tooltip.enabled = Tor deaktivieren
+torbutton.panel.tooltip.disabled = Klicken, um Tor zu aktivieren
+torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor deaktiviert
+torbutton.panel.label.enabled = Tor aktiviert
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Dank Torbutton können Sie den Tor-Proxy mit einem Klick ein- und ausschalten
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd	2008-06-16 18:59:50 UTC (rev 15310)
@@ -27,54 +27,56 @@
 <!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Hier klicken, um Torbutton einzurichten">
-<!ENTITY torbutton.prefs.sec_settings        "Security Settings">
-<!ENTITY torbutton.prefs.block_thread        "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite       "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread       "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite      "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history       "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache        "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache        "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars        "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies        "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies      "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins    "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js        "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content    "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates         "Disable updates during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.set_uagent         "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic              "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies              "Cookies">
-<!ENTITY torbutton.prefs.cache                "Cache">
-<!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown              "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers               "Headers">
-<!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer       "Don't send referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.disable_domstorage    "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms            "Forms">
-<!ENTITY torbutton.prefs.block_tforms       "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms       "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore    "Prevent session store from saving Tor-loaded tabs (recommended)">
-<!ENTITY torbutton.prefs.tor    "Tor">
-<!ENTITY torbutton.prefs.non_tor    "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
-<!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history       "Isolate access of history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">
-<!ENTITY torbutton.prefs.close_tor    "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor       "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_file_net     "Block access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_links        "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.locked_mode        "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state      "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state      "Shutdown state">
-<!ENTITY torbutton.prefs.startup             "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore    "Prevent session store from saving Non-Tor loaded tabs">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.forms "Forms">
+<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
+<!ENTITY torbutton.prefs.tor "Tor">
+<!ENTITY torbutton.prefs.non_tor "Non-Tor">
+<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
+<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
+<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
+<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
+<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
+<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">

Modified: torbutton/trunk/src/chrome/locale/de-CH/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/de-CH/torbutton.properties	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/de-CH/torbutton.properties	2008-06-16 18:59:50 UTC (rev 15310)
@@ -1,10 +1,13 @@
-torbutton.button.tooltip.disabled=Tor aktivieren
-torbutton.button.tooltip.enabled=Tor deaktivieren
-torbutton.panel.tooltip.disabled=Klicken, um Tor zu aktivieren
-torbutton.panel.tooltip.enabled=Klicken, um Tor zu deaktivieren
-torbutton.panel.label.disabled=Tor deaktiviert
-torbutton.panel.label.enabled=Tor aktiviert
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Dank Torbutton können Sie den Tor-Proxy mit einem Klick ein- und ausschalten
+torbutton.button.tooltip.disabled = Tor aktivieren
+torbutton.button.tooltip.enabled = Tor deaktivieren
+torbutton.panel.tooltip.disabled = Klicken, um Tor zu aktivieren
+torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor deaktiviert
+torbutton.panel.label.enabled = Tor aktiviert
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Dank Torbutton können Sie den Tor-Proxy mit einem Klick ein- und ausschalten
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd	2008-06-16 18:59:50 UTC (rev 15310)
@@ -26,55 +26,57 @@
 <!ENTITY torbutton.context_menu.about "Über Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "Hier klicken, um Torbutton einzurichten">
-<!ENTITY torbutton.prefs.sec_settings        "Security Settings">
-<!ENTITY torbutton.prefs.block_thread        "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite       "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread       "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite      "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history       "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache        "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache        "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars        "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies        "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies      "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins    "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js        "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content    "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates         "Disable updates during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.set_uagent         "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic              "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies              "Cookies">
-<!ENTITY torbutton.prefs.cache                "Cache">
-<!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown              "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers               "Headers">
-<!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer       "Don't send referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.disable_domstorage    "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms            "Forms">
-<!ENTITY torbutton.prefs.block_tforms       "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms       "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore    "Prevent session store from saving Tor-loaded tabs (recommended)">
-<!ENTITY torbutton.prefs.tor    "Tor">
-<!ENTITY torbutton.prefs.non_tor    "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
-<!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history       "Isolate access of history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">
-<!ENTITY torbutton.prefs.close_tor    "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor       "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_file_net     "Block access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_links        "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.locked_mode        "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state      "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state      "Shutdown state">
-<!ENTITY torbutton.prefs.startup             "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore    "Prevent session store from saving Non-Tor loaded tabs">
+<!ENTITY torbutton.button.tooltip "Klicken, um Torbutton zu aktivieren">
+<!ENTITY torbutton.prefs.sec_settings "Sicherheitseinstellungen">
+<!ENTITY torbutton.prefs.block_thread "Lesen von History Einträgen während der Benutzung von Tor verhindern (wichtig)">
+<!ENTITY torbutton.prefs.block_thwrite "Schreiben von History Einträgen während der Benutzung von Tor verhindern (empfohlen)">
+<!ENTITY torbutton.prefs.block_nthread "Lesen von History Einträgen ausserhalb der Benutzung von Tor verhindern (optional)">
+<!ENTITY torbutton.prefs.block_nthwrite "Schreiben von History Einträgen ausserhalb der Benutzung von Tor verhindern (optional)">
+<!ENTITY torbutton.prefs.clear_history "History Informationen bei An- und Abschalten von Tor löschen (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Zugriff auf Tor Festplatten Cache verhindern und Cache Informationen bei An- und Abschalten von Tor löschen">
+<!ENTITY torbutton.prefs.block_cache "Verhindern des Zugriffs auf Festplatten- und Speicher Cache während Tor läuft">
+<!ENTITY torbutton.prefs.cookie_jars "Speichern von Cookies, die nicht zu Tor gehören in einem gesicherten jar">
+<!ENTITY torbutton.prefs.mmm_cookies "Ich verwalte meine Cookies manuell (gefährlich)">
+<!ENTITY torbutton.prefs.clear_cookies "Cookies beim An- und Abschalten von Tor löschen">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Gefährlichen Javescriptcode kontrollieren (wichtig)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.forms "Forms">
+<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
+<!ENTITY torbutton.prefs.tor "Tor">
+<!ENTITY torbutton.prefs.non_tor "Non-Tor">
+<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
+<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
+<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
+<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
+<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
+<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">

Modified: torbutton/trunk/src/chrome/locale/de-DE/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/de-DE/torbutton.properties	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/de-DE/torbutton.properties	2008-06-16 18:59:50 UTC (rev 15310)
@@ -1,10 +1,13 @@
-torbutton.button.tooltip.disabled=Tor aktivieren
-torbutton.button.tooltip.enabled=Tor deaktivieren
-torbutton.panel.tooltip.disabled=Klicken, um Tor zu aktivieren
-torbutton.panel.tooltip.enabled=Klicken, um Tor zu deaktivieren
-torbutton.panel.label.disabled=Tor deaktiviert
-torbutton.panel.label.enabled=Tor aktiviert
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Dank Torbutton können Sie den Tor-Proxy mit einem Klick ein- und ausschalten
-torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?
+torbutton.button.tooltip.disabled = Tor aktivieren
+torbutton.button.tooltip.enabled = Tor deaktivieren
+torbutton.panel.tooltip.disabled = Klicken, um Tor zu aktivieren
+torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren
+torbutton.panel.plugins.disabled = Klicken, um Plugins zu aktivieren
+torbutton.panel.plugins.enabled = Klicken, um Plugins zu deaktivieren
+torbutton.panel.label.disabled = Tor deaktiviert
+torbutton.panel.label.enabled = Tor aktiviert
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Dank Torbutton können Sie den Tor-Proxy mit einem Klick ein- und ausschalten
+torbutton.popup.history.warning = Tobutton verhinderte die Veränderung der History Einstellungen.\n\nVerändern Sie die entsprechende Optionen in Ihren Einstellungen, um dies zu erlauben.\n\n
+torbutton.popup.plugin.warning = Der Inhalt des Plugins konnte nicht direkt heruntergeladen werden, weil Torbutton dies verhinderte.\n\nBitte stattdessen "Speichern als" verwenden.\n
+torbutton.popup.confirm_ca_certs = Anmerkung: Es scheint, als seien keinerlei eigene Zertifikatsautoritäten in Ihrer Konfiguration vorhanden. Die Auswertung der globalen Zertifikationsautoritäten-Liste ist aufwändig und verlangsamt das schnelle An- und Abschalten von Tor. Möchten Sie die Isolation von Zertifikatsautoritäten abschalten? (Wenn Sie nicht wissen, was gemeint ist, können Sie ruhig auf OK klicken)
+torbutton.popup.ff3.warning = Warnung!\n\nTorbutton unter Firefox 3 kann nicht verhindern, dass ihre Zeitzone und Livemark Feeds während der Benutzung von Tor an Dritte gelangen. Ausserdem wurde die Sicherheit und Benutzerfreundlichkeit von Tor nicht im selben Umfang wie für Firefox 2 getestet.\n\nMöchten Sie trotzdem weiter fortfahren?

Modified: torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd	2008-06-16 18:59:50 UTC (rev 15310)
@@ -27,54 +27,56 @@
 <!ENTITY torbutton.context_menu.about.key "Π">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Κάντε κλικ για να εκκίνηση του Torbutton">
-<!ENTITY torbutton.prefs.sec_settings        "Security Settings">
-<!ENTITY torbutton.prefs.block_thread        "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite       "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread       "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite      "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history       "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache        "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache        "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars        "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies        "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies      "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins    "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js        "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content    "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates         "Disable updates during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.set_uagent         "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic              "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies              "Cookies">
-<!ENTITY torbutton.prefs.cache                "Cache">
-<!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown              "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers               "Headers">
-<!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer       "Don't send referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.disable_domstorage    "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms            "Forms">
-<!ENTITY torbutton.prefs.block_tforms       "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms       "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore    "Prevent session store from saving Tor-loaded tabs (recommended)">
-<!ENTITY torbutton.prefs.tor    "Tor">
-<!ENTITY torbutton.prefs.non_tor    "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
-<!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history       "Isolate access of history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">
-<!ENTITY torbutton.prefs.close_tor    "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor       "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_file_net     "Block access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_links        "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.locked_mode        "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state      "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state      "Shutdown state">
-<!ENTITY torbutton.prefs.startup             "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore    "Prevent session store from saving Non-Tor loaded tabs">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.forms "Forms">
+<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
+<!ENTITY torbutton.prefs.tor "Tor">
+<!ENTITY torbutton.prefs.non_tor "Non-Tor">
+<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
+<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
+<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
+<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
+<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
+<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">

Modified: torbutton/trunk/src/chrome/locale/el-GR/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/el-GR/torbutton.properties	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/el-GR/torbutton.properties	2008-06-16 18:59:50 UTC (rev 15310)
@@ -1,10 +1,13 @@
-torbutton.button.tooltip.disabled=Ενεργοποίηση του Tor
-torbutton.button.tooltip.enabled=Απενεργοποίηση του Tor
-torbutton.panel.tooltip.disabled=Κάντε κλικ για να ενεργοποιήσετε το Tor
-torbutton.panel.tooltip.enabled=Κάντε κλικ για να απενεργοποιήσετε το Tor
-torbutton.panel.label.disabled=Το Tor είναι απενεργοποιημένο
-torbutton.panel.label.enabled=Το Tor είναι ενεργοποιημένο
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Το Torbutton προσθέτει ένα κουμπί για εύκολη διαχείριση της ανακατεύθυνσης του Firefox στον διαμεσολαβητή Tor
+torbutton.button.tooltip.disabled = Ενεργοποίηση του Tor
+torbutton.button.tooltip.enabled = Απενεργοποίηση του Tor
+torbutton.panel.tooltip.disabled = Κάντε κλικ για να ενεργοποιήσετε το Tor
+torbutton.panel.tooltip.enabled = Κάντε κλικ για να απενεργοποιήσετε το Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Το Tor είναι απενεργοποιημένο
+torbutton.panel.label.enabled = Το Tor είναι ενεργοποιημένο
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Το Torbutton προσθέτει ένα κουμπί για εύκολη διαχείριση της ανακατεύθυνσης του Firefox στον διαμεσολαβητή Tor
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/es/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/es/torbutton.dtd	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/es/torbutton.dtd	2008-06-16 18:59:50 UTC (rev 15310)
@@ -27,54 +27,56 @@
 <!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click para iniciar Torbutton">
-<!ENTITY torbutton.prefs.sec_settings        "Configuración de seguridad">
-<!ENTITY torbutton.prefs.block_thread        "Bloquear lecturas del historial al usar Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite       "Bloquear escrituras al historial al usar Tor (recomendado)">
-<!ENTITY torbutton.prefs.block_nthread       "Bloquear lecturas del historial al no usar Tor (opcional)">
-<!ENTITY torbutton.prefs.block_nthwrite      "Bloquear escrituras al historial al no usar Tor (opcional)">
-<!ENTITY torbutton.prefs.clear_history       "Limpiar el historial al cambiar el estado de Tor (opcional)">
-<!ENTITY torbutton.prefs.clear_cache        "Bloquear el caché de disco de Tor y limpiarlo al cambiar el estado de Tor">
-<!ENTITY torbutton.prefs.block_cache        "Bloquear el acceso a caché de memoria y disco al usar Tor">
-<!ENTITY torbutton.prefs.cookie_jars        "Almacenar cookies al no usar Tor en un jar protegido">
-<!ENTITY torbutton.prefs.mmm_cookies        "Manejaré manualmente mis cookies (peligroso)">
-<!ENTITY torbutton.prefs.clear_cookies      "Limpiar cookies al cambiar el estado de Tor">
-<!ENTITY torbutton.prefs.disable_plugins    "Deshabilitar plugins al usar Tor (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js        "Bloquear javascript peligroso (crucial)">
-<!ENTITY torbutton.prefs.isolate_content    "Aislar contenido dinámico al usar Tor (crucial)">
-<!ENTITY torbutton.prefs.no_updates         "Deshabilitar actualizaciones al usar Tor (recomendado)">
-<!ENTITY torbutton.prefs.set_uagent         "Establecer agente de usuario al usar Tor (crucial)">
-<!ENTITY torbutton.prefs.dynamic              "Contenido dinámico">
-<!ENTITY torbutton.prefs.cookies              "Cookies">
-<!ENTITY torbutton.prefs.cache                "Caché">
-<!ENTITY torbutton.prefs.history             "Historial">
-<!ENTITY torbutton.prefs.no_search           "Deshabilitar las sugerencias de búsqueda mientras Tor está activado (recomendado)">
-<!ENTITY torbutton.prefs.shutdown              "Detener">
-<!ENTITY torbutton.prefs.tor_shutdown          "Limpiar los cookies de Tor cuando el navegador (con Tor) se cierre">
-<!ENTITY torbutton.prefs.all_shutdown          "Limpiar los cookies al cerrar el navegador (con o sin Tor)">
-<!ENTITY torbutton.prefs.no_shutdown           "No limpiar los cookies al cerrar el navegador">
-<!ENTITY torbutton.prefs.disable_sessionstore  "Deshabilitar el guardado de sesión (recomendado)">
-<!ENTITY torbutton.prefs.headers               "Cabeceras">
-<!ENTITY torbutton.prefs.spoof_english         "Fingir navegador en Inglés de EEUU">
-<!ENTITY torbutton.prefs.disable_referer       "No enviar sitio de referencia al usar Tor (puede dejar no operativos algunos sitios web)">
-<!ENTITY torbutton.prefs.disable_domstorage    "Deshabilitar el almacenamiento de DOM al usar Tor (crucial)">
-<!ENTITY torbutton.prefs.forms            "Formularios">
-<!ENTITY torbutton.prefs.block_tforms       "Bloquear el almacenamiento de contraseñas y formularios al usar Tor (recomendado)">
-<!ENTITY torbutton.prefs.block_ntforms       "Bloquear el almacenamiento de contraseñas y formularios al no usar Tor (opcional)">
-<!ENTITY torbutton.prefs.notor_sessionstore    "Evitar que el almacenamiento de sesión guarde pestañas de Tor (recomendado)">
-<!ENTITY torbutton.prefs.tor    "Tor">
-<!ENTITY torbutton.prefs.non_tor    "Sin Tor">
-<!ENTITY torbutton.prefs.restore_tor   "Después de un fallo, restaurar sesión desde:">
-<!ENTITY torbutton.prefs.reload_crashed_jar   "Recargar jar de cookies/limpiar cookies al fallar Firefox (recomendado)">
-<!ENTITY torbutton.prefs.dual_cookie_jars        "Almacenar cookies con Tor y sin Tor en jars protegidos (peligroso)">
-<!ENTITY torbutton.prefs.clear_http_auth        "Limpiar sesiones de autenticación HTTP (recomendado)">
-<!ENTITY torbutton.prefs.block_js_history       "Aislar el acceso del historial de navegación al estado de Tor (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle       "Redimensionar ventanas a múltiplos de 40px al cambiar el estado de Tor (recomendado)">
-<!ENTITY torbutton.prefs.close_tor    "Cerrar las ventanas y pestañas de Tor al cambiar su estado (opcional)">
-<!ENTITY torbutton.prefs.close_nontor       "Cerrar las ventanas y pestañas que no sean de Tor al cambiar el estado (opcional)">
-<!ENTITY torbutton.prefs.block_file_net     "Bloquear el acceso a la red desde archivos en direcciones file:// (recomendado)">
-<!ENTITY torbutton.prefs.block_links        "Bloquear clicks en vínculos y recargas de páginas desde distintos estados de Tor (opcional)">
-<!ENTITY torbutton.prefs.locked_mode        "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state      "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state      "Shutdown state">
-<!ENTITY torbutton.prefs.startup             "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore    "Prevent session store from saving Non-Tor loaded tabs">
+<!ENTITY torbutton.prefs.sec_settings "Configuración de seguridad">
+<!ENTITY torbutton.prefs.block_thread "Bloquear lecturas del historial al usar Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Bloquear escrituras al historial al usar Tor (recomendado)">
+<!ENTITY torbutton.prefs.block_nthread "Bloquear lecturas del historial al no usar Tor (opcional)">
+<!ENTITY torbutton.prefs.block_nthwrite "Bloquear escrituras al historial al no usar Tor (opcional)">
+<!ENTITY torbutton.prefs.clear_history "Limpiar el historial al cambiar el estado de Tor (opcional)">
+<!ENTITY torbutton.prefs.clear_cache "Bloquear el caché de disco de Tor y limpiarlo al cambiar el estado de Tor">
+<!ENTITY torbutton.prefs.block_cache "Bloquear el acceso a caché de memoria y disco al usar Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Almacenar cookies al no usar Tor en un jar protegido">
+<!ENTITY torbutton.prefs.mmm_cookies "Manejaré manualmente mis cookies (peligroso)">
+<!ENTITY torbutton.prefs.clear_cookies "Limpiar cookies al cambiar el estado de Tor">
+<!ENTITY torbutton.prefs.disable_plugins "Deshabilitar plugins al usar Tor (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Bloquear javascript peligroso (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Aislar contenido dinámico al usar Tor (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Deshabilitar actualizaciones al usar Tor (recomendado)">
+<!ENTITY torbutton.prefs.set_uagent "Establecer agente de usuario al usar Tor (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Contenido dinámico">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Caché">
+<!ENTITY torbutton.prefs.history "Historial">
+<!ENTITY torbutton.prefs.no_search "Deshabilitar las sugerencias de búsqueda mientras Tor está activado (recomendado)">
+<!ENTITY torbutton.prefs.shutdown "Detener">
+<!ENTITY torbutton.prefs.tor_shutdown "Limpiar los cookies de Tor cuando el navegador (con Tor) se cierre">
+<!ENTITY torbutton.prefs.all_shutdown "Limpiar los cookies al cerrar el navegador (con o sin Tor)">
+<!ENTITY torbutton.prefs.no_shutdown "No limpiar los cookies al cerrar el navegador">
+<!ENTITY torbutton.prefs.disable_sessionstore "Deshabilitar el guardado de sesión (recomendado)">
+<!ENTITY torbutton.prefs.headers "Cabeceras">
+<!ENTITY torbutton.prefs.spoof_english "Fingir navegador en Inglés de EEUU">
+<!ENTITY torbutton.prefs.disable_referer "No enviar sitio de referencia al usar Tor (puede dejar no operativos algunos sitios web)">
+<!ENTITY torbutton.prefs.disable_domstorage "Deshabilitar el almacenamiento de DOM al usar Tor (crucial)">
+<!ENTITY torbutton.prefs.forms "Formularios">
+<!ENTITY torbutton.prefs.block_tforms "Bloquear el almacenamiento de contraseñas y formularios al usar Tor (recomendado)">
+<!ENTITY torbutton.prefs.block_ntforms "Bloquear el almacenamiento de contraseñas y formularios al no usar Tor (opcional)">
+<!ENTITY torbutton.prefs.notor_sessionstore "Evitar que el almacenamiento de sesión guarde pestañas de Tor (recomendado)">
+<!ENTITY torbutton.prefs.tor "Tor">
+<!ENTITY torbutton.prefs.non_tor "Sin Tor">
+<!ENTITY torbutton.prefs.restore_tor "Después de un fallo, restaurar sesión desde:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Recargar jar de cookies/limpiar cookies al fallar Firefox (recomendado)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Almacenar cookies con Tor y sin Tor en jars protegidos (peligroso)">
+<!ENTITY torbutton.prefs.clear_http_auth "Limpiar sesiones de autenticación HTTP (recomendado)">
+<!ENTITY torbutton.prefs.block_js_history "Aislar el acceso del historial de navegación al estado de Tor (crucial)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Redimensionar ventanas a múltiplos de 40px al cambiar el estado de Tor (recomendado)">
+<!ENTITY torbutton.prefs.close_tor "Cerrar las ventanas y pestañas de Tor al cambiar su estado (opcional)">
+<!ENTITY torbutton.prefs.close_nontor "Cerrar las ventanas y pestañas que no sean de Tor al cambiar el estado (opcional)">
+<!ENTITY torbutton.prefs.block_file_net "Bloquear el acceso a la red desde archivos en direcciones file:// (recomendado)">
+<!ENTITY torbutton.prefs.block_links "Bloquear clicks en vínculos y recargas de páginas desde distintos estados de Tor (opcional)">
+<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
+<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
+<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">

Modified: torbutton/trunk/src/chrome/locale/es/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/es/torbutton.properties	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/es/torbutton.properties	2008-06-16 18:59:50 UTC (rev 15310)
@@ -1,10 +1,13 @@
-torbutton.button.tooltip.disabled= Activar Tor
-torbutton.button.tooltip.enabled= Desactivar Tor
-torbutton.panel.tooltip.disabled= Click para activar Tor
-torbutton.panel.tooltip.enabled= Click para desactivar Tor
-torbutton.panel.label.disabled= Tor Desactivado
-torbutton.panel.label.enabled= Tor Activado
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description= Torbutton provee un botón para activar y desactivar el proxy Tor de manera fácil.
+torbutton.button.tooltip.disabled = Activar Tor
+torbutton.button.tooltip.enabled = Desactivar Tor
+torbutton.panel.tooltip.disabled = Click para activar Tor
+torbutton.panel.tooltip.enabled = Click para desactivar Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Desactivado
+torbutton.panel.label.enabled = Tor Activado
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provee un botón para activar y desactivar el proxy Tor de manera fácil.
 torbutton.popup.history.warning = Torbutton bloqueó un intento de manipulación del Historial.\n\nVea las preferencias del Historial para permitirlo.\n\n
 torbutton.popup.plugin.warning = Torbutton bloqueó la carga directa de un plugin.\n\nUse Guardar como.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/fa-IR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/fa-IR/torbutton.dtd	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/fa-IR/torbutton.dtd	2008-06-16 18:59:50 UTC (rev 15310)
@@ -27,54 +27,56 @@
 <!ENTITY torbutton.context_menu.about.key "O">
 <!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.prefs.disable_plugins    "غیرفعال کردن پلاگین ها هنگام استفاده تُر (بسیار مهم)">
-<!ENTITY torbutton.prefs.kill_bad_js        "گیرانداختن جاوااسکریپت خطرناک (بسیار مهم)">
-<!ENTITY torbutton.prefs.isolate_content    "">
-<!ENTITY torbutton.prefs.no_updates         "غیرفعال کردن بروزرسانی ها هنگام استفاده تُر (توصیه شده)">
-<!ENTITY torbutton.prefs.set_uagent         "نشاندن عامل کاربر برای استفاده تُر (بسیار مهم)">
-<!ENTITY torbutton.prefs.dynamic              "محتوای پویا">
-<!ENTITY torbutton.prefs.cookies              "کوکی ها">
-<!ENTITY torbutton.prefs.cache                "نهان گاه">
-<!ENTITY torbutton.prefs.history             "تاریخچه">
-<!ENTITY torbutton.prefs.no_search           "غیرفعال کردن پیشنهادهای جستجو هنگام تُر (توصیه شده)">
-<!ENTITY torbutton.prefs.shutdown              "بستن">
-<!ENTITY torbutton.prefs.tor_shutdown          "">
-<!ENTITY torbutton.prefs.all_shutdown          "پاک کردن کوکی ها هنگام بستن مرورگر">
-<!ENTITY torbutton.prefs.no_shutdown           "پاک نکردن کوکی ها هنگام بستن">
-<!ENTITY torbutton.prefs.disable_sessionstore  "غیرفعال کردن ذخیره نشست (توصیه شده)">
-<!ENTITY torbutton.prefs.headers               "سرآیندها">
-<!ENTITY torbutton.prefs.spoof_english         "">
-<!ENTITY torbutton.prefs.disable_referer       "">
-<!ENTITY torbutton.prefs.disable_domstorage    "غیرغعال کردن ذخیره گاه DOM هنگام استفاده تُر (بسیار مهم)">
-<!ENTITY torbutton.prefs.forms            "فرم ها">
-<!ENTITY torbutton.prefs.block_tforms       "بازداشتن ذخیره اسم رمز + فرم هنگام تُر (توصیه شده)">
-<!ENTITY torbutton.prefs.block_ntforms       "بازداشتن ذخیره اسم رمز + فرم هنگام غیر تُر (اختیاری)">
-<!ENTITY torbutton.prefs.notor_sessionstore    "">
-<!ENTITY torbutton.prefs.tor    "تُر">
-<!ENTITY torbutton.prefs.non_tor    "غیرتُر">
-<!ENTITY torbutton.prefs.restore_tor   "پس از فروپاشی, بازگرداندن نشست ذخیره شده از راه:">
-<!ENTITY torbutton.prefs.reload_crashed_jar   "بازگذاری مجدد کوکی jar/پاک کردن کوکی ها در فروپاشی فایرفاکس (توصیه شده)">
-<!ENTITY torbutton.prefs.dual_cookie_jars        "ذخیره کوکی های تُر و غیرتُر در jarهای حفاظت شده (خطرناک)">
-<!ENTITY torbutton.prefs.clear_http_auth        "">
-<!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_file_net     "بازداشتن دسترسی به شبکه از file:// نشانی های وب (توصیه شده)">
-<!ENTITY torbutton.prefs.block_links        "بازداشتن فشاردادن پیوند و بازگذاری مجدد برگه از وضعیت های مختلف تُر (اختیاری)">
-<!ENTITY torbutton.prefs.locked_mode        "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state      "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state      "Shutdown state">
-<!ENTITY torbutton.prefs.startup             "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore    "Prevent session store from saving Non-Tor loaded tabs">
+<!ENTITY torbutton.prefs.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 "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "غیرفعال کردن بروزرسانی ها هنگام استفاده تُر (توصیه شده)">
+<!ENTITY torbutton.prefs.set_uagent "نشاندن عامل کاربر برای استفاده تُر (بسیار مهم)">
+<!ENTITY torbutton.prefs.dynamic "محتوای پویا">
+<!ENTITY torbutton.prefs.cookies "کوکی ها">
+<!ENTITY torbutton.prefs.cache "نهان گاه">
+<!ENTITY torbutton.prefs.history "تاریخچه">
+<!ENTITY torbutton.prefs.no_search "غیرفعال کردن پیشنهادهای جستجو هنگام تُر (توصیه شده)">
+<!ENTITY torbutton.prefs.shutdown "بستن">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser 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 "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.disable_domstorage "غیرغعال کردن ذخیره گاه DOM هنگام استفاده تُر (بسیار مهم)">
+<!ENTITY torbutton.prefs.forms "فرم ها">
+<!ENTITY torbutton.prefs.block_tforms "بازداشتن ذخیره اسم رمز + فرم هنگام تُر (توصیه شده)">
+<!ENTITY torbutton.prefs.block_ntforms "بازداشتن ذخیره اسم رمز + فرم هنگام غیر تُر (اختیاری)">
+<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
+<!ENTITY torbutton.prefs.tor "تُر">
+<!ENTITY torbutton.prefs.non_tor "غیرتُر">
+<!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 "Clear HTTP auth sessions (recommended)">
+<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
+<!ENTITY torbutton.prefs.resize_on_toggle "تغییراندازه ابعاد پنجره با مضربهای 40 تصویر دانه در ضامن (توصیه شده)">
+<!ENTITY torbutton.prefs.close_tor "بستن همه پنجره های تُر در ضامن (اختیاری)">
+<!ENTITY torbutton.prefs.close_nontor "بستن همه پنجره های غیرتُر در ضامن (اختیاری)">
+<!ENTITY torbutton.prefs.block_file_net "بازداشتن دسترسی به شبکه از file:// نشانی های وب (توصیه شده)">
+<!ENTITY torbutton.prefs.block_links "بازداشتن فشاردادن پیوند و بازگذاری مجدد برگه از وضعیت های مختلف تُر (اختیاری)">
+<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
+<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
+<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">

Modified: torbutton/trunk/src/chrome/locale/fa-IR/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/fa-IR/torbutton.properties	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/fa-IR/torbutton.properties	2008-06-16 18:59:50 UTC (rev 15310)
@@ -2,8 +2,12 @@
 torbutton.button.tooltip.enabled = غیرفعال کردن تُر
 torbutton.panel.tooltip.disabled = فشاردادن برای فعال کردن تُر
 torbutton.panel.tooltip.enabled = فشاردادن برای غیرفعال کردن تُر
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = تُر غیرفعال شد
 torbutton.panel.label.enabled = تُر فعال شد
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = دکمه تُر به آسانی امکان فعال و غیرفعال کردن پیشکار تُر را بکمک یک دکمه می دهد
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd	2008-06-16 18:59:50 UTC (rev 15310)
@@ -1,80 +1,82 @@
-<!ENTITY torbutton.prefs.title                          "Préférences pour Torbutton">
-<!ENTITY torbutton.prefs.display_settings               "Paramètres de l'affichage">
-<!ENTITY torbutton.prefs.display_panel                  "Afficher les paramètres du proxy Tor dans la barre d'état">
-<!ENTITY torbutton.prefs.panel_format                   "Format d'affichage de la barre d'état:">
-<!ENTITY torbutton.prefs.panel_text_format              "Texte">
-<!ENTITY torbutton.prefs.panel_icon_format              "Icône">
-<!ENTITY torbutton.prefs.tor_settings                   "Paramètres du proxy">
-<!ENTITY torbutton.prefs.recommended_settings           "Utiliser les paramètres de proxy recommandés pour ma version de Firefox">
-<!ENTITY torbutton.prefs.use_privoxy                    "Utiliser Privoxy">
-<!ENTITY torbutton.prefs.custom_settings                "Utiliser des paramètres de proxy personnalisés">
-<!ENTITY torbutton.prefs.proxy.host.http                "Proxy HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https               "Proxy SSL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp                 "Proxy FTP:">
-<!ENTITY torbutton.prefs.proxy.host.gopher              "Proxy Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks               "Hôte SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port                     "Port:">
-<!ENTITY torbutton.about.title                          "À propos de Torbutton">
-<!ENTITY torbutton.pref_connection.notice               "Désactiver Torbutton pour modifier ces paramètres.">
-<!ENTITY torbutton.pref_connection.more_info            "Plus d'information">
-<!ENTITY torbutton.pref_connection_more_info.title      "Aide">	
-<!ENTITY torbutton.pref_connection_more_info.text       "Torbutton est actuellement désactivé. Si vous souhaitez modifier vos paramètres proxy non-Tor, veuillez désactiver Torbutton et revenir à cette fenêtre. Si vous souhaitez modifier vos paramètres Tor, veuillez utiliser la fenêtre des préférences Torbutton.">
-<!ENTITY torbutton.context_menu.toggle                  "Activer/désactiver Tor">
-<!ENTITY torbutton.context_menu.toggle.key              "T">
-<!ENTITY torbutton.context_menu.preferences             "Préférences...">
-<!ENTITY torbutton.context_menu.preferences.key         "P">
-<!ENTITY torbutton.context_menu.about                   "À propos de Torbutton...">
-<!ENTITY torbutton.context_menu.about.key               "A">
-<!ENTITY torbutton.button.label                         "Torbutton">
-<!ENTITY torbutton.button.tooltip                       "Cliquez pour initialiser Torbutton">
-<!ENTITY torbutton.prefs.sec_settings                   "Paramètres de sécurité">
-<!ENTITY torbutton.prefs.block_thread			"Bloquer la lecture de l'historique pendant l'utilisation de Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite			"Bloquer l'écriture à historique pendant l'utilisation de Tor (recommendé)">
-<!ENTITY torbutton.prefs.block_nthread			"Bloquer la lecture de l'historique en mode non-Tor (optionnel)">
-<!ENTITY torbutton.prefs.block_nthwrite			"Bloquer l'écriture à l'historique en mode non-Tor (optionnel)">
-<!ENTITY torbutton.prefs.clear_history			"Vider l'historique à l'activation/désactivation de Tor (optionnel)">
-<!ENTITY torbutton.prefs.clear_cache			"Bloquer la mémoire tampon du disque Tor et vider tous les caches à l'activation/désactivation de Tor">
-<!ENTITY torbutton.prefs.block_cache			"Bloquer la mémoire tampon du disque et l'accès à la mémoire tampon pendant l'utilisation de Tor">
-<!ENTITY torbutton.prefs.cookie_jars			"Conserver les cookies non-Tor dans une cookie-jar sécurisée">
-<!ENTITY torbutton.prefs.mmm_cookies			"Je vais gérer mes cookies manuellement (dangereux)">
-<!ENTITY torbutton.prefs.clear_cookies			"Supprimer les cookies à l'activation/désactivation de Tor">
-<!ENTITY torbutton.prefs.disable_plugins		"Désactiver les plugins pendant l'utilisation de Tor (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js			"Intercepter les éléments Javascript dangereux (crucial)">
-<!ENTITY torbutton.prefs.isolate_content		"Isoler les contenus dynamiques à l'état Tor (crucial)">
-<!ENTITY torbutton.prefs.no_updates			"Désactiver les mises à jour pendant l'utilisation de Tor (recommendé)">
-<!ENTITY torbutton.prefs.set_uagent			"Paramétrer l'agent d'utilisateur pour l'utilisation de Tor (crucial)">
-<!ENTITY torbutton.prefs.dynamic			"Contenu dynamique">
-<!ENTITY torbutton.prefs.cookies			"Cookies">
-<!ENTITY torbutton.prefs.cache				"Cache">
-<!ENTITY torbutton.prefs.history			"Historique">
-<!ENTITY torbutton.prefs.no_search			"Désactiver les suggestions de recherche pendant l'utilisation de Tor (recommendé)">
-<!ENTITY torbutton.prefs.shutdown			"Fermeture">
-<!ENTITY torbutton.prefs.tor_shutdown			"Supprimer les cookies Tor lors de la fermeture d'un navigateur paramétré pour l'utilisation de Tor">
-<!ENTITY torbutton.prefs.all_shutdown			"Supprimer les cookies à chaque fermeture de navigateur">
-<!ENTITY torbutton.prefs.no_shutdown			"Ne pas supprimer mes cookies à la fermeture">
-<!ENTITY torbutton.prefs.disable_sessionstore		"Désactiver la fonction de sauvegarde de session (recommendé)">
-<!ENTITY torbutton.prefs.headers			"Entêtes">
-<!ENTITY torbutton.prefs.spoof_english			"Spoofer/Copier le navigateur anglais US">
-<!ENTITY torbutton.prefs.disable_referer		"Ne pas envoyer de référenceurs pendant l'utilisation de Tor (ceci pourrait endommager certains sites)">
-<!ENTITY torbutton.prefs.disable_domstorage		"Désactiver le stockage DOM pendant l'utilisation de Tor (crucial)">
-<!ENTITY torbutton.prefs.forms				"Formulaires">
-<!ENTITY torbutton.prefs.block_tforms			"Bloquer la sauvegarde de mot de passe+formulaire pendant l'utilisation de Tor (recommendé)">
-<!ENTITY torbutton.prefs.block_ntforms			"Bloquer la sauvegarde de mot de passe+formulaire en mode non-Tor (optionnel)">
-<!ENTITY torbutton.prefs.notor_sessionstore		"Empêcher la sauvegarde des onglets chargés sous Tor (recommendé)">
-<!ENTITY torbutton.prefs.tor				"Tor">
-<!ENTITY torbutton.prefs.non_tor			"Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor			"Après un plantage, récupérer la session sauvegardée via:">
-<!ENTITY torbutton.prefs.reload_crashed_jar		"Recharger la cookie jar et supprimer cookies lors d'un plantage de Firefox crash (recommendé)">
-<!ENTITY torbutton.prefs.dual_cookie_jars		"Stocker les cookies Tor et non-Tor dans des cookie-jars sécurisées (dangereux)">
-<!ENTITY torbutton.prefs.clear_http_auth		"Supprimer les sessions HTTP authentifiées (recommendé)">
-<!ENTITY torbutton.prefs.block_js_history		"Isoler l'accès à l'historique de navigation à l'état Tor (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle		"Redimensionner la fenêtre aux multiples de 50px à l'activation/désactivation (recommended)">
-<!ENTITY torbutton.prefs.close_tor			"Fermer toutes les fenêtres et onglets à l'activation/désactivation (optionnel)">
-<!ENTITY torbutton.prefs.close_nontor			"Fermer toutes les fenêtres et onglets Non-Tor à l'activation/désactivation (optionnel)">
-<!ENTITY torbutton.prefs.block_file_net			"Bloquer l'accès au réseau des urls de type file:// (recommendé)">
-<!ENTITY torbutton.prefs.block_links			"Bloquer les liens cliquables et le rechargement des pages depuis différents états Tor (optionnel)">
-<!ENTITY torbutton.prefs.locked_mode        "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state      "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state      "Shutdown state">
-<!ENTITY torbutton.prefs.startup             "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore    "Prevent session store from saving Non-Tor loaded tabs">
+<!ENTITY torbutton.prefs.title "Préférences pour Torbutton">
+<!ENTITY torbutton.prefs.display_settings "Paramètres de l'affichage">
+<!ENTITY torbutton.prefs.display_panel "Afficher les paramètres du proxy Tor dans la barre d'état">
+<!ENTITY torbutton.prefs.panel_format "Format d'affichage de la barre d'état:">
+<!ENTITY torbutton.prefs.panel_text_format "Texte">
+<!ENTITY torbutton.prefs.panel_icon_format "Icône">
+<!ENTITY torbutton.prefs.tor_settings "Paramètres du proxy">
+<!ENTITY torbutton.prefs.recommended_settings "Utiliser les paramètres de proxy recommandés pour ma version de Firefox">
+<!ENTITY torbutton.prefs.use_privoxy "Utiliser Privoxy">
+<!ENTITY torbutton.prefs.custom_settings "Utiliser des paramètres de proxy personnalisés">
+<!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
+<!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
+<!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:">
+<!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:">
+<!ENTITY torbutton.prefs.proxy.host.socks "Hôte SOCKS:">
+<!ENTITY torbutton.prefs.proxy.port "Port:">
+<!ENTITY torbutton.about.title "À propos de Torbutton">
+<!ENTITY torbutton.pref_connection.notice "Désactiver Torbutton pour modifier ces paramètres.">
+<!ENTITY torbutton.pref_connection.more_info "Plus d'information">
+<!ENTITY torbutton.pref_connection_more_info.title "Aide">
+<!ENTITY torbutton.pref_connection_more_info.text "Torbutton est actuellement désactivé. Si vous souhaitez modifier vos paramètres proxy non-Tor, veuillez désactiver Torbutton et revenir à cette fenêtre. Si vous souhaitez modifier vos paramètres Tor, veuillez utiliser la fenêtre des préférences Torbutton.">
+<!ENTITY torbutton.context_menu.toggle "Activer/désactiver Tor">
+<!ENTITY torbutton.context_menu.toggle.key "T">
+<!ENTITY torbutton.context_menu.preferences "Préférences...">
+<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.about "À propos de Torbutton...">
+<!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.button.label "Torbutton">
+<!ENTITY torbutton.button.tooltip "Cliquez pour initialiser Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "Paramètres de sécurité">
+<!ENTITY torbutton.prefs.block_thread "Bloquer la lecture de l'historique pendant l'utilisation de Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Bloquer l'écriture à historique pendant l'utilisation de Tor (recommendé)">
+<!ENTITY torbutton.prefs.block_nthread "Bloquer la lecture de l'historique en mode non-Tor (optionnel)">
+<!ENTITY torbutton.prefs.block_nthwrite "Bloquer l'écriture à l'historique en mode non-Tor (optionnel)">
+<!ENTITY torbutton.prefs.clear_history "Vider l'historique à l'activation/désactivation de Tor (optionnel)">
+<!ENTITY torbutton.prefs.clear_cache "Bloquer la mémoire tampon du disque Tor et vider tous les caches à l'activation/désactivation de Tor">
+<!ENTITY torbutton.prefs.block_cache "Bloquer la mémoire tampon du disque et l'accès à la mémoire tampon pendant l'utilisation de Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Conserver les cookies non-Tor dans une cookie-jar sécurisée">
+<!ENTITY torbutton.prefs.mmm_cookies "Je vais gérer mes cookies manuellement (dangereux)">
+<!ENTITY torbutton.prefs.clear_cookies "Supprimer les cookies à l'activation/désactivation de Tor">
+<!ENTITY torbutton.prefs.disable_plugins "Désactiver les plugins pendant l'utilisation de Tor (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Intercepter les éléments Javascript dangereux (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isoler les contenus dynamiques à l'état Tor (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Désactiver les mises à jour pendant l'utilisation de Tor (recommendé)">
+<!ENTITY torbutton.prefs.set_uagent "Paramétrer l'agent d'utilisateur pour l'utilisation de Tor (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Contenu dynamique">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "Historique">
+<!ENTITY torbutton.prefs.no_search "Désactiver les suggestions de recherche pendant l'utilisation de Tor (recommendé)">
+<!ENTITY torbutton.prefs.shutdown "Fermeture">
+<!ENTITY torbutton.prefs.tor_shutdown "Supprimer les cookies Tor lors de la fermeture d'un navigateur paramétré pour l'utilisation de Tor">
+<!ENTITY torbutton.prefs.all_shutdown "Supprimer les cookies à chaque fermeture de navigateur">
+<!ENTITY torbutton.prefs.no_shutdown "Ne pas supprimer mes cookies à la fermeture">
+<!ENTITY torbutton.prefs.disable_sessionstore "Désactiver la fonction de sauvegarde de session (recommendé)">
+<!ENTITY torbutton.prefs.headers "Entêtes">
+<!ENTITY torbutton.prefs.spoof_english "Spoofer/Copier le navigateur anglais US">
+<!ENTITY torbutton.prefs.disable_referer "Ne pas envoyer de référenceurs pendant l'utilisation de Tor (ceci pourrait endommager certains sites)">
+<!ENTITY torbutton.prefs.disable_domstorage "Désactiver le stockage DOM pendant l'utilisation de Tor (crucial)">
+<!ENTITY torbutton.prefs.forms "Formulaires">
+<!ENTITY torbutton.prefs.block_tforms "Bloquer la sauvegarde de mot de passe+formulaire pendant l'utilisation de Tor (recommendé)">
+<!ENTITY torbutton.prefs.block_ntforms "Bloquer la sauvegarde de mot de passe+formulaire en mode non-Tor (optionnel)">
+<!ENTITY torbutton.prefs.notor_sessionstore "Empêcher la sauvegarde des onglets chargés sous Tor (recommendé)">
+<!ENTITY torbutton.prefs.tor "Tor">
+<!ENTITY torbutton.prefs.non_tor "Non-Tor">
+<!ENTITY torbutton.prefs.restore_tor "Après un plantage, récupérer la session sauvegardée via:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Recharger la cookie jar et supprimer cookies lors d'un plantage de Firefox crash (recommendé)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Stocker les cookies Tor et non-Tor dans des cookie-jars sécurisées (dangereux)">
+<!ENTITY torbutton.prefs.clear_http_auth "Supprimer les sessions HTTP authentifiées (recommendé)">
+<!ENTITY torbutton.prefs.block_js_history "Isoler l'accès à l'historique de navigation à l'état Tor (crucial)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Redimensionner la fenêtre aux multiples de 50px à l'activation/désactivation (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Fermer toutes les fenêtres et onglets à l'activation/désactivation (optionnel)">
+<!ENTITY torbutton.prefs.close_nontor "Fermer toutes les fenêtres et onglets Non-Tor à l'activation/désactivation (optionnel)">
+<!ENTITY torbutton.prefs.block_file_net "Bloquer l'accès au réseau des urls de type file:// (recommendé)">
+<!ENTITY torbutton.prefs.block_links "Bloquer les liens cliquables et le rechargement des pages depuis différents états Tor (optionnel)">
+<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
+<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
+<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">

Modified: torbutton/trunk/src/chrome/locale/fr-FR/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/fr-FR/torbutton.properties	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/fr-FR/torbutton.properties	2008-06-16 18:59:50 UTC (rev 15310)
@@ -1,4 +1,4 @@
-torbutton.button.tooltip.disabled = Activer Tor
+torbutton.button.tooltip.disabled = Enable Tor
 torbutton.button.tooltip.enabled = Désactiver Tor
 torbutton.panel.tooltip.disabled = Cliquer pour activer Tor
 torbutton.panel.tooltip.enabled = Cliquer pour désactiver Tor
@@ -9,4 +9,5 @@
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton comporte un bouton qui permet d'activer et de désactiver rapidement le pointage de Firefox vers le proxy de Tor.
 torbutton.popup.history.warning = Torbutton a bloqué la manipulation de l'historique des modifications.\n\nVoir les paramètres de l'historique pour permettre la manipulation.\n\n
 torbutton.popup.plugin.warning = Torbutton a bloqué le chargement direct par Tor de contenu de plugin.\n\nUtiliser plutôt la fonction Enregistrer sous.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd	2008-06-16 18:59:50 UTC (rev 15310)
@@ -27,54 +27,56 @@
 <!ENTITY torbutton.context_menu.about.key "O">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Kliknite da biste pokrenuli Torbutton">
-<!ENTITY torbutton.prefs.sec_settings        "Security Settings">
-<!ENTITY torbutton.prefs.block_thread        "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite       "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread       "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite      "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history       "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache        "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache        "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars        "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies        "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies      "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins    "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js        "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content    "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates         "Disable updates during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.set_uagent         "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic              "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies              "Cookies">
-<!ENTITY torbutton.prefs.cache                "Cache">
-<!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown              "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers               "Headers">
-<!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer       "Don't send referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.disable_domstorage    "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms            "Forms">
-<!ENTITY torbutton.prefs.block_tforms       "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms       "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore    "Prevent session store from saving Tor-loaded tabs (recommended)">
-<!ENTITY torbutton.prefs.tor    "Tor">
-<!ENTITY torbutton.prefs.non_tor    "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
-<!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history       "Isolate access of history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">
-<!ENTITY torbutton.prefs.close_tor    "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor       "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_file_net     "Block access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_links        "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.locked_mode        "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state      "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state      "Shutdown state">
-<!ENTITY torbutton.prefs.startup             "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore    "Prevent session store from saving Non-Tor loaded tabs">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.forms "Forms">
+<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
+<!ENTITY torbutton.prefs.tor "Tor">
+<!ENTITY torbutton.prefs.non_tor "Non-Tor">
+<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
+<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
+<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
+<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
+<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
+<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">

Modified: torbutton/trunk/src/chrome/locale/hr-HR/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/hr-HR/torbutton.properties	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/hr-HR/torbutton.properties	2008-06-16 18:59:50 UTC (rev 15310)
@@ -1,10 +1,13 @@
-torbutton.button.tooltip.disabled= Omogući Tor
-torbutton.button.tooltip.enabled= Onemogući Tor
-torbutton.panel.tooltip.disabled= Kliknite da biste omogućili Tor
-torbutton.panel.tooltip.enabled= Kliknite da biste onemogućili Tor
-torbutton.panel.label.disabled= Tor onemogućen
-torbutton.panel.label.enabled= Tor omogućen
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description= Torbutton omogućava gumb za lakše omogućavanje ili onemogućavanje tor proxy-a
+torbutton.button.tooltip.disabled = Omogući Tor
+torbutton.button.tooltip.enabled = Onemogući Tor
+torbutton.panel.tooltip.disabled = Kliknite da biste omogućili Tor
+torbutton.panel.tooltip.enabled = Kliknite da biste onemogućili Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor onemogućen
+torbutton.panel.label.enabled = Tor omogućen
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton omogućava gumb za lakše omogućavanje ili onemogućavanje tor proxy-a
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd	2008-06-16 18:59:50 UTC (rev 15310)
@@ -75,8 +75,8 @@
 <!ENTITY torbutton.prefs.block_links "Blocca i clic sui link e la ricarica delle pagine da stati Tor differenti (facoltativo)">
 <!ENTITY torbutton.prefs.jar_certs "Conserva i certificati SSL in depositi separati per Tor/Non-Tor (consigliato)">
 <!ENTITY torbutton.prefs.jar_ca_certs "Conserva i certificati delle CA in depositi separati per Tor/Non-Tor (consigliato)">
-<!ENTITY torbutton.prefs.locked_mode        "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state      "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state      "Shutdown state">
-<!ENTITY torbutton.prefs.startup             "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore    "Prevent session store from saving Non-Tor loaded tabs">
+<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
+<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
+<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">

Modified: torbutton/trunk/src/chrome/locale/it-IT/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/it-IT/torbutton.properties	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/it-IT/torbutton.properties	2008-06-16 18:59:50 UTC (rev 15310)
@@ -1,13 +1,13 @@
-torbutton.button.tooltip.disabled=Attiva Tor
-torbutton.button.tooltip.enabled=Disattiva Tor
-torbutton.panel.tooltip.disabled=Fare clic per attivare Tor
-torbutton.panel.tooltip.enabled=Fare clic per disattivare Tor
-torbutton.panel.plugins.disabled=Fare clic per attivare i plugin
-torbutton.panel.plugins.enabled=Fare clic per disattivare i plugin
-torbutton.panel.label.disabled=Tor disattivato
-torbutton.panel.label.enabled=Tor attivato
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=L&apos;estensione mette a disposizione un pulsante per attivare e disattivare facilmente il proxy Tor
-torbutton.popup.history.warning=Torbutton ha bloccato la modifica della cronologia quando cambia stato.\n\nVai alle impostazioni della cronologia per permetterlo.\n\n
-torbutton.popup.plugin.warning=Torbutton ha bloccato l&apos;attivazione dei plugin durante l'uso di Tor.\n\nUsa Salva Con Nome al suo posto.\n\n
-torbutton.popup.confirm_ca_certs= Avviso di Torbutton: sembra che tu non abbia delle tue proprie Certification Authority. L&apos;esame della lista delle Certification Authority &grave; un&apos;operazione lenta e rallenta ancora attivando/disattivando Tor. Vuoi disabilitare l'isolamento dei certificati delle Certification Authority? (Se non capisci questo avviso, puoi tranquillamente fare clic su OK)
-torbutton.popup.ff3.warning= Attenzione!\n\nTorbutton su Firefox 3 rivela il tuo fuso orario e i feed dei tuoi livemark durante l&apos;uso di Tor. Inoltre non &egrave; stato testato a fondo come Firefox 2 per verificare la sicurezza e usabilit&agrave; di Tor.\n\nVuoi continuare ugualmente?
+torbutton.button.tooltip.disabled = Attiva Tor
+torbutton.button.tooltip.enabled = Disattiva Tor
+torbutton.panel.tooltip.disabled = Fare clic per attivare Tor
+torbutton.panel.tooltip.enabled = Fare clic per disattivare Tor
+torbutton.panel.plugins.disabled = Fare clic per attivare i plugin
+torbutton.panel.plugins.enabled = Fare clic per disattivare i plugin
+torbutton.panel.label.disabled = Tor disattivato
+torbutton.panel.label.enabled = Tor attivato
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = L&apos;estensione mette a disposizione un pulsante per attivare e disattivare facilmente il proxy Tor
+torbutton.popup.history.warning = Torbutton ha bloccato la modifica della cronologia quando cambia stato.\n\nVai alle impostazioni della cronologia per permetterlo.\n\n
+torbutton.popup.plugin.warning = Torbutton ha bloccato l&apos;attivazione dei plugin durante l'uso di Tor.\n\nUsa Salva Con Nome al suo posto.\n\n
+torbutton.popup.confirm_ca_certs = Avviso di Torbutton: sembra che tu non abbia delle tue proprie Certification Authority. L&apos;esame della lista delle Certification Authority &grave; un&apos;operazione lenta e rallenta ancora attivando/disattivando Tor. Vuoi disabilitare l'isolamento dei certificati delle Certification Authority? (Se non capisci questo avviso, puoi tranquillamente fare clic su OK)
+torbutton.popup.ff3.warning = Attenzione!\n\nTorbutton su Firefox 3 rivela il tuo fuso orario e i feed dei tuoi livemark durante l&apos;uso di Tor. Inoltre non &egrave; stato testato a fondo come Firefox 2 per verificare la sicurezza e usabilit&agrave; di Tor.\n\nVuoi continuare ugualmente?

Modified: torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd	2008-06-16 18:59:50 UTC (rev 15310)
@@ -27,54 +27,56 @@
 <!ENTITY torbutton.context_menu.about.key "O">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klik hier om Torbutton te initialiseren">
-<!ENTITY torbutton.prefs.sec_settings        "Security Settings">
-<!ENTITY torbutton.prefs.block_thread        "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite       "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread       "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite      "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history       "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache        "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache        "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars        "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies        "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies      "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins    "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js        "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content    "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates         "Disable updates during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.set_uagent         "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic              "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies              "Cookies">
-<!ENTITY torbutton.prefs.cache                "Cache">
-<!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown              "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers               "Headers">
-<!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer       "Don't send referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.disable_domstorage    "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms            "Forms">
-<!ENTITY torbutton.prefs.block_tforms       "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms       "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore    "Prevent session store from saving Tor-loaded tabs (recommended)">
-<!ENTITY torbutton.prefs.tor    "Tor">
-<!ENTITY torbutton.prefs.non_tor    "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
-<!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history       "Isolate access of history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">
-<!ENTITY torbutton.prefs.close_tor    "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor       "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_file_net     "Block access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_links        "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.locked_mode        "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state      "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state      "Shutdown state">
-<!ENTITY torbutton.prefs.startup             "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore    "Prevent session store from saving Non-Tor loaded tabs">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.forms "Forms">
+<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
+<!ENTITY torbutton.prefs.tor "Tor">
+<!ENTITY torbutton.prefs.non_tor "Non-Tor">
+<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
+<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
+<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
+<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
+<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
+<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">

Modified: torbutton/trunk/src/chrome/locale/nl-NL/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/nl-NL/torbutton.properties	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/nl-NL/torbutton.properties	2008-06-16 18:59:50 UTC (rev 15310)
@@ -1,10 +1,13 @@
-torbutton.button.tooltip.disabled=Tor inschakelen
-torbutton.button.tooltip.enabled=Tot uitschakelen
-torbutton.panel.tooltip.disabled=Klik hier om Tor in te schakelen
-torbutton.panel.tooltip.enabled=Klik hier om Tor uit te schakelen
-torbutton.panel.label.disabled=Tor uitgeschakeld
-torbutton.panel.label.enabled=Tor ingeschakeld
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Torbutton voorziet in een knop om eenvoudig de Tor proxy in- of uit te schakelen
+torbutton.button.tooltip.disabled = Tor inschakelen
+torbutton.button.tooltip.enabled = Tot uitschakelen
+torbutton.panel.tooltip.disabled = Klik hier om Tor in te schakelen
+torbutton.panel.tooltip.enabled = Klik hier om Tor uit te schakelen
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor uitgeschakeld
+torbutton.panel.label.enabled = Tor ingeschakeld
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton voorziet in een knop om eenvoudig de Tor proxy in- of uit te schakelen
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd	2008-06-16 18:59:50 UTC (rev 15310)
@@ -27,54 +27,56 @@
 <!ENTITY torbutton.context_menu.about.key "T">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Kliknij tutaj, aby uruchomić Torbutton">
-<!ENTITY torbutton.prefs.sec_settings        "Security Settings">
-<!ENTITY torbutton.prefs.block_thread        "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite       "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread       "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite      "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history       "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache        "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache        "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars        "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies        "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies      "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins    "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js        "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content    "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates         "Disable updates during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.set_uagent         "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic              "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies              "Cookies">
-<!ENTITY torbutton.prefs.cache                "Cache">
-<!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown              "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers               "Headers">
-<!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer       "Don't send referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.disable_domstorage    "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms            "Forms">
-<!ENTITY torbutton.prefs.block_tforms       "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms       "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore    "Prevent session store from saving Tor-loaded tabs (recommended)">
-<!ENTITY torbutton.prefs.tor    "Tor">
-<!ENTITY torbutton.prefs.non_tor    "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
-<!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history       "Isolate access of history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">
-<!ENTITY torbutton.prefs.close_tor    "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor       "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_file_net     "Block access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_links        "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.locked_mode        "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state      "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state      "Shutdown state">
-<!ENTITY torbutton.prefs.startup             "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore    "Prevent session store from saving Non-Tor loaded tabs">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.forms "Forms">
+<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
+<!ENTITY torbutton.prefs.tor "Tor">
+<!ENTITY torbutton.prefs.non_tor "Non-Tor">
+<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
+<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
+<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
+<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
+<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
+<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">

Modified: torbutton/trunk/src/chrome/locale/pl-PL/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/pl-PL/torbutton.properties	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/pl-PL/torbutton.properties	2008-06-16 18:59:50 UTC (rev 15310)
@@ -1,10 +1,13 @@
-torbutton.button.tooltip.disabled= Włącz Tor
-torbutton.button.tooltip.enabled= Wyłącz Tor
-torbutton.panel.tooltip.disabled= Kliknij tutaj, aby włączyć Tor
-torbutton.panel.tooltip.enabled= Kliknij tutaj, aby wyłączyć Tor
-torbutton.panel.label.disabled= Tor wyłączony
-torbutton.panel.label.enabled= Tor włączony
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description= Rozszerzenia dostarcza przycisk do łatwego włącznia/wyłączania proxy Tor
+torbutton.button.tooltip.disabled = Włącz Tor
+torbutton.button.tooltip.enabled = Wyłącz Tor
+torbutton.panel.tooltip.disabled = Kliknij tutaj, aby włączyć Tor
+torbutton.panel.tooltip.enabled = Kliknij tutaj, aby wyłączyć Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor wyłączony
+torbutton.panel.label.enabled = Tor włączony
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Rozszerzenia dostarcza przycisk do łatwego włącznia/wyłączania proxy Tor
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd	2008-06-16 18:59:50 UTC (rev 15310)
@@ -27,54 +27,56 @@
 <!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Clique para iniciar Torbutton">
-<!ENTITY torbutton.prefs.sec_settings        "Security Settings">
-<!ENTITY torbutton.prefs.block_thread        "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite       "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread       "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite      "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history       "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache        "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache        "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars        "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies        "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies      "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins    "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js        "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content    "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates         "Disable updates during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.set_uagent         "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic              "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies              "Cookies">
-<!ENTITY torbutton.prefs.cache                "Cache">
-<!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown              "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers               "Headers">
-<!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer       "Don't send referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.disable_domstorage    "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms            "Forms">
-<!ENTITY torbutton.prefs.block_tforms       "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms       "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore    "Prevent session store from saving Tor-loaded tabs (recommended)">
-<!ENTITY torbutton.prefs.tor    "Tor">
-<!ENTITY torbutton.prefs.non_tor    "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
-<!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history       "Isolate access of history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">
-<!ENTITY torbutton.prefs.close_tor    "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor       "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_file_net     "Block access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_links        "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.locked_mode        "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state      "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state      "Shutdown state">
-<!ENTITY torbutton.prefs.startup             "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore    "Prevent session store from saving Non-Tor loaded tabs">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.forms "Forms">
+<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
+<!ENTITY torbutton.prefs.tor "Tor">
+<!ENTITY torbutton.prefs.non_tor "Non-Tor">
+<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
+<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
+<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
+<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
+<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
+<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">

Modified: torbutton/trunk/src/chrome/locale/pt-BR/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/pt-BR/torbutton.properties	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/pt-BR/torbutton.properties	2008-06-16 18:59:50 UTC (rev 15310)
@@ -1,10 +1,13 @@
-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.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.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 = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable 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.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/ru/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/ru/torbutton.dtd	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/ru/torbutton.dtd	2008-06-16 18:59:50 UTC (rev 15310)
@@ -1,80 +1,82 @@
-<!ENTITY torbutton.prefs.title "Настройки Torbutton">
-<!ENTITY torbutton.prefs.display_settings "Вид">
-<!ENTITY torbutton.prefs.display_panel "Отображать параметры соединения с сетью Tor">
-<!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 "Использовать параметры прокси, рекомендованные для данной версии Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Использовать Privoxy">
-<!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 "Для изменения настроек необходимо отключить Torbutton.">
-<!ENTITY torbutton.pref_connection.more_info "Подробности">
-<!ENTITY torbutton.pref_connection_more_info.title "Подсказка">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton включен. Если будут изменяться настройки прокси, не являющегося частью сети Tor,  необходимо сначала отключить Torbutton и затем вернуться сюда. Если будут изменяться настройки Tor, необходимо использовать окно настроек Torbutton.">
-<!ENTITY torbutton.context_menu.toggle "Изменить состояние Tor">
-<!ENTITY torbutton.context_menu.toggle.key "И">
-<!ENTITY torbutton.context_menu.preferences "Настройки...">
-<!ENTITY torbutton.context_menu.preferences.key "Н">
-<!ENTITY torbutton.context_menu.about "О Torbutton">
-<!ENTITY torbutton.context_menu.about.key "О">
-<!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "Инициализировать Torbutton">
-<!ENTITY torbutton.prefs.sec_settings        "Настройки безопасности">
-<!ENTITY torbutton.prefs.block_thread        "Блокировать чтение из журнала в режиме Tor (важно)">
-<!ENTITY torbutton.prefs.block_thwrite       "Блокировать запись в журнал в режиме Tor (желательно)">
-<!ENTITY torbutton.prefs.block_nthread       "Блокировать чтение из журнала в режиме не-Tor (необяз.)">
-<!ENTITY torbutton.prefs.block_nthwrite      "Блокировать запись в журнал в режиме не-Tor (необяз.)">
-<!ENTITY torbutton.prefs.clear_history       "Очищать журнал при переключении режимов Tor (необяз.)">
-<!ENTITY torbutton.prefs.clear_cache        "Запрещать кеширование на диск при использовании Tor и очищать весь кеш при переключении режимов Tor">
-<!ENTITY torbutton.prefs.block_cache        "Полностью отключить кеш при использовании Tor">
-<!ENTITY torbutton.prefs.cookie_jars        "Хранить cookies в режиме не-Tor в защищенном файле">
-<!ENTITY torbutton.prefs.mmm_cookies        "Ручное управление cookies  (опасно)">
-<!ENTITY torbutton.prefs.clear_cookies      "Очищать cookies при переключении режимов Tor">
-<!ENTITY torbutton.prefs.disable_plugins    "Отключать плагины при использовании Tor (важно)">
-<!ENTITY torbutton.prefs.kill_bad_js        "Перехватывать опасный код javascript (важно)">
-<!ENTITY torbutton.prefs.isolate_content    "Ограничить динамическое содержание текущим режимом Tor (важно)">
-<!ENTITY torbutton.prefs.no_updates         "Блокировать обновления при использовании Tor (желательно)">
-<!ENTITY torbutton.prefs.set_uagent         "Маскировать пользователя при использовании Tor (важно)">
-<!ENTITY torbutton.prefs.dynamic              "Содержание">
-<!ENTITY torbutton.prefs.cookies              "Cookies">
-<!ENTITY torbutton.prefs.cache                "Кеш">
-<!ENTITY torbutton.prefs.history             "Журнал">
-<!ENTITY torbutton.prefs.no_search           "Блокировать поисковые запросы при использовании Tor (желательно)">
-<!ENTITY torbutton.prefs.shutdown              "Закрытие">
-<!ENTITY torbutton.prefs.tor_shutdown          "Очищать cookies Tor, если браузер закрывается при включенном Tor">
-<!ENTITY torbutton.prefs.all_shutdown          "Очищать cookies при любом закрытии браузера">
-<!ENTITY torbutton.prefs.no_shutdown           "Не очищать cookies при закрытии браузера">
-<!ENTITY torbutton.prefs.disable_sessionstore  "Отключить сохранение сессий (желательно)">
-<!ENTITY torbutton.prefs.headers               "Заголовки">
-<!ENTITY torbutton.prefs.spoof_english         "Заголовки как в американской версии браузера">
-<!ENTITY torbutton.prefs.disable_referer       "Не показывать другим, откуда вы пришли (м.б. проблемы на некоторых сайтах)">
-<!ENTITY torbutton.prefs.disable_domstorage    "Отключить DOM Storage при использовани Tor (важно)">
-<!ENTITY torbutton.prefs.forms            "Формы">
-<!ENTITY torbutton.prefs.block_tforms       "Блокировать сохранение паролей и данных форм при использовании Tor (желательно)">
-<!ENTITY torbutton.prefs.block_ntforms       "Блокировать сохранение паролей и данных форм при отключенном Tor (необяз.)">
-<!ENTITY torbutton.prefs.notor_sessionstore    "Вкладки Tor не сохраняются в общей сессии (желательно)">
-<!ENTITY torbutton.prefs.tor    "Tor">
-<!ENTITY torbutton.prefs.non_tor    "не-Tor">
-<!ENTITY torbutton.prefs.restore_tor   "После аварии восстанавливать сессию в режиме:">
-<!ENTITY torbutton.prefs.reload_crashed_jar   "Восстанавливать/очищать cookies после аварии Firefox (желательно)">
-<!ENTITY torbutton.prefs.dual_cookie_jars        "Хранить все cookies в защищенных файлах (опасно)">
-<!ENTITY torbutton.prefs.clear_http_auth        "Очищать сессии аутентификации HTTP (желательно)">
-<!ENTITY torbutton.prefs.block_js_history       "Открывать все предыдущие страницы в нынешнем режиме Tor (важно)">
-<!ENTITY torbutton.prefs.resize_on_toggle       "Масштабировать окна с множителем 40px при переключении Tor (желательно)">
-<!ENTITY torbutton.prefs.close_tor    "Закрывать все окна и вкладки Tor при переключении режимов (необяз.)">
-<!ENTITY torbutton.prefs.close_nontor       "Закрывать все окна и вкладки не-Tor при переключении режимов (необяз.)">
-<!ENTITY torbutton.prefs.block_file_net     "Блокировать доступ к сети по адресам типа file:// (желательно)">
-<!ENTITY torbutton.prefs.block_links        "Блокировать щелчки по ссылкам и перезагрузку страниц из разных режимов Tor (необяз.)">
-<!ENTITY torbutton.prefs.locked_mode        "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state      "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state      "Shutdown state">
-<!ENTITY torbutton.prefs.startup             "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore    "Prevent session store from saving Non-Tor loaded tabs">
+<!ENTITY torbutton.prefs.title "Настройки Torbutton">
+<!ENTITY torbutton.prefs.display_settings "Вид">
+<!ENTITY torbutton.prefs.display_panel "Отображать параметры соединения с сетью Tor">
+<!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 "Использовать параметры прокси, рекомендованные для данной версии Firefox">
+<!ENTITY torbutton.prefs.use_privoxy "Использовать Privoxy">
+<!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 "Для изменения настроек необходимо отключить Torbutton.">
+<!ENTITY torbutton.pref_connection.more_info "Подробности">
+<!ENTITY torbutton.pref_connection_more_info.title "Подсказка">
+<!ENTITY torbutton.pref_connection_more_info.text "Torbutton включен. Если будут изменяться настройки прокси, не являющегося частью сети Tor,  необходимо сначала отключить Torbutton и затем вернуться сюда. Если будут изменяться настройки Tor, необходимо использовать окно настроек Torbutton.">
+<!ENTITY torbutton.context_menu.toggle "Изменить состояние Tor">
+<!ENTITY torbutton.context_menu.toggle.key "И">
+<!ENTITY torbutton.context_menu.preferences "Настройки...">
+<!ENTITY torbutton.context_menu.preferences.key "Н">
+<!ENTITY torbutton.context_menu.about "О Torbutton">
+<!ENTITY torbutton.context_menu.about.key "О">
+<!ENTITY torbutton.button.label "Torbutton">
+<!ENTITY torbutton.button.tooltip "Инициализировать Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "Настройки безопасности">
+<!ENTITY torbutton.prefs.block_thread "Блокировать чтение из журнала в режиме Tor (важно)">
+<!ENTITY torbutton.prefs.block_thwrite "Блокировать запись в журнал в режиме Tor (желательно)">
+<!ENTITY torbutton.prefs.block_nthread "Блокировать чтение из журнала в режиме не-Tor (необяз.)">
+<!ENTITY torbutton.prefs.block_nthwrite "Блокировать запись в журнал в режиме не-Tor (необяз.)">
+<!ENTITY torbutton.prefs.clear_history "Очищать журнал при переключении режимов Tor (необяз.)">
+<!ENTITY torbutton.prefs.clear_cache "Запрещать кеширование на диск при использовании Tor и очищать весь кеш при переключении режимов Tor">
+<!ENTITY torbutton.prefs.block_cache "Полностью отключить кеш при использовании Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Хранить cookies в режиме не-Tor в защищенном файле">
+<!ENTITY torbutton.prefs.mmm_cookies "Ручное управление cookies  (опасно)">
+<!ENTITY torbutton.prefs.clear_cookies "Очищать cookies при переключении режимов Tor">
+<!ENTITY torbutton.prefs.disable_plugins "Отключать плагины при использовании Tor (важно)">
+<!ENTITY torbutton.prefs.kill_bad_js "Перехватывать опасный код javascript (важно)">
+<!ENTITY torbutton.prefs.isolate_content "Ограничить динамическое содержание текущим режимом Tor (важно)">
+<!ENTITY torbutton.prefs.no_updates "Блокировать обновления при использовании Tor (желательно)">
+<!ENTITY torbutton.prefs.set_uagent "Маскировать пользователя при использовании Tor (важно)">
+<!ENTITY torbutton.prefs.dynamic "Содержание">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Кеш">
+<!ENTITY torbutton.prefs.history "Журнал">
+<!ENTITY torbutton.prefs.no_search "Блокировать поисковые запросы при использовании Tor (желательно)">
+<!ENTITY torbutton.prefs.shutdown "Закрытие">
+<!ENTITY torbutton.prefs.tor_shutdown "Очищать cookies Tor, если браузер закрывается при включенном Tor">
+<!ENTITY torbutton.prefs.all_shutdown "Очищать cookies при любом закрытии браузера">
+<!ENTITY torbutton.prefs.no_shutdown "Не очищать cookies при закрытии браузера">
+<!ENTITY torbutton.prefs.disable_sessionstore "Отключить сохранение сессий (желательно)">
+<!ENTITY torbutton.prefs.headers "Заголовки">
+<!ENTITY torbutton.prefs.spoof_english "Заголовки как в американской версии браузера">
+<!ENTITY torbutton.prefs.disable_referer "Не показывать другим, откуда вы пришли (м.б. проблемы на некоторых сайтах)">
+<!ENTITY torbutton.prefs.disable_domstorage "Отключить DOM Storage при использовани Tor (важно)">
+<!ENTITY torbutton.prefs.forms "Формы">
+<!ENTITY torbutton.prefs.block_tforms "Блокировать сохранение паролей и данных форм при использовании Tor (желательно)">
+<!ENTITY torbutton.prefs.block_ntforms "Блокировать сохранение паролей и данных форм при отключенном Tor (необяз.)">
+<!ENTITY torbutton.prefs.notor_sessionstore "Вкладки Tor не сохраняются в общей сессии (желательно)">
+<!ENTITY torbutton.prefs.tor "Tor">
+<!ENTITY torbutton.prefs.non_tor "не-Tor">
+<!ENTITY torbutton.prefs.restore_tor "После аварии восстанавливать сессию в режиме:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Восстанавливать/очищать cookies после аварии Firefox (желательно)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Хранить все cookies в защищенных файлах (опасно)">
+<!ENTITY torbutton.prefs.clear_http_auth "Очищать сессии аутентификации HTTP (желательно)">
+<!ENTITY torbutton.prefs.block_js_history "Открывать все предыдущие страницы в нынешнем режиме Tor (важно)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Масштабировать окна с множителем 40px при переключении Tor (желательно)">
+<!ENTITY torbutton.prefs.close_tor "Закрывать все окна и вкладки Tor при переключении режимов (необяз.)">
+<!ENTITY torbutton.prefs.close_nontor "Закрывать все окна и вкладки не-Tor при переключении режимов (необяз.)">
+<!ENTITY torbutton.prefs.block_file_net "Блокировать доступ к сети по адресам типа file:// (желательно)">
+<!ENTITY torbutton.prefs.block_links "Блокировать щелчки по ссылкам и перезагрузку страниц из разных режимов Tor (необяз.)">
+<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
+<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
+<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">

Modified: torbutton/trunk/src/chrome/locale/ru/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/ru/torbutton.properties	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/ru/torbutton.properties	2008-06-16 18:59:50 UTC (rev 15310)
@@ -1,10 +1,13 @@
-torbutton.button.tooltip.disabled=Включить Tor
-torbutton.button.tooltip.enabled=Отключить Tor
-torbutton.panel.tooltip.disabled=Нажмите, чтобы включить Tor
-torbutton.panel.tooltip.enabled=Нажмите, чтобы отключить Tor
-torbutton.panel.label.disabled=Tor отключен
-torbutton.panel.label.enabled=Tor включен
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Кнопка включения/отключения доступа к Интернет через сеть Tor
-torbutton.popup.history.warning = Torbutton заблокировал операции с журналом.\n\nСм. настройки журнала.\n\n
-torbutton.popup.plugin.warning = Torbutton заблокировал прямую установку  плагинов через Tor.\n\nИспользуйте способ Сохранить как.\n\n
+torbutton.button.tooltip.disabled = Включить Tor
+torbutton.button.tooltip.enabled = Отключить Tor
+torbutton.panel.tooltip.disabled = Нажмите, чтобы включить Tor
+torbutton.panel.tooltip.enabled = Нажмите, чтобы отключить Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor отключен
+torbutton.panel.label.enabled = Tor включен
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Кнопка включения/отключения доступа к Интернет через сеть Tor
+torbutton.popup.history.warning = Torbutton заблокировал операции с журналом.\n\nСм. настройки журнала.\n\n
+torbutton.popup.plugin.warning = Torbutton заблокировал прямую установку  плагинов через Tor.\n\nИспользуйте способ Сохранить как.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd	2008-06-16 18:59:50 UTC (rev 15310)
@@ -27,54 +27,56 @@
 <!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klikni za inicializiranje razširitve Torbutton">
-<!ENTITY torbutton.prefs.sec_settings        "Security Settings">
-<!ENTITY torbutton.prefs.block_thread        "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite       "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread       "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite      "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history       "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache        "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache        "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars        "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies        "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies      "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins    "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js        "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content    "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates         "Disable updates during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.set_uagent         "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic              "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies              "Cookies">
-<!ENTITY torbutton.prefs.cache                "Cache">
-<!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown              "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers               "Headers">
-<!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer       "Don't send referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.disable_domstorage    "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms            "Forms">
-<!ENTITY torbutton.prefs.block_tforms       "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms       "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore    "Prevent session store from saving Tor-loaded tabs (recommended)">
-<!ENTITY torbutton.prefs.tor    "Tor">
-<!ENTITY torbutton.prefs.non_tor    "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
-<!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history       "Isolate access of history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">
-<!ENTITY torbutton.prefs.close_tor    "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor       "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_file_net     "Block access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_links        "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.locked_mode        "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state      "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state      "Shutdown state">
-<!ENTITY torbutton.prefs.startup             "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore    "Prevent session store from saving Non-Tor loaded tabs">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.forms "Forms">
+<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
+<!ENTITY torbutton.prefs.tor "Tor">
+<!ENTITY torbutton.prefs.non_tor "Non-Tor">
+<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
+<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
+<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
+<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
+<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
+<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">

Modified: torbutton/trunk/src/chrome/locale/sl-SI/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/sl-SI/torbutton.properties	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/sl-SI/torbutton.properties	2008-06-16 18:59:50 UTC (rev 15310)
@@ -1,10 +1,13 @@
-torbutton.button.tooltip.disabled=Vključi anonimizacijo
-torbutton.button.tooltip.enabled=Izključi anonimizacijo
-torbutton.panel.tooltip.disabled=Klikni za vklop anonimizacije
-torbutton.panel.tooltip.enabled=Klikni za izklop anonimizacije
-torbutton.panel.label.disabled=Anonimizacija izključena
-torbutton.panel.label.enabled=Anonimizacija vključena
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Torbutton razširitev omogoča enostavno vključitev ali izključitev povezave preko anonimizacijskega omrežja Tor
+torbutton.button.tooltip.disabled = Vključi anonimizacijo
+torbutton.button.tooltip.enabled = Izključi anonimizacijo
+torbutton.panel.tooltip.disabled = Klikni za vklop anonimizacije
+torbutton.panel.tooltip.enabled = Klikni za izklop anonimizacije
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Anonimizacija izključena
+torbutton.panel.label.enabled = Anonimizacija vključena
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton razširitev omogoča enostavno vključitev ali izključitev povezave preko anonimizacijskega omrežja Tor
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd	2008-06-16 18:59:50 UTC (rev 15310)
@@ -27,54 +27,56 @@
 <!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "点击初始化 Torbutton">
-<!ENTITY torbutton.prefs.sec_settings        "Security Settings">
-<!ENTITY torbutton.prefs.block_thread        "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite       "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread       "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite      "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history       "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache        "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache        "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars        "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies        "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies      "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins    "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js        "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content    "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates         "Disable updates during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.set_uagent         "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic              "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies              "Cookies">
-<!ENTITY torbutton.prefs.cache                "Cache">
-<!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown              "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers               "Headers">
-<!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer       "Don't send referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.disable_domstorage    "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms            "Forms">
-<!ENTITY torbutton.prefs.block_tforms       "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms       "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore    "Prevent session store from saving Tor-loaded tabs (recommended)">
-<!ENTITY torbutton.prefs.tor    "Tor">
-<!ENTITY torbutton.prefs.non_tor    "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
-<!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history       "Isolate access of history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">
-<!ENTITY torbutton.prefs.close_tor    "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor       "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_file_net     "Block access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_links        "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.locked_mode        "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state      "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state      "Shutdown state">
-<!ENTITY torbutton.prefs.startup             "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore    "Prevent session store from saving Non-Tor loaded tabs">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.forms "Forms">
+<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
+<!ENTITY torbutton.prefs.tor "Tor">
+<!ENTITY torbutton.prefs.non_tor "Non-Tor">
+<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
+<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
+<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
+<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
+<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
+<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">

Modified: torbutton/trunk/src/chrome/locale/zh-CN/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-CN/torbutton.properties	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/zh-CN/torbutton.properties	2008-06-16 18:59:50 UTC (rev 15310)
@@ -1,10 +1,13 @@
-torbutton.button.tooltip.disabled=使用 Tor
-torbutton.button.tooltip.enabled=禁用 Tor
-torbutton.panel.tooltip.disabled=点击使用 Tor
-torbutton.panel.tooltip.enabled=点击禁用 Tor
-torbutton.panel.label.disabled=Tor 被禁用
-torbutton.panel.label.enabled=Tor 使用中
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Torbutton 提供一个按钮来方便的使用或禁用 Tor 代理
+torbutton.button.tooltip.disabled = 使用 Tor
+torbutton.button.tooltip.enabled = 禁用 Tor
+torbutton.panel.tooltip.disabled = 点击使用 Tor
+torbutton.panel.tooltip.enabled = 点击禁用 Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor 被禁用
+torbutton.panel.label.enabled = Tor 使用中
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton 提供一个按钮来方便的使用或禁用 Tor 代理
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?

Modified: torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd	2008-06-16 18:59:50 UTC (rev 15310)
@@ -27,54 +27,56 @@
 <!ENTITY torbutton.context_menu.about.key "A">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "點擊以初始 Torbutton">
-<!ENTITY torbutton.prefs.sec_settings        "Security Settings">
-<!ENTITY torbutton.prefs.block_thread        "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite       "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread       "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite      "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history       "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache        "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache        "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars        "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies        "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies      "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins    "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js        "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content    "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates         "Disable updates during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.set_uagent         "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic              "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies              "Cookies">
-<!ENTITY torbutton.prefs.cache                "Cache">
-<!ENTITY torbutton.prefs.history             "History">
-<!ENTITY torbutton.prefs.no_search           "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown              "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown          "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown          "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown           "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore  "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers               "Headers">
-<!ENTITY torbutton.prefs.spoof_english         "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer       "Don't send referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.disable_domstorage    "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms            "Forms">
-<!ENTITY torbutton.prefs.block_tforms       "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms       "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.notor_sessionstore    "Prevent session store from saving Tor-loaded tabs (recommended)">
-<!ENTITY torbutton.prefs.tor    "Tor">
-<!ENTITY torbutton.prefs.non_tor    "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor   "After a crash, restore saved session via:">
-<!ENTITY torbutton.prefs.reload_crashed_jar   "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars        "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth        "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history       "Isolate access of history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle       "Resize window dimensions to multiples of 40px on toggle (recommended)">
-<!ENTITY torbutton.prefs.close_tor    "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor       "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_file_net     "Block access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_links        "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.locked_mode        "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state      "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state      "Shutdown state">
-<!ENTITY torbutton.prefs.startup             "Startup">
-<!ENTITY torbutton.prefs.nonontor_sessionstore    "Prevent session store from saving Non-Tor loaded tabs">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.forms "Forms">
+<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.notor_sessionstore "Prevent session store from saving Tor loaded tabs">
+<!ENTITY torbutton.prefs.tor "Tor">
+<!ENTITY torbutton.prefs.non_tor "Non-Tor">
+<!ENTITY torbutton.prefs.restore_tor "On crash recovery or session restored startup, restore via:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
+<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
+<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
+<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
+<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
+<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.nonontor_sessionstore "Prevent session store from saving Non-Tor loaded tabs">

Modified: torbutton/trunk/src/chrome/locale/zh-TW/torbutton.properties
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-TW/torbutton.properties	2008-06-16 18:43:27 UTC (rev 15309)
+++ torbutton/trunk/src/chrome/locale/zh-TW/torbutton.properties	2008-06-16 18:59:50 UTC (rev 15310)
@@ -1,10 +1,13 @@
-torbutton.button.tooltip.disabled=啟用 Tor
-torbutton.button.tooltip.enabled=停用 Tor
-torbutton.panel.tooltip.disabled=點擊以啟用 Tor
-torbutton.panel.tooltip.enabled=點擊以停用 Tor
-torbutton.panel.label.disabled=Tor 已停用
-torbutton.panel.label.enabled=Tor 已啟用
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description=Torbutton 提供一個切換啟用/停用 Proxy 的按鈕
+torbutton.button.tooltip.disabled = 啟用 Tor
+torbutton.button.tooltip.enabled = 停用 Tor
+torbutton.panel.tooltip.disabled = 點擊以啟用 Tor
+torbutton.panel.tooltip.enabled = 點擊以停用 Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor 已停用
+torbutton.panel.label.enabled = Tor 已啟用
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton 提供一個切換啟用/停用 Proxy 的按鈕
 torbutton.popup.history.warning = Torbutton blocked changed-state history manipulation.\n\nSee history settings to allow.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemark feeds during Tor usage. In addition, it has not been as extensively tested for Tor security and usability as Firefox 2.\n\nDo you wish to continue anyway?