[or-cvs] r22137: {translation} Update pootle strings with strings from torbutton. (in translation/trunk/projects/torbutton: af ar bg bms bo ca cs da de el en es et 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)

Mike Perry mikeperry-svn at fscked.org
Wed Apr 7 09:26:48 UTC 2010


Author: mikeperry
Date: 2010-04-07 09:26:47 +0000 (Wed, 07 Apr 2010)
New Revision: 22137

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/et/torbutton.dtd.po
   translation/trunk/projects/torbutton/et/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:

Update pootle strings with strings from torbutton.



Modified: translation/trunk/projects/torbutton/af/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/af/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/af/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/af/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/af/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/af/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ar/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/ar/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/ar/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-02-25 10:27-0700\n"
 "Last-Translator: Anas Qtiesh <anasqtiesh at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -422,6 +422,36 @@
 msgid "(crucial)"
 msgstr "(حَرِج)"
 
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+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	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/ar/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2009-12-09 10:10-0700\n"
 "Last-Translator: Anas Qtiesh <anasqtiesh at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -56,17 +56,16 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
-"مفتاح تور منع التلاعب بتغيير حالة تاريخ التصفح. تم هذا لحل مشكلة أمنية في "
-"فايرفوكس.\n"
-"\n"
-"إضغط \"إدخال\" في مكان العنوان أو افتح صفحة جديدة أو تبويباً جديداً بدلاً عن "
-"ذلك\n"
 
 #: torbutton.popup.plugin.warning
 msgid ""
@@ -193,6 +192,15 @@
 "ملاحظة: التطبيقات الخارجية ليست آمنة مع تور بشكل افتراضي ويمكن أن تكشف "
 "هويتك!\n"
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr "إطلاق التطبيق"
@@ -211,7 +219,43 @@
 msgstr ""
 "فحص وكيل تور: لا يمكن الوصول إلى وكيل HTTP المحلي. هل بوليبو يعمل بشكل صحيح؟"
 
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+#, fuzzy
+msgid "Always perform this action from now on"
+msgstr "دائماً أطلق التطبيقات ابتداءً من الآن"
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""
+
 #~ msgid ""
+#~ "Torbutton blocked changed-state history manipulation. This is to work "
+#~ "around a Firefox security bug.\n"
+#~ "\n"
+#~ "Hit 'enter' in the location box or open a new window or tab instead.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "مفتاح تور منع التلاعب بتغيير حالة تاريخ التصفح. تم هذا لحل مشكلة أمنية في "
+#~ "فايرفوكس.\n"
+#~ "\n"
+#~ "إضغط \"إدخال\" في مكان العنوان أو افتح صفحة جديدة أو تبويباً جديداً بدلاً عن "
+#~ "ذلك\n"
+
+#~ msgid ""
 #~ "The most recent Tor proxy test failed to use Tor.\n"
 #~ "\n"
 #~ "Are you sure you want to enable anyway?"

Modified: translation/trunk/projects/torbutton/bg/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/bg/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/bg/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/bg/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/bg/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/bg/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/bms/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/bms/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/bms/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -443,3 +443,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/bms/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/bms/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/bms/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -56,18 +56,16 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
-msgstr ""
-"ေျပာင္းလဲမႈ အေျခအေန History ကုိင္တြယ္ထိန္းသိမ္းမႈ ကုိ Torbutton မွ ပိတ္ပင္ထားပါသည္။Firefox "
-"လံုျခံဳမႈ bug တြင္ အလုပ္လုပ္ႏဳိင္ရန္ ျဖစ္ပါသည္။ \n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
 "\n"
-"location box ေနရာတြင္ enter ကုိ ႏွိပ္ပါ သို႕မဟုတ္ window  အသစ္တစ္ခု သို႕မဟုတ္ tab တစ္ခု အစားထိုး "
-"ဖြင့္လွစ္ပါ။ \n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
 "\n"
+msgstr ""
 
 #: torbutton.popup.plugin.warning
 msgid ""
@@ -187,6 +185,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -204,7 +211,43 @@
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
 
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""
+
 #~ msgid ""
+#~ "Torbutton blocked changed-state history manipulation. This is to work "
+#~ "around a Firefox security bug.\n"
+#~ "\n"
+#~ "Hit 'enter' in the location box or open a new window or tab instead.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "ေျပာင္းလဲမႈ အေျခအေန History ကုိင္တြယ္ထိန္းသိမ္းမႈ ကုိ Torbutton မွ "
+#~ "ပိတ္ပင္ထားပါသည္။Firefox လံုျခံဳမႈ bug တြင္ အလုပ္လုပ္ႏဳိင္ရန္ ျဖစ္ပါသည္။ \n"
+#~ "\n"
+#~ "location box ေနရာတြင္ enter ကုိ ႏွိပ္ပါ သို႕မဟုတ္ window  အသစ္တစ္ခု သို႕မဟုတ္ tab တစ္ခု "
+#~ "အစားထိုး ဖြင့္လွစ္ပါ။ \n"
+#~ "\n"
+
+#~ msgid ""
 #~ "The most recent Tor proxy test failed to use Tor.\n"
 #~ "\n"
 #~ "Are you sure you want to enable anyway?"

Modified: translation/trunk/projects/torbutton/bo/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/bo/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/bo/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/bo/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/bo/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/bo/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ca/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/ca/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/ca/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ca/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/ca/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/ca/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/cs/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/cs/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/cs/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/cs/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/cs/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/cs/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/da/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/da/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/da/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-02-10 00:46-0700\n"
 "Last-Translator: Hans-Jørgen Martinus Hansen <hans-jorgen at live.dk>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -514,3 +514,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr "(Vigtigt)"
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/da/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/da/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/da/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-03-02 05:32-0700\n"
 "Last-Translator: Hans-Jørgen Martinus Hansen <hans-jorgen at live.dk>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -63,21 +63,18 @@
 "Torbutton gør det nemt at aktivere og deaktivere Tor Proxyen ved brug af "
 "Firefox"
 
