[or-cvs] r21089: {translation} Add new strings to templates. Update translated strings from (in translation/trunk/projects/torbutton: af ar bg bms bo ca cs da de el en es eu fa fi fr fur gl gu he hi hr hu id is it ja ka km ko ku mt nb nl pa pl pt pt_BR ro ru sl sq sv sw templates th tr uk vi zh_CN zh_HK zh_TW)

Tue Dec 1 23:42:22 UTC 2009

Author: mikeperry
Date: 2009-12-01 18:42:22 -0500 (Tue, 01 Dec 2009)
New Revision: 21089

Modified:
   translation/trunk/projects/torbutton/af/torbutton.dtd.po
   translation/trunk/projects/torbutton/af/torbutton.properties.po
   translation/trunk/projects/torbutton/ar/torbutton.dtd.po
   translation/trunk/projects/torbutton/ar/torbutton.properties.po
   translation/trunk/projects/torbutton/bg/torbutton.dtd.po
   translation/trunk/projects/torbutton/bg/torbutton.properties.po
   translation/trunk/projects/torbutton/bms/torbutton.dtd.po
   translation/trunk/projects/torbutton/bms/torbutton.properties.po
   translation/trunk/projects/torbutton/bo/torbutton.dtd.po
   translation/trunk/projects/torbutton/bo/torbutton.properties.po
   translation/trunk/projects/torbutton/ca/torbutton.dtd.po
   translation/trunk/projects/torbutton/ca/torbutton.properties.po
   translation/trunk/projects/torbutton/cs/torbutton.dtd.po
   translation/trunk/projects/torbutton/cs/torbutton.properties.po
   translation/trunk/projects/torbutton/da/torbutton.dtd.po
   translation/trunk/projects/torbutton/da/torbutton.properties.po
   translation/trunk/projects/torbutton/de/torbutton.dtd.po
   translation/trunk/projects/torbutton/de/torbutton.properties.po
   translation/trunk/projects/torbutton/el/torbutton.dtd.po
   translation/trunk/projects/torbutton/el/torbutton.properties.po
   translation/trunk/projects/torbutton/en/torbutton.dtd.po
   translation/trunk/projects/torbutton/en/torbutton.properties.po
   translation/trunk/projects/torbutton/es/torbutton.dtd.po
   translation/trunk/projects/torbutton/es/torbutton.properties.po
   translation/trunk/projects/torbutton/eu/torbutton.dtd.po
   translation/trunk/projects/torbutton/eu/torbutton.properties.po
   translation/trunk/projects/torbutton/fa/torbutton.dtd.po
   translation/trunk/projects/torbutton/fa/torbutton.properties.po
   translation/trunk/projects/torbutton/fi/torbutton.dtd.po
   translation/trunk/projects/torbutton/fi/torbutton.properties.po
   translation/trunk/projects/torbutton/fr/torbutton.dtd.po
   translation/trunk/projects/torbutton/fr/torbutton.properties.po
   translation/trunk/projects/torbutton/fur/torbutton.dtd.po
   translation/trunk/projects/torbutton/fur/torbutton.properties.po
   translation/trunk/projects/torbutton/gl/torbutton.dtd.po
   translation/trunk/projects/torbutton/gl/torbutton.properties.po
   translation/trunk/projects/torbutton/gu/torbutton.dtd.po
   translation/trunk/projects/torbutton/gu/torbutton.properties.po
   translation/trunk/projects/torbutton/he/torbutton.dtd.po
   translation/trunk/projects/torbutton/he/torbutton.properties.po
   translation/trunk/projects/torbutton/hi/torbutton.dtd.po
   translation/trunk/projects/torbutton/hi/torbutton.properties.po
   translation/trunk/projects/torbutton/hr/torbutton.dtd.po
   translation/trunk/projects/torbutton/hr/torbutton.properties.po
   translation/trunk/projects/torbutton/hu/torbutton.dtd.po
   translation/trunk/projects/torbutton/hu/torbutton.properties.po
   translation/trunk/projects/torbutton/id/torbutton.dtd.po
   translation/trunk/projects/torbutton/id/torbutton.properties.po
   translation/trunk/projects/torbutton/is/torbutton.dtd.po
   translation/trunk/projects/torbutton/is/torbutton.properties.po
   translation/trunk/projects/torbutton/it/torbutton.dtd.po
   translation/trunk/projects/torbutton/it/torbutton.properties.po
   translation/trunk/projects/torbutton/ja/torbutton.dtd.po
   translation/trunk/projects/torbutton/ja/torbutton.properties.po
   translation/trunk/projects/torbutton/ka/torbutton.dtd.po
   translation/trunk/projects/torbutton/ka/torbutton.properties.po
   translation/trunk/projects/torbutton/km/torbutton.dtd.po
   translation/trunk/projects/torbutton/km/torbutton.properties.po
   translation/trunk/projects/torbutton/ko/torbutton.dtd.po
   translation/trunk/projects/torbutton/ko/torbutton.properties.po
   translation/trunk/projects/torbutton/ku/torbutton.dtd.po
   translation/trunk/projects/torbutton/ku/torbutton.properties.po
   translation/trunk/projects/torbutton/mt/torbutton.dtd.po
   translation/trunk/projects/torbutton/mt/torbutton.properties.po
   translation/trunk/projects/torbutton/nb/torbutton.dtd.po
   translation/trunk/projects/torbutton/nb/torbutton.properties.po
   translation/trunk/projects/torbutton/nl/torbutton.dtd.po
   translation/trunk/projects/torbutton/nl/torbutton.properties.po
   translation/trunk/projects/torbutton/pa/torbutton.dtd.po
   translation/trunk/projects/torbutton/pa/torbutton.properties.po
   translation/trunk/projects/torbutton/pl/torbutton.dtd.po
   translation/trunk/projects/torbutton/pl/torbutton.properties.po
   translation/trunk/projects/torbutton/pt/torbutton.dtd.po
   translation/trunk/projects/torbutton/pt/torbutton.properties.po
   translation/trunk/projects/torbutton/pt_BR/torbutton.dtd.po
   translation/trunk/projects/torbutton/pt_BR/torbutton.properties.po
   translation/trunk/projects/torbutton/ro/torbutton.dtd.po
   translation/trunk/projects/torbutton/ro/torbutton.properties.po
   translation/trunk/projects/torbutton/ru/torbutton.dtd.po
   translation/trunk/projects/torbutton/ru/torbutton.properties.po
   translation/trunk/projects/torbutton/sl/torbutton.dtd.po
   translation/trunk/projects/torbutton/sl/torbutton.properties.po
   translation/trunk/projects/torbutton/sq/torbutton.dtd.po
   translation/trunk/projects/torbutton/sq/torbutton.properties.po
   translation/trunk/projects/torbutton/sv/torbutton.dtd.po
   translation/trunk/projects/torbutton/sv/torbutton.properties.po
   translation/trunk/projects/torbutton/sw/torbutton.dtd.po
   translation/trunk/projects/torbutton/sw/torbutton.properties.po
   translation/trunk/projects/torbutton/templates/torbutton.dtd.pot
   translation/trunk/projects/torbutton/templates/torbutton.properties.pot
   translation/trunk/projects/torbutton/th/torbutton.dtd.po
   translation/trunk/projects/torbutton/th/torbutton.properties.po
   translation/trunk/projects/torbutton/tr/torbutton.dtd.po
   translation/trunk/projects/torbutton/tr/torbutton.properties.po
   translation/trunk/projects/torbutton/uk/torbutton.dtd.po
   translation/trunk/projects/torbutton/uk/torbutton.properties.po
   translation/trunk/projects/torbutton/vi/torbutton.dtd.po
   translation/trunk/projects/torbutton/vi/torbutton.properties.po
   translation/trunk/projects/torbutton/zh_CN/torbutton.dtd.po
   translation/trunk/projects/torbutton/zh_CN/torbutton.properties.po
   translation/trunk/projects/torbutton/zh_HK/torbutton.dtd.po
   translation/trunk/projects/torbutton/zh_HK/torbutton.properties.po
   translation/trunk/projects/torbutton/zh_TW/torbutton.dtd.po
   translation/trunk/projects/torbutton/zh_TW/torbutton.properties.po
Log:

Add new strings to templates. Update translated strings from
template.



Modified: translation/trunk/projects/torbutton/af/torbutton.dtd.po
===================================================================

--- translation/trunk/projects/torbutton/af/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/af/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/af/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/af/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/af/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ar/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/ar/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/ar/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.dtd, ar/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-10-16 20:27+0000\n"
 "Last-Translator: Eman Al-Timimi <eman.al-timimi at lincolngroup.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -52,6 +52,11 @@
 msgid "Use Privoxy"
 msgstr "استخدم بريڤوكسي"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "استخدم بريڤوكسي"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "استخدم إعدادات وسيط معرّفة "
@@ -312,7 +317,8 @@
 
 #: torbutton.prefs.block_links
 msgid "Block link clicks and page reloads from different Tor states (optional)"
-msgstr "امنع نقر الروابط و إعادة تحميل الصفحات بين حالات تور المختلفة (اختياري)"
+msgstr ""
+"امنع نقر الروابط و إعادة تحميل الصفحات بين حالات تور المختلفة (اختياري)"
 
 #: torbutton.prefs.jar_certs
 msgid "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"
@@ -393,6 +399,14 @@
 msgid "SOCKS v5"
 msgstr "SOCKS النسخة 5"
 
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr "امنع التحديثات أثناء عمل تور (محبذ)"
 

Modified: translation/trunk/projects/torbutton/ar/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/ar/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/ar/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.properties, ar/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-10-16 20:05+0000\n"
 "Last-Translator: Eman Al-Timimi <eman.al-timimi at lincolngroup.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -87,16 +87,17 @@
 "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)"
 msgstr ""
-"ملاحظة مفتاح تور: بما أنّك لا تملك ميثاق إصدار الشهادة الرقمي، وحيث أنّ "
-"عملية فحص قائمة مصدر الشهادة الرقمي عملية بطيئة وتسبب بطئا في عمل مفتاح تور، "
-"فهل ترغب في تعطيل عملية عزل شهادات الإصدار الرقمي؟ (إن كنت لا تعلم او لا "
-"تفهم معنى ذلك، فإنه من المستحسن أن تختار خيار الموافقة) "
+"ملاحظة مفتاح تور: بما أنّك لا تملك ميثاق إصدار الشهادة الرقمي، وحيث أنّ عملية "
+"فحص قائمة مصدر الشهادة الرقمي عملية بطيئة وتسبب بطئا في عمل مفتاح تور، فهل "
+"ترغب في تعطيل عملية عزل شهادات الإصدار الرقمي؟ (إن كنت لا تعلم او لا تفهم "
+"معنى ذلك، فإنه من المستحسن أن تختار خيار الموافقة) "
 
 #: torbutton.popup.ff3.warning
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -113,7 +114,8 @@
 msgstr "تمّ بنجاح تفحص وكيل التور!"
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+#, fuzzy
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 "فشلت عملية تفحص وكيل التور! تأكد من إعدادات الوسيط وبرنامج البرايفوكسي. "
 
@@ -121,11 +123,11 @@
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
-"أحدث تفحص لوكيل التور فشل.\n"
-"\n"
-"هل أنت متأكد أنك تريد تفعيله علي أي حال؟"
 
 #: torbutton.popup.test.ff3_notice
 msgid ""
@@ -161,7 +163,50 @@
 msgid "(crucial)"
 msgstr "(مُحَتَّم)"
 
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""
+
 #~ msgid ""
+#~ "The most recent Tor proxy test failed to use Tor.\n"
+#~ "\n"
+#~ "Are you sure you want to enable anyway?"
+#~ msgstr ""
+#~ "أحدث تفحص لوكيل التور فشل.\n"
+#~ "\n"
+#~ "هل أنت متأكد أنك تريد تفعيله علي أي حال؟"
+
+#~ msgid ""
 #~ "Torbutton blocked changed-state history manipulation.\n"
 #~ "\n"
 #~ "See history settings to allow.\n"

Modified: translation/trunk/projects/torbutton/bg/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/bg/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/bg/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/bg/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/bg/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/bg/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/bms/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/bms/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/bms/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-10-19 06:32+0000\n"
 "Last-Translator: H2A <htaike2aung at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -44,14 +44,17 @@
 
 #: torbutton.prefs.recommended_settings
 msgid "Use the recommended proxy settings for my version of Firefox"
-msgstr ""
-"အၾကံျပဳ ေထာက္ခံေသာ proxy ခ်ိန္ညိႇခ်က္မ်ားကို မိမိ၏ Firefox version တြင္ "
-"အသံုးျပဳရန္"
+msgstr "အၾကံျပဳ ေထာက္ခံေသာ proxy ခ်ိန္ညိႇခ်က္မ်ားကို မိမိ၏ Firefox version တြင္ အသံုးျပဳရန္"
 
 #: torbutton.prefs.use_privoxy
 msgid "Use Privoxy"
 msgstr "Privoxy ကို အသံုးျပဳရန္"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "Privoxy ကို အသံုးျပဳရန္"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "proxy ခ်ိန္ညိႇခ်က္မ်ားကို စိတ္ၾကိဳက္ျပဳျပင္၍ အသံုးျပဳရန္"
@@ -102,10 +105,9 @@
 "proxy settings, please disable Torbutton and return here.  If you would like "
 "to change your Tor settings, please use the Torbutton preference window."
 msgstr ""
-"Torbutton ကုိ လက္ရွိတြင္ အသံုးျပဳႏုိင္ပါသည္။ Tor Proxy မဟုတ္ေသာ "
-"ခ်ိန္ညိႇခ်က္မ်ားကို ေျပာင္းလဲ အသံုးျပဳႏုိင္ရန္အတြက္ Torbutton ကုိ "
-"အသံုးမျပဳႏိုင္ေအာင္ ပိတ္၍ ယခုေနရာသို႕ ျပန္လာပါ။ Tor ခ်ိန္ညႇိခ်က္မ်ားကို "
-"ေျပာင္းလဲလိုပါက Torbutton ဦးစားေပးညႊန္ျပခ်က္မ်ားကို ကို အသံုးျပဳပါ။"
+"Torbutton ကုိ လက္ရွိတြင္ အသံုးျပဳႏုိင္ပါသည္။ Tor Proxy မဟုတ္ေသာ ခ်ိန္ညိႇခ်က္မ်ားကို ေျပာင္းလဲ "
+"အသံုးျပဳႏုိင္ရန္အတြက္ Torbutton ကုိ အသံုးမျပဳႏိုင္ေအာင္ ပိတ္၍ ယခုေနရာသို႕ ျပန္လာပါ။ Tor "
+"ခ်ိန္ညႇိခ်က္မ်ားကို ေျပာင္းလဲလိုပါက Torbutton ဦးစားေပးညႊန္ျပခ်က္မ်ားကို ကို အသံုးျပဳပါ။"
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -145,43 +147,33 @@
 
 #: torbutton.prefs.block_thread
 msgid "Block history reads during Tor (crucial)"
