[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[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)

To: or-cvs@xxxxxxxxxxxxx
Subject: [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)
From: Mike Perry <mikeperry-svn@xxxxxxxxxx>
Date: Wed, 7 Apr 2010 09:26:48 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivered-to: or-cvs-outgoing@xxxxxxxx
Delivered-to: or-cvs@xxxxxxxx
Delivery-date: Wed, 07 Apr 2010 05:27:05 -0400
Reply-to: or-dev@xxxxxxxxxxxxx
Sender: owner-or-cvs@xxxxxxxxxxxxx
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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxx
 #: 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@xxxxxxxx
 #: 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@xxxxxxxx
 #~ 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@xxxxxxxx
+#~ 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@xxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\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@xxxxxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\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 ""