-# Translated by Manuel Ojeda - ojeda at ojeda.dk
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
-msgstr ""
-"Torbutton har blokeret historik skift manipulation. Dette er for at omgå en "
-"Firefox sikkerheds fejl.\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
 "\n"
-"Tryk på 'return' i adresse boksen eller åben en ny fane eller browservindue "
-"i stedet.\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
 "\n"
+msgstr ""
 
 # Translated by Manuel Ojeda - ojeda at ojeda.dk
 #: torbutton.popup.plugin.warning
@@ -207,6 +204,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -224,8 +230,45 @@
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
 
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""
+
 # Translated by Manuel Ojeda - ojeda at ojeda.dk
 #~ msgid ""
+#~ "Torbutton blocked changed-state history manipulation. This is to work "
+#~ "around a Firefox security bug.\n"
+#~ "\n"
+#~ "Hit 'enter' in the location box or open a new window or tab instead.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Torbutton har blokeret historik skift manipulation. Dette er for at omgå "
+#~ "en Firefox sikkerheds fejl.\n"
+#~ "\n"
+#~ "Tryk på 'return' i adresse boksen eller åben en ny fane eller "
+#~ "browservindue i stedet.\n"
+#~ "\n"
+
+# 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?"

Modified: translation/trunk/projects/torbutton/de/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/de/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/de/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-03-03 16:12-0700\n"
 "Last-Translator: CS <cs at carlostrub.ch>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -459,6 +459,36 @@
 msgid "(crucial)"
 msgstr "(kritisch)"
 
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""
+
 # typo
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr ""

Modified: translation/trunk/projects/torbutton/de/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/de/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/de/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-03-26 06:19-0600\n"
 "Last-Translator: CS <cs at carlostrub.ch>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -56,18 +56,16 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
-msgstr ""
-"Torbutton hat die Manipulation der Status-Historie blockiert. Dies wurde "
-"gemacht, um einen Sicherheitsfehler in Firefox zu umgehen.\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
 "\n"
-"Klicken Sie 'enter' in der location box oder öffnen Sie ein neues Fenster "
-"oder einen neuen Tab.\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
 "\n"
+msgstr ""
 
 #: torbutton.popup.plugin.warning
 msgid ""
@@ -200,6 +198,15 @@
 "Anmerkung: Externe Applikationen sind im Allgemeinen NICHT Tor gesichert und "
 "können Sie verraten!\n"
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr "Applikation starten"
@@ -218,7 +225,44 @@
 msgstr ""
 "Tor proxy test: Lokaler HTTP Proxy ist unerreichbar. Läuft Polipo korrekt?"
 
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+#, fuzzy
+msgid "Always perform this action from now on"
+msgstr "Von nun an immer Applikationen laden"
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""
+
 #~ msgid ""
+#~ "Torbutton blocked changed-state history manipulation. This is to work "
+#~ "around a Firefox security bug.\n"
+#~ "\n"
+#~ "Hit 'enter' in the location box or open a new window or tab instead.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Torbutton hat die Manipulation der Status-Historie blockiert. Dies wurde "
+#~ "gemacht, um einen Sicherheitsfehler in Firefox zu umgehen.\n"
+#~ "\n"
+#~ "Klicken Sie 'enter' in der location box oder öffnen Sie ein neues Fenster "
+#~ "oder einen neuen Tab.\n"
+#~ "\n"
+
+#~ msgid ""
 #~ "Torbutton blocked changed-state history manipulation.\n"
 #~ "\n"
 #~ "See history settings to allow.\n"

Modified: translation/trunk/projects/torbutton/el/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/el/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/el/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-03-24 19:26-0600\n"
 "Last-Translator: George Fragos <fragos.george at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -375,7 +375,8 @@
 #: torbutton.prefs.block_tor_file_net
 #, fuzzy
 msgid "Block Tor access to network from file:// urls (recommended)"
-msgstr "Απαγόρευση πρόσβασης στο δίκτυο Tor από url μορφής file:// (συνιστάται)"
+msgstr ""
+"Απαγόρευση πρόσβασης στο δίκτυο Tor από url μορφής file:// (συνιστάται)"
 
 #: torbutton.prefs.block_nontor_file_net
 msgid "Block Non-Tor access to network from file:// urls"
@@ -455,6 +456,36 @@
 msgid "(crucial)"
 msgstr "(κρίσιμο)"
 
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""
+
 #~ msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
 #~ msgstr ""
 #~ "Απαγόρευση αποθήκευσης καρτελών φορτωμένων από Tor στο διαχειριστή "

Modified: translation/trunk/projects/torbutton/el/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/el/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/el/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-03-25 06:12-0600\n"
 "Last-Translator: George Fragos <fragos.george at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -57,11 +57,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -196,6 +200,15 @@
 "ΣΗΜΕΙΩΣΗ: Οι εξωτερικές εφαρμογές ΔΕΝ είναι εξορισμού ασφαλής για το Tor και "
 "μπορούν να σας αποκαλύψουν!\n"
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr "Εκτέλεση εφαρμογής"
@@ -215,6 +228,29 @@
 "Δοκιμή Tor proxy: Ο τοπικός HTTP Proxy είναι απρόσιτος. Εκτελείται σωστά το "
 "Polipo;"
 
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+#, fuzzy
+msgid "Always perform this action from now on"
+msgstr "Από τώρα και στο εξής να εκτελούνται πάντοτε εφαρμογές"
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""
+
 #~ msgid ""
 #~ "Torbutton blocked changed-state history manipulation.\n"
 #~ "\n"