-msgstr ""
-"Tor အသံုးျပဳစဥ္အတြင္း history ဖတ္႐ႈျခင္းကို ပိတ္ပင္ထားရန္ (အေရးၾကီးပါသည္)"
+msgstr "Tor အသံုးျပဳစဥ္အတြင္း history ဖတ္႐ႈျခင္းကို ပိတ္ပင္ထားရန္ (အေရးၾကီးပါသည္)"
 
 #: torbutton.prefs.block_thwrite
 msgid "Block history writes during Tor (recommended)"
-msgstr ""
-"Tor အသံုးျပဳစဥ္အတြင္း history ေရးျခင္းကုိ ပိတ္ပင္ထားရန္ "
-"(အၾကံျပဳေထာက္ခံပါသည္)"
+msgstr "Tor အသံုးျပဳစဥ္အတြင္း history ေရးျခင္းကုိ ပိတ္ပင္ထားရန္ (အၾကံျပဳေထာက္ခံပါသည္)"
 
 #: torbutton.prefs.block_nthread
 msgid "Block history reads during Non-Tor (optional)"
-msgstr ""
-"Tor အသံုးမျပဳစဥ္အတြင္း history ဖတ္ျခင္းကို ပိတ္ပင္ထားရန္ "
-"(ေရြးခ်ယ္ႏိုင္ပါသည္)"
+msgstr "Tor အသံုးမျပဳစဥ္အတြင္း history ဖတ္ျခင္းကို ပိတ္ပင္ထားရန္ (ေရြးခ်ယ္ႏိုင္ပါသည္)"
 
 #: torbutton.prefs.block_nthwrite
 msgid "Block history writes during Non-Tor (optional)"
-msgstr ""
-"Tor အသံုးမျပဳစဥ္အတြင္း history ေရးျခင္းကုိ ပိတ္ပင္ထားရန္ "
-"(ေရြးခ်ယ္ႏုိင္ပါသည္)"
+msgstr "Tor အသံုးမျပဳစဥ္အတြင္း history ေရးျခင္းကုိ ပိတ္ပင္ထားရန္ (ေရြးခ်ယ္ႏုိင္ပါသည္)"
 
 #: torbutton.prefs.clear_history
 msgid "Clear history on Tor toggle (optional)"
-msgstr ""
-"Tor အသံုးျပဳ/မျပဳ ေျပာင္းလဲခ်ိန္တြင္ history ကုိ ရွင္းလင္းရန္ "
-"(ေရြးခ်ယ္ႏုိင္ပါသည္)"
+msgstr "Tor အသံုးျပဳ/မျပဳ ေျပာင္းလဲခ်ိန္တြင္ history ကုိ ရွင္းလင္းရန္ (ေရြးခ်ယ္ႏုိင္ပါသည္)"
 
 #: torbutton.prefs.clear_cache
 msgid "Block Tor disk cache and clear all cache on Tor toggle"
 msgstr ""
-"Tor အသံုးျပဳ/မျပဳ ေျပာင္းလဲခ်ိန္တြင္ Disk cache ျပဳလုပ္မႈႏွင့္ cache "
-"ရွင္းလင္းမႈမ်ားကုိ ပိတ္ပင္ထားရန္"
+"Tor အသံုးျပဳ/မျပဳ ေျပာင္းလဲခ်ိန္တြင္ Disk cache ျပဳလုပ္မႈႏွင့္ cache ရွင္းလင္းမႈမ်ားကုိ "
+"ပိတ္ပင္ထားရန္"
 
 #: torbutton.prefs.block_cache
 msgid "Block disk and memory cache access during Tor"
-msgstr ""
-"Tor အသံုးျပဳစဥ္အတြင္း disk ႏွင့္ memory cache အသံုးျပဳမႈကို ပိတ္ပင္ထားရန္"
+msgstr "Tor အသံုးျပဳစဥ္အတြင္း disk ႏွင့္ memory cache အသံုးျပဳမႈကို ပိတ္ပင္ထားရန္"
 
 #: torbutton.prefs.cookie_jars
 msgid "Store Non-Tor cookies in a protected jar"
@@ -197,19 +189,16 @@
 
 #: torbutton.prefs.disable_plugins
 msgid "Disable plugins during Tor usage (crucial)"
-msgstr ""
-"Tor အသံုးျပဳမႈရွိေနစဥ္အတြင္း plugins မ်ားကုိ ပိတ္ပင္ထားရန္ (အေရးၾကီးပါသည္)"
+msgstr "Tor အသံုးျပဳမႈရွိေနစဥ္အတြင္း plugins မ်ားကုိ ပိတ္ပင္ထားရန္ (အေရးၾကီးပါသည္)"
 
 #: torbutton.prefs.kill_bad_js
 msgid "Hook dangerous javascript (crucial)"
 msgstr ""
-"အႏၱရယ္ရွိေသာ javascript မ်ားကုိ hook ခ်ိတ္ျဖင့္ထိန္းခ်ဳပ္ထားရန္ လုပ္ထားရန္ "
-"(အေရးၾကီးပါသည္)"
+"အႏၱရယ္ရွိေသာ javascript မ်ားကုိ hook ခ်ိတ္ျဖင့္ထိန္းခ်ဳပ္ထားရန္ လုပ္ထားရန္ (အေရးၾကီးပါသည္)"
 
 #: torbutton.prefs.isolate_content
 msgid "Isolate dynamic content to Tor state (crucial)"
-msgstr ""
-"Tor အေျခအေနတြင္ dynamic content မ်ားကို သီးျခား ခဲြထားရန္ (အေရးၾကီးပါသည္)"
+msgstr "Tor အေျခအေနတြင္ dynamic content မ်ားကို သီးျခား ခဲြထားရန္ (အေရးၾကီးပါသည္)"
 
 #: torbutton.prefs.no_updates
 msgid "Disable updates during Tor usage"
@@ -217,8 +206,7 @@
 
 #: torbutton.prefs.set_uagent
 msgid "Set user agent for Tor usage (crucial)"
-msgstr ""
-"Tor အသံုးျပဳမႈအတြက္ အသံုးျပဳသူ ကုိယ္စားလွယ္ကို သတ္မွတ္ရန္ (အေရးၾကီးပါသည္)"
+msgstr "Tor အသံုးျပဳမႈအတြက္ အသံုးျပဳသူ ကုိယ္စားလွယ္ကို သတ္မွတ္ရန္ (အေရးၾကီးပါသည္)"
 
 #: torbutton.prefs.dynamic
 msgid "Dynamic Content"
@@ -238,9 +226,7 @@
 
 #: torbutton.prefs.no_search
 msgid "Disable search suggestions during Tor (recommended)"
-msgstr ""
-"Tor အသံုးျပဳစဥ္အတြင္း ရွာေဖြရန္ အၾကံျပဳမႈမ်ားကုိ ပိတ္ပင္ထားရန္ "
-"(အၾကံျပဳေထာက္ခံပါသည္)"
+msgstr "Tor အသံုးျပဳစဥ္အတြင္း ရွာေဖြရန္ အၾကံျပဳမႈမ်ားကုိ ပိတ္ပင္ထားရန္ (အၾကံျပဳေထာက္ခံပါသည္)"
 
 #: torbutton.prefs.shutdown
 msgid "Shutdown"
@@ -248,9 +234,7 @@
 
 #: torbutton.prefs.tor_shutdown
 msgid "Clear Tor cookies during Tor-enabled browser shutdown"
-msgstr ""
-"Tor အသံုးျပဳႏုိင္ေသာ browser ကုိ ပိတ္ေနစဥ္အတြင္း Tor Cookies မ်ားကို "
-"ရွင္းလင္းရန္"
+msgstr "Tor အသံုးျပဳႏုိင္ေသာ browser ကုိ ပိတ္ေနစဥ္အတြင္း Tor Cookies မ်ားကို ရွင္းလင္းရန္"
 
 #: torbutton.prefs.all_shutdown
 msgid "Clear cookies during any browser shutdown"
@@ -275,8 +259,7 @@
 #: torbutton.prefs.disable_referer
 msgid "Don't send referer during Tor usage (may break some sites)"
 msgstr ""
-"Tor အသံုးျပဳေနစဥ္အတြင္း ရည္ညႊန္းသူကို ေပးပို႕ျခင္း မျပဳရန္ (အခ်ိဳ႕ "
-"ဆုိက္မ်ားကို ျပတ္ေတာက္ေစႏုိင္ပါသည္)"
+"Tor အသံုးျပဳေနစဥ္အတြင္း ရည္ညႊန္းသူကို ေပးပို႕ျခင္း မျပဳရန္ (အခ်ိဳ႕ ဆုိက္မ်ားကို ျပတ္ေတာက္ေစႏုိင္ပါသည္)"
 
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
@@ -289,14 +272,14 @@
 #: torbutton.prefs.block_tforms
 msgid "Block password+form saving during Tor (recommended)"
 msgstr ""
-"Tor အသံုးျပဳစဥ္အတြင္း စကားဝွက္ ႏွင့္ ျဖည့္စြက္ပံုစံမ်ား သိမ္းဆည္းျခင္းကုိ "
-"ပိတ္ပင္ထားရန္ (အၾကံျပဳေထာက္ခံပါသည္)"
+"Tor အသံုးျပဳစဥ္အတြင္း စကားဝွက္ ႏွင့္ ျဖည့္စြက္ပံုစံမ်ား သိမ္းဆည္းျခင္းကုိ ပိတ္ပင္ထားရန္ "
+"(အၾကံျပဳေထာက္ခံပါသည္)"
 
 #: torbutton.prefs.block_ntforms
 msgid "Block password+form saving during Non-Tor (optional)"
 msgstr ""
-"Tor အသံုးမျပဳစဥ္အတြင္း စကားဝွက္ ႏွင့္ ျဖည့္စြက္ပံုစံမ်ား သိမ္းဆည္းျခင္းကုိ "
-"ပိတ္ပင္ထားရန္ (ေရြးခ်ယ္ႏုိင္ပါသည္)"
+"Tor အသံုးမျပဳစဥ္အတြင္း စကားဝွက္ ႏွင့္ ျဖည့္စြက္ပံုစံမ်ား သိမ္းဆည္းျခင္းကုိ ပိတ္ပင္ထားရန္ "
+"(ေရြးခ်ယ္ႏုိင္ပါသည္)"
 
 #: torbutton.prefs.tor
 msgid "Tor"
@@ -313,14 +296,12 @@
 #: torbutton.prefs.reload_crashed_jar
 msgid "Reload cookie jar/clear cookies on Firefox crash (recommended)"
 msgstr ""
-"Firefox မွားယြင္းရပ္တန္႕သြားလွ်င္ cookie jar ကုိ ျပန္လည္ တင္ပို႕ယူရန္/ "
-"ရွင္းလင္းရန္ (အၾကံျပဳေထာက္ခံပါသည္)"
+"Firefox မွားယြင္းရပ္တန္႕သြားလွ်င္ cookie jar ကုိ ျပန္လည္ တင္ပို႕ယူရန္/ ရွင္းလင္းရန္ "
+"(အၾကံျပဳေထာက္ခံပါသည္)"
 
 #: torbutton.prefs.dual_cookie_jars
 msgid "Store both Tor and Non-Tor cookies in protected jars (dangerous)"
-msgstr ""
-"Tor ႏွင့္ Tor မဟုတ္ေသာ cookies မ်ားကုိ ကာကြယ္ထားေသာ jars မ်ားထဲတြင္ "
-"သိမ္းဆည္းထားရန္"
+msgstr "Tor ႏွင့္ Tor မဟုတ္ေသာ cookies မ်ားကုိ ကာကြယ္ထားေသာ jars မ်ားထဲတြင္ သိမ္းဆည္းထားရန္"
 
 #: torbutton.prefs.clear_http_auth
 msgid "Clear HTTP auth sessions (recommended)"
@@ -329,49 +310,47 @@
 #: torbutton.prefs.block_js_history
 msgid "Isolate access to history navigation to Tor state (crucial)"
 msgstr ""
-"Tor အေျခအေနသို႕ history ရွာေဖြသြားလာမႈ အသံုးျပဳခြင့္ကို သီးျခား ခဲြျခား "
-"ထားရန္ (အေရးၾကီးပါသည္)"
+"Tor အေျခအေနသို႕ history ရွာေဖြသြားလာမႈ အသံုးျပဳခြင့္ကို သီးျခား ခဲြျခား ထားရန္ "
+"(အေရးၾကီးပါသည္)"
 
 #: torbutton.prefs.resize_on_toggle
 msgid "Resize windows to multiples of 50px during Tor usage (recommended)"
 msgstr ""
-"Tor အသံုးျပဳေနစဥ္အတြင္း windows ကုိ 50 px သို႕ အရြယ္အစား ထားရွိရန္ "
-"(အၾကံျပဳေထာက္ခံပါသည္)"
+"Tor အသံုးျပဳေနစဥ္အတြင္း windows ကုိ 50 px သို႕ အရြယ္အစား ထားရွိရန္ (အၾကံျပဳေထာက္ခံပါသည္)"
 
 #: torbutton.prefs.close_tor
 msgid "Close all Tor windows and tabs on toggle (optional)"
 msgstr ""
-"အသံုးျပဳမႈ ေျပာင္းလဲစဥ္အတြင္း Tor windows မ်ားႏွင့္ tabs မ်ား အားလံုးကုိ "
-"ပိတ္သိမ္းရန္ (ေရြးခ်ယ္ႏုိင္ပါသည္)"
+"အသံုးျပဳမႈ ေျပာင္းလဲစဥ္အတြင္း Tor windows မ်ားႏွင့္ tabs မ်ား အားလံုးကုိ ပိတ္သိမ္းရန္ "
+"(ေရြးခ်ယ္ႏုိင္ပါသည္)"
 
 #: torbutton.prefs.close_nontor
 msgid "Close all Non-Tor windows and tabs on toggle (optional)"
 msgstr ""
-"အသံုးျပဳမႈ ေျပာင္းလဲစဥ္အတြင္း Tor မဟုတ္ေသာ windows မ်ားႏွင့္ tabs မ်ား "
-"အားလံုးကုိ ပိတ္သိမ္းရန္ (ေရြးခ်ယ္ႏုိင္ပါသည္)"
+"အသံုးျပဳမႈ ေျပာင္းလဲစဥ္အတြင္း Tor မဟုတ္ေသာ windows မ်ားႏွင့္ tabs မ်ား အားလံုးကုိ ပိတ္သိမ္းရန္ "
+"(ေရြးခ်ယ္ႏုိင္ပါသည္)"
 
 #: torbutton.prefs.block_links
 msgid "Block link clicks and page reloads from different Tor states (optional)"
 msgstr ""
-"မတူညီေသာ Tor အေျခအေနမ်ားတြင္ ခ်ိတ္ဆက္လင့္ခ္မ်ားကုိ ကုိ ကလစ္လုပ္ျခင္းႏွင့္ "
-"စာမ်က္ႏွာမ်ား ျပန္လည္ ေခၚယူျခင္းကို ပိတ္ပင္ရန္ (ေရြးခ်ယ္ႏုိင္ပါသည္)"
+"မတူညီေသာ Tor အေျခအေနမ်ားတြင္ ခ်ိတ္ဆက္လင့္ခ္မ်ားကုိ ကုိ ကလစ္လုပ္ျခင္းႏွင့္ စာမ်က္ႏွာမ်ား "
+"ျပန္လည္ ေခၚယူျခင္းကို ပိတ္ပင္ရန္ (ေရြးခ်ယ္ႏုိင္ပါသည္)"
 
 #: torbutton.prefs.jar_certs
 msgid "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"
 msgstr ""
-"Tor အသံုးျပဳေသာ သို႕မဟုတ္ Tor အသံုးမျပဳေသာ အေျခအေနတြင္ SSL certs မ်ားကုိ "
-"သီးျခား jars မ်ားတြင္ သိမ္းဆည္းရန္ (အၾကံျပဳေထာက္ခံပါသည္)"
+"Tor အသံုးျပဳေသာ သို႕မဟုတ္ Tor အသံုးမျပဳေသာ အေျခအေနတြင္ SSL certs မ်ားကုိ သီးျခား jars "
+"မ်ားတြင္ သိမ္းဆည္းရန္ (အၾကံျပဳေထာက္ခံပါသည္)"
 
 #: torbutton.prefs.jar_ca_certs
 msgid "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"
 msgstr ""
-"Tor အသံုးျပဳေသာ သို႕မဟုတ္ Tor အသံုးမျပဳေသာ အေျခအေနတြင္ CA certs မ်ားကုိ "
-"သီးျခား jars မ်ားတြင္ သိမ္းဆည္းရန္ (အၾကံျပဳေထာက္ခံပါသည္)"
+"Tor အသံုးျပဳေသာ သို႕မဟုတ္ Tor အသံုးမျပဳေသာ အေျခအေနတြင္ CA certs မ်ားကုိ သီးျခား jars "
+"မ်ားတြင္ သိမ္းဆည္းရန္ (အၾကံျပဳေထာက္ခံပါသည္)"
 
 #: torbutton.prefs.locked_mode
 msgid "Disable Button and Hotkeys to prevent accidental toggle"
-msgstr ""
-"မေတာ္တဆ ေျပာင္းလဲမႈ မျဖစ္ေစရန္ Button ႏွင့္ Hotkeys မ်ားကို ပိတ္ပင္ထားရန္"
+msgstr "မေတာ္တဆ ေျပာင္းလဲမႈ မျဖစ္ေစရန္ Button ႏွင့္ Hotkeys မ်ားကို ပိတ္ပင္ထားရန္"
 
 #: torbutton.prefs.startup_state
 msgid "On normal startup, set Tor state to:"
@@ -387,8 +366,7 @@
 
 #: torbutton.prefs.block_tor_file_net
 msgid "Block Tor access to network from file:// urls (recommended)"
-msgstr ""
-"Network သုိ႕ Tor အသံုးျပဳမႈကုိ ပိတ္ပင္ရန္ file:// urls (အၾကံျပဳေထာက္ခံပါသည္)"
+msgstr "Network သုိ႕ Tor အသံုးျပဳမႈကုိ ပိတ္ပင္ရန္ file:// urls (အၾကံျပဳေထာက္ခံပါသည္)"
 
 #: torbutton.prefs.block_nontor_file_net
 msgid "Block Non-Tor access to network from file:// urls"
@@ -406,8 +384,8 @@
 msgid ""
 "Test my Tor settings after the first time I toggle on every Firefox start"
 msgstr ""
-"Firefox စတင္ျပီး ပထမဆံုး ေျပာင္းလဲအသံုးျပဳမႈျပီးလွ်င္ မိမိ၏ Tor "
-"ခ်ိန္ညိႇမႈမ်ားကို ျပန္လည္ စမ္းသပ္ရန္"
+"Firefox စတင္ျပီး ပထမဆံုး ေျပာင္းလဲအသံုးျပဳမႈျပီးလွ်င္ မိမိ၏ Tor ခ်ိန္ညိႇမႈမ်ားကို ျပန္လည္ "
+"စမ္းသပ္ရန္"
 
 #: torbutton.prefs.disable_livemarks
 msgid "Disable livemarks updates during Tor usage"
@@ -423,8 +401,7 @@
 
 #: torbutton.prefs.session_restore
 msgid "Have the session store save and restore these tabs:"
-msgstr ""
-"session သိမ္းဆည္းမႈအတြက္ သိမ္းဆည္းရန္ ရန္ႏွင့္ ျပန္လည္ တင္ယူရန္ tabs မ်ား :"
+msgstr "session သိမ္းဆည္းမႈအတြက္ သိမ္းဆည္းရန္ ရန္ႏွင့္ ျပန္လည္ တင္ယူရန္ tabs မ်ား :"
 
 #: torbutton.prefs.nontor_tabs
 msgid "Tabs loaded in Non-Tor"
@@ -441,3 +418,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr "SOCKS v5"
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/bms/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/bms/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/bms/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-10-19 07:03+0000\n"
 "Last-Translator: H2A <htaike2aung at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,8 +51,8 @@
 "Torbutton provides a button to easily enable or disable pointing Firefox to "
 "the Tor proxy"
 msgstr ""
-"Tor proxy ကုိ Firefox တြင္ အလြယ္တကူ အသံုးျပဳခြင့္ ျပဳရန္/ မျပဳရန္ Torbutton "
-"မွ ခလုပ္တစ္ခုကုိ ထည့္သြင္းထားပါသည္"
+"Tor proxy ကုိ Firefox တြင္ အလြယ္တကူ အသံုးျပဳခြင့္ ျပဳရန္/ မျပဳရန္ Torbutton မွ ခလုပ္တစ္ခုကုိ "
+"ထည့္သြင္းထားပါသည္"
 
 #: torbutton.popup.history.warning
 msgid ""
@@ -62,11 +62,11 @@
 "Hit 'enter' in the location box or open a new window or tab instead.\n"
 "\n"
 msgstr ""
-"ေျပာင္းလဲမႈ အေျခအေန History ကုိင္တြယ္ထိန္းသိမ္းမႈ ကုိ Torbutton မွ "
-"ပိတ္ပင္ထားပါသည္။Firefox လံုျခံဳမႈ bug တြင္ အလုပ္လုပ္ႏဳိင္ရန္ ျဖစ္ပါသည္။ \n"
+"ေျပာင္းလဲမႈ အေျခအေန History ကုိင္တြယ္ထိန္းသိမ္းမႈ ကုိ Torbutton မွ ပိတ္ပင္ထားပါသည္။Firefox "
+"လံုျခံဳမႈ bug တြင္ အလုပ္လုပ္ႏဳိင္ရန္ ျဖစ္ပါသည္။ \n"
 "\n"
-"location box ေနရာတြင္ enter ကုိ ႏွိပ္ပါ သို႕မဟုတ္ window  အသစ္တစ္ခု "
-"သို႕မဟုတ္ tab တစ္ခု အစားထိုး ဖြင့္လွစ္ပါ။ \n"
+"location box ေနရာတြင္ enter ကုိ ႏွိပ္ပါ သို႕မဟုတ္ window  အသစ္တစ္ခု သို႕မဟုတ္ tab တစ္ခု အစားထိုး "
+"ဖြင့္လွစ္ပါ။ \n"
 "\n"
 
 #: torbutton.popup.plugin.warning
@@ -76,8 +76,7 @@
 "Use Save-As instead.\n"
 "\n"
 msgstr ""
-"plugin အခ်က္အလက္မ်ားကုိ Tor မွ တုိက္ရုိက္ တင္ယူျခင္းကုိ Torbutton မွ "
-"ပိတ္ပင္ပါသည္။ \n"
+"plugin အခ်က္အလက္မ်ားကုိ Tor မွ တုိက္ရုိက္ တင္ယူျခင္းကုိ Torbutton မွ ပိတ္ပင္ပါသည္။ \n"
 "\n"
 "Save-As ကို အစားထုိး အသံုးျပဳပါ။ \n"
 "\n"
@@ -89,61 +88,61 @@
 "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)"
 msgstr ""
-"Torbutton မွတ္ခ်က္: သင့္အတြက္  ျပဳလုပ္ထားေသာ Certificate Authorities "
-"မေဖာ္ျပထားပါ။ Certificate Authority စာရင္း စစ္ေဆးရွာေဖြျခင္းသည္ Tor "
-"ေျပာင္းလဲ အသံုးျပဳမႈကို ေႏွးေကြးေစႏုိင္ျပီး အလုပ္လုပ္ရာတြင္ "
-"ေႏွးေကြးေစႏုိင္ပါသည္။ Certificate Authority certificates မ်ား "
-"ခဲြျခားထားရွိျခင္းကုိ ပိတ္ပင္လိုပါသလား ? (သင္ ထုိအေၾကာင္းအရာကုိ နားလည္ျခင္း "
+"Torbutton မွတ္ခ်က္: သင့္အတြက္  ျပဳလုပ္ထားေသာ Certificate Authorities မေဖာ္ျပထားပါ။ "
+"Certificate Authority စာရင္း စစ္ေဆးရွာေဖြျခင္းသည္ Tor ေျပာင္းလဲ "
+"အသံုးျပဳမႈကို ေႏွးေကြးေစႏုိင္ျပီး အလုပ္လုပ္ရာတြင္ ေႏွးေကြးေစႏုိင္ပါသည္။ Certificate Authority "
+"certificates မ်ား ခဲြျခားထားရွိျခင္းကုိ ပိတ္ပင္လိုပါသလား ? (သင္ ထုိအေၾကာင္းအရာကုိ နားလည္ျခင္း "
 "မရွိပါလွ်င္ OK ကုိ ကလစ္ႏွိပ္ျခင္းျဖင့္ လံုျခံဳစိတ္ခ်ႏုိင္ပါသည္)"
 
 #: torbutton.popup.ff3.warning
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
 "သတိေပးခ်က္!\n"
 "\n"
-"သင္၏ အခ်ိန္ေဒသဇုန္ႏွင့္ livemarks မ်ား ေပါက္ၾကားျခင္းကို Firefox 3 တြင္ "
-"Torbutton သည္ Tor မွတဆင့္ ျဖစ္ေပၚေစႏုိင္ပါသည္။ \n"
+"သင္၏ အခ်ိန္ေဒသဇုန္ႏွင့္ livemarks မ်ား ေပါက္ၾကားျခင္းကို Firefox 3 တြင္ Torbutton သည္ Tor "
+"မွတဆင့္ ျဖစ္ေပၚေစႏုိင္ပါသည္။ \n"
 "\n"
 "မည္သုိ႕ပင္ျဖစ္ေစ ေရွ႕သို႕ ဆက္လက္လုပ္ေဆာင္ လုိပါသလား ?"
 
 #: torbutton.popup.toggle.warning
 msgid "You need to toggle Tor or restart for your settings to take effect."
 msgstr ""
-"ခ်ိညိႇမႈမ်ား အက်ိဳးသက္ေရာက္မႈ ရွိေစရန္ Tor အသံုးျပဳမႈႏွင့္ အသံုးမျပဳမႈ "
-"ေျပာင္းလဲရန္ သို႕မဟုတ္ ျပန္လည္စတင္ရန္ လိုအပ္ပါသည္"
+"ခ်ိညိႇမႈမ်ား အက်ိဳးသက္ေရာက္မႈ ရွိေစရန္ Tor အသံုးျပဳမႈႏွင့္ အသံုးမျပဳမႈ ေျပာင္းလဲရန္ သို႕မဟုတ္ "
+"ျပန္လည္စတင္ရန္ လိုအပ္ပါသည္"
 
 #: torbutton.popup.test.success
 msgid "Tor proxy test successful!"
 msgstr "Tor proxy စမ္းသပ္မႈ ေအာင္ျမင္ပါသည္ !"
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+#, fuzzy
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
-"Tor proxy စမ္းသပ္မႈ မေအာင္ျမင္ပါ ! သင္၏ proxy ႏွင့္ Privoxy "
-"ခ်ိန္ညိႇမႈမ်ားကို စစ္ေဆးပါ။"
+"Tor proxy စမ္းသပ္မႈ မေအာင္ျမင္ပါ ! သင္၏ proxy ႏွင့္ Privoxy ခ်ိန္ညိႇမႈမ်ားကို စစ္ေဆးပါ။"
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
-"Tor အသံုးျပဳရန္ မၾကာျမင့္မီက ေနာက္ဆံုး Tor proxy စမ္းသပ္မႈ မေအာင္ျမင္ပါ။ \n"
-"\n"
-"မည္သို႕ပင္ျဖစ္ေစ အသံုးျပဳခြင့္ျပဳရန္ ေသခ်ာပါသလား ?"
 
 #: torbutton.popup.test.ff3_notice
 msgid ""
 "Click OK to test Tor proxy settings. This test will happen in the "
 "background. Please be patient."
 msgstr ""
-"Tor proxy ခ်ိန္ညိႇမႈမ်ားကုိ စမ္းသပ္ရန္ OK ကုိ ကလစ္ႏွိပ္ပါ။ စမ္းသပ္မႈသည္ "
-"ေနာက္ကြယ္တြင္ ျပဳလုပ္ပါမည္။ ေက်းဇူးျပဳ၍ သည္းခံေစာင့္ဆုိင္းေပးပါရန္။"
+"Tor proxy ခ်ိန္ညိႇမႈမ်ားကုိ စမ္းသပ္ရန္ OK ကုိ ကလစ္ႏွိပ္ပါ။ စမ္းသပ္မႈသည္ ေနာက္ကြယ္တြင္ "
+"ျပဳလုပ္ပါမည္။ ေက်းဇူးျပဳ၍ သည္းခံေစာင့္ဆုိင္းေပးပါရန္။"
 
 #: torbutton.panel.label.verified
 msgid "Tor Verified"