Modified: translation/trunk/projects/torbutton/en/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/en/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/en/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -413,3 +413,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/en/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/en/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/en/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/es/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/es/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/es/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-01-10 17:12-0700\n"
 "Last-Translator: carolyn anhalt <carolyn at anhalt.org>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -449,6 +449,36 @@
 msgid "(crucial)"
 msgstr "(crucial)"
 
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr "Deshabilitar actualizaciones al usar Tor (recomendado)"
 

Modified: translation/trunk/projects/torbutton/es/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/es/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/es/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-01-10 17:14-0700\n"
 "Last-Translator: carolyn anhalt <carolyn at anhalt.org>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -56,17 +56,17 @@
 "proxy Tor desde el Firefox de manera fácil."
 
 #: torbutton.popup.history.warning
-#, fuzzy
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
-"Torbutton bloqueó la manipulación del historial de change-state. Esto es "
-"para enmendar un hueco de seguridad de Firefox.Presione 'enter' en la caja "
-"de texto de lugar o en su lugar abra una nueva ventana."
 
 #: torbutton.popup.plugin.warning
 msgid ""
@@ -198,6 +198,15 @@
 "NOTA: Las aplicaciones Tor externos no son seguros por defecto y puede "
 "desenmascarar a usted!\n"
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr "Iniciar la aplicación"
@@ -217,7 +226,42 @@
 "Prueba de Tor proxy: Local Proxy HTTP es inalcanzable. Polipo está "
 "funcionando correctamente?"
 
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+#, fuzzy
+msgid "Always perform this action from now on"
+msgstr "A partir de ahora, siempre iniciar la aplicación"
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""
+
+#, fuzzy
 #~ msgid ""
+#~ "Torbutton blocked changed-state history manipulation. This is to work "
+#~ "around a Firefox security bug.\n"
+#~ "\n"
+#~ "Hit 'enter' in the location box or open a new window or tab instead.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Torbutton bloqueó la manipulación del historial de change-state. Esto es "
+#~ "para enmendar un hueco de seguridad de Firefox.Presione 'enter' en la "
+#~ "caja de texto de lugar o en su lugar abra una nueva ventana."
+
+#~ msgid ""
 #~ "The most recent Tor proxy test failed to use Tor.\n"
 #~ "\n"
 #~ "Are you sure you want to enable anyway?"

Modified: translation/trunk/projects/torbutton/et/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/et/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/et/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-02-18 02:29-0700\n"
 "Last-Translator: Heiki Ojasild <heiki.ojasild at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -413,3 +413,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/et/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/et/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/et/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-02-18 03:19-0700\n"
 "Last-Translator: Heiki Ojasild <heiki.ojasild at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -58,16 +58,16 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
-"Torbutton blokeeris teise oleku ajaloomanipulatsiooni, et kaitsta sind "
-"Firefoxi turvavea eest.\n"
-"\n"
-"Vajuta klahvi 'Enter' URL ribal või ava selle asemel uus aken või sakk."
 
 #: torbutton.popup.plugin.warning
 msgid ""
@@ -98,7 +98,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 ""
@@ -199,6 +200,15 @@
 "Teadaanne: välised rakendused ei ole vaikimisi Toriga koos kasutades "
 "turvalised ning võivad sind paljastada."
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr "Käivita rakendus"
@@ -217,3 +227,38 @@
 msgstr ""
 "Tor vaheserveri kontroll: kohalik HTTP vaheserver kättesaamatu. Kas Polipo "
 "jookseb korralikult?"
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+#, fuzzy
+msgid "Always perform this action from now on"
+msgstr "Alati käivita rakendusi edaspidi"
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""
+
+#~ msgid ""
+#~ "Torbutton blocked changed-state history manipulation. This is to work "
+#~ "around a Firefox security bug.\n"
+#~ "\n"
+#~ "Hit 'enter' in the location box or open a new window or tab instead.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Torbutton blokeeris teise oleku ajaloomanipulatsiooni, et kaitsta sind "
+#~ "Firefoxi turvavea eest.\n"
+#~ "\n"
+#~ "Vajuta klahvi 'Enter' URL ribal või ava selle asemel uus aken või sakk."

Modified: translation/trunk/projects/torbutton/eu/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/eu/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/eu/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/eu/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/eu/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/eu/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/fa/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/fa/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/fa/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2009-12-09 06:59-0700\n"
 "Last-Translator: Amirreza A. <scorpino at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -430,6 +430,36 @@
 msgid "(crucial)"
 msgstr ""
 
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+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	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/fa/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2009-12-09 08:05-0700\n"
 "Last-Translator: Amirreza A. <scorpino at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,16 +51,19 @@
 "Torbutton provides a button to easily enable or disable pointing Firefox to "
 "the Tor proxy"
 msgstr ""
-"دکمه تُر به آسانی امکان فعال و غیرفعال کردن پراکسی تُر را بکمک یک دکمه می "
-"دهد"
+"دکمه تُر به آسانی امکان فعال و غیرفعال کردن پراکسی تُر را بکمک یک دکمه می دهد"
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -189,6 +192,15 @@
 "نکته: برنامه های خارجی توسط تُر به طور پیشفرض امن نشده اند و ممکن است هویت "
 "اصلی شما را آشکار کنند!\n"
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr "اجرای برنامه"
@@ -205,9 +217,32 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
-"آزمون پراکسی تُر: پراکسی HTTP محلی قابل دسترسی نیست. آیا پولیپو به درستی "
-"اجرا شده است؟"
+"آزمون پراکسی تُر: پراکسی HTTP محلی قابل دسترسی نیست. آیا پولیپو به درستی اجرا "
+"شده است؟"
 
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+#, fuzzy
+msgid "Always perform this action from now on"
+msgstr "از حالا به بعد هر برنامه ای را اجرا کن"
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""
+
 #~ msgid ""
 #~ "Torbutton blocked changed-state history manipulation.\n"
 #~ "\n"

Modified: translation/trunk/projects/torbutton/fi/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/fi/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/fi/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2009-12-20 03:06-0700\n"
 "Last-Translator: Harri Vähätalo <harri at svahatalo.fi>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -428,3 +428,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr "(kriittinen)"
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/fi/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/fi/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/fi/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2009-12-20 03:00-0700\n"
 "Last-Translator: Harri Vähätalo <harri at svahatalo.fi>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -54,11 +54,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -157,6 +161,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -173,3 +186,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/fr/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/fr/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/fr/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: Torbutton\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-01-15 12:26-0700\n"
 "Last-Translator: Médéric RIBREUX <mederic.ribreux at gmail.com>\n"
 "Language-Team: Mfr <mfr (ä] misericoridia.be>\n"
@@ -454,6 +454,36 @@
 msgid "(crucial)"
 msgstr "(essentiel)"
 
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr ""
 #~ "Désactiver les mises à jour pendant l'utilisation de Tor (recommandé)"

Modified: translation/trunk/projects/torbutton/fr/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/fr/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/fr/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: Torbutton\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-01-15 12:36-0700\n"
 "Last-Translator: Médéric RIBREUX <mederic.ribreux at gmail.com>\n"
 "Language-Team: Mfr <mfr (ä] misericordia.be>\n"
@@ -57,18 +57,16 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
-msgstr ""
-"Torbutton a bloqué la manipulation de changement d'état de l'historique. "
-"C'est la correction d'un bug de secrité de Firefox.\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
 "\n"
-"Tapez 'entrée' dans la barre d'adresse ou autrement ouvrez une nouvelle "
-"fenêtre ou une nouvel onglet.\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
 "\n"
+msgstr ""
 
 #: torbutton.popup.plugin.warning
 msgid ""
@@ -201,6 +199,15 @@
 "NOTE: Les applicatiosn externes ne sont pas saines par défaut pour Tor et "
 "peuvent vous démasquer !\n"
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr "Lancer l'application"
@@ -220,7 +227,44 @@
 "Test du proxy Tor: Le proxy HTTP localLocalest injoignable. Est-ce-que "
 "Polipo fonctionne correctement ?"
 
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+#, fuzzy
+msgid "Always perform this action from now on"
+msgstr "Toujours lancer les applications à partir de maintenant"
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""
+
 #~ msgid ""
+#~ "Torbutton blocked changed-state history manipulation. This is to work "
+#~ "around a Firefox security bug.\n"
+#~ "\n"
+#~ "Hit 'enter' in the location box or open a new window or tab instead.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Torbutton a bloqué la manipulation de changement d'état de l'historique. "
+#~ "C'est la correction d'un bug de secrité de Firefox.\n"
+#~ "\n"
+#~ "Tapez 'entrée' dans la barre d'adresse ou autrement ouvrez une nouvelle "
+#~ "fenêtre ou une nouvel onglet.\n"
+#~ "\n"
+
+#~ msgid ""
 #~ "The most recent Tor proxy test failed to use Tor.\n"
 #~ "\n"
 #~ "Are you sure you want to enable anyway?"

Modified: translation/trunk/projects/torbutton/fur/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/fur/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/fur/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/fur/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/fur/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/fur/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/gl/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/gl/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/gl/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/gl/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/gl/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/gl/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/gu/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/gu/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/gu/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/gu/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/gu/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/gu/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/he/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/he/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/he/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/he/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/he/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/he/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/hi/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/hi/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/hi/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -418,3 +418,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/hi/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/hi/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/hi/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/hr/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/hr/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/hr/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -420,3 +420,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/hr/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/hr/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/hr/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -57,11 +57,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -158,6 +162,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -174,3 +187,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/hu/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/hu/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/hu/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/hu/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/hu/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/hu/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/id/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/id/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/id/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/id/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/id/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/id/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/is/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/is/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/is/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/is/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/is/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/is/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/it/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/it/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/it/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -455,6 +455,36 @@
 msgid "(crucial)"
 msgstr ""
 
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr "Disablita gli aggiornamenti usando Tor (consigliato)"
 

Modified: translation/trunk/projects/torbutton/it/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/it/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/it/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -57,18 +57,16 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
-msgstr ""
-"Torbutton ha bloccato la modifica della cronologia fatta in stati diversi. "
-"Questo serve ad aggirare un baco di sicurezza di Firefox.\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
 "\n"
-"Fai clic su 'invio' nella barra degli indirizzi oppure apri una nuova "
-"finestra od una nuova scheda.\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
 "\n"
+msgstr ""
 
 #: torbutton.popup.plugin.warning
 msgid ""
@@ -189,6 +187,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -206,7 +213,43 @@
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
 
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""
+
 #~ msgid ""
+#~ "Torbutton blocked changed-state history manipulation. This is to work "
+#~ "around a Firefox security bug.\n"
+#~ "\n"
+#~ "Hit 'enter' in the location box or open a new window or tab instead.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Torbutton ha bloccato la modifica della cronologia fatta in stati "
+#~ "diversi. Questo serve ad aggirare un baco di sicurezza di Firefox.\n"
+#~ "\n"
+#~ "Fai clic su 'invio' nella barra degli indirizzi oppure apri una nuova "
+#~ "finestra od una nuova scheda.\n"
+#~ "\n"
+
+#~ msgid ""
 #~ "The most recent Tor proxy test failed to use Tor.\n"
 #~ "\n"
 #~ "Are you sure you want to enable anyway?"