@@ -170,3 +169,46 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr "(အေရးၾကီးပါသည္)"
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""
+
+#~ msgid ""
+#~ "The most recent Tor proxy test failed to use Tor.\n"
+#~ "\n"
+#~ "Are you sure you want to enable anyway?"
+#~ msgstr ""
+#~ "Tor အသံုးျပဳရန္ မၾကာျမင့္မီက ေနာက္ဆံုး Tor proxy စမ္းသပ္မႈ မေအာင္ျမင္ပါ။ \n"
+#~ "\n"
+#~ "မည္သို႕ပင္ျဖစ္ေစ အသံုးျပဳခြင့္ျပဳရန္ ေသခ်ာပါသလား ?"

Modified: translation/trunk/projects/torbutton/bo/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/bo/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/bo/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/bo/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/bo/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/bo/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ca/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/ca/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/ca/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ca/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/ca/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/ca/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/cs/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/cs/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/cs/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/cs/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/cs/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/cs/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/da/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/da/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/da/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-10-02 23:20+0000\n"
 "Last-Translator: Manuel Ojeda <ojeda at ojeda.dk>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -60,6 +60,12 @@
 msgstr "Brug Privoxy"
 
 # Ok
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "Brug Privoxy"
+
+# Ok
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "Brug brugerdefinerede proxyindstillinger"
@@ -484,3 +490,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr "SOCKS v5"
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/da/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/da/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/da/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-10-02 23:31+0000\n"
 "Last-Translator: Manuel Ojeda <ojeda at ojeda.dk>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -110,7 +110,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -135,20 +136,20 @@
 
 # Translated by Manuel Ojeda - ojeda at ojeda.dk
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+#, fuzzy
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 "Tor proxy test MISLYKKEDES! Kontroller dine proxy og Privoxy indstillinger."
 
-# Translated by Manuel Ojeda - ojeda at ojeda.dk
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
-"Det mislykkedes den seneste Tor proxy test at benytte Tor.\n"
-"\n"
-"Er du sikker på du vil aktivere alligevel?"
 
 # Translated by Manuel Ojeda - ojeda at ojeda.dk
 #: torbutton.popup.test.ff3_notice
@@ -189,3 +190,47 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr "(afgørende)"
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""
+
+# Translated by Manuel Ojeda - ojeda at ojeda.dk
+#~ msgid ""
+#~ "The most recent Tor proxy test failed to use Tor.\n"
+#~ "\n"
+#~ "Are you sure you want to enable anyway?"
+#~ msgstr ""
+#~ "Det mislykkedes den seneste Tor proxy test at benytte Tor.\n"
+#~ "\n"
+#~ "Er du sikker på du vil aktivere alligevel?"

Modified: translation/trunk/projects/torbutton/de/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/de/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/de/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.dtd, de-DE/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-07-06 12:13+0000\n"
 "Last-Translator: Oliver Knapp <mail at oliverknapp.de>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,11 @@
 msgid "Use Privoxy"
 msgstr "Privoxy verwenden"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "Privoxy verwenden"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "Individuelle Proxy-Einstellungen verwenden"
@@ -103,8 +108,8 @@
 msgstr ""
 "Torbutten ist momentan aktiv. Wenn Sie die Proxy-Einstellungen für den "
 "Betrieb ohne Tor ändern möchten, deaktivieren Sie bitte zuerst Torbutton. "
-"Für Änderungen der Tor-Einstellungen verwenden Sie bitte das Fenster &quot"
-";Torbutton-Einstellungen&quot;."
+"Für Änderungen der Tor-Einstellungen verwenden Sie bitte das Fenster &quot;"
+"Torbutton-Einstellungen&quot;."
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -209,8 +214,7 @@
 #: torbutton.prefs.isolate_content
 msgid "Isolate dynamic content to Tor state (crucial)"
 msgstr ""
-"Dynamisch generierte Daten während der Benutzung von Tor separieren "
-"(wichtig)"
+"Dynamisch generierte Daten während der Benutzung von Tor separieren (wichtig)"
 
 #: torbutton.prefs.no_updates
 msgid "Disable updates during Tor usage"
@@ -278,7 +282,8 @@
 
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
-msgstr "Deaktiviere die DOM-Speicherung während der Benutzung von Tor (wichtig)"
+msgstr ""
+"Deaktiviere die DOM-Speicherung während der Benutzung von Tor (wichtig)"
 
 #: torbutton.prefs.forms
 msgid "Forms"
@@ -430,13 +435,23 @@
 msgid "SOCKS v5"
 msgstr "SOCKS v5"
 
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""
+
 # typo
 #~ msgid "Disable updates during Tor usage (recommended)"
-#~ msgstr "Aktualisierungen während der Benutzung von Tor deaktivieren (empfohlen)"
+#~ msgstr ""
+#~ "Aktualisierungen während der Benutzung von Tor deaktivieren (empfohlen)"
 
 #~ msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
 #~ msgstr ""
-#~ "Verhindern, dass Tor-initiierte Browser-Tabs gespeichert werden (empfohlen)"
+#~ "Verhindern, dass Tor-initiierte Browser-Tabs gespeichert werden "
+#~ "(empfohlen)"
 
 #~ msgid "After a crash, restore saved session via:"
 #~ msgstr "Nach einem Absturz den letzten Stand laden über:"

Modified: translation/trunk/projects/torbutton/de/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/de/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/de/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.properties, de-DE/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-09-20 22:20+0000\n"
 "Last-Translator: Christian Dietrich <tortranslation at christian-dietrich.eu>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -93,7 +93,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -113,7 +114,8 @@
 msgstr "Tor-Proxy Test erfolgreich!"
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+#, fuzzy
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 "Tor-Proxy Test FEHLGESCHLAGEN! Überprüfe deine Proxy- und "
 "Privoxyeinstellungen."
@@ -122,7 +124,10 @@
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -159,6 +164,40 @@
 msgid "(crucial)"
 msgstr "(kritisch)"
 
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""
+
 #~ msgid ""
 #~ "Torbutton blocked changed-state history manipulation.\n"
 #~ "\n"
@@ -167,22 +206,24 @@
 #~ msgstr ""
 #~ "Tobutton verhinderte die Veränderung der History Einstellungen.\n"
 #~ "\n"
-#~ "Verändern Sie die entsprechende Optionen in Ihren Einstellungen, um dies zu "
-#~ "erlauben.\n"
+#~ "Verändern Sie die entsprechende Optionen in Ihren Einstellungen, um dies "
+#~ "zu erlauben.\n"
 #~ "\n"
 
 #~ msgid ""
 #~ "Warning!\n"
 #~ "\n"
-#~ "Torbutton 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"
+#~ "Torbutton 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"
 #~ "\n"
 #~ "Do you wish to continue anyway?"
 #~ msgstr ""
 #~ "Warnung!\n"
 #~ "\n"
 #~ "Torbutton 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"
+#~ "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"
 #~ "\n"
 #~ "Möchten Sie trotzdem weiter fortfahren?"

Modified: translation/trunk/projects/torbutton/el/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/el/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/el/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.dtd, el-GR/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-03-26 02:03+0200\n"
 "Last-Translator: Γιώργος Φιωτάκης <fiotakis at otenet.gr>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,11 @@
 msgid "Use Privoxy"
 msgstr "Χρήση του Privoxy"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "Χρήση του Privoxy"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "Χρήση προσαρμοσμένων ρυθμίσεων διαμεσολαβητή"
@@ -300,8 +305,7 @@
 #: torbutton.prefs.dual_cookie_jars
 msgid "Store both Tor and Non-Tor cookies in protected jars (dangerous)"
 msgstr ""
-"Αποθήκευση cookies από και εκτός Tor σε προστατευμένα αρχεία jar "
-"(επικίνδυνο)"
+"Αποθήκευση cookies από και εκτός Tor σε προστατευμένα αρχεία jar (επικίνδυνο)"
 
 #: torbutton.prefs.clear_http_auth
 msgid "Clear HTTP auth sessions (recommended)"
@@ -309,7 +313,8 @@
 
 #: torbutton.prefs.block_js_history
 msgid "Isolate access to history navigation to Tor state (crucial)"
-msgstr "Απομόνωση πρόσβασης στο ιστορικό περιήγησης ανά κατάσταση Tor (κρίσιμο)"
+msgstr ""
+"Απομόνωση πρόσβασης στο ιστορικό περιήγησης ανά κατάσταση Tor (κρίσιμο)"
 
 #: torbutton.prefs.resize_on_toggle
 msgid "Resize windows to multiples of 50px during Tor usage (recommended)"
@@ -417,13 +422,21 @@
 msgid "SOCKS v5"
 msgstr ""
 
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr "Απενεργοποίηση ενημερώσεων κατά τη χρήση Tor (συνιστάται)"
 
 #~ msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
 #~ msgstr ""
-#~ "Απαγόρευση αποθήκευσης καρτελών φορτωμένων από Tor στο διαχειριστή συνεδρίας "
-#~ "(συνιστάται)"
+#~ "Απαγόρευση αποθήκευσης καρτελών φορτωμένων από Tor στο διαχειριστή "
+#~ "συνεδρίας (συνιστάται)"
 
 #~ msgid "After a crash, restore saved session via:"
 #~ msgstr "Μετά από κατάρευση, να γίνει επαναφορά συνεδρίας μέσω:"

Modified: translation/trunk/projects/torbutton/el/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/el/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/el/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.properties, el-GR/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-03-26 02:07+0200\n"
 "Last-Translator: Γιώργος Φιωτάκης <fiotakis at otenet.gr>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -94,7 +94,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -108,14 +109,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -147,13 +151,48 @@
 msgid "(crucial)"
 msgstr ""
 
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""
+
 #~ msgid ""
 #~ "Torbutton blocked changed-state history manipulation.\n"
 #~ "\n"
 #~ "See history settings to allow.\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Το Torbutton μπλοκάρισε τη διαχείριση αλλαγμένης κατάστασης του ιστορικού.\n"
+#~ "Το Torbutton μπλοκάρισε τη διαχείριση αλλαγμένης κατάστασης του "
+#~ "ιστορικού.\n"
 #~ "\n"
 #~ "Δείτε τις ρυθμίσεις ιστορικού για να την επιτρέψετε.\n"
 #~ "\n"
@@ -161,7 +200,9 @@
 #~ msgid ""
 #~ "Warning!\n"
 #~ "\n"
-#~ "Torbutton 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"
+#~ "Torbutton 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"
 #~ "\n"
 #~ "Do you wish to continue anyway?"
 #~ msgstr ""
@@ -169,6 +210,7 @@
 #~ "\n"
 #~ "Το Torbutton είναι γνωστό πως διαρρέει τη ζώνη ώρας και τους δυναμικούς "
 #~ "σελιδοδείκτες όταν χρησιμοποιείται ο Tor στον Firefox 3. Επιπρόσθετα, δεν "
-#~ "έχει ελεγχθεί εκτεταμένα η λειτουργία του όπως έχει γίνει με τον Firefox 2.\n"
+#~ "έχει ελεγχθεί εκτεταμένα η λειτουργία του όπως έχει γίνει με τον Firefox "
+#~ "2.\n"
 #~ "\n"
 #~ "Θέλετε να συνεχίσετε;"

Modified: translation/trunk/projects/torbutton/en/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/en/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/en/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-07-27 05:34+0000\n"
 "Last-Translator: Joshua M. Biscarra <joshuamayobiscarra at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -50,6 +50,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -385,3 +389,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/en/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/en/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/en/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/es/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/es/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/es/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.dtd, es/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-10-30 20:03+0000\n"
 "Last-Translator: avd <avd at resolution.de>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,11 @@
 msgid "Use Privoxy"
 msgstr "Usar Privoxy"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "Usar Privoxy"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "Usar una configuración de proxy personalizada"
@@ -307,7 +312,8 @@
 
 #: torbutton.prefs.block_js_history
 msgid "Isolate access to history navigation to Tor state (crucial)"
-msgstr "Aislar el acceso del historial de navegación al estado de Tor (crucial)"
+msgstr ""
+"Aislar el acceso del historial de navegación al estado de Tor (crucial)"
 
 #: torbutton.prefs.resize_on_toggle
 msgid "Resize windows to multiples of 50px during Tor usage (recommended)"
@@ -338,7 +344,8 @@
 
 #: torbutton.prefs.jar_ca_certs
 msgid "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"
-msgstr "Guardar certificados CA en jars separadas para Tor/No Tor (recomendado)"
+msgstr ""
+"Guardar certificados CA en jars separadas para Tor/No Tor (recomendado)"
 
 #: torbutton.prefs.locked_mode
 msgid "Disable Button and Hotkeys to prevent accidental toggle"
@@ -417,11 +424,21 @@
 msgid "SOCKS v5"
 msgstr "SOCKS v5"
 
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr "Deshabilitar actualizaciones al usar Tor (recomendado)"
 
 #~ msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
-#~ msgstr "Evitar que el almacenamiento de sesión guarde pestañas de Tor (recomendado)"
+#~ msgstr ""
+#~ "Evitar que el almacenamiento de sesión guarde pestañas de Tor "
+#~ "(recomendado)"
 
 #~ msgid "After a crash, restore saved session via:"
 #~ msgstr "Después de un fallo, restaurar sesión desde:"

Modified: translation/trunk/projects/torbutton/es/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/es/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/es/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.properties, es/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-11-18 18:20-0700\n"
 "Last-Translator: ariel viera <avd at resolution.de>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -97,15 +97,18 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
-msgstr "¡Advertencia!\\nSe ha detectado que el Torbutton de Firefox 3 perdió su zona "
+msgstr ""
+"¡Advertencia!\\nSe ha detectado que el Torbutton de Firefox 3 perdió su zona "
 "horaria y la marcas a través de Tor.\\n\\n¿Desea continuar de todos modos?\n"
 
 #: torbutton.popup.toggle.warning
 msgid "You need to toggle Tor or restart for your settings to take effect."
-msgstr "Tiene que conmutar a Tor o reiniciar para que sus preferencias entre en "
+msgstr ""
+"Tiene que conmutar a Tor o reiniciar para que sus preferencias entre en "
 "efecto.\\n. \n"
 
 #: torbutton.popup.test.success