Modified: translation/trunk/projects/torbutton/ja/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/ja/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/ja/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ja/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/ja/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/ja/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ka/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/ka/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/ka/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ka/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/ka/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/ka/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/km/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/km/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/km/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/km/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/km/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/km/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ko/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/ko/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/ko/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ko/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/ko/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/ko/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ku/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/ku/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/ku/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ku/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/ku/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/ku/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/mt/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/mt/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/mt/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/mt/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/mt/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/mt/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/nb/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/nb/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/nb/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2009-12-25 19:18-0700\n"
 "Last-Translator: Cato Auestad <c2auestad at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -298,8 +298,7 @@
 #: torbutton.prefs.dual_cookie_jars
 msgid "Store both Tor and Non-Tor cookies in protected jars (dangerous)"
 msgstr ""
-"Lagre informasjonskapsler for både Tor og ikke-Tor i beskyttende jar "
-"(farlig)"
+"Lagre informasjonskapsler for både Tor og ikke-Tor i beskyttende jar (farlig)"
 
 #: torbutton.prefs.clear_http_auth
 msgid "Clear HTTP auth sessions (recommended)"
@@ -430,3 +429,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr "(kritisk)"
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/nb/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/nb/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/nb/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2009-12-26 17:22-0700\n"
 "Last-Translator: Cato Auestad <c2auestad at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -56,17 +56,16 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
-msgstr ""
-"Torbutton blokkerte endret-tilstand historimanipulasjon. Dette er for å "
-"jobbe rundt en Firefox sikkerhetsfeil.\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
 "\n"
-"Trykk 'enter' i adresselinjen eller åpne et nytt vindu eller fane isteden.\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
 "\n"
+msgstr ""
 
 #: torbutton.popup.plugin.warning
 msgid ""
@@ -194,6 +193,15 @@
 "\n"
 "MERK: Eksterne program er IKKE Tor-sikker som standard og kan røpe deg!\n"
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr "Start program"
@@ -209,9 +217,47 @@
 #: torbutton.popup.test.no_http_proxy
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
-msgstr "Tor-proxy test: Lokal HTTP-proxy kan ikke nås. Kjører Polipo skikkelig?"
+msgstr ""
+"Tor-proxy test: Lokal HTTP-proxy kan ikke nås. Kjører Polipo skikkelig?"
 
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+#, fuzzy
+msgid "Always perform this action from now on"
+msgstr "Start alltid programmer fra nå av"
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""
+
 #~ msgid ""
+#~ "Torbutton blocked changed-state history manipulation. This is to work "
+#~ "around a Firefox security bug.\n"
+#~ "\n"
+#~ "Hit 'enter' in the location box or open a new window or tab instead.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Torbutton blokkerte endret-tilstand historimanipulasjon. Dette er for å "
+#~ "jobbe rundt en Firefox sikkerhetsfeil.\n"
+#~ "\n"
+#~ "Trykk 'enter' i adresselinjen eller åpne et nytt vindu eller fane "
+#~ "isteden.\n"
+#~ "\n"
+
+#~ msgid ""
 #~ "The most recent Tor proxy test failed to use Tor.\n"
 #~ "\n"
 #~ "Are you sure you want to enable anyway?"

Modified: translation/trunk/projects/torbutton/nl/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/nl/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/nl/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-01-13 10:40-0700\n"
 "Last-Translator: Flabber <flabber at online.be>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -422,3 +422,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/nl/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/nl/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/nl/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -57,11 +57,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -158,6 +162,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -174,3 +187,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/pa/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/pa/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/pa/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/pa/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/pa/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/pa/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/pl/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/pl/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/pl/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2009-12-17 11:30-0700\n"
 "Last-Translator: saint <kochambrowar at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -439,6 +439,36 @@
 msgid "(crucial)"
 msgstr ""
 
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr "Zablokuj aktualizacje podczas używania Tora (zalecane)"
 

Modified: translation/trunk/projects/torbutton/pl/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/pl/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/pl/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2009-12-17 12:18-0700\n"
 "Last-Translator: saint <kochambrowar at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -57,17 +57,16 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
-msgstr ""
-"Torbutton zablokował manipulowanie historią, aby załatać niebezpieczną lukę "
-"w Firefoxie.\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
 "\n"
-"Naciśnij 'Enter' w polu adresu lub otwórz nową zakładkę lub okno.\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
 "\n"
+msgstr ""
 
 #: torbutton.popup.plugin.warning
 msgid ""
@@ -182,6 +181,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr "Uruchom aplikację"
@@ -203,7 +211,43 @@
 "Test Tor proxy: Lokalne HTTP proxy jest nieosiągalne. Czy Polipo działa "
 "prawidłowo?"
 
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+#, fuzzy
+msgid "Always perform this action from now on"
+msgstr "Od teraz zawsze uruchamiaj aplikację o "
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""
+
 #~ msgid ""
+#~ "Torbutton blocked changed-state history manipulation. This is to work "
+#~ "around a Firefox security bug.\n"
+#~ "\n"
+#~ "Hit 'enter' in the location box or open a new window or tab instead.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Torbutton zablokował manipulowanie historią, aby załatać niebezpieczną "
+#~ "lukę w Firefoxie.\n"
+#~ "\n"
+#~ "Naciśnij 'Enter' w polu adresu lub otwórz nową zakładkę lub okno.\n"
+#~ "\n"
+
+#~ msgid ""
 #~ "The most recent Tor proxy test failed to use Tor.\n"
 #~ "\n"
 #~ "Are you sure you want to enable anyway?"

Modified: translation/trunk/projects/torbutton/pt/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/pt/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/pt/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2009-12-16 18:33-0700\n"
 "Last-Translator: Tiago Faria <gouki at goukihq.org>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -453,6 +453,36 @@
 msgid "(crucial)"
 msgstr "(crucial)"
 
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+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	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/pt/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2009-12-13 13:07-0700\n"
 "Last-Translator: Tiago Faria <gouki at goukihq.org>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -52,22 +52,20 @@
 "Torbutton provides a button to easily enable or disable pointing Firefox to "
 "the Tor proxy"
 msgstr ""