@@ -113,7 +116,8 @@
 msgstr "¡La prueba del proxy Tor finalizó con éxito!"
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+#, fuzzy
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 "¡La prueba del proxy Tor FALLÓ! Revise las preferencias de su Proxy y de "
 "Privoxy."
@@ -122,10 +126,11 @@
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
-"La prueba más reciente del proxy Tor no tuvo éxito al emplear el Tor.\n"
-" ¿Está seguro de que desea habilitarlo de todos modos?"
 
 #: torbutton.popup.test.ff3_notice
 msgid ""
@@ -159,3 +164,45 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr "(crucial)"
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""
+
+#~ msgid ""
+#~ "The most recent Tor proxy test failed to use Tor.\n"
+#~ "\n"
+#~ "Are you sure you want to enable anyway?"
+#~ msgstr ""
+#~ "La prueba más reciente del proxy Tor no tuvo éxito al emplear el Tor.\n"
+#~ " ¿Está seguro de que desea habilitarlo de todos modos?"

Modified: translation/trunk/projects/torbutton/eu/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/eu/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/eu/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/eu/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/eu/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/eu/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/fa/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/fa/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/fa/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,11 @@
 msgid "Use Privoxy"
 msgstr "بکاربردن پریوکسی"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "بکاربردن پریوکسی"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "بکاربردن تنظیمات سفارشی برای پیشکار"
@@ -102,8 +107,8 @@
 "to change your Tor settings, please use the Torbutton preference window."
 msgstr ""
 "دکمه تُر فعال هم اکنون فعال شد. اگر می خواهید تنظیمات پیشکار را که به تُر "
-"اعمال نمی شود تغییر دهید, دکمه تُر را غیرفعال کنید و به اینجا برگردید. اگر "
-"می خواهید تنظیمات تُر را تغییر دهید, پنجره تنظیمات دکمه تُر را بکارببرید."
+"اعمال نمی شود تغییر دهید, دکمه تُر را غیرفعال کنید و به اینجا برگردید. اگر می "
+"خواهید تنظیمات تُر را تغییر دهید, پنجره تنظیمات دکمه تُر را بکارببرید."
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -283,7 +288,8 @@
 
 #: torbutton.prefs.reload_crashed_jar
 msgid "Reload cookie jar/clear cookies on Firefox crash (recommended)"
-msgstr "بازگذاری مجدد کوکی jar/پاک کردن کوکی ها در فروپاشی فایرفاکس (توصیه شده)"
+msgstr ""
+"بازگذاری مجدد کوکی jar/پاک کردن کوکی ها در فروپاشی فایرفاکس (توصیه شده)"
 
 #: torbutton.prefs.dual_cookie_jars
 msgid "Store both Tor and Non-Tor cookies in protected jars (dangerous)"
@@ -312,8 +318,7 @@
 #: torbutton.prefs.block_links
 msgid "Block link clicks and page reloads from different Tor states (optional)"
 msgstr ""
-"بازداشتن فشاردادن پیوند و بازگذاری مجدد برگه از وضعیت های مختلف تُر "
-"(اختیاری)"
+"بازداشتن فشاردادن پیوند و بازگذاری مجدد برگه از وضعیت های مختلف تُر (اختیاری)"
 
 #: torbutton.prefs.jar_certs
 msgid "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"
@@ -395,6 +400,14 @@
 msgid "SOCKS v5"
 msgstr ""
 
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr "غیرفعال کردن بروزرسانی ها هنگام استفاده تُر (توصیه شده)"
 

Modified: translation/trunk/projects/torbutton/fa/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/fa/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/fa/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -52,8 +52,7 @@
 "Torbutton provides a button to easily enable or disable pointing Firefox to "
 "the Tor proxy"
 msgstr ""
-"دکمه تُر به آسانی امکان فعال و غیرفعال کردن پیشکار تُر را بکمک یک دکمه می "
-"دهد"
+"دکمه تُر به آسانی امکان فعال و غیرفعال کردن پیشکار تُر را بکمک یک دکمه می دهد"
 
 #: torbutton.popup.history.warning
 msgid ""
@@ -83,16 +82,17 @@
 "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)"
 msgstr ""
-"یادداشت دکمه تُر: بنظر میرسد که شما دارای اسناد سفارشی نمی باشید. بازرسی "
-"لیست اسناد زمان می برد و موجب کندی عملکرد ضامن تُر می شود. آیا می خواهید "
-"جداسازی اسناد را غیرفعال کنید؟ (اگر متوجه معنی نمی شوید, بهتر است روی "
-"بسیارخوب فشار دهید)"
+"یادداشت دکمه تُر: بنظر میرسد که شما دارای اسناد سفارشی نمی باشید. بازرسی لیست "
+"اسناد زمان می برد و موجب کندی عملکرد ضامن تُر می شود. آیا می خواهید جداسازی "
+"اسناد را غیرفعال کنید؟ (اگر متوجه معنی نمی شوید, بهتر است روی بسیارخوب فشار "
+"دهید)"
 
 #: torbutton.popup.ff3.warning
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -106,14 +106,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -145,19 +148,61 @@
 msgid "(crucial)"
 msgstr ""
 
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""
+
 #~ msgid ""
 #~ "Torbutton blocked changed-state history manipulation.\n"
 #~ "\n"
 #~ "See history settings to allow.\n"
 #~ "\n"
-#~ msgstr "دکمه تُر مانع ازدستکاری در تاریخچه شد.\n"
+#~ msgstr ""
+#~ "دکمه تُر مانع ازدستکاری در تاریخچه شد.\n"
 #~ "\n"
 #~ " مشاهده و تغییر در تنظیمات تاریخچه برای اجازه دادن اینگونه دستکاری.\n"
 
 #~ msgid ""
 #~ "Warning!\n"
 #~ "\n"
-#~ "Torbutton 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"
+#~ "Torbutton 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"
 #~ "\n"
 #~ "Do you wish to continue anyway?"
-#~ msgstr "دکمه تُر در فایرفاکس 3 برای تغذیه کردن ناحیه زمان و لایومارک هنگام استفاده تُر شناخته شد. افزون بر اینکه بطور قابل توجه تست نشده برای امنیت تُر و استفاده در فایر فاکس 2.\n\nآیا می خواهید ادامه دهید؟"
+#~ msgstr ""
+#~ "دکمه تُر در فایرفاکس 3 برای تغذیه کردن ناحیه زمان و لایومارک هنگام استفاده "
+#~ "تُر شناخته شد. افزون بر اینکه بطور قابل توجه تست نشده برای امنیت تُر و "
+#~ "استفاده در فایر فاکس 2.\n"
+#~ "\n"
+#~ "آیا می خواهید ادامه دهید؟"

Modified: translation/trunk/projects/torbutton/fi/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/fi/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/fi/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-07-25 19:29+0000\n"
 "Last-Translator: Irma <monochrome.technicolor at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -44,12 +44,18 @@
 
 #: torbutton.prefs.recommended_settings
 msgid "Use the recommended proxy settings for my version of Firefox"
-msgstr "Käytä suositeltuja välityspalvelin asetuksia minun Firefox versiolleni."
+msgstr ""
+"Käytä suositeltuja välityspalvelin asetuksia minun Firefox versiolleni."
 
 #: torbutton.prefs.use_privoxy
 msgid "Use Privoxy"
 msgstr "Käytä Privoxyä"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "Käytä Privoxyä"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "Aseta välityspalvelinasetukset käsin"
@@ -159,7 +165,8 @@
 
 #: torbutton.prefs.clear_history
 msgid "Clear history on Tor toggle (optional)"
-msgstr "Tyhjennä historiatiedot vaihdettaessa Tor-käytön tilaa. (Vapaaehtoista)"
+msgstr ""
+"Tyhjennä historiatiedot vaihdettaessa Tor-käytön tilaa. (Vapaaehtoista)"
 
 #: torbutton.prefs.clear_cache
 msgid "Block Tor disk cache and clear all cache on Tor toggle"
@@ -267,7 +274,8 @@
 
 #: torbutton.prefs.block_ntforms
 msgid "Block password+form saving during Non-Tor (optional)"
-msgstr "Estä salasana+lomake tallennus kun Tor ei ole käytössä (vaihtoehtoinen)"
+msgstr ""
+"Estä salasana+lomake tallennus kun Tor ei ole käytössä (vaihtoehtoinen)"
 
 #: torbutton.prefs.tor
 msgid "Tor"
@@ -328,8 +336,8 @@
 #: torbutton.prefs.locked_mode
 msgid "Disable Button and Hotkeys to prevent accidental toggle"
 msgstr ""
-"Poista painike ja pikanäppäimet käytöstä estääkseen tahatonta "
-"käyttöönottoa/käytöstä poistamista"
+"Poista painike ja pikanäppäimet käytöstä estääkseen tahatonta käyttöönottoa/"
+"käytöstä poistamista"
 
 #: torbutton.prefs.startup_state
 msgid "On normal startup, set Tor state to:"
@@ -397,3 +405,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr "SOCKS v5"
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/fi/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/fi/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/fi/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-07-25 18:13+0000\n"
 "Last-Translator: Irma <monochrome.technicolor at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -81,7 +81,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -95,14 +96,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -133,3 +137,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr "(kriittinen)"
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/fr/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/fr/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/fr/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.dtd, fr-FR/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: Torbutton\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-03-14 11:20+0000\n"
 "Last-Translator: Mfr <mfr at misericordia.be>\n"
 "Language-Team: Mfr <mfr (ä] misericoridia.be>\n"
@@ -45,12 +45,18 @@
 
 #: torbutton.prefs.recommended_settings
 msgid "Use the recommended proxy settings for my version of Firefox"
-msgstr "Utiliser les paramètres de proxy recommandés pour ma version de Firefox"
+msgstr ""
+"Utiliser les paramètres de proxy recommandés pour ma version de Firefox"
 
 #: torbutton.prefs.use_privoxy
 msgid "Use Privoxy"
 msgstr "Utiliser Privoxy"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "Utiliser Privoxy"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "Utiliser des paramètres de proxy personnalisés"
@@ -286,8 +292,7 @@
 #: torbutton.prefs.block_ntforms
 msgid "Block password+form saving during Non-Tor (optional)"
 msgstr ""
-"Bloquer la sauvegarde de mot de passe+formulaire en mode non-Tor "
-"(facultatif)"
+"Bloquer la sauvegarde de mot de passe+formulaire en mode non-Tor (facultatif)"
 
 #: torbutton.prefs.tor
 msgid "Tor"
@@ -310,8 +315,7 @@
 #: torbutton.prefs.dual_cookie_jars
 msgid "Store both Tor and Non-Tor cookies in protected jars (dangerous)"
 msgstr ""
-"Stocker les cookies Tor et non-Tor dans des cookie-jars sécurisés "
-"(dangereux)"
+"Stocker les cookies Tor et non-Tor dans des cookie-jars sécurisés (dangereux)"
 
 #: torbutton.prefs.clear_http_auth
 msgid "Clear HTTP auth sessions (recommended)"
@@ -427,14 +431,25 @@
 msgid "SOCKS v5"
 msgstr "SOCKS v5"
 
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
-#~ msgstr "Désactiver les mises à jour pendant l'utilisation de Tor (recommandé)"
+#~ msgstr ""
+#~ "Désactiver les mises à jour pendant l'utilisation de Tor (recommandé)"
 
 #~ msgid "Prevent session store from saving Tor loaded tabs"
 #~ msgstr "Empêcher la sauvegarde des onglets chargés par Tor"
 
 #~ msgid "On crash recovery or session restored startup, restore via:"
-#~ msgstr "Lors d'un plantage ou de la récupération d'un session, récupérez avec:"
+#~ msgstr ""
+#~ "Lors d'un plantage ou de la récupération d'un session, récupérez avec:"
 
 #~ msgid "Prevent session store from saving Non-Tor loaded tabs"
-#~ msgstr "Empêcher l'enregistrement des onglets non-Tor par la sauvegarde de session"
+#~ msgstr ""
+#~ "Empêcher l'enregistrement des onglets non-Tor par la sauvegarde de session"

Modified: translation/trunk/projects/torbutton/fr/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/fr/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/fr/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.properties, fr-FR/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: Torbutton\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-03-14 11:25+0000\n"
 "Last-Translator: Mfr <mfr at misericordia.be>\n"
 "Language-Team: Mfr <mfr (ä] misericordia.be>\n"
@@ -99,7 +99,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -121,7 +122,8 @@
 msgstr "Test du proxy Tor réussi !"
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+#, fuzzy
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 "ECHEC du test du proxy Tor ! Vérifiez votre configuration de proxy et de "
 "Privoxy."
@@ -130,11 +132,11 @@
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
-"Le dernier test de proxy Tor n'a pas réussi à utiliser Tor.\n"
-"\n"
-"Êtes-vous sûr de vouloir tout de même l'activer ?"
 
 #: torbutton.popup.test.ff3_notice
 msgid ""
@@ -170,7 +172,50 @@
 msgid "(crucial)"
 msgstr "(indispensable)"
 
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""
+
 #~ msgid ""
+#~ "The most recent Tor proxy test failed to use Tor.\n"
+#~ "\n"
+#~ "Are you sure you want to enable anyway?"
+#~ msgstr ""
+#~ "Le dernier test de proxy Tor n'a pas réussi à utiliser Tor.\n"
+#~ "\n"
+#~ "Êtes-vous sûr de vouloir tout de même l'activer ?"
+
+#~ msgid ""
 #~ "Torbutton blocked changed-state history manipulation.\n"
 #~ "\n"
 #~ "See history settings to allow.\n"
@@ -184,12 +229,16 @@
 #~ msgid ""
 #~ "Warning!\n"
 #~ "\n"
-#~ "Torbutton on Firefox 3 is known to leak your timezone, livemarks, and not properly restore cookies due to Firefox bugs. There may be other issues as well.\n"
+#~ "Torbutton on Firefox 3 is known to leak your timezone, livemarks, and not "
+#~ "properly restore cookies due to Firefox bugs. There may be other issues "
+#~ "as well.\n"
 #~ "\n"
 #~ "Do you wish to continue anyway?"
 #~ msgstr ""
 #~ "Attention !\n"
 #~ "\n"
-#~ "Torbutton sur Firefox 3 est connu pour laisser échapper votre fuseau horaire et les marques-pages dynamiques durant l'utilisation de Tor. Il est possible qu'il y ait d'autres problèmes également.\n"
+#~ "Torbutton sur Firefox 3 est connu pour laisser échapper votre fuseau "
+#~ "horaire et les marques-pages dynamiques durant l'utilisation de Tor. Il "
+#~ "est possible qu'il y ait d'autres problèmes également.\n"
 #~ "\n"
 #~ "Voulez-vous continuer tout de même ?"

Modified: translation/trunk/projects/torbutton/fur/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/fur/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/fur/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/fur/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/fur/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/fur/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/gl/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/gl/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/gl/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/gl/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/gl/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/gl/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/gu/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/gu/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/gu/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/gu/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/gu/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/gu/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/he/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/he/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/he/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/he/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/he/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/he/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/hi/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/hi/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/hi/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-03-18 10:25+0000\n"
 "Last-Translator: Dharmesh Shah <deshah at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -50,6 +50,11 @@
 msgid "Use Privoxy"
 msgstr "प्रिवोक्सी का उपयोग करे"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "प्रिवोक्सी का उपयोग करे"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "व्यवाहारिक प्रोक्सी सेटिंग का उपयोग करे"
@@ -100,10 +105,9 @@
 "proxy settings, please disable Torbutton and return here.  If you would like "
 "to change your Tor settings, please use the Torbutton preference window."
 msgstr ""
-"टोर बटन अभी समर्थकृत है । अगर आप आपने अन्य (टोर के अलावा) प्रोक्सी सेटिंग को "
-"बदलना चाहते है तो टोर को असमर्थ करके इधर प्रतिगमन करे । अगर आप अपने टोर "
-"सेटिंग को बदलना चाहते है तो कृपिया टोर बटन के प्रिफ़रेन्स खिड़की का उपयोग करे "
-"।"
+"टोर बटन अभी समर्थकृत है । अगर आप आपने अन्य (टोर के अलावा) प्रोक्सी सेटिंग को बदलना "
+"चाहते है तो टोर को असमर्थ करके इधर प्रतिगमन करे । अगर आप अपने टोर सेटिंग को बदलना "
+"चाहते है तो कृपिया टोर बटन के प्रिफ़रेन्स खिड़की का उपयोग करे ।"
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -143,8 +147,7 @@
 
 #: torbutton.prefs.block_thread
 msgid "Block history reads during Tor (crucial)"
-msgstr ""
-"टोर चलते समय अपने ब्राउसर के इतिहास रेकार्द को बन्द करे (अतियन्त महत्वपूर्ण)"
+msgstr "टोर चलते समय अपने ब्राउसर के इतिहास रेकार्द को बन्द करे (अतियन्त महत्वपूर्ण)"
 
 #: torbutton.prefs.block_thwrite
 msgid "Block history writes during Tor (recommended)"
@@ -153,8 +156,7 @@
 #: torbutton.prefs.block_nthread
 #, fuzzy
 msgid "Block history reads during Non-Tor (optional)"
-msgstr ""
-"टोर चलते समय अपने ब्राउसर के इतिहास रेकार्द को बन्द करे (अतियन्त महत्वपूर्ण)"
+msgstr "टोर चलते समय अपने ब्राउसर के इतिहास रेकार्द को बन्द करे (अतियन्त महत्वपूर्ण)"
 
 #: torbutton.prefs.block_nthwrite
 msgid "Block history writes during Non-Tor (optional)"
@@ -392,3 +394,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/hi/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/hi/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/hi/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/hr/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/hr/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/hr/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from en-US/torbutton.dtd, hr-HR/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -52,6 +52,11 @@
 msgid "Use Privoxy"
 msgstr "Koristi Privoxy"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "Koristi Privoxy"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "Koristi prilagođene proxy postavke"
@@ -391,3 +396,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/hr/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/hr/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/hr/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from en-US/torbutton.properties, hr-HR/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -53,8 +53,7 @@
 "Torbutton provides a button to easily enable or disable pointing Firefox to "
 "the Tor proxy"
 msgstr ""
-"Torbutton omogućava gumb za lakše omogućavanje ili onemogućavanje tor "
-"proxy-a"
+"Torbutton omogućava gumb za lakše omogućavanje ili onemogućavanje tor proxy-a"
 
 #: torbutton.popup.history.warning
 msgid ""
@@ -85,7 +84,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -99,14 +99,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -137,3 +140,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/hu/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/hu/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/hu/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/hu/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/hu/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/hu/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/id/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/id/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/id/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/id/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/id/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/id/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/is/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/is/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/is/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/is/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/is/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/is/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/it/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/it/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/it/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.dtd, it-IT/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-10-02 09:25+0000\n"
 "Last-Translator: Jan Reister <jan.reister at unimi.it>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,11 @@
 msgid "Use Privoxy"
 msgstr "Usa Privoxy"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "Usa Privoxy"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "Usa delle impostazioni proxy personalizzate"
@@ -148,7 +153,8 @@
 
 #: torbutton.prefs.block_thwrite
 msgid "Block history writes during Tor (recommended)"
-msgstr "Blocca la scrittura della cronologia durante l'uso di Tor (consigliato)"
+msgstr ""
+"Blocca la scrittura della cronologia durante l'uso di Tor (consigliato)"
 
 #: torbutton.prefs.block_nthread
 msgid "Block history reads during Non-Tor (optional)"
@@ -173,7 +179,8 @@
 
 #: torbutton.prefs.block_cache
 msgid "Block disk and memory cache access during Tor"
-msgstr "Blocca l'accesso alla cache sul disco e in memoria durante l'uso di Tor"
+msgstr ""
+"Blocca l'accesso alla cache sul disco e in memoria durante l'uso di Tor"
 
 #: torbutton.prefs.cookie_jars
 msgid "Store Non-Tor cookies in a protected jar"
@@ -339,8 +346,7 @@
 #: torbutton.prefs.jar_certs
 msgid "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"
 msgstr ""
-"Conserva i certificati SSL in depositi separati per Tor/Non-Tor "
-"(consigliato)"
+"Conserva i certificati SSL in depositi separati per Tor/Non-Tor (consigliato)"
 
 #: torbutton.prefs.jar_ca_certs
 msgid "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"
@@ -351,8 +357,8 @@
 #: torbutton.prefs.locked_mode
 msgid "Disable Button and Hotkeys to prevent accidental toggle"
 msgstr ""
-"Disabilita il pulsante e le scorciatoie da tastiera per evitare di "
-"attivare/disattivare Tor per sbaglio"
+"Disabilita il pulsante e le scorciatoie da tastiera per evitare di attivare/"
+"disattivare Tor per sbaglio"
 
 #: torbutton.prefs.startup_state
 msgid "On normal startup, set Tor state to:"
@@ -375,8 +381,7 @@
 #: torbutton.prefs.block_nontor_file_net
 msgid "Block Non-Tor access to network from file:// urls"
 msgstr ""
-"Blocca l'accesso non-Tor alla rete da indirizzi di tipo file:// "
-"(consigliato)"
+"Blocca l'accesso non-Tor alla rete da indirizzi di tipo file:// (consigliato)"
 
 #: torbutton.prefs.restore_defaults
 msgid "Restore Defaults"
@@ -425,11 +430,21 @@
 msgid "SOCKS v5"
 msgstr "SOCKS v5"
 
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr "Disablita gli aggiornamenti usando Tor (consigliato)"
 
 #~ msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
-#~ msgstr "Impedisci il salvataggio di schede aperte con Tor in una sessione (consigliato)"
+#~ msgstr ""
+#~ "Impedisci il salvataggio di schede aperte con Tor in una sessione "
+#~ "(consigliato)"
 
 #~ msgid "After a crash, restore saved session via:"
 #~ msgstr "Ripristina una sessione dopo un crash con:"

Modified: translation/trunk/projects/torbutton/it/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/it/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/it/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.properties, it-IT/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-10-02 09:27+0000\n"
 "Last-Translator: Jan Reister <jan.reister at unimi.it>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -99,7 +99,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -121,7 +122,8 @@
 msgstr "Il test del proxy Tor ha avuto successo!"
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+#, fuzzy
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 "Il test del proxy Tor è FALLITO! Verifica la configurazione del proxy e di "
 "Privoxy."
@@ -130,11 +132,11 @@
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
-"L'ultimo test del proxy Tor non è riuscito ad usare Tor.\n"
-"\n"
-"Sei sicuro di volerlo abilitare ugualmente?"
 
 #: torbutton.popup.test.ff3_notice
 msgid ""
@@ -170,7 +172,50 @@
 msgid "(crucial)"
 msgstr "(essenziale)"
 
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""
+
 #~ msgid ""
+#~ "The most recent Tor proxy test failed to use Tor.\n"
+#~ "\n"
+#~ "Are you sure you want to enable anyway?"
+#~ msgstr ""
+#~ "L'ultimo test del proxy Tor non è riuscito ad usare Tor.\n"
+#~ "\n"
+#~ "Sei sicuro di volerlo abilitare ugualmente?"
+
+#~ msgid ""
 #~ "Torbutton blocked changed-state history manipulation.\n"
 #~ "\n"
 #~ "See history settings to allow.\n"
@@ -179,20 +224,23 @@
 #~ "Torbutton ha bloccato la modifica della cronologia durante il cambio di "
 #~ "stato. \n"
 #~ "\n"
-#~ "Fai 'invio' nella barra degli indirizzi o apri una nuova finestra o scheda-\n"
+#~ "Fai 'invio' nella barra degli indirizzi o apri una nuova finestra o "
+#~ "scheda-\n"
 #~ "\n"
 
 #~ msgid ""
 #~ "Warning!\n"
 #~ "\n"
-#~ "Torbutton 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"
+#~ "Torbutton 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"
 #~ "\n"
 #~ "Do you wish to continue anyway?"
 #~ msgstr ""
 #~ "Attenzione!\n"
 #~ "\n"
-#~ "Torbutton su Firefox 3 rivela il tuo fuso orario ed i tuoi livemark durante "
-#~ "l'uso di Tor. Inoltre non è stato testato a fondo come Firefox 2 per "
-#~ "verificare la sicurezza e usabilità di Tor.\n"
+#~ "Torbutton su Firefox 3 rivela il tuo fuso orario ed i tuoi livemark "
+#~ "durante l'uso di Tor. Inoltre non è stato testato a fondo come Firefox 2 "
+#~ "per verificare la sicurezza e usabilità di Tor.\n"
 #~ "\n"
 #~ "Vuoi continuare ugualmente?"

Modified: translation/trunk/projects/torbutton/ja/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/ja/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/ja/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ja/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/ja/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/ja/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ka/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/ka/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/ka/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ka/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/ka/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/ka/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/km/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/km/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/km/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/km/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/km/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/km/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ko/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/ko/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/ko/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ko/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/ko/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/ko/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ku/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/ku/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/ku/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ku/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/ku/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/ku/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/mt/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/mt/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/mt/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/mt/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/mt/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/mt/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/nb/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/nb/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/nb/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-04-27 11:53+0000\n"
 "Last-Translator: Runa Sandvik <runa.sandvik at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -50,6 +50,11 @@
 msgid "Use Privoxy"
 msgstr "Bruk Privoxy"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "Bruk Privoxy"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "Bruk egne proxyinnstillinger"
@@ -393,3 +398,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr "SOCKS v5"
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/nb/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/nb/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/nb/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-04-08 07:31+0000\n"
 "Last-Translator: Runa Sandvik <runa.sandvik at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -84,7 +84,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -106,18 +107,19 @@
 msgstr "Tor proxy-test vellykket!"
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+#, fuzzy
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr "Tor proxy-test feilet! Sjekk proxy- og Privoxy-innstillingene dine."
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
-"Den nyeste Tor proxy-testen klarte ikke bruke Tor.\n"
-"\n"
-"Er du sikker på at du vil aktivere allikevel?"
 
 #: torbutton.popup.test.ff3_notice
 msgid ""
@@ -152,3 +154,46 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr "(avgjørende)"
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""
+
+#~ msgid ""
+#~ "The most recent Tor proxy test failed to use Tor.\n"
+#~ "\n"
+#~ "Are you sure you want to enable anyway?"
+#~ msgstr ""
+#~ "Den nyeste Tor proxy-testen klarte ikke bruke Tor.\n"
+#~ "\n"
+#~ "Er du sikker på at du vil aktivere allikevel?"

Modified: translation/trunk/projects/torbutton/nl/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/nl/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/nl/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from en-US/torbutton.dtd, nl-NL/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -46,12 +46,18 @@
 
 #: torbutton.prefs.recommended_settings
 msgid "Use the recommended proxy settings for my version of Firefox"
-msgstr "De aanbevolen proxy-instellingen voor mijn versie van Firefox gebruiken"
+msgstr ""
+"De aanbevolen proxy-instellingen voor mijn versie van Firefox gebruiken"
 
 #: torbutton.prefs.use_privoxy
 msgid "Use Privoxy"
 msgstr "Privoxy gebruiken"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "Privoxy gebruiken"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "Aangepaste proxy-instellingen gebruiken"
@@ -393,3 +399,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/nl/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/nl/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/nl/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.properties, nl-NL/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-08-23 16:16+0000\n"
 "Last-Translator: CJ <libertarismeforum at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -84,7 +84,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -98,14 +99,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -136,3 +140,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/pa/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/pa/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/pa/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/pa/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/pa/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/pa/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/pl/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/pl/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/pl/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.dtd, pl-PL/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-09-06 14:30+0000\n"
 "Last-Translator: Lukasz Kieres <zeewolf16 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -52,6 +52,11 @@
 msgid "Use Privoxy"
 msgstr "Użyj Privoxy"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "Użyj Privoxy"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "Użyj ustawień proxy użytkownika"
@@ -168,7 +173,8 @@
 
 #: torbutton.prefs.block_cache
 msgid "Block disk and memory cache access during Tor"
-msgstr "Blokuj dostęp do pamięci podręcznej (dysk/pamięć) gdy Tor jest włączony"
+msgstr ""
+"Blokuj dostęp do pamięci podręcznej (dysk/pamięć) gdy Tor jest włączony"
 
 #: torbutton.prefs.cookie_jars
 msgid "Store Non-Tor cookies in a protected jar"
@@ -407,11 +413,20 @@
 msgid "SOCKS v5"
 msgstr "SOCKS v5"
 
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr "Zablokuj aktualizacje podczas używania Tora (zalecane)"
 
 #~ msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