-"Torbutton fornece um ícone para activar ou desactivar rapidamente o proxy "
-"Tor"
+"Torbutton fornece um ícone para activar ou desactivar rapidamente o proxy Tor"
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
-msgstr ""
-"O Torbutton bloqueou a alteração de histórico desta página. Isto é uma "
-"resolução de um problema de segurança conhecido.\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
 "\n"
-"Pressione 'enter' na barra de endereços ou abra uma nova aba.\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
 "\n"
+msgstr ""
 
 #: torbutton.popup.plugin.warning
 msgid ""
@@ -198,6 +196,15 @@
 "Nota: Aplicações externas ao Tor NÃO são seguras, e podem dar a conhecer a "
 "sua origem!\n"
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr "Correr aplicação"
@@ -217,7 +224,43 @@
 "Teste ao proxy Tor: Erro na ligação ao proxy HTTP local. O Polipo está em "
 "execução?"
 
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+#, fuzzy
+msgid "Always perform this action from now on"
+msgstr "Sempre correr aplicações daqui para a frente"
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""
+
 #~ msgid ""
+#~ "Torbutton blocked changed-state history manipulation. This is to work "
+#~ "around a Firefox security bug.\n"
+#~ "\n"
+#~ "Hit 'enter' in the location box or open a new window or tab instead.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "O Torbutton bloqueou a alteração de histórico desta página. Isto é uma "
+#~ "resolução de um problema de segurança conhecido.\n"
+#~ "\n"
+#~ "Pressione 'enter' na barra de endereços ou abra uma nova aba.\n"
+#~ "\n"
+
+#~ msgid ""
 #~ "Torbutton blocked changed-state history manipulation.\n"
 #~ "\n"
 #~ "See history settings to allow.\n"

Modified: translation/trunk/projects/torbutton/pt_BR/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/pt_BR/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/pt_BR/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-02-02 16:11-0700\n"
 "Last-Translator: Aníbal Deboni Neto <anibaldeboni at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -372,7 +372,8 @@
 
 #: torbutton.prefs.block_tor_file_net
 msgid "Block Tor access to network from file:// urls (recommended)"
-msgstr "Bloquear o acesso à rede a partir de urls do tipo file:// (recomendado)"
+msgstr ""
+"Bloquear o acesso à rede a partir de urls do tipo file:// (recomendado)"
 
 #: torbutton.prefs.block_nontor_file_net
 msgid "Block Non-Tor access to network from file:// urls"
@@ -451,6 +452,36 @@
 msgid "(crucial)"
 msgstr "(crucial)"
 
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""
+
 #~ msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
 #~ msgstr ""
 #~ "Prevenir que o armazenamento de sessão salve as abas carregadas com Tor "

Modified: translation/trunk/projects/torbutton/pt_BR/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/pt_BR/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/pt_BR/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2009-12-03 14:49-0700\n"
 "Last-Translator: Bruno G Oliveira <bruno.mphx2 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -57,11 +57,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -190,6 +194,15 @@
 "NOTA: Aplicações externas NÃO são seguras por padrão e podem desmascarar "
 "você!\n"
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr "Rode a aplicação"
@@ -209,6 +222,28 @@
 "Teste do Tor proxy: HTTP Proxy local está inacessível. Polipo está rodando "
 "devidamente?"
 
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""
+
 #~ msgid ""
 #~ "Torbutton blocked changed-state history manipulation.\n"
 #~ "\n"

Modified: translation/trunk/projects/torbutton/ro/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/ro/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/ro/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-04-05 13:23-0600\n"
 "Last-Translator: m3ta user <zugravu.gheorghe at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr "(crucial)"
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/ro/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/ro/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/ro/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -54,11 +54,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -161,6 +165,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -178,6 +191,28 @@
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
 
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""
+
 #, fuzzy
 #~ msgid ""
 #~ "The most recent Tor proxy test failed to use Tor.\n"

Modified: translation/trunk/projects/torbutton/ru/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/ru/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/ru/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,15 +4,15 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-01-02 08:07-0700\n"
 "Last-Translator: carolyn anhalt <carolyn at anhalt.org>\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"
 
@@ -443,6 +443,36 @@
 msgid "(crucial)"
 msgstr "(критично)"
 
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+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	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/ru/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,15 +4,15 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-03-14 18:43-0600\n"
 "Last-Translator: carolyn anhalt <carolyn at anhalt.org>\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"
 
@@ -56,17 +56,16 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
-msgstr ""
-"Torbutton блокирует работу с историей броузера. Это позволяет устранить "
-"ошибку в безопасности Firefox.\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
 "\n"
-"Нажмите 'enter' в адресной строке либо откройте новую вкладку или окно.\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
 "\n"
+msgstr ""
 
 #: torbutton.popup.plugin.warning
 msgid ""
@@ -201,6 +200,15 @@
 "ПРИМЕЧАНИЕ: Внешние прикладные программы НЕ ЯВЛЯЮТСЯ безопасны для Tor по "
 "умолчанию и могут разоблачить вас!\n"
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 # kd
 #: torbutton.popup.launch
 msgid "Launch application"
@@ -224,7 +232,44 @@
 "Tor прокси-тест: Местные HTTP-прокси недоступны. Работает-ли Polipo  должным "
 "образом?"
 
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+# kd
+#: torbutton.popup.captcha.always
+#, fuzzy
+msgid "Always perform this action from now on"
+msgstr "Отнане всегда запускать приложения"
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""
+
 #~ msgid ""
+#~ "Torbutton blocked changed-state history manipulation. This is to work "
+#~ "around a Firefox security bug.\n"
+#~ "\n"
+#~ "Hit 'enter' in the location box or open a new window or tab instead.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Torbutton блокирует работу с историей броузера. Это позволяет устранить "
+#~ "ошибку в безопасности Firefox.\n"
+#~ "\n"
+#~ "Нажмите 'enter' в адресной строке либо откройте новую вкладку или окно.\n"
+#~ "\n"
+
+#~ msgid ""
 #~ "The most recent Tor proxy test failed to use Tor.\n"
 #~ "\n"
 #~ "Are you sure you want to enable anyway?"