-#~ msgstr "Zapobiegaj zapisywaniu sesji z zakładkami używającymi Tora (zalecane)"
+#~ msgstr ""
+#~ "Zapobiegaj zapisywaniu sesji z zakładkami używającymi Tora (zalecane)"
 
 #~ msgid "After a crash, restore saved session via:"
 #~ msgstr "Po nieoczekiwanym zamknięciu, odzyskaj zapisaną sesję poprzez:"

Modified: translation/trunk/projects/torbutton/pl/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/pl/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/pl/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.properties, pl-PL/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-09-06 14:36+0000\n"
 "Last-Translator: Lukasz Kieres <zeewolf16 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -52,7 +52,8 @@
 msgid ""
 "Torbutton provides a button to easily enable or disable pointing Firefox to "
 "the Tor proxy"
-msgstr "Rozszerzenie posiada przycisk do łatwego włączania/wyłączania proxy Tor"
+msgstr ""
+"Rozszerzenie posiada przycisk do łatwego włączania/wyłączania proxy Tor"
 
 #: torbutton.popup.history.warning
 msgid ""
@@ -96,7 +97,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -115,18 +117,19 @@
 msgstr "Test proxy zakończony pomyślnie!"
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+#, fuzzy
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr "Test proxy się nie powiódł! Sprawdź ustawienia proxy i Privoxy."
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
-"Ostatni test proxy zakończył się niepowodzeniem.\n"
-"\n"
-"Czy mimo to chcesz kontynuować?"
 
 #: torbutton.popup.test.ff3_notice
 msgid ""
@@ -162,13 +165,57 @@
 msgid "(crucial)"
 msgstr "(wymagane)"
 
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""
+
 #~ msgid ""
+#~ "The most recent Tor proxy test failed to use Tor.\n"
+#~ "\n"
+#~ "Are you sure you want to enable anyway?"
+#~ msgstr ""
+#~ "Ostatni test proxy zakończył się niepowodzeniem.\n"
+#~ "\n"
+#~ "Czy mimo to chcesz kontynuować?"
+
+#~ msgid ""
 #~ "Torbutton blocked changed-state history manipulation.\n"
 #~ "\n"
 #~ "See history settings to allow.\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Torbutton zablokował niebezpieczną dla anonimowości operację na historii.\n"
+#~ "Torbutton zablokował niebezpieczną dla anonimowości operację na "
+#~ "historii.\n"
 #~ "\n"
 #~ "Zobacz Ustawienia historii aby zmienić to ustawienie.\n"
 #~ "\n"
@@ -176,14 +223,16 @@
 #~ msgid ""
 #~ "Warning!\n"
 #~ "\n"
-#~ "Torbutton 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"
+#~ "Torbutton 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"
 #~ "\n"
 #~ "Do you wish to continue anyway?"
 #~ msgstr ""
 #~ "Ostrzeżenie!\n"
 #~ "\n"
 #~ "Torbutton na Firefox 3 posiada lukę, która ujawnia Twoją strefę czasową "
-#~ "podczas pracy w trybie Tora. Ponadto nie został tak dokładnie przetestowany "
-#~ "pod kątem bezpieczeństwa i uzyteczności jak na Firefox 2.\n"
+#~ "podczas pracy w trybie Tora. Ponadto nie został tak dokładnie "
+#~ "przetestowany pod kątem bezpieczeństwa i uzyteczności jak na Firefox 2.\n"
 #~ "\n"
 #~ "Czy pomimo tego chcesz kontynuować?"

Modified: translation/trunk/projects/torbutton/pt/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/pt/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/pt/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.dtd, pt-BR/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-04-26 20:35+0000\n"
 "Last-Translator: bernardo Luis <bernardotrigo at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -52,6 +52,11 @@
 msgid "Use Privoxy"
 msgstr "Usar Privoxy"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "Usar Privoxy"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "Usar configurações padrão de proxy"
@@ -104,8 +109,8 @@
 msgstr ""
 "Torbutton está habilitado. Se você deseja mudar as configurações de Proxy "
 "que não sejam do Tor, por favor desabilite Torbutton e retorne aqui. Se você "
-"deseja mudar as configurações do Tor, por favor, use a janela de "
-"preferência do Torbutton."
+"deseja mudar as configurações do Tor, por favor, use a janela de preferência "
+"do Torbutton."
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -149,7 +154,8 @@
 
 #: torbutton.prefs.block_thwrite
 msgid "Block history writes during Tor (recommended)"
-msgstr "Bloquear escrita no histórico durante a utilização do TOR (recomendado)"
+msgstr ""
+"Bloquear escrita no histórico durante a utilização do TOR (recomendado)"
 
 #: torbutton.prefs.block_nthread
 msgid "Block history reads during Non-Tor (optional)"
@@ -282,8 +288,7 @@
 #: torbutton.prefs.block_ntforms
 msgid "Block password+form saving during Non-Tor (optional)"
 msgstr ""
-"Bloquear senhas + informações de formulários quando não usar o TOR "
-"(opcional)"
+"Bloquear senhas + informações de formulários quando não usar o TOR (opcional)"
 
 #: torbutton.prefs.tor
 msgid "Tor"
@@ -420,6 +425,14 @@
 msgid "SOCKS v5"
 msgstr ""
 
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr "Desabilitar updates durante o uso do TOR (recomendado)"
 

Modified: translation/trunk/projects/torbutton/pt/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/pt/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/pt/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.properties, pt-BR/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2008-09-01 21:36+0000\n"
 "Last-Translator: Wesley Karl Trevenzoli <wtrevenzoli at servknow.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -92,7 +92,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -106,14 +107,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -145,6 +149,40 @@
 msgid "(crucial)"
 msgstr ""
 
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""
+
 #~ msgid ""
 #~ "Torbutton blocked changed-state history manipulation.\n"
 #~ "\n"
@@ -159,15 +197,17 @@
 #~ msgid ""
 #~ "Warning!\n"
 #~ "\n"
-#~ "Torbutton 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"
+#~ "Torbutton 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"
 #~ "\n"
 #~ "Do you wish to continue anyway?"
 #~ msgstr ""
 #~ "Atenção!\n"
 #~ "\n"
-#~ "Em Firefox 3 o Torbutton é conhecido por deixar escapar a sua zona horária e "
-#~ "os livemark feeds durante o uso de Tor. Além disso, a seguridade e "
-#~ "utilização nessa versão ainda não foram testadas exaustivamente como em "
-#~ "Firefox 2.\n"
+#~ "Em Firefox 3 o Torbutton é conhecido por deixar escapar a sua zona "
+#~ "horária e os livemark feeds durante o uso de Tor. Além disso, a "
+#~ "seguridade e utilização nessa versão ainda não foram testadas "
+#~ "exaustivamente como em Firefox 2.\n"
 #~ "\n"
 #~ "Quer continuar assim mesmo?"

Modified: translation/trunk/projects/torbutton/pt_BR/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/pt_BR/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/pt_BR/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.dtd, pt-BR/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-09-30 15:53+0000\n"
 "Last-Translator: Alexsandro C. Carvalho <alexsandro at bibliotecalivre.org>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -52,6 +52,11 @@
 msgid "Use Privoxy"
 msgstr "Usar Privoxy"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "Usar Privoxy"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "Usar configurações padrão de proxy"
@@ -104,8 +109,8 @@
 msgstr ""
 "Torbutton está habilitado. Se você deseja mudar as configurações de Proxy "
 "que não sejam do Tor, por favor desabilite Torbutton e retorne aqui. Se você "
-"deseja mudar as configurações do Tor, por favor, use a janela de "
-"preferência do Torbutton."
+"deseja mudar as configurações do Tor, por favor, use a janela de preferência "
+"do Torbutton."
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -149,7 +154,8 @@
 
 #: torbutton.prefs.block_thwrite
 msgid "Block history writes during Tor (recommended)"
-msgstr "Bloquear escrita no histórico durante a utilização do TOR (recomendado)"
+msgstr ""
+"Bloquear escrita no histórico durante a utilização do TOR (recomendado)"
 
 #: torbutton.prefs.block_nthread
 msgid "Block history reads during Non-Tor (optional)"
@@ -282,8 +288,7 @@
 #: torbutton.prefs.block_ntforms
 msgid "Block password+form saving during Non-Tor (optional)"
 msgstr ""
-"Bloquear senhas + informações de formulários quando não usar o TOR "
-"(opcional)"
+"Bloquear senhas + informações de formulários quando não usar o TOR (opcional)"
 
 #: torbutton.prefs.tor
 msgid "Tor"
@@ -419,6 +424,14 @@
 msgid "SOCKS v5"
 msgstr ""
 
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr "Desabilitar updates durante o uso do TOR (recomendado)"
 

Modified: translation/trunk/projects/torbutton/pt_BR/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/pt_BR/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/pt_BR/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.properties, pt-BR/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2008-09-01 21:36+0000\n"
 "Last-Translator: Wesley Karl Trevenzoli <wtrevenzoli at servknow.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -92,7 +92,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -106,14 +107,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -145,6 +149,40 @@
 msgid "(crucial)"
 msgstr ""
 
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""
+
 #~ msgid ""
 #~ "Torbutton blocked changed-state history manipulation.\n"
 #~ "\n"
@@ -159,15 +197,17 @@
 #~ msgid ""
 #~ "Warning!\n"
 #~ "\n"
-#~ "Torbutton 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"
+#~ "Torbutton 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"
 #~ "\n"
 #~ "Do you wish to continue anyway?"
 #~ msgstr ""
 #~ "Atenção!\n"
 #~ "\n"
-#~ "Em Firefox 3 o Torbutton é conhecido por deixar escapar a sua zona horária e "
-#~ "os livemark feeds durante o uso de Tor. Além disso, a seguridade e "
-#~ "utilização nessa versão ainda não foram testadas exaustivamente como em "
-#~ "Firefox 2.\n"
+#~ "Em Firefox 3 o Torbutton é conhecido por deixar escapar a sua zona "
+#~ "horária e os livemark feeds durante o uso de Tor. Além disso, a "
+#~ "seguridade e utilização nessa versão ainda não foram testadas "
+#~ "exaustivamente como em Firefox 2.\n"
 #~ "\n"
 #~ "Quer continuar assim mesmo?"

Modified: translation/trunk/projects/torbutton/ro/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/ro/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/ro/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-09-20 02:25+0000\n"
 "Last-Translator: Cristian Dan Farcas <danfarcas at live.co.uk>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -50,6 +50,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -385,3 +389,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ro/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/ro/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/ro/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-09-06 16:28+0000\n"
 "Last-Translator: Top Quality Software <tqsoftware at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -81,7 +81,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -95,19 +96,19 @@
 msgstr "Test proxy Tor cu succes!"
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+#, fuzzy
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr "Testul proxy Tor a EŞUAT! Verificaţi setările proxy şi Privoxy."
 
 #: torbutton.popup.test.confirm_toggle
-#, fuzzy
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
-"Testul automat pentru proxy Tor a eşuat la folosirea Tor.\n"
-"\n"
-"Sunteţi sigur că vreţi să permiteţi oricum?"
 
 #: torbutton.popup.test.ff3_notice
 msgid ""
@@ -142,3 +143,47 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr "(critic)"
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "The most recent Tor proxy test failed to use Tor.\n"
+#~ "\n"
+#~ "Are you sure you want to enable anyway?"
+#~ msgstr ""
+#~ "Testul automat pentru proxy Tor a eşuat la folosirea Tor.\n"
+#~ "\n"
+#~ "Sunteţi sigur că vreţi să permiteţi oricum?"

Modified: translation/trunk/projects/torbutton/ru/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/ru/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/ru/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,18 +1,18 @@
 # extracted from en-US/torbutton.dtd, ru/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-10-30 22:56+0000\n"
 "Last-Translator: Alexey Vertinsky <webbegemot at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 1.1.0\n"
 "X-Accelerator-Marker: &\n"
 
@@ -53,6 +53,11 @@
 msgid "Use Privoxy"
 msgstr "Использовать Privoxy"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "Использовать Privoxy"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "Установить параметры прокси вручную"
@@ -309,7 +314,8 @@
 
 #: torbutton.prefs.resize_on_toggle
 msgid "Resize windows to multiples of 50px during Tor usage (recommended)"
-msgstr "Масштабировать окна с множителем 40px при переключении Tor (желательно)"
+msgstr ""
+"Масштабировать окна с множителем 40px при переключении Tor (желательно)"
 
 #: torbutton.prefs.close_tor
 msgid "Close all Tor windows and tabs on toggle (optional)"
@@ -414,6 +420,14 @@
 msgid "SOCKS v5"
 msgstr "SOCKS v5"
 
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr "Блокировать обновления при использовании Tor (желательно)"
 

Modified: translation/trunk/projects/torbutton/ru/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/ru/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/ru/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,18 +1,18 @@
 # extracted from en-US/torbutton.properties, ru/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-10-31 00:20+0000\n"
 "Last-Translator: Alexey Vertinsky <webbegemot at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 1.1.0\n"
 "X-Accelerator-Marker: &\n"
 
@@ -97,7 +97,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -119,7 +120,8 @@
 msgstr "Tor proxy тест успешно пройден!"
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+#, fuzzy
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 "Tor proxy тест завершился НЕУДАЧЕЙ! Проверьте ваш proxy и конфигурацию "
 "Privoxy."
@@ -128,11 +130,11 @@
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
-"Основной тест Tor proxy не может использовать Tor сеть.\n"
-"\n"
-"Вы уверены что хотите включить Tor не смотря на провал теста?"
 
 #: torbutton.popup.test.ff3_notice
 msgid ""
@@ -168,7 +170,50 @@
 msgid "(crucial)"
 msgstr "(критично)"
 
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""
+
 #~ msgid ""
+#~ "The most recent Tor proxy test failed to use Tor.\n"
+#~ "\n"
+#~ "Are you sure you want to enable anyway?"
+#~ msgstr ""
+#~ "Основной тест Tor proxy не может использовать Tor сеть.\n"
+#~ "\n"
+#~ "Вы уверены что хотите включить Tor не смотря на провал теста?"
+
+#~ msgid ""
 #~ "Torbutton blocked changed-state history manipulation.\n"
 #~ "\n"
 #~ "See history settings to allow.\n"

Modified: translation/trunk/projects/torbutton/sl/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/sl/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/sl/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from en-US/torbutton.dtd, sl-SI/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -54,6 +54,11 @@
 msgid "Use Privoxy"
 msgstr "Uporabi tudi povezavo preko Privoxy-a"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "Uporabi tudi povezavo preko Privoxy-a"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "Uporabi nastavitve proxy strežnika po meri"