Modified: translation/trunk/projects/torbutton/sl/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/sl/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/sl/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,15 +4,15 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-03-04 06:02-0700\n"
 "Last-Translator: yeah right <telingit.howitis 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=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
-"n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
 "X-Generator: Pootle 1.1.0\n"
 "X-Accelerator-Marker: &\n"
 
@@ -264,7 +264,8 @@
 
 #: torbutton.prefs.disable_referer
 msgid "Don't send referer during Tor usage (may break some sites)"
-msgstr "Ne pošiljaj \"referer\" med uporabo Tor-a (lahko prekine določene strani)"
+msgstr ""
+"Ne pošiljaj \"referer\" med uporabo Tor-a (lahko prekine določene strani)"
 
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
@@ -318,7 +319,8 @@
 
 #: torbutton.prefs.resize_on_toggle
 msgid "Resize windows to multiples of 50px during Tor usage (recommended)"
-msgstr "Spremeni velikost oken na več 50px oken med uporabo Tor-a (priporočeno)"
+msgstr ""
+"Spremeni velikost oken na več 50px oken med uporabo Tor-a (priporočeno)"
 
 #: torbutton.prefs.close_tor
 msgid "Close all Tor windows and tabs on toggle (optional)"
@@ -435,3 +437,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr "(obvezno)"
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/sl/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/sl/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/sl/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,15 +4,15 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-03-04 06:03-0700\n"
 "Last-Translator: yeah right <telingit.howitis 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=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
-"n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
 "X-Generator: Pootle 1.1.0\n"
 "X-Accelerator-Marker: &\n"
 
@@ -58,11 +58,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -167,6 +171,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr "Zaženi program"
@@ -185,3 +198,26 @@
 msgstr ""
 "Tor proxy test: Lokalni HTTP proxy je nedosegljiv. Ali Polipo deluje "
 "pravilno?"
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+#, fuzzy
+msgid "Always perform this action from now on"
+msgstr "Vedno zaženi program."
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/sq/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/sq/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/sq/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/sq/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/sq/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/sq/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/sv/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/sv/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/sv/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-02-25 16:16-0700\n"
 "Last-Translator: Martin Josefsson <josefsson.martin at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -429,3 +429,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/sv/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/sv/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/sv/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/sw/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/sw/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/sw/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/sw/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/sw/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/sw/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/templates/torbutton.dtd.pot
===================================================================
--- translation/trunk/projects/torbutton/templates/torbutton.dtd.pot	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/templates/torbutton.dtd.pot	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,14 +4,14 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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.4.0\n"
+"X-Generator: Translate Toolkit 1.5.3\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title
@@ -413,3 +413,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/templates/torbutton.properties.pot
===================================================================
--- translation/trunk/projects/torbutton/templates/torbutton.properties.pot	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/templates/torbutton.properties.pot	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,14 +4,14 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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.4.0\n"
+"X-Generator: Translate Toolkit 1.5.3\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.button.tooltip.disabled
@@ -54,11 +54,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -154,6 +158,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -170,3 +183,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/th/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/th/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/th/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/th/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/th/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/th/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/tr/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/tr/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/tr/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -413,3 +413,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/tr/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/tr/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/tr/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -56,11 +56,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -161,6 +165,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -178,6 +191,28 @@
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
 
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""
+
 #~ msgid ""
 #~ "The most recent Tor proxy test failed to use Tor.\n"
 #~ "\n"

Modified: translation/trunk/projects/torbutton/uk/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/uk/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/uk/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2009-12-12 17:39-0700\n"
 "Last-Translator: Stepan <stepafix at rambler.ru>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -423,3 +423,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/uk/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/uk/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/uk/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/vi/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/vi/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/vi/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -1,9 +1,10 @@
 # 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-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-03-08 03:33-0700\n"
 "Last-Translator: Steve Wang <doctorswan at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -429,3 +430,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/vi/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/vi/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/vi/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -1,9 +1,10 @@
 # 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-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2010-03-05 23:05+0930\n"
 "Last-Translator: Lyndon Johnson <lyndon.johnson58 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -55,17 +56,16 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
-msgstr ""
-"Torbutton chặn việc thay đổi tình trạng lược sử. Cách này là để sửa lại một "
-"lỗi bảo mật của Firefox.\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
 "\n"
-"Nhấn 'enter' trong hộp địa chỉ, hoặc mở một cửa sổ mới hay thẻ mới.\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
 "\n"
+msgstr ""
 
 #: torbutton.popup.plugin.warning
 msgid ""
@@ -195,6 +195,15 @@
 "LƯU Ý: Các ứng dụng bên ngoài không an toàn cho Tor theo mặc định và có thể "
 "làm lộ chân tướng bạn!\n"
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr "Khởi chạy ứng dụng"
@@ -214,7 +223,43 @@
 "Thử nghiệm Tor ủy nhiệm: HTTP ủy nhiệm địa phương không thể tới được. Polipo "
 "có đang chạy đúng cách không?"
 
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+#, fuzzy
+msgid "Always perform this action from now on"
+msgstr "Luôn luôn khởi chạy các ứng dụng kể từ bây giờ"
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""
+
 #~ msgid ""
+#~ "Torbutton blocked changed-state history manipulation. This is to work "
+#~ "around a Firefox security bug.\n"
+#~ "\n"
+#~ "Hit 'enter' in the location box or open a new window or tab instead.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Torbutton chặn việc thay đổi tình trạng lược sử. Cách này là để sửa lại "
+#~ "một lỗi bảo mật của Firefox.\n"
+#~ "\n"
+#~ "Nhấn 'enter' trong hộp địa chỉ, hoặc mở một cửa sổ mới hay thẻ mới.\n"
+#~ "\n"
+
+#~ msgid ""
 #~ "The most recent Tor proxy test failed to use Tor.\n"
 #~ "\n"
 #~ "Are you sure you want to enable anyway?"

Modified: translation/trunk/projects/torbutton/zh_CN/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/zh_CN/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/zh_CN/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2009-12-24 08:48-0700\n"
 "Last-Translator: Ben <zhazhenzhong at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -424,6 +424,36 @@
 msgid "(crucial)"
 msgstr "(重要)"
 
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+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	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/zh_CN/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-0700\n"
 "PO-Revision-Date: 2009-12-14 03:29-0700\n"
 "Last-Translator: Ben <zhazhenzhong at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -55,17 +55,16 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
-msgstr ""
-"为了解决 Firefox 的安全漏洞,Torbutton 阻止了模式改变后,在已浏览网页间的跳转"
-"操作。\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
 "\n"
-"请在地址栏中按回车或打开新窗口或新标签页进行浏览。\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
 "\n"
+msgstr ""
 
 #: torbutton.popup.plugin.warning
 msgid ""
@@ -189,6 +188,15 @@
 "\n"
 "注意:外部程序使用Tor并不安全可能泄露您的身份!\n"
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr "启动程序"
@@ -206,7 +214,43 @@
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr "Tor代理测试:本地HTTP代理不可达,您的Polipo正常启动了吗?"
 
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+#, fuzzy
+msgid "Always perform this action from now on"
+msgstr "此后总是启动程序"
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""
+
 #~ msgid ""
+#~ "Torbutton blocked changed-state history manipulation. This is to work "
+#~ "around a Firefox security bug.\n"
+#~ "\n"
+#~ "Hit 'enter' in the location box or open a new window or tab instead.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "为了解决 Firefox 的安全漏洞,Torbutton 阻止了模式改变后,在已浏览网页间的"
+#~ "跳转操作。\n"
+#~ "\n"
+#~ "请在地址栏中按回车或打开新窗口或新标签页进行浏览。\n"
+#~ "\n"
+
+#~ msgid ""
 #~ "The most recent Tor proxy test failed to use Tor.\n"
 #~ "\n"
 #~ "Are you sure you want to enable anyway?"

Modified: translation/trunk/projects/torbutton/zh_HK/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/zh_HK/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/zh_HK/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -414,3 +414,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/zh_HK/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/zh_HK/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/zh_HK/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -55,11 +55,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -156,6 +160,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -172,3 +185,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""

Modified: translation/trunk/projects/torbutton/zh_TW/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/zh_TW/torbutton.dtd.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/zh_TW/torbutton.dtd.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-16 16:35-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -419,3 +419,33 @@
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
 msgstr ""
+
+#: torbutton.prefs.update_torbutton_via_tor
+msgid "Redirect Torbutton updates through Tor"
+msgstr ""
+
+#: torbutton.prefs.dodge_google_captcha
+msgid ""
+"Automatically use an alternate search engine when presented with a Google "
+"Captcha"
+msgstr ""
+
+#: torbutton.prefs.search_engine
+msgid "Search engine:"
+msgstr ""
+
+#: torbutton.prefs.engine1
+msgid "ixquick.com"
+msgstr ""
+
+#: torbutton.prefs.engine2
+msgid "Bing.com"
+msgstr ""
+
+#: torbutton.prefs.engine3
+msgid "scroogle.org"
+msgstr ""
+
+#: torbutton.prefs.fix_google_srch
+msgid "Strip platform and language off of Google Search Box queries"
+msgstr ""

Modified: translation/trunk/projects/torbutton/zh_TW/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/zh_TW/torbutton.properties.po	2010-04-06 17:16:12 UTC (rev 22136)
+++ translation/trunk/projects/torbutton/zh_TW/torbutton.properties.po	2010-04-07 09:26:47 UTC (rev 22137)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 15:21-0700\n"
+"POT-Creation-Date: 2010-04-06 18:45-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"
@@ -56,11 +56,15 @@
 
 #: torbutton.popup.history.warning
 msgid ""
-"Torbutton blocked changed-state history manipulation. This is to work around "
-"a Firefox security bug.\n"
+"Torbutton blocked activity from a tab loaded in a different Tor state.\n"
 "\n"
-"Hit 'enter' in the location box or open a new window or tab instead.\n"
+"This is to work around Firefox Bugs 409737 and 417869.\n"
 "\n"
+"If this popup seemed to happen for no reason, one of your tabs is attempting "
+"to reload itself in the background, and this was blocked.\n"
+"\n"
+"To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
+"\n"
 msgstr ""
 
 #: torbutton.popup.plugin.warning
@@ -157,6 +161,15 @@
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
 
+#: torbutton.popup.external.suggest
+msgid ""
+"\n"
+"If this file is untrusted, you should either save it to view while offline "
+"or in a VM,\n"
+"or consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or "
+"TorVM.\n"
+msgstr ""
+
 #: torbutton.popup.launch
 msgid "Launch application"
 msgstr ""
@@ -173,3 +186,25 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+
+#: torbutton.popup.captcha.title
+msgid "Avoid Google Captchas?"
+msgstr ""
+
+#: torbutton.popup.captcha.ask
+msgid ""
+"Torbutton detected a Google Captcha. Would you like to be redirected to "
+"another search engine for this query?"
+msgstr ""
+
+#: torbutton.popup.captcha.always
+msgid "Always perform this action from now on"
+msgstr ""
+
+#: torbutton.popup.redirect
+msgid "Redirect"
+msgstr ""
+
+#: torbutton.popup.no_redirect
+msgid "Don't Redirect"
+msgstr ""



More information about the tor-commits mailing list