@@ -393,3 +398,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/sl/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/sl/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/sl/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from en-US/torbutton.properties, sl-SI/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -85,7 +85,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -99,14 +100,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -137,3 +141,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/sq/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/sq/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/sq/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/sq/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/sq/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/sq/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/sv/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/sv/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/sv/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/sv/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/sv/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/sv/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/sw/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/sw/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/sw/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/sw/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/sw/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/sw/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/templates/torbutton.dtd.pot
===================================================================
--- translation/trunk/projects/torbutton/templates/torbutton.dtd.pot	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/templates/torbutton.dtd.pot	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,17 +1,17 @@
-#. extracted from ../../src/chrome/locale/en/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-08 16:47-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.3.0\n"
+"X-Generator: Translate Toolkit 1.4.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title
@@ -50,6 +50,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""

Modified: translation/trunk/projects/torbutton/templates/torbutton.properties.pot
===================================================================
--- translation/trunk/projects/torbutton/templates/torbutton.properties.pot	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/templates/torbutton.properties.pot	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,17 +1,17 @@
-#. extracted from ../../src/chrome/locale/en/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-08 16:47-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.3.0\n"
+"X-Generator: Translate Toolkit 1.4.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.button.tooltip.disabled
@@ -95,14 +95,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -162,3 +165,8 @@
 #: torbutton.popup.dontask
 msgid "Always launch applications from now on"
 msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/th/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/th/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/th/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-07-17 16:02+0000\n"
 "Last-Translator: Teerawat Kunlayanopakorn <deutsche3289 at yahoo.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -50,6 +50,11 @@
 msgid "Use Privoxy"
 msgstr "นำ Privoxy มาใช้"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "นำ Privoxy มาใช้"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "นำ Proxy ที่กำหนดมาใช้"
@@ -385,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/th/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/th/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/th/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/tr/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/tr/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/tr/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-03-16 14:42+0200\n"
 "Last-Translator: yunuskaba <yunuskaba at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -50,6 +50,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -385,3 +389,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr "SOCKS v5"
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/tr/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/tr/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/tr/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-03-16 15:05+0200\n"
 "Last-Translator: yunuskaba <yunuskaba at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -83,7 +83,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -97,7 +98,8 @@
 msgstr "Tor proxy testi bşarıyla gerçekleşti"
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+#, fuzzy
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 "Proxy testi başarısız oldu!Lütfen proxyinizi ve ayarlarını kontrol ediniz."
 
@@ -105,16 +107,19 @@
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
-msgstr "En son yapmış olduğunuz proxy testi başarısız oldu.\n"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
+msgstr ""
 
 #: torbutton.popup.test.ff3_notice
 msgid ""
 "Click OK to test Tor proxy settings. This test will happen in the "
 "background. Please be patient."
 msgstr ""
-"Tamama tıklayarak proxy ayarlarını test edin. Test arkaplanda "
-"gerçekleşiyor.Lütfen bekleyin."
+"Tamama tıklayarak proxy ayarlarını test edin. Test arkaplanda gerçekleşiyor."
+"Lütfen bekleyin."
 
 #: torbutton.panel.label.verified
 msgid "Tor Verified"
@@ -138,3 +143,43 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr "(çok önemlil)"
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""
+
+#~ msgid ""
+#~ "The most recent Tor proxy test failed to use Tor.\n"
+#~ "\n"
+#~ "Are you sure you want to enable anyway?"
+#~ msgstr "En son yapmış olduğunuz proxy testi başarısız oldu.\n"

Modified: translation/trunk/projects/torbutton/uk/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/uk/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/uk/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-07-12 15:27+0000\n"
 "Last-Translator: Nestor Z. <nestor at linuxmail.org>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -50,6 +50,11 @@
 msgid "Use Privoxy"
 msgstr "Використовувати Privoxy"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "Використовувати Privoxy"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "Використовувати незвичні налаштування проксі"
@@ -393,3 +398,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/uk/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/uk/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/uk/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/vi/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/vi/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/vi/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-04-10 11:59+0000\n"
 "Last-Translator: NGUYỄN Mạnh Hùng <loveleeyoungae at yahoo.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -50,6 +50,11 @@
 msgid "Use Privoxy"
 msgstr "Dùng Privoxy"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "Dùng Privoxy"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "Dùng thiết lập proxy tùy biến"
@@ -251,8 +256,7 @@
 #: torbutton.prefs.disable_referer
 msgid "Don't send referer during Tor usage (may break some sites)"
 msgstr ""
-"Không gửi referer trong quá trình dùng Tor (có thể gây lỗi trên một số "
-"trang)"
+"Không gửi referer trong quá trình dùng Tor (có thể gây lỗi trên một số trang)"
 
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
@@ -402,3 +406,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr "SOCKS v5"
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/vi/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/vi/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/vi/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-04-10 12:14+0000\n"
 "Last-Translator: NGUYỄN Mạnh Hùng <loveleeyoungae at yahoo.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -96,7 +96,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -116,7 +117,8 @@
 msgstr "Thử nghiệm Tor thành công!"
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+#, fuzzy
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 "Thử nghiệm Tor THẤT BẠI! Hãy kiểm tra thiết lập proxy và Privoxy của bạn."
 
@@ -124,11 +126,11 @@
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
-"Thử nghiệm proxy Tor gần đây nhất đã bị thất bại.\n"
-"\n"
-"Bạn có chắc là bạn vẫn muốn bật không?"
 
 #: torbutton.popup.test.ff3_notice
 msgid ""
@@ -163,3 +165,46 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr "(cấp thiết)"
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""
+
+#~ msgid ""
+#~ "The most recent Tor proxy test failed to use Tor.\n"
+#~ "\n"
+#~ "Are you sure you want to enable anyway?"
+#~ msgstr ""
+#~ "Thử nghiệm proxy Tor gần đây nhất đã bị thất bại.\n"
+#~ "\n"
+#~ "Bạn có chắc là bạn vẫn muốn bật không?"

Modified: translation/trunk/projects/torbutton/zh_CN/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/zh_CN/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/zh_CN/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.dtd, zh-CN/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-09-05 12:56+0000\n"
 "Last-Translator: Ben <zhazhenzhong at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,11 @@
 msgid "Use Privoxy"
 msgstr "使用 Privoxy"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "使用 Privoxy"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "使用自定义代理设置"
@@ -101,8 +106,8 @@
 "proxy settings, please disable Torbutton and return here.  If you would like "
 "to change your Tor settings, please use the Torbutton preference window."
 msgstr ""
-"Torbutton 目前使用中。如果您想改变非 Tor 代理设置，请禁用 Torbutton 后回到这里。如果您想改变 Tor 代理设置，请使用 "
-"Torbutton 偏好设置。"
+"Torbutton 目前使用中。如果您想改变非 Tor 代理设置，请禁用 Torbutton 后回到这"
+"里。如果您想改变 Tor 代理设置，请使用 Torbutton 偏好设置。"
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -395,6 +400,14 @@
 msgid "SOCKS v5"
 msgstr "SOCKS v5"
 
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr "使用 Tor 时禁用更新(重要)"
 

Modified: translation/trunk/projects/torbutton/zh_CN/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/zh_CN/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/zh_CN/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.properties, zh-CN/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-11-27 13:15-0700\n"
 "Last-Translator: yfdyh000 <yfdyh000 at Gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -61,7 +61,8 @@
 "Hit 'enter' in the location box or open a new window or tab instead.\n"
 "\n"
 msgstr ""
-"为了解决 Firefox 的安全漏洞，Torbutton 阻止了模式改变后，在已浏览网页间的跳转操作。\n"
+"为了解决 Firefox 的安全漏洞，Torbutton 阻止了模式改变后，在已浏览网页间的跳转"
+"操作。\n"
 "\n"
 "请在地址栏中按回车或打开新窗口或新标签页进行浏览。\n"
 "\n"
@@ -86,21 +87,24 @@
 "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)"
 msgstr ""
-"Torbutton 注意：浏览器似乎缺少自定义的CA(证书颁发机构)。检查CA列表是一项耗时的操作，障碍Tor的切换。您是否希望禁用对CA证书的隔离？)"
-"如果您不懂，可以选择“确定”)"
+"Torbutton 注意：浏览器似乎缺少自定义的CA(证书颁发机构)。检查CA列表是一项耗时"
+"的操作，障碍Tor的切换。您是否希望禁用对CA证书的隔离？)如果您不懂，可以选择“确"
+"定”)"
 
 # Torbutton过谦了这是Firefox3的问题
 #: torbutton.popup.ff3.warning
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
 "警告！\n"
 "\n"
-"Firefox 3 会通过 Tor 泄露您的时区及Livemark（书签栏的RSS链接），Torbutton 对此无能为力。\n"
+"Firefox 3 会通过 Tor 泄露您的时区及Livemark（书签栏的RSS链接），Torbutton 对"
+"此无能为力。\n"
 "\n"
 "您是否要继续？"
 
@@ -113,18 +117,19 @@
 msgstr "Tor 代理测试成功！"
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+#, fuzzy
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr "Tor 代理测试失败！请检查您的代理和Privoxy 设置。"
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
-"Tor 没能通过上一次的代理测试。\n"
-"\n"
-"您是否仍然要启用？"
 
 #: torbutton.popup.test.ff3_notice
 msgid ""
@@ -158,6 +163,49 @@
 msgid "(crucial)"
 msgstr "(重要)"
 
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""
+
+#~ msgid ""
+#~ "The most recent Tor proxy test failed to use Tor.\n"
+#~ "\n"
+#~ "Are you sure you want to enable anyway?"
+#~ msgstr ""
+#~ "Tor 没能通过上一次的代理测试。\n"
+#~ "\n"
+#~ "您是否仍然要启用？"
+
 #, fuzzy
 #~ msgid ""
 #~ "Torbutton blocked changed-state history manipulation.\n"
@@ -173,13 +221,15 @@
 #~ msgid ""
 #~ "Warning!\n"
 #~ "\n"
-#~ "Torbutton 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"
+#~ "Torbutton 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"
 #~ "\n"
 #~ "Do you wish to continue anyway?"
 #~ msgstr ""
 #~ "警告！\n"
 #~ "\n"
-#~ "已知Torbutton在Firefox 3上运行时会泄漏你的失去以及实时书签。并且他对于Firefox "
-#~ "2也没有进行深入的关于Tor安全性以及易用性的检查。\n"
+#~ "已知Torbutton在Firefox 3上运行时会泄漏你的失去以及实时书签。并且他对于"
+#~ "Firefox 2也没有进行深入的关于Tor安全性以及易用性的检查。\n"
 #~ "\n"
 #~ "你是不是仍然愿意继续呢？"

Modified: translation/trunk/projects/torbutton/zh_HK/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/zh_HK/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/zh_HK/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,10 @@
 msgid "Use Privoxy"
 msgstr ""
 
+#: torbutton.prefs.use_polipo
+msgid "Use Polipo"
+msgstr ""
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr ""
@@ -386,3 +390,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/zh_HK/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/zh_HK/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/zh_HK/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -96,14 +97,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -134,3 +138,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

Modified: translation/trunk/projects/torbutton/zh_TW/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/zh_TW/torbutton.dtd.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/zh_TW/torbutton.dtd.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.dtd, zh-TW/torbutton.dtd
-#. extracted from ../src/chrome/locale/en-US/torbutton.dtd
+#. extracted from src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: 2009-07-09 12:24+0000\n"
 "Last-Translator: Ravi Wu <raviwu at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,6 +51,11 @@
 msgid "Use Privoxy"
 msgstr "使用 Privoxy"
 
+#: torbutton.prefs.use_polipo
+#, fuzzy
+msgid "Use Polipo"
+msgstr "使用 Privoxy"
+
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
 msgstr "使用自訂的Proxy 設定"
@@ -101,8 +106,8 @@
 "proxy settings, please disable Torbutton and return here.  If you would like "
 "to change your Tor settings, please use the Torbutton preference window."
 msgstr ""
-"Torbutton 現在已經啟用。如果您想改變非-Tor "
-"Proxy的設定，請停用Torbutton並回到這裏。如果您想改變Tor的設定，請使用Torbutton 設置視窗。"
+"Torbutton 現在已經啟用。如果您想改變非-Tor Proxy的設定，請停用Torbutton並回到"
+"這裏。如果您想改變Tor的設定，請使用Torbutton 設置視窗。"
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -389,3 +394,11 @@
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
 msgstr ""
+
+#: torbutton.prefs.no_proxies_on
+msgid "No Proxies for: "
+msgstr ""
+
+#: torbutton.prefs.no_proxy_warning
+msgid "Warning: Avoid using any hostnames above"
+msgstr ""

Modified: translation/trunk/projects/torbutton/zh_TW/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/zh_TW/torbutton.properties.po	2009-12-01 20:06:58 UTC (rev 21088)
+++ translation/trunk/projects/torbutton/zh_TW/torbutton.properties.po	2009-12-01 23:42:22 UTC (rev 21089)
@@ -1,11 +1,11 @@
 # extracted from en-US/torbutton.properties, zh-TW/torbutton.properties
-#. extracted from ../src/chrome/locale/en-US/torbutton.properties
+#. extracted from src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 16:30-0700\n"
+"POT-Creation-Date: 2009-12-01 15:21-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -83,7 +83,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -97,14 +98,17 @@
 msgstr ""
 
 #: torbutton.popup.test.failure
-msgid "Tor proxy test FAILED! Check your proxy and Privoxy settings."
+msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
 "The most recent Tor proxy test failed to use Tor.\n"
 "\n"
-"Are you sure you want to enable anyway?"
+"Are you sure you want to enable anyway?\n"
+"\n"
+"Note: If you have fixed the problem, you can rerun the test in the Torbutton "
+"Proxy Preferences window to eliminate this warning."
 msgstr ""
 
 #: torbutton.popup.test.ff3_notice
@@ -135,3 +139,37 @@
 #: torbutton.prefs.crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.popup.external.title
+msgid "Load external content?"
+msgstr ""
+
+#: torbutton.popup.external.app
+msgid ""
+"An external application is needed to handle:\n"
+"\n"
+msgstr ""
+
+#: torbutton.popup.external.note
+msgid ""
+"\n"
+"\n"
+"NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
+msgstr ""
+
+#: torbutton.popup.launch
+msgid "Launch application"
+msgstr ""
+
+#: torbutton.popup.cancel
+msgid "Cancel"
+msgstr ""
+
+#: torbutton.popup.dontask
+msgid "Always launch applications from now on"
+msgstr ""
+
+#: torbutton.popup.test.no_http_proxy
+msgid ""
+"Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
+msgstr ""

