[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] r25777: {translation} New translation strings. (in translation/trunk/projects/torbutton/po: af ak am ar arn ast az be bg bn bn_IN bo br bs ca cs csb cy da de dz el en eo es et eu fa fi fil fo fr fur fy ga gl gu gun ha he hi hr ht hu hy id is it ja jv ka km kn ko ku kw ky lb ln lo lt lv mg mi mk ml mn mr ms mt my nah nap nb ne nl nn nso oc or pa pap pl pms ps pt pt_BR ro ru sco sk sl so son sq sr st su sv sw ta te templates tg th ti tk tr uk ur ve vi wa wo zh_CN zh_HK zh_TW zu)

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] r25777: {translation} New translation strings. (in translation/trunk/projects/torbutton/po: af ak am ar arn ast az be bg bn bn_IN bo br bs ca cs csb cy da de dz el en eo es et eu fa fi fil fo fr fur fy ga gl gu gun ha he hi hr ht hu hy id is it ja jv ka km kn ko ku kw ky lb ln lo lt lv mg mi mk ml mn mr ms mt my nah nap nb ne nl nn nso oc or pa pap pl pms ps pt pt_BR ro ru sco sk sl so son sq sr st su sv sw ta te templates tg th ti tk tr uk ur ve vi wa wo zh_CN zh_HK zh_TW zu)
From: Mike Perry <mikeperry-svn@xxxxxxxxxx>
Date: Thu, 30 Aug 2012 22:09:49 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 30 Aug 2012 18:10:25 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Sender: tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx
Author: mikeperry
Date: 2012-08-30 22:09:48 +0000 (Thu, 30 Aug 2012)
New Revision: 25777

Modified:
   translation/trunk/projects/torbutton/po/af/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/af/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ak/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ak/torbutton.properties.po
   translation/trunk/projects/torbutton/po/am/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/am/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ar/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ar/torbutton.properties.po
   translation/trunk/projects/torbutton/po/arn/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/arn/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ast/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ast/torbutton.properties.po
   translation/trunk/projects/torbutton/po/az/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/az/torbutton.properties.po
   translation/trunk/projects/torbutton/po/be/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/be/torbutton.properties.po
   translation/trunk/projects/torbutton/po/bg/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/bg/torbutton.properties.po
   translation/trunk/projects/torbutton/po/bn/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/bn/torbutton.properties.po
   translation/trunk/projects/torbutton/po/bn_IN/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/bn_IN/torbutton.properties.po
   translation/trunk/projects/torbutton/po/bo/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/bo/torbutton.properties.po
   translation/trunk/projects/torbutton/po/br/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/br/torbutton.properties.po
   translation/trunk/projects/torbutton/po/bs/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/bs/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ca/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ca/torbutton.properties.po
   translation/trunk/projects/torbutton/po/cs/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/cs/torbutton.properties.po
   translation/trunk/projects/torbutton/po/csb/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/csb/torbutton.properties.po
   translation/trunk/projects/torbutton/po/cy/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/cy/torbutton.properties.po
   translation/trunk/projects/torbutton/po/da/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/da/torbutton.properties.po
   translation/trunk/projects/torbutton/po/de/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/de/torbutton.properties.po
   translation/trunk/projects/torbutton/po/dz/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/dz/torbutton.properties.po
   translation/trunk/projects/torbutton/po/el/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/el/torbutton.properties.po
   translation/trunk/projects/torbutton/po/en/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/en/torbutton.properties.po
   translation/trunk/projects/torbutton/po/eo/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/eo/torbutton.properties.po
   translation/trunk/projects/torbutton/po/es/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/es/torbutton.properties.po
   translation/trunk/projects/torbutton/po/et/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/et/torbutton.properties.po
   translation/trunk/projects/torbutton/po/eu/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/eu/torbutton.properties.po
   translation/trunk/projects/torbutton/po/fa/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/fa/torbutton.properties.po
   translation/trunk/projects/torbutton/po/fi/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/fi/torbutton.properties.po
   translation/trunk/projects/torbutton/po/fil/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/fil/torbutton.properties.po
   translation/trunk/projects/torbutton/po/fo/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/fo/torbutton.properties.po
   translation/trunk/projects/torbutton/po/fr/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/fr/torbutton.properties.po
   translation/trunk/projects/torbutton/po/fur/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/fur/torbutton.properties.po
   translation/trunk/projects/torbutton/po/fy/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/fy/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ga/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ga/torbutton.properties.po
   translation/trunk/projects/torbutton/po/gl/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/gl/torbutton.properties.po
   translation/trunk/projects/torbutton/po/gu/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/gu/torbutton.properties.po
   translation/trunk/projects/torbutton/po/gun/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/gun/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ha/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ha/torbutton.properties.po
   translation/trunk/projects/torbutton/po/he/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/he/torbutton.properties.po
   translation/trunk/projects/torbutton/po/hi/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/hi/torbutton.properties.po
   translation/trunk/projects/torbutton/po/hr/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/hr/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ht/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ht/torbutton.properties.po
   translation/trunk/projects/torbutton/po/hu/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/hu/torbutton.properties.po
   translation/trunk/projects/torbutton/po/hy/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/hy/torbutton.properties.po
   translation/trunk/projects/torbutton/po/id/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/id/torbutton.properties.po
   translation/trunk/projects/torbutton/po/is/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/is/torbutton.properties.po
   translation/trunk/projects/torbutton/po/it/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/it/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ja/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ja/torbutton.properties.po
   translation/trunk/projects/torbutton/po/jv/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/jv/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ka/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ka/torbutton.properties.po
   translation/trunk/projects/torbutton/po/km/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/km/torbutton.properties.po
   translation/trunk/projects/torbutton/po/kn/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/kn/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ko/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ko/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ku/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ku/torbutton.properties.po
   translation/trunk/projects/torbutton/po/kw/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/kw/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ky/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ky/torbutton.properties.po
   translation/trunk/projects/torbutton/po/lb/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/lb/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ln/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ln/torbutton.properties.po
   translation/trunk/projects/torbutton/po/lo/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/lo/torbutton.properties.po
   translation/trunk/projects/torbutton/po/lt/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/lt/torbutton.properties.po
   translation/trunk/projects/torbutton/po/lv/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/lv/torbutton.properties.po
   translation/trunk/projects/torbutton/po/mg/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/mg/torbutton.properties.po
   translation/trunk/projects/torbutton/po/mi/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/mi/torbutton.properties.po
   translation/trunk/projects/torbutton/po/mk/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/mk/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ml/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ml/torbutton.properties.po
   translation/trunk/projects/torbutton/po/mn/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/mn/torbutton.properties.po
   translation/trunk/projects/torbutton/po/mr/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/mr/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ms/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ms/torbutton.properties.po
   translation/trunk/projects/torbutton/po/mt/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/mt/torbutton.properties.po
   translation/trunk/projects/torbutton/po/my/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/my/torbutton.properties.po
   translation/trunk/projects/torbutton/po/nah/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/nah/torbutton.properties.po
   translation/trunk/projects/torbutton/po/nap/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/nap/torbutton.properties.po
   translation/trunk/projects/torbutton/po/nb/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/nb/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ne/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ne/torbutton.properties.po
   translation/trunk/projects/torbutton/po/nl/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/nl/torbutton.properties.po
   translation/trunk/projects/torbutton/po/nn/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/nn/torbutton.properties.po
   translation/trunk/projects/torbutton/po/nso/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/nso/torbutton.properties.po
   translation/trunk/projects/torbutton/po/oc/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/oc/torbutton.properties.po
   translation/trunk/projects/torbutton/po/or/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/or/torbutton.properties.po
   translation/trunk/projects/torbutton/po/pa/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/pa/torbutton.properties.po
   translation/trunk/projects/torbutton/po/pap/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/pap/torbutton.properties.po
   translation/trunk/projects/torbutton/po/pl/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/pl/torbutton.properties.po
   translation/trunk/projects/torbutton/po/pms/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/pms/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ps/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ps/torbutton.properties.po
   translation/trunk/projects/torbutton/po/pt/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/pt/torbutton.properties.po
   translation/trunk/projects/torbutton/po/pt_BR/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/pt_BR/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ro/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ro/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ru/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ru/torbutton.properties.po
   translation/trunk/projects/torbutton/po/sco/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/sco/torbutton.properties.po
   translation/trunk/projects/torbutton/po/sk/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/sk/torbutton.properties.po
   translation/trunk/projects/torbutton/po/sl/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/sl/torbutton.properties.po
   translation/trunk/projects/torbutton/po/so/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/so/torbutton.properties.po
   translation/trunk/projects/torbutton/po/son/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/son/torbutton.properties.po
   translation/trunk/projects/torbutton/po/sq/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/sq/torbutton.properties.po
   translation/trunk/projects/torbutton/po/sr/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/sr/torbutton.properties.po
   translation/trunk/projects/torbutton/po/st/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/st/torbutton.properties.po
   translation/trunk/projects/torbutton/po/su/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/su/torbutton.properties.po
   translation/trunk/projects/torbutton/po/sv/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/sv/torbutton.properties.po
   translation/trunk/projects/torbutton/po/sw/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/sw/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ta/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ta/torbutton.properties.po
   translation/trunk/projects/torbutton/po/te/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/te/torbutton.properties.po
   translation/trunk/projects/torbutton/po/templates/torbutton.dtd.pot
   translation/trunk/projects/torbutton/po/templates/torbutton.properties.pot
   translation/trunk/projects/torbutton/po/tg/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/tg/torbutton.properties.po
   translation/trunk/projects/torbutton/po/th/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/th/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ti/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ti/torbutton.properties.po
   translation/trunk/projects/torbutton/po/tk/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/tk/torbutton.properties.po
   translation/trunk/projects/torbutton/po/tr/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/tr/torbutton.properties.po
   translation/trunk/projects/torbutton/po/uk/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/uk/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ur/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ur/torbutton.properties.po
   translation/trunk/projects/torbutton/po/ve/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/ve/torbutton.properties.po
   translation/trunk/projects/torbutton/po/vi/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/vi/torbutton.properties.po
   translation/trunk/projects/torbutton/po/wa/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/wa/torbutton.properties.po
   translation/trunk/projects/torbutton/po/wo/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/wo/torbutton.properties.po
   translation/trunk/projects/torbutton/po/zh_CN/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/zh_CN/torbutton.properties.po
   translation/trunk/projects/torbutton/po/zh_HK/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/zh_HK/torbutton.properties.po
   translation/trunk/projects/torbutton/po/zh_TW/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/zh_TW/torbutton.properties.po
   translation/trunk/projects/torbutton/po/zu/torbutton.dtd.po
   translation/trunk/projects/torbutton/po/zu/torbutton.properties.po
Log:
New translation strings.



Modified: translation/trunk/projects/torbutton/po/af/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/af/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/af/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/af/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/af/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/af/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ak/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ak/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ak/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/ak/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ak/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ak/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/am/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/am/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/am/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/am/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/am/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/am/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ar/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ar/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ar/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: Mohammed Babiker <sudanhacker@xxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -608,8 +608,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -622,3 +622,6 @@
 #: torbutton.prefs.transparentTor
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
 msgstr "ØÙØÙÙØ ØÙØÙÙÙÙØÙ (ØØØØØ ÙÙØÙ ØÙØ ØÙ ØØØÙØØÙÙØÙ ÙØØØ)"
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/ar/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ar/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ar/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: Fadi Mansour <fadi.redeemer.mansour@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -320,3 +320,33 @@
 msgstr ""
 "ÙØØÙ ØÙ ØÙÙØØ ÙÙØÙØ. ÙØØÙ ØÙØÙØ ÙØØØØ  ØÙØØ ØÙ ÙÙ ØÙÙÙ ÙØØÙØ ØÙØ ØÙÙ ÙØØØ "
 "ØØØÙÙ ØØØÙ."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/arn/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/arn/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/arn/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/arn/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/arn/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/arn/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ast/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ast/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ast/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/ast/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ast/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ast/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/az/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/az/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/az/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/az/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/az/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/az/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/be/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/be/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/be/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -597,7 +597,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/be/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/be/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/be/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -253,3 +253,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/bg/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/bg/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/bg/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/bg/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/bg/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/bg/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/bn/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/bn/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/bn/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/bn/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/bn/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/bn/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/bn_IN/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/bn_IN/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/bn_IN/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/bn_IN/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/bn_IN/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/bn_IN/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/bo/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/bo/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/bo/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/bo/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/bo/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/bo/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/br/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/br/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/br/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/br/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/br/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/br/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/bs/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/bs/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/bs/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -597,7 +597,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/bs/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/bs/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/bs/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -253,3 +253,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ca/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ca/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ca/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -610,7 +610,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/ca/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ca/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ca/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-03-07 00:21+0000\n"
 "Last-Translator: danielnayach <daniel.nayach@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -332,3 +332,33 @@
 msgstr ""
 "Sembla que el disc Ãs ple. Siusplau allibereu espai o moveu Tor Browser a un "
 "nou dispositiu."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/cs/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/cs/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/cs/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: m4iler <Mailer01100001@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -601,8 +601,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -615,3 +615,6 @@
 #: torbutton.prefs.transparentTor
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
 msgstr ""
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/cs/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/cs/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/cs/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: m4iler <Mailer01100001@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -305,3 +305,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/csb/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/csb/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/csb/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -597,7 +597,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/csb/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/csb/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/csb/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -253,3 +253,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/cy/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/cy/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/cy/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -597,7 +597,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/cy/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/cy/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/cy/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -254,3 +254,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/da/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/da/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/da/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-04-20 22:07+0000\n"
 "Last-Translator: Aputsiaq Janussen <aputtu@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -613,8 +613,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -628,3 +628,6 @@
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
 msgstr ""
 "Gennemsigtig Torifikation (KrÃver tilpasset transproxy eller Tor-router)"
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/da/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/da/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/da/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-04-20 21:29+0000\n"
 "Last-Translator: Aputsiaq Janussen <aputtu@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -324,3 +324,33 @@
 msgstr ""
 "Disken ser ud til at vÃre fuld. FrigÃr venligst plads eller flyt Tor Browser "
 "til en ny enhed."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/de/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/de/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/de/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: Sacro <Scion@xxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -648,8 +648,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -663,3 +663,6 @@
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
 msgstr ""
 "Transparente Torification (Erfordert eigenen Transproxy oder Tor-Router)"
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/de/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/de/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/de/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-03-12 10:12+0000\n"
 "Last-Translator: gerd56 <gerd56@xxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -333,3 +333,33 @@
 msgstr ""
 "Es scheint als wÃrde die Disk voll sein. Bitte machen sie etwas Platz frei, "
 "oder bewegen sie den Tor-Browser auf ein neues GerÃt."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/dz/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/dz/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/dz/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/dz/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/dz/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/dz/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/el/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/el/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/el/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-24 18:59+0000\n"
 "Last-Translator: Ioannis Stilianakos <stilia.johny@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -645,8 +645,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -662,3 +662,6 @@
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
 msgstr ""
 "ÎÎÎÏÎÎÎÏ Torification  (ÎÏÎÎÏÎÎ ÏÏÎÏÎÏÎÎÏÎÎÎÎ  proxy Î Tor ÎÏÎÎÎÎÎÎÎÏÎ)"
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/el/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/el/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/el/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-04-22 17:13+0000\n"
 "Last-Translator: anvo <fragos.george@xxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -338,3 +338,33 @@
 msgstr ""
 "Î ÎÎÏÎÎÏ ÏÎÎÎÎÏÎÎ ÏÏÎ ÎÎÎÎÎ ÎÎÎÎÏÎÏ. ÎÎÏÎÎÎÎÎÏÎÎ ÎÎÎÏÎÎÏÏÏÏÎ ÏÏÏÎ ÏÏÎÎ ÎÎÏÎÎ "
 "Î ÎÎÏÎÎÎÎÎÏÏÎ ÏÎÎ ÎÏÎÎÎÎÎÏÏÎÏÎ Tor ÏÎ ÎÎÏÎÎÎÎ ÎÎÎÎ ÎÎÏÎÎ."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/en/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/en/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/en/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-27 18:33-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-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"
@@ -594,7 +594,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/en/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/en/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/en/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-09 23:45-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-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"
@@ -251,3 +251,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/eo/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/eo/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/eo/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-03-11 20:46+0000\n"
 "Last-Translator: aleksejrs <deletesoftware@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -597,7 +597,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/eo/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/eo/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/eo/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/es/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/es/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/es/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: Gioyik <gioyik@xxxxxxxxx>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/";
@@ -640,8 +640,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -656,3 +656,6 @@
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
 msgstr ""
 "TorificaciÃn transparente (Requiere transproxy personalizado o router Tor)"
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/es/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/es/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/es/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: lenazun <lenazun@xxxxxxxxx>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/";
@@ -333,3 +333,33 @@
 msgstr ""
 "El disco parece estar lleno. Por favor libere espacio o mueva el Navegador "
 "Tor a un nuevo dispositivo."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/et/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/et/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/et/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -597,7 +597,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/et/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/et/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/et/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -1,14 +1,15 @@
 #
 # Translators:
+#   <boamaod@xxxxxxxxx>, 2012.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 #. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
-"PO-Revision-Date: 2012-02-14 09:45+0000\n"
-"Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
+"PO-Revision-Date: 2012-06-21 19:41+0000\n"
+"Last-Translator: boamaod <boamaod@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
@@ -245,11 +246,11 @@
 
 #: torbutton.popup.redirect
 msgid "Redirect"
-msgstr ""
+msgstr "Suuna Ãmber"
 
 #: torbutton.popup.no_redirect
 msgid "Don't Redirect"
-msgstr ""
+msgstr "Ãra suuna Ãmber"
 
 #: torbutton.popup.prompted_language
 msgid ""
@@ -294,3 +295,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/eu/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/eu/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/eu/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-03-06 17:13+0000\n"
 "Last-Translator: Antxon Baldarra <baldarra@xxxxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -620,8 +620,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -635,3 +635,6 @@
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
 msgstr ""
 "Torifikazio Gardena (transproxy pertsonalizatua edo Tor routerra behar du)"
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/eu/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/eu/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/eu/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-03-05 19:09+0000\n"
 "Last-Translator: Antxon Baldarra <baldarra@xxxxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -332,3 +332,33 @@
 msgstr ""
 "Diska beteta dago, antza. Mesedez egizu lekua edo mugitu Tor Nabigatzailea "
 "gailu berri batera."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/fa/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/fa/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/fa/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: greenwave <green.dove1388@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -635,8 +635,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -653,3 +653,6 @@
 msgstr ""
 "ØØØÚØØØØØÛ ØØ ØÙØ ØÙ ØÙØØ ØÙØÙ (ÙÙØØ ØÙ ØÙÙØØ ØÙØ ÙØ Tor router Ù ÙØ "
 "transproxy ØÙØØØÛ ØØØØ)"
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/fa/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/fa/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/fa/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: greenwave <green.dove1388@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -325,3 +325,33 @@
 msgstr ""
 "ØÛØÚ ØÙ ÙØØ ÙÛ ØØØ ÙØ ØØÙ ØØØ. ÙØÙØ ÙÙØØØÛ ÙØØ ØØÙÛ ÚÙÛØ ÛØ ØÙØ ØØ ØÙ ÙÚØÙ "
 "ØØÛØÛ ØÙØÙØÙ ØÙÛØ."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/fi/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/fi/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/fi/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -625,8 +625,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -641,3 +641,6 @@
 #: torbutton.prefs.transparentTor
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
 msgstr ""
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/fi/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/fi/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/fi/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: morso <debris@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -329,3 +329,33 @@
 msgstr ""
 "Levy nÃyttÃisi olevan tÃysi. Vapauta tilaa tai siirrÃ Tor Browser uudelle "
 "laitteelle."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/fil/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/fil/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/fil/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/fil/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/fil/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/fil/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/fo/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/fo/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/fo/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/fo/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/fo/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/fo/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/fr/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/fr/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/fr/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: Pierre Antoine <pierre.antoine@xxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -643,8 +643,8 @@
 msgstr "yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -661,3 +661,6 @@
 msgstr ""
 "Torification transparente (requiert un transproxy personnalisÃ ou un routeur "
 "Tor)"
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/fr/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/fr/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/fr/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: Pierre Antoine <pierre.antoine@xxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -339,3 +339,33 @@
 msgstr ""
 "Le disque semble Ãtre plein. Merci de libÃrer de la place ou dÃplacer le "
 "Navigateur Tor vers un nouveau pÃriphÃrique. "
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/fur/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/fur/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/fur/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/fur/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/fur/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/fur/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/fy/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/fy/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/fy/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/fy/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/fy/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/fy/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ga/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ga/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ga/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -597,7 +597,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/ga/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ga/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ga/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -253,3 +253,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/gl/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/gl/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/gl/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/gl/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/gl/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/gl/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/gu/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/gu/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/gu/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -597,8 +597,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -611,3 +611,6 @@
 #: torbutton.prefs.transparentTor
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
 msgstr ""
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/gu/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/gu/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/gu/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -253,3 +253,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/gun/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/gun/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/gun/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/gun/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/gun/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/gun/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ha/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ha/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ha/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/ha/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ha/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ha/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/he/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/he/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/he/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: Something Another <roeyjobsyud@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -598,7 +598,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/he/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/he/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/he/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: Amichay P. K. <am1chay.p.k@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -307,3 +307,33 @@
 "new device."
 msgstr ""
 "××××× ×××× ××× ××× ××××× ××××. ××× ××× ×××× ×× ×××× ×× ××××× Tor ×××××× ×××."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/hi/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/hi/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/hi/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -600,7 +600,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/hi/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/hi/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/hi/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/hr/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/hr/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/hr/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: cisterna <jan.lovrinic@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -603,7 +603,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/hr/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/hr/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/hr/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -255,3 +255,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ht/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ht/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ht/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/ht/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ht/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ht/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/hu/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/hu/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/hu/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: vargaviktor <viktor.varga@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -641,8 +641,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -656,3 +656,6 @@
 #: torbutton.prefs.transparentTor
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
 msgstr "ÃtlÃtszÃ Tor-osÃtÃs (Egyedi transproxy-t vagy Tor routert igÃnyel)"
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/hu/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/hu/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/hu/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: vargaviktor <viktor.varga@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -327,3 +327,33 @@
 msgstr ""
 "Ãgy tÅnik, hogy a lemez megtelt. KÃrjÃk, szabadÃtson fel helyet, vagy "
 "helyezze Ãt a Tor Browser-t egy mÃsik hÃttÃrtÃrolÃra."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/hy/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/hy/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/hy/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/hy/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/hy/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/hy/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/id/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/id/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/id/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -612,8 +612,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -626,3 +626,6 @@
 #: torbutton.prefs.transparentTor
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
 msgstr ""
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/id/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/id/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/id/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -1,14 +1,15 @@
 #
 # Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
+#   <SecretCommission@xxxxxxxxxxx>, 2012.
 #. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
-"PO-Revision-Date: 2012-02-14 09:45+0000\n"
-"Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
+"PO-Revision-Date: 2012-08-21 05:28+0000\n"
+"Last-Translator: Jaya Wijaya <SecretCommission@xxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
@@ -270,6 +271,11 @@
 "\n"
 "Would you like to request English language web pages for better privacy?"
 msgstr ""
+"Untuk memberikan Anda kerahasiaan yang lebih, Torbutton akan meminta versi "
+"bahasa Inggris dari halaman web. Ini mungkin menyebabkan halaman web yang "
+"Anda ingin baca dalam bahasa asli Anda akan ditampilkan dalam bahasa "
+"Inggris. â â Apakah anda mau meminta halaman web bahasa Inggris untuk "
+"kerahasiaan yang lebih baik?"
 
 #: torbutton.popup.no_newnym
 msgid ""
@@ -278,6 +284,9 @@
 "\n"
 "Are you running Tor Browser Bundle?"
 msgstr ""
+"Torbution tidak dapat memberikan Anda identitas baru secara aman. Torbutton "
+"tidak memiliki akses terhadap Tor Control Port. ââ Apakah Anda sedang "
+"menjalankan paket browser Tor?"
 
 #: torbutton.popup.use_tbb
 msgid ""
@@ -288,20 +297,59 @@
 "sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following "
 "URL: "
 msgstr ""
+"Tampaknya Anda menggunakan Torbutton dengan Firefox, yang mana bukan lagi "
+"merupakan konfigurasi aman yang direkomendasikan.ââ sebaliknya, Kami "
+"rekomendasikan Anda untuk mendapatkan paket browser Tor yang terbaru dengan "
+"mengirimkan email ke gettor@xxxxxxxxxxxxxx atau dengan mendownload melalui "
+"URL berikut:"
 
 #: torbutton.popup.pref_error
 msgid ""
 "Torbutton cannot update preferences in the Tor Browser profile directory."
 msgstr ""
+"Torbutton tidak dapat memperbarui preferensi di dalam petunjuk profil "
+"browser Tor."
 
 #: torbutton.popup.permission_denied
 msgid ""
 "Please either reset the permissions of the Tor Browser directory or copy it "
 "to a new location."
-msgstr ""
+msgstr "Silahkan reset izin petunjuk dari browser Tor atau copy ke lokasi baru"
 
 #: torbutton.popup.device_full
 msgid ""
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+"Disk tampaknya sudah penuh. Harap kosongkan tempat atau pindahkan browser "
+"Tor ke alat baru."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/is/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/is/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/is/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/is/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/is/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/is/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/it/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/it/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/it/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: n0on3 <a.n0on3@xxxxxxxxx>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/";
@@ -647,8 +647,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -663,3 +663,6 @@
 msgstr ""
 "Torificazione trasparente (richiede un transproxy personalizzato o un tor "
 "router)"
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/it/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/it/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/it/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: n0on3 <a.n0on3@xxxxxxxxx>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/";
@@ -332,3 +332,33 @@
 msgstr ""
 "Sembra che il disco sia pieno. Liberare spazio o spostare Tor Browser in un "
 "altro dispositivo."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ja/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ja/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ja/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -602,7 +602,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/ja/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ja/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ja/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-03-25 14:57+0000\n"
 "Last-Translator: Eshin Kunishima <kaoru@xxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -290,3 +290,33 @@
 msgstr ""
 "èæèçãçãåéãäèãããããããããçãåéãåããããTorãããããæ"
 "ããèæèçãçåããããããã"
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/jv/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/jv/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/jv/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/jv/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/jv/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/jv/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ka/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ka/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ka/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/ka/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ka/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ka/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/km/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/km/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/km/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/km/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/km/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/km/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/kn/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/kn/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/kn/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/kn/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/kn/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/kn/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ko/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ko/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ko/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -1,13 +1,15 @@
 #
 # Translators:
+#   <cwt967@xxxxxxxxx>, 2012.
+#   <pcsori@xxxxxxxxx>, 2012.
 #. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
-"PO-Revision-Date: 2010-12-05 19:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
+"PO-Revision-Date: 2012-07-08 13:04+0000\n"
+"Last-Translator: cwt96 <cwt967@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
@@ -19,115 +21,115 @@
 
 #: torbutton.prefs.title
 msgid "Torbutton Preferences"
-msgstr ""
+msgstr "Torbutton íê ìì"
 
 #: torbutton.prefs.display_settings
 msgid "Display Settings"
-msgstr ""
+msgstr "íë ìì"
 
 #: torbutton.prefs.display_panel
 msgid "Display Tor proxy setting in the status bar"
-msgstr ""
+msgstr "ìíëì Tor íëì ììì íì"
 
 #: torbutton.prefs.panel_format
 msgid "Status bar display format:"
-msgstr ""
+msgstr "ìí ë íì íí : "
 
 #: torbutton.prefs.panel_text_format
 msgid "Text"
-msgstr ""
+msgstr "íìí"
 
 #: torbutton.prefs.panel_icon_format
 msgid "Icon"
-msgstr ""
+msgstr "ììì"
 
 #: torbutton.prefs.tor_settings
 msgid "Proxy Settings"
-msgstr ""
+msgstr "íëì ìì"
 
 #: torbutton.prefs.recommended_settings
 msgid "Use the recommended proxy settings for my version of Firefox"
-msgstr ""
+msgstr "ëê ììíê ìë íììíìë ìí ìì ìì ìì"
 
 #: torbutton.prefs.use_privoxy
 msgid "Use Privoxy"
-msgstr ""
+msgstr "Privoxy ìì"
 
 #: torbutton.prefs.use_polipo
 msgid "Use Polipo"
-msgstr ""
+msgstr "Polipo ìì"
 
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
-msgstr ""
+msgstr "ììì íëì ìì ìì"
 
 #: torbutton.prefs.proxy.host.http
 msgid "HTTP Proxy:"
-msgstr ""
+msgstr "HTTP Proxy:"
 
 #: torbutton.prefs.proxy.host.https
 msgid "SSL Proxy:"
-msgstr ""
+msgstr "SSL Proxy:"
 
 #: torbutton.prefs.proxy.host.ftp
 msgid "FTP Proxy:"
-msgstr ""
+msgstr "FTP Proxy:"
 
 #: torbutton.prefs.proxy.host.gopher
 msgid "Gopher Proxy:"
-msgstr ""
+msgstr "Gopher Proxy:"
 
 #: torbutton.prefs.proxy.host.socks
 msgid "SOCKS Host:"
-msgstr ""
+msgstr "SOCKS Host:"
 
 #: torbutton.prefs.proxy.port
 msgid "Port:"
-msgstr ""
+msgstr "íí : "
 
 #: torbutton.about.title
 msgid "About Torbutton"
-msgstr ""
+msgstr "Torbuttonì ëíì"
 
 #: torbutton.about.version
 msgid "Version:"
-msgstr ""
+msgstr "ëì:"
 
 #: torbutton.about.summary
 msgid "Protects the privacy of your Tor browsing."
-msgstr ""
+msgstr "Tor ëëììì íëìëì ëí"
 
 #: torbutton.about.code
 msgid "Code Contributors:"
-msgstr ""
+msgstr "ìë êíì:"
 
 #: torbutton.about.maintainer
 msgid "Maintainer:"
-msgstr ""
+msgstr "êëì :"
 
 #: torbutton.about.security_review
 msgid "Security Review:"
-msgstr ""
+msgstr "ëì ëë:"
 
 #: torbutton.about.donate
 msgid "If you like using Tor, you might consider"
-msgstr ""
+msgstr "Torë ììíë êì ìììëë, êìí ì ììëë"
 
 #: torbutton.about.make_donation
 msgid "making a donation."
-msgstr ""
+msgstr "êëíê"
 
 #: torbutton.pref_connection.notice
 msgid "Disable Torbutton to change these settings."
-msgstr ""
+msgstr "ì ììì ëêë êì ëíìííëë"
 
 #: torbutton.pref_connection.more_info
 msgid "More information"
-msgstr ""
+msgstr "ë ëì ìë"
 
 #: torbutton.pref_connection_more_info.title
 msgid "Help"
-msgstr ""
+msgstr "ëìë"
 
 #: torbutton.pref_connection_more_info.text
 msgid ""
@@ -135,478 +137,487 @@
 "proxy settings, please disable Torbutton and return here.  If you would like "
 "to change your Tor settings, please use the Torbutton preference window."
 msgstr ""
+"Torbuttonì íì íìíëììëë.  ëì Tor íëìë ììíì ìììëë, "
+"Torbuttonì ëíìííê ìêë ëëí ìììì.  ëì Tor ììì ëêê ìì"
+"ìëë, Torbutton ìì íëì ììí ìììì."
 
 #: torbutton.context_menu.new_identity
 msgid "New Identity"
-msgstr ""
+msgstr "ìëì ìì"
 
 #: torbutton.context_menu.new_identity_key
 msgid "I"
-msgstr ""
+msgstr "I"
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
-msgstr ""
+msgstr "Tor ìí íê"
 
 #: torbutton.context_menu.toggle.key
 msgid "T"
-msgstr ""
+msgstr "T"
 
 #: torbutton.context_menu.preferences
 msgid "Preferences..."
-msgstr ""
+msgstr "ìì..."
 
 #: torbutton.context_menu.preferences.key
 msgid "P"
-msgstr ""
+msgstr "P"
 
 #: torbutton.context_menu.about
 msgid "About Torbutton..."
-msgstr ""
+msgstr "Torbuttonì ëíì"
 
 #: torbutton.context_menu.about.key
 msgid "A"
-msgstr ""
+msgstr "A"
 
 #: torbutton.context_menu.cookieProtections
 msgid "Cookie Protections"
-msgstr ""
+msgstr "ìí ëí"
 
 #: torbutton.context_menu.cookieProtections.key
 msgid "C"
-msgstr ""
+msgstr "C"
 
 #: torbutton.context_menu.copyTor
 msgid "Copy Tor URL"
-msgstr ""
+msgstr "Tor URL ëì"
 
 #: torbutton.context_menu.copyTor.key
 msgid "p"
-msgstr ""
+msgstr "P"
 
 #: torbutton.context_menu.openTorTab
 msgid "Open Tor URL in new Tab"
-msgstr ""
+msgstr "Tor URLì ì íìì ìê"
 
 #: torbutton.context_menu.openTorTab.key
 msgid "r"
-msgstr ""
+msgstr "r"
 
 #: torbutton.context_menu.openTorWindow
 msgid "Open Tor URL in new Window"
-msgstr ""
+msgstr "Tor URLì ì ììì ìê"
 
 #: torbutton.context_menu.openTorWindow.key
 msgid "d"
-msgstr ""
+msgstr "d"
 
 #: torbutton.button.label
 msgid "Torbutton"
-msgstr ""
+msgstr "Torbutton"
 
 #: torbutton.button.tooltip
 msgid "Click to initialize Torbutton"
-msgstr ""
+msgstr "Torbutton ìêí"
 
 #: torbutton.prefs.sec_settings
 msgid "Security Settings"
-msgstr ""
+msgstr "ëì ìì"
 
 #: torbutton.prefs.block_thread
 msgid "Block history reads during Tor (crucial)"
-msgstr ""
+msgstr "Tor ììíë ëì íìíëë ìë êì ëê (ìì)"
 
 #: torbutton.prefs.block_thwrite
 msgid "Block history writes during Tor (recommended)"
-msgstr ""
+msgstr "Tor ììì íìíë ìê ëê (ìì)"
 
 #: torbutton.prefs.block_nthread
 msgid "Block history reads during Non-Tor (optional)"
-msgstr ""
+msgstr "Torë ììíì ìì ë íìíëë ìë êì ëê (ìí)"
 
 #: torbutton.prefs.block_nthwrite
 msgid "Block history writes during Non-Tor (optional)"
-msgstr ""
+msgstr "Torë ììíì ìì ë íìíëë ìë êì ëê (ìí)"
 
 #: torbutton.prefs.clear_history
 msgid "Clear history on Tor toggle (optional)"
-msgstr ""
+msgstr "Tor Toggleìì íìíë ìêí (ìí)"
 
 #: torbutton.prefs.clear_cache
 msgid "Block Tor disk cache and clear all cache on Tor toggle"
-msgstr ""
+msgstr "Tor ëìí ììë ëê Tor Toggleìì ëë ìì ìêí"
 
 #: torbutton.prefs.block_cache
 msgid "Block disk and memory cache access during Tor"
-msgstr ""
+msgstr "Tor ìëì ëìíì ëëë ìì ìê ìë"
 
 #: torbutton.prefs.cookie_jars
 msgid "Store Non-Tor cookies in a protected jar"
-msgstr ""
+msgstr "ëíëë íìëì Torê ìë ìí ìì"
 
 #: torbutton.prefs.cookie_protection
 msgid "Use the Cookie Protections Dialog to choose"
-msgstr ""
+msgstr "ìííê ìí ìí ëí ëììëê ìì"
 
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
-msgstr ""
+msgstr "ëë ìëìë ë ìíë êëí êìëë (ìí)"
 
 #: torbutton.prefs.clear_cookies
 msgid "Clear cookies on Tor toggle"
-msgstr ""
+msgstr "Tor toggleìì ìí ìêí"
 
 #: torbutton.prefs.disable_plugins
 msgid "Disable plugins during Tor usage (crucial)"
-msgstr ""
+msgstr "Tor ììì íëêì ëíìí (ìë)"
 
 #: torbutton.prefs.kill_bad_js
 msgid "Hook dangerous javascript (crucial)"
-msgstr ""
+msgstr "ìíí ìëìíëí ìììê (ìì)"
 
 #: torbutton.prefs.isolate_content
 msgid "Isolate dynamic content to Tor state (crucial)"
-msgstr ""
+msgstr "Tor ìíìì ëìì ìíì êë (ìì)"
 
 #: torbutton.prefs.no_updates
 msgid "Disable updates during Tor usage"
-msgstr ""
+msgstr "Tor ììì ìëìí ëíìí"
 
 #: torbutton.prefs.set_uagent
 msgid "Set user agent for Tor usage (crucial)"
-msgstr ""
+msgstr "Tor ììì ìì ìììí ìì  (ìì)"
 
 #: torbutton.prefs.dynamic
 msgid "Dynamic Content"
-msgstr ""
+msgstr "ëì ìíì"
 
 #: torbutton.prefs.cookies
 msgid "Cookies"
-msgstr ""
+msgstr "ìí"
 
 #: torbutton.prefs.cache
 msgid "Cache"
-msgstr ""
+msgstr "ìì"
 
 #: torbutton.prefs.history
 msgid "History"
-msgstr ""
+msgstr "íìíë"
 
 #: torbutton.prefs.no_search
 msgid "Disable search suggestions during Tor (recommended)"
-msgstr ""
+msgstr "Tor ììì êì ìì ìì ëíìí (ìì)"
 
 #: torbutton.prefs.shutdown
 msgid "Shutdown"
-msgstr ""
+msgstr "ìë"
 
 #: torbutton.prefs.tor_shutdown
 msgid "Clear Tor cookies during Tor-enabled browser shutdown"
-msgstr ""
+msgstr "Torê íìíë ëëììê êìë ëì ìí ìì"
 
 #: torbutton.prefs.all_shutdown
 msgid "Clear cookies during any browser shutdown"
-msgstr ""
+msgstr "ìë ëëììëë êìë ìí ìì"
 
 #: torbutton.prefs.no_shutdown
 msgid "Do not clear my cookies at shutdown"
-msgstr ""
+msgstr "ìëì ìíë ììíì ìì"
 
 #: torbutton.prefs.disable_sessionstore
 msgid "Disable Session Saving (recommended)"
-msgstr ""
+msgstr "ììì ììíì ìì (ìì)"
 
 #: torbutton.prefs.headers
 msgid "Headers"
-msgstr ""
+msgstr "íë"
 
 #: torbutton.prefs.spoof_english
 msgid "Spoof US English Browser"
-msgstr ""
+msgstr "US ìì ëëììë ìì"
 
 #: torbutton.prefs.refererspoofing
 msgid "Referer spoofing"
-msgstr ""
+msgstr "ëíë ìì"
 
 #: torbutton.prefs.spoofblank
 msgid "Spoof blank referer during Tor usage (may break some sites)"
-msgstr ""
+msgstr "Tor ììì ëíëë êëìë ìì (ëë ììíìì ëìíì ìì)"
 
 #: torbutton.prefs.smartspoof
 msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
-msgstr ""
+msgstr "Tor ììì ìëí ëíë ìì (ëëì ëíëë êëìë ìì)"
 
 #: torbutton.prefs.nospoof
 msgid "No referer spoof during Tor usage (sends referers as normal)"
-msgstr ""
+msgstr "Tor ììì ëíëë ììì ìì (ëíëë ìëììë ëë)"
 
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
-msgstr ""
+msgstr "Tor ììì DOM ììì ëíìí (ìì)"
 
 #: torbutton.prefs.forms
 msgid "Forms"
-msgstr ""
+msgstr "ìì"
 
 #: torbutton.prefs.block_tforms
 msgid "Block password+form saving during Tor (recommended)"
-msgstr ""
+msgstr "Tor ììì ëëëíì ìì ìì ëê (ìì)"
 
 #: torbutton.prefs.block_ntforms
 msgid "Block password+form saving during Non-Tor (optional)"
-msgstr ""
+msgstr "Torë ììíì ìì ë ëëëíì ìì ìì ëê (ìì)"
 
 #: torbutton.prefs.tor
 msgid "Tor"
-msgstr ""
+msgstr "Tor"
 
 #: torbutton.prefs.non_tor
 msgid "Non-Tor"
-msgstr ""
+msgstr "Non-Tor"
 
 #: torbutton.prefs.restore_tor
 msgid "On session restored startup, set Tor state to:"
-msgstr ""
+msgstr "ììì ììë ììì ìëë, Tor ìíë ëìê êì íëë."
 
 #: torbutton.prefs.startup_tor
 msgid "On browser startup, set Tor state to:"
-msgstr ""
+msgstr "ëëììê ììë ë, Tor ìí : "
 
 #: torbutton.prefs.reload_crashed_jar
 msgid "Reload cookie jar/clear cookies on Firefox crash (recommended)"
 msgstr ""
+"íììíìê ìëë ìëëììë Cookie Jarë ëì ëëíê ìíë ìêíë"
+"ë."
 
 #: torbutton.prefs.dual_cookie_jars
 msgid "Store both Tor and Non-Tor cookies in protected jars (dangerous)"
-msgstr ""
+msgstr "ëíë Jar íìì Tor ë ë-Tor ìí ìì (ìí)"
 
 #: torbutton.prefs.clear_http_auth
 msgid "Clear HTTP auth sessions (recommended)"
-msgstr ""
+msgstr "HTTP ìì ìì ììê (êì)"
 
 #: torbutton.prefs.block_js_history
 msgid "Isolate access to history navigation to Tor state (crucial)"
-msgstr ""
+msgstr "Tor ìíë íì êëì ëí ììì ëë (ìì)"
 
 #: torbutton.prefs.resize_on_toggle
 msgid "Resize windows to multiples of 50px during Tor usage (recommended)"
-msgstr ""
+msgstr "Torë ììíë ëì 50 íìì ëìë ì íê ìì (êì)"
 
 #: torbutton.prefs.close_tor
 msgid "Close all Tor windows and tabs on toggle (optional)"
-msgstr ""
+msgstr "ìí ì ëë Tor ìê í ëê (ìì)"
 
 #: torbutton.prefs.close_nontor
 msgid "Close all Non-Tor windows and tabs on toggle (optional)"
-msgstr ""
+msgstr "ìí ì ëë ë-Tor ìê í ëê (ìì)"
 
 #: torbutton.prefs.block_links
 msgid "Block link clicks and page reloads from different Tor states (optional)"
 msgstr ""
+"ëë Tor ìíëëí ëí íëê íììë ëì ëëíë êì ëì (ìí)"
 
 #: torbutton.prefs.jar_certs
 msgid "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"
-msgstr ""
+msgstr "SSL ìììë Tor/Non-Torì ëì ëë ëêìì ëê (ìì)"
 
 #: torbutton.prefs.jar_ca_certs
 msgid "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"
-msgstr ""
+msgstr "CA ìììë Tor/Non-Torì ëì ëë ëêìì ëê (ìì)"
 
 #: torbutton.prefs.locked_mode
 msgid "Disable Button and Hotkeys to prevent accidental toggle"
-msgstr ""
+msgstr "êììì íêì ëë ëíê ëìíë ëíìííëë."
 
 #: torbutton.prefs.startup_state
 msgid "On normal startup, set Tor state to:"
-msgstr ""
+msgstr "ìëìì ìììì, Tor ìí ìì :"
 
 #: torbutton.prefs.shutdown_state
 msgid "Shutdown state"
-msgstr ""
+msgstr "ìëë ìí"
 
 #: torbutton.prefs.startup
 msgid "Startup"
-msgstr ""
+msgstr "ìì"
 
 #: torbutton.prefs.block_tor_file_net
 msgid "Block Tor access to network from file:// urls (recommended)"
-msgstr ""
+msgstr "file:// urlë Torì ìêì ëì (ìì)"
 
 #: torbutton.prefs.block_nontor_file_net
 msgid "Block Non-Tor access to network from file:// urls"
-msgstr ""
+msgstr "file:// urlë Torë ììììì ìì ìíìì ìêì ëì"
 
 #: torbutton.prefs.restore_defaults
 msgid "Restore Defaults"
-msgstr ""
+msgstr "ìì ìêí"
 
 #: torbutton.prefs.test_settings
 msgid "Test Settings"
-msgstr ""
+msgstr "ìì íìí"
 
 #: torbutton.prefs.test_auto
 msgid ""
 "Test my Tor settings after the first time I toggle on every Firefox start"
-msgstr ""
+msgstr "íììíìê ììí ëëë ë Tor ìì íì"
 
 #: torbutton.prefs.disable_livemarks
 msgid "Disable livemarks updates during Tor usage"
-msgstr ""
+msgstr "Tor ììì livemarks ìëìí ëíìí"
 
 #: torbutton.prefs.tor_memory_jar
 msgid "Do not write Tor cookies to disk"
-msgstr ""
+msgstr "Tor ìíë ëìíì ìì ìì"
 
 #: torbutton.prefs.nontor_memory_jar
 msgid "Do not write Non-Tor cookies to disk"
-msgstr ""
+msgstr "Torê ìë ìíë ëìíì ìì ìì"
 
 #: torbutton.prefs.session_restore
 msgid "Have the session store save and restore these tabs:"
-msgstr ""
+msgstr "ìì ìììê ìëí íì ììíê ëìíìëë"
 
 #: torbutton.prefs.nontor_tabs
 msgid "Tabs loaded in Non-Tor"
-msgstr ""
+msgstr "Torê ìë ëëë í"
 
 #: torbutton.prefs.tor_tabs
 msgid "Tabs loaded in Tor"
-msgstr ""
+msgstr "Torìì ëëë í"
 
 #: torbutton.prefs.socks_vfour
 msgid "SOCKS v4"
-msgstr ""
+msgstr "SOCKS v4"
 
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
-msgstr ""
+msgstr "SOCKS v5"
 
 #: torbutton.prefs.no_proxies_on
 msgid "No Proxies for: "
-msgstr ""
+msgstr "ëì ììììë íëìë ììíì ìì :"
 
 #: torbutton.prefs.no_proxy_warning
 msgid "Warning: Avoid using any hostnames above"
-msgstr ""
+msgstr "ìì : ìë íìíëìì ìëìì ììíë êì ííììì."
 
 #: torbutton.prefs.spoofreresh
 msgid "Spoof Refresh"
-msgstr ""
+msgstr "Spoof Refresh"
 
 #: torbutton.prefs.refereroptions
 msgid "Referer Spoofing Options"
-msgstr ""
+msgstr "Referer Spoofing ìì"
 
 #: torbutton.prefs.nospoof
 msgid "Do not spoof referer"
-msgstr ""
+msgstr "ëíëë spoof íì ëììì"
 
 #: torbutton.prefs.spoofroot
 msgid "Spoof the containing folder of the page"
-msgstr ""
+msgstr "íìì íëë íííë spoof"
 
 #: torbutton.prefs.spoofdomain
 msgid "Spoof the domain as referer"
-msgstr ""
+msgstr "ëìëì ëíëë spoof íììì"
 
 #: torbutton.prefs.spoofblank
 msgid "Make referer blank"
-msgstr ""
+msgstr "refererë êëìë ëëê"
 
 #: torbutton.cookiedialog.title
 msgid "Manage Cookie Protections"
-msgstr ""
+msgstr "ìí ëí êë"
 
 #: torbutton.cookiedialog.lockCol
 msgid "Protected"
-msgstr ""
+msgstr "ëíë"
 
 #: torbutton.cookiedialog.domainCol
 msgid "Host"
-msgstr ""
+msgstr "Host"
 
 #: torbutton.cookiedialog.nameCol
 msgid "Name"
-msgstr ""
+msgstr "ìë"
 
 #: torbutton.cookiedialog.pathCol
 msgid "Path"
-msgstr ""
+msgstr "êë"
 
 #: torbutton.cookiedialog.protectCookie
 msgid "Protect Cookie"
-msgstr ""
+msgstr "ìí ëí"
 
 #: torbutton.cookiedialog.removeCookie
 msgid "Remove Cookie"
-msgstr ""
+msgstr "ìí ìì"
 
 #: torbutton.cookiedialog.unprotectCookie
 msgid "Unprotect Cookie"
-msgstr ""
+msgstr "ìí ëííì ìì"
 
 #: torbutton.cookiedialog.removeAllBut
 msgid "Remove All But Protected"
-msgstr ""
+msgstr "ëíë ê ëê ëë ììê"
 
 #: torbutton.cookiedialog.saveAllCookies
 msgid "Protect New Cookies"
-msgstr ""
+msgstr "ìëì ìí ëí"
 
 #: torbutton.cookiedialog.doNotSaveAllCookies
 msgid "Do Not Protect New Cookies"
-msgstr ""
+msgstr "ìëì ìíë ëííì ìì"
 
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
-msgstr ""
+msgstr "Tor toggle ëì Livemark ìëìí ëíìí"
 
 #: torbutton.prefs.dtd_recommended
 msgid "(recommended)"
-msgstr ""
+msgstr "(ìì)"
 
 #: torbutton.prefs.dtd_optional
 msgid "(optional)"
-msgstr ""
+msgstr "(ìí)"
 
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
-msgstr ""
+msgstr "(ìì)"
 
 #: torbutton.prefs.update_torbutton_via_tor
 msgid "Redirect Torbutton updates through Tor"
-msgstr ""
+msgstr "Torbutton ìëìíë Torë ëëìëí"
 
 #: torbutton.prefs.dodge_google_captcha
 msgid ""
 "Automatically use an alternate search engine when presented with a Google "
 "Captcha:"
-msgstr ""
+msgstr "Google Captcha ê êìëììë ìëììë ëë êì ìì ìì"
 
 #: torbutton.prefs.engine1
 msgid "ixquick.com"
-msgstr ""
+msgstr "ixquick.com"
 
 #: torbutton.prefs.engine2
 msgid "Bing.com"
-msgstr ""
+msgstr "Bing.com"
 
 #: torbutton.prefs.engine3
 msgid "Yahoo.com"
-msgstr ""
+msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
-msgstr ""
+msgstr "duckduckgo.com"
 
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
-msgstr ""
+msgstr "êê êì ìëì íëíê ìì ìëë ëêë"
 
 #: torbutton.prefs.transparentTor
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
-msgstr ""
+msgstr "íë Toritication (ììì transproxyë Tor ëìí íì)"
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/ko/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ko/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ko/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -1,13 +1,14 @@
 #
 # Translators:
+#   <cwt967@xxxxxxxxx>, 2012.
 #. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
-"PO-Revision-Date: 2010-12-05 19:40+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
+"PO-Revision-Date: 2012-07-08 13:30+0000\n"
+"Last-Translator: cwt96 <cwt967@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
@@ -19,41 +20,43 @@
 
 #: torbutton.button.tooltip.disabled
 msgid "Enable Tor"
-msgstr ""
+msgstr "Tor íìí"
 
 #: torbutton.button.tooltip.enabled
 msgid "Disable Tor"
-msgstr ""
+msgstr "Tor ëíìí"
 
 #: torbutton.panel.tooltip.disabled
 msgid "Click to enable Tor"
-msgstr ""
+msgstr "Torë íìííëë íë"
 
 #: torbutton.panel.tooltip.enabled
 msgid "Click to disable Tor"
-msgstr ""
+msgstr "Torë ëíìííëë íë"
 
 #: torbutton.panel.plugins.disabled
 msgid "Click to enable plugins"
-msgstr ""
+msgstr "íëêìì íìííëë íë"
 
 #: torbutton.panel.plugins.enabled
 msgid "Click to disable plugins"
-msgstr ""
+msgstr "íëêìì ëíìííëë íë"
 
 #: torbutton.panel.label.disabled
 msgid "Tor Disabled"
-msgstr ""
+msgstr "Tor ëíìí"
 
 #: torbutton.panel.label.enabled
 msgid "Tor Enabled"
-msgstr ""
+msgstr "Tor íìí"
 
 #: extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description
 msgid ""
 "Torbutton provides a button to easily enable or disable pointing Firefox to "
 "the Tor proxy"
 msgstr ""
+"Torbuttonì Firefoxê Tor íëìë ììíêë ììíì ìëë ìê í ìë ë"
+"íìëë."
 
 #: torbutton.popup.history.warning
 msgid ""
@@ -67,6 +70,14 @@
 "To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
 "\n"
 msgstr ""
+"Torbuttonì ëë Tor ìíìì ìë íì íëì ëììëë.\n"
+"\n"
+"ìêì Firefox ëê 409737ê 417869 ëëì ììëìëë.\n"
+"\n"
+"ëì ì íìì ìì ìì ììë êìë ëìëë, êíì í ì íëê ëêëì"
+"ëìì ëì ìëëê íë êìê, ìêì ëíìëë.\n"
+"\n"
+"ê íì ì Tor ìíìì ìê ìíì, URL ììì Enter íë ëëììì.\n"
 
 #: torbutton.popup.plugin.warning
 msgid ""
@@ -75,6 +86,10 @@
 "Use Save-As instead.\n"
 "\n"
 msgstr ""
+"Torbuttonì íëêì ìíìì ìì Tor ëëë ëììëë.\n"
+"\n"
+"ëë ìëìë ììì ëì ììíììì.\n"
+"\n"
 
 #: torbutton.popup.confirm_ca_certs
 msgid ""
@@ -83,6 +98,9 @@
 "Tor toggle. Would you like to disable the isolation of Certificate Authority "
 "certificates? (If you don't understand this, it is safe to click OK)"
 msgstr ""
+"Torbutton Note: ììì ìì ìì êêì ìë êìë ëìëë. ìì êê ëë "
+"êìë ëëê, Tor toggle ìëê ëëìëë. ìì êê ìììì êëë íìí"
+"ìêìëê? (ëì ìíê ì ëìëë, OKë ëëë ììíëë.)"
 
 #: torbutton.popup.ff3.warning
 msgid ""
@@ -93,18 +111,25 @@
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
+"êê!\n"
+"\n"
+"Firefox 3 ìì Torbuttonì íììê Livemarkë Torë íí ëììíëë.\n"
+"\n"
+"êëë êìíìêìëê?"
 
 #: torbutton.popup.toggle.warning
 msgid "You need to toggle Tor or restart for your settings to take effect."
 msgstr ""
+"êíì ììì íêë ëííê ìíìë, Torë íêíêë ìììí íìê ìì"
+"ëë."
 
 #: torbutton.popup.test.success
 msgid "Tor proxy test successful!"
-msgstr ""
+msgstr "Tor íëì íìí ìê!"
 
 #: torbutton.popup.test.failure
 msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
-msgstr ""
+msgstr "Tor íëì íìí \"ìí\"! íëìì Polipo ììì íìíììì."
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
@@ -115,16 +140,24 @@
 "Note: If you have fixed the problem, you can rerun the test in the Torbutton "
 "Proxy Preferences window to eliminate this warning."
 msgstr ""
+"ìê ëëë Torë ììíê ìí Tor íëì íìíê ìííììëë.\n"
+"\n"
+"ììë íìííìêë ìíë êì íìíìëê?\n"
+"\n"
+"Note: ëìë êììëë, ì êêë ììê ìí Tor íëì ììì íìíë ë"
+"ì í ì ììëë."
 
 #: torbutton.popup.test.ff3_notice
 msgid ""
 "Click OK to test Tor proxy settings. This test will happen in the "
 "background. Please be patient."
 msgstr ""
+"OKë ëëìë Tor íëì ììì íìííëë. ì íìíë ëêëìëìì ìì"
+"ëëë. ìì êëë ììì."
 
 #: torbutton.panel.label.verified
 msgid "Tor Verified"
-msgstr ""
+msgstr "Tor êìë."
 
 #: torbutton.popup.test.auto_failed
 msgid ""
@@ -132,28 +165,33 @@
 "\n"
 "Are you sure you want to enable anyway?"
 msgstr ""
+"ìë Tor íëì íìíê ìííììëë.\n"
+"\n"
+"ììë íìííêë ìíìë êì íìíìëê?"
 
 #: torbutton.prefs.recommended
 msgid "(recommended)"
-msgstr ""
+msgstr "(ìì)"
 
 #: torbutton.prefs.optional
 msgid "(optional)"
-msgstr ""
+msgstr "(ìí)"
 
 #: torbutton.prefs.crucial
 msgid "(crucial)"
-msgstr ""
+msgstr "(ìì)"
 
 #: torbutton.popup.external.title
 msgid "Load external content?"
-msgstr ""
+msgstr "ìë ìíì ëë?"
 
 #: torbutton.popup.external.app
 msgid ""
 "An external application is needed to handle:\n"
 "\n"
 msgstr ""
+"ìë ìíëìììì ëêëë êì íìë íëë:\n"
+"\n"
 
 #: torbutton.popup.external.note
 msgid ""
@@ -161,6 +199,10 @@
 "\n"
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
+"\n"
+"\n"
+"NOTE: ìë ìíëìììì êëììë Torì ìí ììíìì ììë, êíì ì"
+"ììëë ìì ì ììëë.\n"
 
 #: torbutton.popup.external.suggest
 msgid ""
@@ -169,45 +211,54 @@
 "or in a VM,\n"
 "or consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n"
 msgstr ""
+"\n"
+"ëì ì íìì ìëëì ìëëë, íìì ììíì ìíëì ìíë ëìëì, "
+"VM ëìì ëìì íëë.\n"
+"ëë Tails LuveCDë Torsocks êì íë Tor íëìë ììíë êì êëí ëì"
+"ìì.\n"
 
 #: torbutton.popup.launch
 msgid "Launch application"
-msgstr ""
+msgstr "ìíëììì ìí"
 
 #: torbutton.popup.cancel
 msgid "Cancel"
-msgstr ""
+msgstr "ìì"
 
 #: torbutton.popup.dontask
 msgid "Always launch applications from now on"
-msgstr ""
+msgstr "ìêëí íì ìíëììì ìí"
 
 #: torbutton.popup.test.no_http_proxy
 msgid ""
 "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 ""
+msgstr "Google Capchas ííê?"
 
 #: 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ì Google Capcthaë êìíìëë. ì ìëë ìí ëë êì ìììë "
+"ëëìëí íìêìëê?"
 
 #: torbutton.popup.captcha.always
 msgid "Always perform this action from now on"
-msgstr ""
+msgstr "ìêëí ì ëì êìíê"
 
 #: torbutton.popup.redirect
 msgid "Redirect"
-msgstr ""
+msgstr "ëëìëí"
 
 #: torbutton.popup.no_redirect
 msgid "Don't Redirect"
-msgstr ""
+msgstr "ëëìëí íì ìì"
 
 #: torbutton.popup.prompted_language
 msgid ""
@@ -217,6 +268,11 @@
 "\n"
 "Would you like to request English language web pages for better privacy?"
 msgstr ""
+"ë ëì êì ìëë ìí, Torbuttonì ìì ëì ìíììë ììí ì ììë"
+"ë. ìêì êíì ëêì ëì ììë íìíë ì íììë ììí ì ììë"
+"ë.\n"
+"\n"
+"ë ëì êì ìëë ìí ìì ì íììë ììíìêìëê?"
 
 #: torbutton.popup.no_newnym
 msgid ""
@@ -225,6 +281,10 @@
 "\n"
 "Are you running Tor Browser Bundle?"
 msgstr ""
+"Torbuttonì ììíê ìëì ììì ì ì ììëë. ìêì Tor ìíë ííì "
+"ìêí ì ììëë.\n"
+"\n"
+"Tor Browser Bundleì ììíê êìëê?"
 
 #: torbutton.popup.use_tbb
 msgid ""
@@ -235,20 +295,59 @@
 "sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following "
 "URL: "
 msgstr ""
+"ìêì Torbuttonì íììíìì íê ììíì ë ëíëëë. êëê ëì ìì"
+"ëë ìì ììì ìëëë.\n"
+"\n"
+"ëì, ìíë gettor@xxxxxxxxxxxxxx ìê ëìì ëëêë, ëì URLì ììíì "
+"ìì Tor browser bundleì ëë êì ììëëëë: "
 
 #: torbutton.popup.pref_error
 msgid ""
 "Torbutton cannot update preferences in the Tor Browser profile directory."
-msgstr ""
+msgstr "Torbuttonì Tor Browser íëíì ëëíë ìëìí í ì ììëë."
 
 #: torbutton.popup.permission_denied
 msgid ""
 "Please either reset the permissions of the Tor Browser directory or copy it "
 "to a new location."
 msgstr ""
+"Tor Browser ëëíëì êíì ìêí íìêë,  Tor browserë ìëì ììë "
+"ìê ìììì."
 
 #: torbutton.popup.device_full
 msgid ""
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+"ì ëìíë êë ì ê êìëë. ë êêì ëëìêë ìëì ììë Tor "
+"browserë ìê ìììì."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ku/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ku/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ku/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/ku/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ku/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ku/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/kw/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/kw/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/kw/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/kw/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/kw/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/kw/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ky/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ky/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ky/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/ky/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ky/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ky/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/lb/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/lb/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/lb/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/lb/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/lb/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/lb/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ln/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ln/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ln/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/ln/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ln/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ln/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/lo/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/lo/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/lo/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/lo/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/lo/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/lo/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/lt/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/lt/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/lt/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -597,7 +597,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/lt/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/lt/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/lt/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -253,3 +253,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/lv/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/lv/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/lv/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -597,7 +597,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/lv/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/lv/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/lv/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -1,13 +1,14 @@
 #
 # Translators:
+# Ojars Balcers <ojars.balcers@xxxxxxxxx>, 2012.
 #. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
-"PO-Revision-Date: 2010-12-05 19:40+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
+"PO-Revision-Date: 2012-08-09 14:33+0000\n"
+"Last-Translator: Ojars Balcers <ojars.balcers@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "Language: lv\n"
 "MIME-Version: 1.0\n"
@@ -20,41 +21,43 @@
 
 #: torbutton.button.tooltip.disabled
 msgid "Enable Tor"
-msgstr ""
+msgstr "IespÄjot Tor"
 
 #: torbutton.button.tooltip.enabled
 msgid "Disable Tor"
-msgstr ""
+msgstr "AtspÄjot Tor"
 
 #: torbutton.panel.tooltip.disabled
 msgid "Click to enable Tor"
-msgstr ""
+msgstr "NoklikÅÄinÄt, lai iespÄjotu Tor"
 
 #: torbutton.panel.tooltip.enabled
 msgid "Click to disable Tor"
-msgstr ""
+msgstr "NoklikÅÄinÄt, lai atspÄjotu Tor"
 
 #: torbutton.panel.plugins.disabled
 msgid "Click to enable plugins"
-msgstr ""
+msgstr "NoklikÅÄinÄt, lai iespÄjotu spraudÅus"
 
 #: torbutton.panel.plugins.enabled
 msgid "Click to disable plugins"
-msgstr ""
+msgstr "NoklikÅÄinÄt, lai atspÄjotu spraudÅus"
 
 #: torbutton.panel.label.disabled
 msgid "Tor Disabled"
-msgstr ""
+msgstr "Tor ir atspÄjots"
 
 #: torbutton.panel.label.enabled
 msgid "Tor Enabled"
-msgstr ""
+msgstr "Tor ir iespÄjots"
 
 #: extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description
 msgid ""
 "Torbutton provides a button to easily enable or disable pointing Firefox to "
 "the Tor proxy"
 msgstr ""
+"Torbutton piedÄvÄ pogu, lai viegli iespÄjotu vai atspÄjotu Firefox rÄdÄÅanu "
+"uz Tor starpnieka"
 
 #: torbutton.popup.history.warning
 msgid ""
@@ -68,6 +71,12 @@
 "To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
 "\n"
 msgstr ""
+"Torbutton bloÄÄja cilnes aktivitÄti, kura ielÄdÄta citÄ Tor stÄvoklÄ.â â Tas "
+"nepiecieÅams, lai novÄrstu Firefox kÄÅdas nr. 409737 un 417869.â â Ja Åis "
+"uznirstoÅais elements parÄdÄjÄs bez ÅÄietama iemesla, tad kÄda no jÅsu "
+"cilnÄm cenÅas sevi fonÄ pÄrlÄdÄt, taÄu Åis mÄÄinÄjums tika bloÄÄts.â âLai "
+"pÄrlÄdÄtu cilni ÅajÄ Tor stÄvoklÄ, lodziÅÄ URL atraÅanÄs vieta nospiediet "
+"taustiÅu \"IevadÄt\".â â\n"
 
 #: torbutton.popup.plugin.warning
 msgid ""
@@ -76,6 +85,8 @@
 "Use Save-As instead.\n"
 "\n"
 msgstr ""
+"Torbutton bloÄÄja tieÅu Tor spraudÅa satura ielÄdi. â â TÄdÄ gadÄjumÄ "
+"lietojiet SaglabÄt kÄ. â â\n"
 
 #: torbutton.popup.confirm_ca_certs
 msgid ""
@@ -84,6 +95,11 @@
 "Tor toggle. Would you like to disable the isolation of Certificate Authority "
 "certificates? (If you don't understand this, it is safe to click OK)"
 msgstr ""
+"Torbutton piezÄme: ÅÄiet, ka jums nav pielÄgotu SertificÄÅanas iestÄÅu. "
+"SertificÄÅanas iestÄÅu pÄrbaude ir laikietilpÄga darbÄba un palÄnina Tor "
+"pÄrslÄgÅanos. Vai vÄlaties atspÄjot sertificÄÅanas iestÄÅu sertifikÄtu "
+"izolÄÅanu? (Ja nesaprotat, kas tieÅi te ir domÄts, tad, ziniet, ka ir droÅi "
+"noklikÅÄinÄt Labi jeb OK)"
 
 #: torbutton.popup.ff3.warning
 msgid ""
@@ -94,18 +110,24 @@
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
+"BrÄdinÄjums!â âIr zinÄms, ka Torbutton, strÄdÄjot Firefox 3, ar Tor "
+"starpniecÄbu nopludina jÅsu laika joslu un tieÅatzÄmes.â â Vai vÄlaties "
+"tomÄr turpinÄt? "
 
 #: torbutton.popup.toggle.warning
 msgid "You need to toggle Tor or restart for your settings to take effect."
 msgstr ""
+"NepiecieÅams pÄrslÄgt vai pÄrstartÄt Tor, lai iestatÄjumi stÄtos spÄkÄ."
 
 #: torbutton.popup.test.success
 msgid "Tor proxy test successful!"
-msgstr ""
+msgstr "Tor starpnieka pÄrbaude ir sekmÄga!"
 
 #: torbutton.popup.test.failure
 msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
+"Tor starpnieka pÄrbaudes tests NEIZDEVÄS! PÄrbaudiet starpnieka un Polipo "
+"iestatÄjumus."
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
@@ -116,16 +138,22 @@
 "Note: If you have fixed the problem, you can rerun the test in the Torbutton "
 "Proxy Preferences window to eliminate this warning."
 msgstr ""
+"PÄdÄjÄ Tor starpnieka pÄrbaudÄ neizdevÄs izmantot Tor.â â Vai esat "
+"pÄrliecinÄts, ka tomÄr vÄlaties to iespÄjot?â â PiezÄme: Ja esat atrisinÄjis "
+"Åo problÄmu, varat atkÄrtoti palaist pÄrbaudi lodziÅÄ Torbutton starpnieka "
+"preferences, lai nebÅtu ÅÄ brÄdinÄjuma. "
 
 #: torbutton.popup.test.ff3_notice
 msgid ""
 "Click OK to test Tor proxy settings. This test will happen in the "
 "background. Please be patient."
 msgstr ""
+"NoklikÅÄiniet Labi jeb OK, lai pÄrbaudÄtu Tor starpnieka iestatÄjumus. ÅÄ "
+"pÄrbaude notiks fonÄ. LÅdzu, esiet pacietÄgs.  "
 
 #: torbutton.panel.label.verified
 msgid "Tor Verified"
-msgstr ""
+msgstr "Tor ir verificÄts"
 
 #: torbutton.popup.test.auto_failed
 msgid ""
@@ -133,28 +161,30 @@
 "\n"
 "Are you sure you want to enable anyway?"
 msgstr ""
+"AutomÄtiskÄ Tor starpnieka pÄrbaudÄ neizdevÄs izmantot Tor.â â Vai esat "
+"pÄrliecinÄts, ka tomÄr vÄlaties to iespÄjot?"
 
 #: torbutton.prefs.recommended
 msgid "(recommended)"
-msgstr ""
+msgstr "(ieteicams)"
 
 #: torbutton.prefs.optional
 msgid "(optional)"
-msgstr ""
+msgstr "(neobligÄts)"
 
 #: torbutton.prefs.crucial
 msgid "(crucial)"
-msgstr ""
+msgstr "(bÅtisks)"
 
 #: torbutton.popup.external.title
 msgid "Load external content?"
-msgstr ""
+msgstr "IelÄdÄt ÄrÄju saturu?"
 
 #: torbutton.popup.external.app
 msgid ""
 "An external application is needed to handle:\n"
 "\n"
-msgstr ""
+msgstr "NepiecieÅama ÄrÄja lietotne, lai apstrÄdÄtu:â â\n"
 
 #: torbutton.popup.external.note
 msgid ""
@@ -162,6 +192,9 @@
 "\n"
 "NOTE: External applications are NOT Tor safe by default and can unmask you!\n"
 msgstr ""
+"\n"
+"â âPIEZÄME: PÄc noklusÄjuma ÄrÄjas lietotnes NAV gana droÅas Tor un var jÅs "
+"atklÄt!â\n"
 
 #: torbutton.popup.external.suggest
 msgid ""
@@ -170,45 +203,53 @@
 "or in a VM,\n"
 "or consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n"
 msgstr ""
+"\n"
+"Ja ÅÄ datne nav uzticama, jums vai nu tÄ jÄsaglabÄ, lai apskatÄtu bezsaistÄ "
+"vai VM, vai arÄ apsveriet izmantot pÄrskatÄmu Tor starpnieku, tÄdu kÄ Tails "
+"LiveCD vai torsocks.\n"
 
 #: torbutton.popup.launch
 msgid "Launch application"
-msgstr ""
+msgstr "Palaist lietotni"
 
 #: torbutton.popup.cancel
 msgid "Cancel"
-msgstr ""
+msgstr "Atcelt"
 
 #: torbutton.popup.dontask
 msgid "Always launch applications from now on"
-msgstr ""
+msgstr "TurpmÄk vienmÄr palaist lietotnes"
 
 #: torbutton.popup.test.no_http_proxy
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
+"Tor starpnieka pÄrbaude: HTTP vietÄjais starpnieks nav sasniedzams. Vai "
+"Polipo darbojas pareizi?"
 
 #: torbutton.popup.captcha.title
 msgid "Avoid Google Captchas?"
-msgstr ""
+msgstr "IzvairÄties no Google Captchas?"
 
 #: 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 konstatÄja Google Captcha. Vai vÄlaties, lai Åis vaicÄjums tiktu "
+"pÄradresÄts uz citu meklÄtÄjprogrammu?"
 
 #: torbutton.popup.captcha.always
 msgid "Always perform this action from now on"
-msgstr ""
+msgstr "TurpmÄk vienmÄr veikt Åo darbÄbu"
 
 #: torbutton.popup.redirect
 msgid "Redirect"
-msgstr ""
+msgstr "NovirzÄt"
 
 #: torbutton.popup.no_redirect
 msgid "Don't Redirect"
-msgstr ""
+msgstr "NenovirzÄt"
 
 #: torbutton.popup.prompted_language
 msgid ""
@@ -218,6 +259,11 @@
 "\n"
 "Would you like to request English language web pages for better privacy?"
 msgstr ""
+"Lai nodroÅinÄtu jums lielÄku privÄtuma lÄmeni, Torbutton var pieprasÄt "
+"tÄmekÄa vietÅu angÄu valodas versiju. Tas var radÄt situÄciju, ka tÄmekÄa "
+"vietnes, kuras izvÄlaties lasÄt dzimtajÄ valodÄ, tiek attÄlotas angÄu valodÄ."
+"â â Vai vÄlaties pieprasÄt tÄmekÄa vietnes angÄu valodÄ, lai nodroÅinÄtu "
+"lielÄku privÄtuma lÄmeni?"
 
 #: torbutton.popup.no_newnym
 msgid ""
@@ -226,6 +272,8 @@
 "\n"
 "Are you running Tor Browser Bundle?"
 msgstr ""
+"Torbutton nespÄj droÅi sniegt jums jaunu identitÄti. Tai nav piekÄuves pie "
+"Tor vadÄbas porta. â â Vai esat palaidis PÄrlÅka Tor komplektu?"
 
 #: torbutton.popup.use_tbb
 msgid ""
@@ -236,20 +284,59 @@
 "sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following "
 "URL: "
 msgstr ""
+"ÅÄiet, ka strÄdÄjot ar Firefox lietojat Torbutton, kas vairs nav rekomendÄta "
+"droÅa konfigurÄcija.â â TÄ vietÄ mÄs iesakÄm izmantot jaunÄko pÄrlÅka Tor "
+"komplektu, ko iespÄjams saÅemt nosÅtot epastu, kurÅ adresÄts "
+"gettor@torprojec , vai lejupielÄdÄjot komplektu norÄdÄtajÄ URL: "
 
 #: torbutton.popup.pref_error
 msgid ""
 "Torbutton cannot update preferences in the Tor Browser profile directory."
 msgstr ""
+"Torbutton nespÄj atjauninÄt preferences PÄrlÅka Tor profila direktorijÄ."
 
 #: torbutton.popup.permission_denied
 msgid ""
 "Please either reset the permissions of the Tor Browser directory or copy it "
 "to a new location."
 msgstr ""
+"LÅdzu vai nu atiestatiet pÄrlÅka Tor direktorijas atÄaujas, vai arÄ kopÄjiet "
+"to uz jaunu vietu."
 
 #: torbutton.popup.device_full
 msgid ""
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+"ÅÄiet, ka cietais disks ir pilns. LÅdzu, atbrÄvojiet vietu uz diska vai "
+"pÄrvietojiet pÄrlÅku Tor uz citu ierÄci."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/mg/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/mg/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/mg/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/mg/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/mg/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/mg/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/mi/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/mi/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/mi/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/mi/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/mi/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/mi/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/mk/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/mk/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/mk/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/mk/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/mk/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/mk/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ml/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ml/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ml/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/ml/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ml/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ml/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/mn/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/mn/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/mn/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/mn/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/mn/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/mn/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/mr/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/mr/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/mr/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/mr/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/mr/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/mr/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ms/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ms/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ms/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/ms/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ms/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ms/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/mt/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/mt/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/mt/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -597,7 +597,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/mt/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/mt/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/mt/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -253,3 +253,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/my/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/my/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/my/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
-"PO-Revision-Date: 2012-05-11 04:26+0000\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
+"PO-Revision-Date: 2012-06-23 08:52+0000\n"
 "Last-Translator: Thura Hlaing <trhura@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "Language: my\n"
@@ -21,19 +21,19 @@
 
 #: torbutton.prefs.title
 msgid "Torbutton Preferences"
-msgstr "Torbutton áááááááááááááá"
+msgstr "Torbutton áááááááááááááááá"
 
 #: torbutton.prefs.display_settings
 msgid "Display Settings"
-msgstr "áááááááááááááááááááááááááááááááá"
+msgstr "áááááá áááááááááááááááá"
 
 #: torbutton.prefs.display_panel
 msgid "Display Tor proxy setting in the status bar"
-msgstr "ááááááááááááááááá Tor ááááááááá ááááááááááááááááá ááááááááá"
+msgstr "Tor proxy ááááááááááááááááááá status bar áááááá áááááá"
 
 #: torbutton.prefs.panel_format
 msgid "Status bar display format:"
-msgstr "ááááááááá áááááááá áááááááááá ááááá -"
+msgstr "Status bar á áááááááááá ááááá -"
 
 #: torbutton.prefs.panel_text_format
 msgid "Text"
@@ -41,51 +41,51 @@
 
 #: torbutton.prefs.panel_icon_format
 msgid "Icon"
-msgstr "áááááááááá"
+msgstr "ááááááááá"
 
 #: torbutton.prefs.tor_settings
 msgid "Proxy Settings"
-msgstr "ááááááááááááááááááááááááááá"
+msgstr "áááááááá áááááááááááááááá"
 
 #: torbutton.prefs.recommended_settings
 msgid "Use the recommended proxy settings for my version of Firefox"
-msgstr "ááááááááááá Firefox ááááááááááááá áááááááááááááá áááááááááááááááááááááááááááááá ááááááá"
+msgstr "áááááááááá áááááááááááááá ááááááááááááá ááááááááááááá áááááááá ááááááááááááááááááá ááááááááááá"
 
 #: torbutton.prefs.use_privoxy
 msgid "Use Privoxy"
-msgstr "Privoxyááá ááááááá"
+msgstr "Privoxy ááá ááááááá"
 
 #: torbutton.prefs.use_polipo
 msgid "Use Polipo"
-msgstr "Polipoááá ááááááá"
+msgstr "Polipo ááá ááááááá"
 
 #: torbutton.prefs.custom_settings
 msgid "Use custom proxy settings"
-msgstr "áááááááááááááááááááááááááááááááááááááááá ááááááá"
+msgstr "áááááááááá áááááááá ááááááááááááááááááá ááááááá"
 
 #: torbutton.prefs.proxy.host.http
 msgid "HTTP Proxy:"
-msgstr "HTTP ááááááááá -"
+msgstr "HTTP áááááááá -"
 
 #: torbutton.prefs.proxy.host.https
 msgid "SSL Proxy:"
-msgstr "SSL ááááááááá -"
+msgstr "SSL áááááááá -"
 
 #: torbutton.prefs.proxy.host.ftp
 msgid "FTP Proxy:"
-msgstr "FTP ááááááááá -"
+msgstr "FTP áááááááá -"
 
 #: torbutton.prefs.proxy.host.gopher
 msgid "Gopher Proxy:"
-msgstr "Gopher ááááááááá -"
+msgstr "Gopher áááááááá -"
 
 #: torbutton.prefs.proxy.host.socks
 msgid "SOCKS Host:"
-msgstr "SOCKS ááááááááááááááááá -"
+msgstr "SOCKS Host -"
 
 #: torbutton.prefs.proxy.port
 msgid "Port:"
-msgstr "áááááááááááá -"
+msgstr "Port -"
 
 #: torbutton.about.title
 msgid "About Torbutton"
@@ -97,11 +97,11 @@
 
 #: torbutton.about.summary
 msgid "Protects the privacy of your Tor browsing."
-msgstr "áááá Tor áááááááá áááááááááááá ááááááááááááááááááááááá áááááááááááááá"
+msgstr "áááá Tor  ááááááááááááááá ááááááááááááááááááá ááááááááá"
 
 #: torbutton.about.code
 msgid "Code Contributors:"
-msgstr "áááá áááááááááááááááááááá -"
+msgstr "áááá ááááá áááááááááááá -"
 
 #: torbutton.about.maintainer
 msgid "Maintainer:"
@@ -109,23 +109,23 @@
 
 #: torbutton.about.security_review
 msgid "Security Review:"
-msgstr "ááááááááááááááááááááááááááááááááááá -"
+msgstr "ááááááááááááááááá ááááááááááá -"
 
 #: torbutton.about.donate
 msgid "If you like using Tor, you might consider"
-msgstr "áááááá Tor ááá áááááááááááá áááááááááááááááááá áááááá ááááááááááááááá"
+msgstr "ááááá Tor ááá ááá ááááááááááááááááá ááá áááááááááááááá"
 
 #: torbutton.about.make_donation
 msgid "making a donation."
-msgstr "ááááááááááááá"
+msgstr "ááááááááááá áááááááááá"
 
 #: torbutton.pref_connection.notice
 msgid "Disable Torbutton to change these settings."
-msgstr "áááááááááááááááááááááááááááááááá Torbutton ááááááááááááááá"
+msgstr "áááá ááááááááááááááááááá áááááááááá Torbutton ááá ááááááá"
 
 #: torbutton.pref_connection.more_info
 msgid "More information"
-msgstr "áááááááááááááááááááááááááá"
+msgstr "áááááááá ááááááááááááá"
 
 #: torbutton.pref_connection_more_info.title
 msgid "Help"
@@ -137,13 +137,13 @@
 "proxy settings, please disable Torbutton and return here.  If you would like "
 "to change your Tor settings, please use the Torbutton preference window."
 msgstr ""
-"Torbutton áááááááááááááááá ááááááááááááááááááá áááááááááá Tor ááááááááááááááááá áááááááááááááááááá "
-"ááááááááááááááááá ááááááááááá Torbutton ááá ááááááááááááá áááááááááááááááááá áááááááááá Tor "
-"ááááááááááááááááááááááááááá ááááááááááá Torbutton áááááááááá ááááááááááá ááááááááááá"
+"Torbutton ááá ááááááááá áááááááááááá ááááá áááá Tor áááááááá áááááááá ááááááááááááááááááá "
+"áááááááááááááááá Torbutton ááá áááááááá ááááááááá ááááááááá ááááá áááá Tor ááááááááááááááááááá "
+"áááááááááááááá Torbutton ááááááááááá ááááááááááá áááááááááá"
 
 #: torbutton.context_menu.new_identity
 msgid "New Identity"
-msgstr "áááááááááááááá"
+msgstr "áááááááááá áááá"
 
 #: torbutton.context_menu.new_identity_key
 msgid "I"
@@ -151,7 +151,7 @@
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
-msgstr "Tor áááááááááá áááááááááá ááááááááááááááááá"
+msgstr "Tor status ááá áááááâáááááááááá"
 
 #: torbutton.context_menu.toggle.key
 msgid "T"
@@ -159,7 +159,7 @@
 
 #: torbutton.context_menu.preferences
 msgid "Preferences..."
-msgstr "áááááááááááááááá ..."
+msgstr "áááááááááááááááá..."
 
 #: torbutton.context_menu.preferences.key
 msgid "P"
@@ -183,7 +183,7 @@
 
 #: torbutton.context_menu.copyTor
 msgid "Copy Tor URL"
-msgstr "Tor URL áááááááááááááá áááááááá"
+msgstr "Tor URL ááá ááááááááááááá"
 
 #: torbutton.context_menu.copyTor.key
 msgid "p"
@@ -191,7 +191,7 @@
 
 #: torbutton.context_menu.openTorTab
 msgid "Open Tor URL in new Tab"
-msgstr "áááááááááááááááááTor URL áááááááááááááá áááááááá"
+msgstr "Tor URL ááá áááááááááááááá áááááááá"
 
 #: torbutton.context_menu.openTorTab.key
 msgid "r"
@@ -199,7 +199,7 @@
 
 #: torbutton.context_menu.openTorWindow
 msgid "Open Tor URL in new Window"
-msgstr "áááááááááááááááá Tor URLáááááááááááááá áááááááá"
+msgstr "Tor URL ááá ááááááááááááááá áááááááá"
 
 #: torbutton.context_menu.openTorWindow.key
 msgid "d"
@@ -215,80 +215,75 @@
 
 #: torbutton.prefs.sec_settings
 msgid "Security Settings"
-msgstr "áááááááááááááááááááááááááááá"
+msgstr "áááááááááá áááááááááááááááá"
 
 #: torbutton.prefs.block_thread
 msgid "Block history reads during Tor (crucial)"
-msgstr "Tor ááá ááááááááááááááááááá áááááááááááááá áááááááááááááááááááááá ááááááááááá (ááááááááááááááááááá)"
+msgstr "Tor áááááááááááááááááá ááááááááááá áááááááááááá ááááááá (ááááááááá)"
 
 #: torbutton.prefs.block_thwrite
 msgid "Block history writes during Tor (recommended)"
-msgstr "Tor ááá ááááááááááá ááááááááááááááááááááááá áááááááááá (áááááááááááááááááááááááá)"
+msgstr "Tor áááááááááááááááááá ááááááááááá áááááááááááááá ááááááá (ááááááááááááá)"
 
 #: torbutton.prefs.block_nthread
 msgid "Block history reads during Non-Tor (optional)"
-msgstr "Tor ááááááááá ááááááááááá ááááááááááá ááááááááááááááá áááááááááááááá áááááááááá (áááááááááááááá)"
+msgstr "Tor áááááááááááááááá ááááááááááá áááááááááááááá ááááááá (ááááááááá)"
 
 #: torbutton.prefs.block_nthwrite
 msgid "Block history writes during Non-Tor (optional)"
-msgstr ""
-"Tor ááááááááá ááááááááááá ááááááááááá ááááááááááááááá áááááááááááááááááá áááááááááá (áááááááááááááá)"
+msgstr "Tor áááááááááááááááá ááááááááááá áááááááááááá ááááááá (ááááááááá)"
 
 #: torbutton.prefs.clear_history
 msgid "Clear history on Tor toggle (optional)"
-msgstr "Tor áááááááááááá ááááááááááááááá áááááááááááá (áááááááááááááááááá)"
+msgstr "Tor ááááááááááááááá ááááááááááá ááááááááááá (ááááááááá)"
 
 #: torbutton.prefs.clear_cache
 msgid "Block Tor disk cache and clear all cache on Tor toggle"
-msgstr ""
-"Toráááááááá ááááááááááá ááááááááááááááá Tor ááááááááááááááááááááááááááááááááááá ááááááááááá "
-"ááááááááááááááááááááááááááá áááááááá"
+msgstr "Tor disk âáááá áááááááááááááááá áááááááá Tor áááááááá ááááááááááááá áááááááááá ááááááááááá"
 
 #: torbutton.prefs.block_cache
 msgid "Block disk and memory cache access during Tor"
-msgstr ""
-"Torááá ááááááááááááááááááá ááááááááááááááááááá áááááááááááááááááá áááááááááááá ááááááááááááááááááá áááááááááááááá "
-"áááááááááá"
+msgstr "Tor áááááááááâââááááá Disk ááááá ááááááááááááá áááá áááááááááááááá ááááááá"
 
 #: torbutton.prefs.cookie_jars
 msgid "Store Non-Tor cookies in a protected jar"
-msgstr "ááááááááááááá jar ááá Tor  ááááááááá áááááááááá áááááááááááááá áááááááá"
+msgstr "ááááááááááááá jar áááááá Tor  áááááââââââááá áááááááááááááá áááááááá"
 
 #: torbutton.prefs.cookie_protection
 msgid "Use the Cookie Protections Dialog to choose"
-msgstr "ááááááááááá ááááááá ááááááááááááá ááááááááááááááááááá ááááááá"
+msgstr "ááááááááááá ááááááá áááááááááááá ááááááááááááááááááá ááááááá"
 
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
-msgstr "áááááááááá áááááááááááááá ááááááááááááááááááááááá ááááááááááááááááááá (ááááááááááááááá)"
+msgstr "áááááááááá áááááááááááááá ááááááááá áááááááááá áááááááááááááá (áááááááááááááá)"
 
 #: torbutton.prefs.clear_cookies
 msgid "Clear cookies on Tor toggle"
-msgstr "Tor ááá áááááááááááááááááááá áááááááááááááá áááááááááááá"
+msgstr "Tor ááááááááááá áááááááááááááá áááááááááááá"
 
 #: torbutton.prefs.disable_plugins
 msgid "Disable plugins during Tor usage (crucial)"
-msgstr "Tor ááá ááááááááááááááááááá áááááááááááááááááááááááá ááááááá áááááááááá (ááááááááááááááááááá)"
+msgstr "Tor áááááááááááááááááááá áááááááááááááá ááááááá (ááááááááááá)"
 
 #: torbutton.prefs.kill_bad_js
 msgid "Hook dangerous javascript (crucial)"
-msgstr "ááááááááááááááá javascript ááá áááááááááááááá (ááááááááááááááááááá)"
+msgstr "áááááááááááááá javascript ááá ááááááááááá (ááááááááááá)"
 
 #: torbutton.prefs.isolate_content
 msgid "Isolate dynamic content to Tor state (crucial)"
-msgstr "Tor ááááááááááá ááááááááááááááááááááááá ááááááááááááá (ááááááááááááááááááá)"
+msgstr "ááááááááá áááááááááááááá Tor áááááááá ááááááááááááá (ááááááááááá)"
 
 #: torbutton.prefs.no_updates
 msgid "Disable updates during Tor usage"
-msgstr "Tor ááááááááááááááááááá ááááááááááááááááááááááááá ááááááááááááááááá"
+msgstr "Tor áááááááááááááááááá áááááááááááááááááá ááááááá"
 
 #: torbutton.prefs.set_uagent
 msgid "Set user agent for Tor usage (crucial)"
-msgstr "Tor áááááááááááááááá ááááááááááááááááááááá áááááááááá (ááááááááááááááááááá)"
+msgstr "Tor ááááááááááááááá ááááááááá ááááááááááá áááááááááá (ááááááááááá)"
 
 #: torbutton.prefs.dynamic
 msgid "Dynamic Content"
-msgstr "áááááááááááááááá"
+msgstr "ááááááááá ááááááááááá"
 
 #: torbutton.prefs.cookies
 msgid "Cookies"
@@ -296,7 +291,7 @@
 
 #: torbutton.prefs.cache
 msgid "Cache"
-msgstr "áááááááááááááááááá"
+msgstr "áááá ááááááááááááá"
 
 #: torbutton.prefs.history
 msgid "History"
@@ -304,28 +299,27 @@
 
 #: torbutton.prefs.no_search
 msgid "Disable search suggestions during Tor (recommended)"
-msgstr ""
-"Tor ááááááááááááááááá ááááááááááááááááááááááááááá áááááááááááá áááááááááá (áááááááááááááááááááááááá)"
+msgstr "Tor áááááááááááááááááááá ááááááááá áááááááááááááááááá ááááááá (ááááááááááááá)"
 
 #: torbutton.prefs.shutdown
 msgid "Shutdown"
-msgstr "áááááá ááááááá"
+msgstr "áááááááááá"
 
 #: torbutton.prefs.tor_shutdown
 msgid "Clear Tor cookies during Tor-enabled browser shutdown"
-msgstr "Tor áááááááááá áááááááááááá áááááááááááááááááá Tor áááááááááááááá áááááááááááá"
+msgstr "Tor áááááááááá ááááááááááá ááááááááááááááá Tor  áááááááááááááá áááááááááááá"
 
 #: torbutton.prefs.all_shutdown
 msgid "Clear cookies during any browser shutdown"
-msgstr "ááááááá áááááááááááááááá áááááááááááááááááááááá áááááááááááááá áááááááááááá"
+msgstr "áááááááá ááááááááááááááá áááááááááááááá áááááááááááá"
 
 #: torbutton.prefs.no_shutdown
 msgid "Do not clear my cookies at shutdown"
-msgstr "ááááááááááááá ááááááááááááááááááááá ááááááááááááááááááááá"
+msgstr "áááááááááááááááá áááááááááá áááááááááá ááááááááááááá"
 
 #: torbutton.prefs.disable_sessionstore
 msgid "Disable Session Saving (recommended)"
-msgstr "áááááááááááááááááááááááááááááááááá ááááááá áááááááááá (ááááááááááááááááááááá)"
+msgstr "áááááááá ááááááááááááááá ááááááá (ááááááááááááá)"
 
 #: torbutton.prefs.headers
 msgid "Headers"
@@ -333,43 +327,40 @@
 
 #: torbutton.prefs.spoof_english
 msgid "Spoof US English Browser"
-msgstr "ááááááááááááááááááááááááááááááááááá ááááááááááááááá"
+msgstr "ááááááá ááááááááááááá ááááááááááá ááááááááááááááá"
 
 #: torbutton.prefs.refererspoofing
 msgid "Referer spoofing"
-msgstr "áááááááááá ááááááááááááááááá"
+msgstr "ááááááááááá ááááááááááááááááá"
 
 #: torbutton.prefs.spoofblank
 msgid "Spoof blank referer during Tor usage (may break some sites)"
-msgstr ""
-"Tor ááááááááááááááááááá áááááááááááááááááááá ááááááááááááááá (áááááááááááááááá ááá "
-"ááááááááááááááááááááááááááááááááááá)"
+msgstr "Tor áááááááááááááááááá ááá áááááááááááááááá ááááááááááááááá (áááááá ááááááá áááááááááááááááá áááááááááááá)"
 
 #: torbutton.prefs.smartspoof
 msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
 msgstr ""
-"Tor ááááááááááááááááááá áááááááá áááááááááááááááááááá áááááááááááá (ááááááááááááááááááááááááááááááááááááááááááááááá)"
+"Tor áááááááááááááááááááá ááááááááááááá áááááááááááááááááááá ááááááá(áááááááá áááááááááááááááááááá áááááááááááááááááááá)"
 
 #: torbutton.prefs.nospoof
 msgid "No referer spoof during Tor usage (sends referers as normal)"
-msgstr "Tor ááááááááááááááááááá áááááááááá ááááááááááááááááá ááááááá (ááááááááááááááá ááááááááááááááá ááááááááááááá)"
+msgstr "Tor áááááááááááááááá ááááááááááááá ááááááááááááááááá áááááá (áááááááááááááááááá áááááááááááááá áááááááááá)"
 
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
-msgstr "Tor ááááááááááááááááááááá DOM ááááááááááááááá áááááááááááá áááááááááá (ááááááááááááááááááá)"
+msgstr "Tor áááááááááááááááá DOM ááááááááááááááá ááááááá (ááááááááááá)"
 
 #: torbutton.prefs.forms
 msgid "Forms"
-msgstr "ááááááááá"
+msgstr "áááááááááááááááááá"
 
 #: torbutton.prefs.block_tforms
 msgid "Block password+form saving during Tor (recommended)"
-msgstr "Tor ááá ááááááááááááááááááá áááááááá+ááááá ááááááááááááááááá áááááááááá (áááááááááááááááááááááááá)"
+msgstr "Tor áááááááááááááááááá áááááááá+áááááááááááááá ááááááááááááááá ááááááá(ááááááááááááá)"
 
 #: torbutton.prefs.block_ntforms
 msgid "Block password+form saving during Non-Tor (optional)"
-msgstr ""
-"Tor ááááááááá áááááááá ááá ááááááááááááááááááá áááááááá+ááááá ááááááááááááááááá áááááááááá (áááááááááááááááááá)"
+msgstr "Tor ááááá áááááááááááááááááá áááááááá+áááááááááááááá ááááááááááááááá ááááááá(ááááááááá)"
 
 #: torbutton.prefs.tor
 msgid "Tor"
@@ -377,134 +368,120 @@
 
 #: torbutton.prefs.non_tor
 msgid "Non-Tor"
-msgstr "Tor ááááááááá áááááááááááá"
+msgstr "Tor áááááááá áááááááááááá"
 
 #: torbutton.prefs.restore_tor
 msgid "On session restored startup, set Tor state to:"
-msgstr "áááááááááá ááááááááááá áááááááááááá  áááááááááááááááá Tor áááááááááá ááááááááááááááá áááááááááá -"
+msgstr "ááááâáááá áááááááááá Tor ááááááá ááááááááááá ááááá -"
 
 #: torbutton.prefs.startup_tor
 msgid "On browser startup, set Tor state to:"
-msgstr "áááááááááááá áááááááááááááááá Tor áááááááááá ááááááááááááááá áááááááááá - "
+msgstr "áááááááá ááááááááááá Tor ááááááá ááááááááááá ááááá -"
 
 #: torbutton.prefs.reload_crashed_jar
 msgid "Reload cookie jar/clear cookies on Firefox crash (recommended)"
-msgstr ""
-"Firefox ááááááááááááá áááááááá áááááááááááááááááá ááááááá jar ááá ááááááááááááá (ááááááááá) áááááááááááááá "
-"áááááááá (áááááááááááááááááááááááá)"
+msgstr "áááâááááááááááá ááááááááááá ááááááá jar ááá áááááááááááá/áááááááááá áááááááááááá (ááááááááááááá)"
 
 #: torbutton.prefs.dual_cookie_jars
 msgid "Store both Tor and Non-Tor cookies in protected jars (dangerous)"
 msgstr ""
-"Tor ááááá Tor ááááááááá áááááááá áááááááááá áááááááááááááá ááááááááááááá jar áááááááááááá áááááááá "
-"(ááááááááááááááá)"
+"Tor ááááá Tor áááááá ááááááá áááááááááááááá ááááááááááááá jar ááááááá áááááááááááá (áááááááááááááá)"
 
 #: torbutton.prefs.clear_http_auth
 msgid "Clear HTTP auth sessions (recommended)"
-msgstr "HTTP auth áááááááááááááá áááááááá (áááááááááááááááááááááááá)"
+msgstr "HTTP auth ááááááááááááááá áááááááááááá (ááááááááááááá)"
 
 #: torbutton.prefs.block_js_history
 msgid "Isolate access to history navigation to Tor state (crucial)"
-msgstr ""
-"Tor ááááááááááá áááááááá ááááááááááááááááááááááá áááááááááááááááá ááááááááááááááááá "
-"(ááááááááááááááááááá)"
+msgstr "Tor ááááááááá áááááááá ááááááááááá áááááááááááááá ááááááá (âááááááááááá)"
 
 #: torbutton.prefs.resize_on_toggle
 msgid "Resize windows to multiples of 50px during Tor usage (recommended)"
-msgstr ""
-"Tor ááá áááááááááááááááá ááááááááááááááá áá áá áááááááááá ááááá áááááááááá (áááááááááááááááááááááááá)"
+msgstr "Tor áááááááááááááááááá ááááááááááá áá px ááááá ááááááá áááááááááá (ááááááááááááá)"
 
 #: torbutton.prefs.close_tor
 msgid "Close all Tor windows and tabs on toggle (optional)"
-msgstr ""
-"Tor ááá ááááááááááááááááááááá áááááááááááááááááááááááá ááááááááááááááááááááááá ááááááá (áááááááááááááááááá)"
+msgstr "ááááááááááááá Tor ááááááááááááá áááááááááááááá ááááááá (ááááááááááá)"
 
 #: torbutton.prefs.close_nontor
 msgid "Close all Non-Tor windows and tabs on toggle (optional)"
-msgstr ""
-"Tor ááááááááá ááááááááááá ááááááááááááááááááááá áááááááááááááááááááááááá ááááááááááááááááááááááá ááááááá "
-"(áááááááááááááááááá)"
+msgstr "Tor áááááá ááááááááááááá ááááááá áááááááááá ááááááá (ááááááááááá)"
 
 #: torbutton.prefs.block_links
 msgid "Block link clicks and page reloads from different Tor states (optional)"
-msgstr ""
-"ááááááááá Tor ááááááááááááá ááááááááááááááááááááááááááááááááááááááááá ááááááááá ááááááááááááááááááá ááá "
-"áááááááááá (áááááááááááááááááá)"
+msgstr "Tor ááááááá ááááááááááááá áááááááááááááááááá ááááááááá áááááááááááááááááááá ááááááá (ááááááááááá)"
 
 #: torbutton.prefs.jar_certs
 msgid "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"
 msgstr ""
-"Tor/Tor ááááááááá áááááááá ááááááááá ááááááá jar ááááááá SSL áááááááááááááááááááááá áááááááá "
-"(áááááááááááááááááááááááá)"
+"Tor/Tor áááááááá áááááááááááá ááááá SSL áááááááááááááá ááááááá jar ááá áááááááááááá "
+"(ááááááááááááá)"
 
 #: torbutton.prefs.jar_ca_certs
 msgid "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"
 msgstr ""
-"Tor/Tor ááááááááá áááááááá ááááááááá ááááááá jar ááááááá CA áááááááááááááááááááááá áááááááá "
-"(áááááááááááááááááááááááá)"
+"Tor/Tor áááááááá áááááááá ááááá CA áááááááááááááá ááááááá jar ááá ááááááááááá (ááááááááááááá)"
 
 #: torbutton.prefs.locked_mode
 msgid "Disable Button and Hotkeys to prevent accidental toggle"
-msgstr ""
-"ááááááá áááááááááááááááááááááááááá ááááááááá áááááááááááááá ááááááááááááááááá ááááááááááááááá áááááááááá"
+msgstr "ááááááá ááááááááááá ááááááááááááááá ááááááááá áááááááááááááá Hotkeys ááááááá ááááááá"
 
 #: torbutton.prefs.startup_state
 msgid "On normal startup, set Tor state to:"
-msgstr "ááááááá ááá ááááááááááá Tor áááááááááá ááááááááááááááá áááááááááá -"
+msgstr "ááááááá ááááááááááááááááá Tor áááááááááá ááááááááááá ááááá -"
 
 #: torbutton.prefs.shutdown_state
 msgid "Shutdown state"
-msgstr "ááááááááááá ááááááá"
+msgstr "ááááááááááá ááááááá"
 
 #: torbutton.prefs.startup
 msgid "Startup"
-msgstr "ááááááááááááááá"
+msgstr "áááááááá áááá"
 
 #: torbutton.prefs.block_tor_file_net
 msgid "Block Tor access to network from file:// urls (recommended)"
-msgstr "file:// urls áá ááááááááááá  Tor áá ááááááááááááááá áááááááááá (áááááááááááááááááááááááá)"
+msgstr "file:// urls áá ááááááááááá Tor ááááááááááááá ááááááá (ááááááááááááá)"
 
 #: torbutton.prefs.block_nontor_file_net
 msgid "Block Non-Tor access to network from file:// urls"
-msgstr "file://urls áá ááááááááááá Tor ááááááááá áááááááááááá áááááááááááááááá áááááááááá"
+msgstr "file://urls áá ááááááááááá Tor áááááááá áááááááá áááááááááááááá ááááááá"
 
 #: torbutton.prefs.restore_defaults
 msgid "Restore Defaults"
-msgstr " áááááááááááááá áááááááááá"
+msgstr " áááááááááá áááááááááá"
 
 #: torbutton.prefs.test_settings
 msgid "Test Settings"
-msgstr "ááááááááááááááááááááááááááá"
+msgstr "ááááááááá áááááááááááááááá"
 
 #: torbutton.prefs.test_auto
 msgid ""
 "Test my Tor settings after the first time I toggle on every Firefox start"
-msgstr ""
-"Firefox áááááááá ááááááááááá Tor ááá ááááááááááááááá áááááááááá Tor ááááááááááááááááááááá ááááááááá"
+msgstr "áááááááááááááá ááááááááááááá áááááááááá Tor ááááááááááááááááááá áááááááááá"
 
 #: torbutton.prefs.disable_livemarks
 msgid "Disable livemarks updates during Tor usage"
-msgstr "Tor ááá ááááááááááááááááááá livemarks áááááááááááááááááááááááá ááááááá áááááááááá"
+msgstr "Tor áááááááááááááááááá livemarks áááááááááááááááááá ááááááá"
 
 #: torbutton.prefs.tor_memory_jar
 msgid "Do not write Tor cookies to disk"
-msgstr "Tor áá ááááááááááááááá áááááááááááá áááááááááááááááá"
+msgstr "Tor áááááááááááááá disk áá ááááááááááá ááááááá"
 
 #: torbutton.prefs.nontor_memory_jar
 msgid "Do not write Non-Tor cookies to disk"
-msgstr "Tor ááááááááá áááááááááá áááááááááááááá áááááááááááá ááááááááááá"
+msgstr "Tor áááááááá áááááááááá áááááááááááááá disk áá ááááááááááá ááááááá"
 
 #: torbutton.prefs.session_restore
 msgid "Have the session store save and restore these tabs:"
-msgstr "ááááááá áááááááááááááááááá áááááááááááá áááá áááááááááááááááá ááááááááááá ááááááááááá -"
+msgstr "áááááááá áááááááááááááááááá ááááááááááááá áááááááááááááá áááááááááá -"
 
 #: torbutton.prefs.nontor_tabs
 msgid "Tabs loaded in Non-Tor"
-msgstr "Tor ááááááááá áááááááááá áááááááááá ááááááááááááá"
+msgstr "Tor áááááááá áááááááááá ááááááááááá áááááááááááá"
 
 #: torbutton.prefs.tor_tabs
 msgid "Tabs loaded in Tor"
-msgstr "Tor áá áááááááááá ááááááááááááá"
+msgstr "Tor áá ááááááááááá áááááááááááá"
 
 #: torbutton.prefs.socks_vfour
 msgid "SOCKS v4"
@@ -516,47 +493,47 @@
 
 #: torbutton.prefs.no_proxies_on
 msgid "No Proxies for: "
-msgstr "ááááááááááááá ááááááááááááá áááááá -"
+msgstr "áááááááá ááááááááááá ááá -"
 
 #: torbutton.prefs.no_proxy_warning
 msgid "Warning: Avoid using any hostnames above"
-msgstr "áááááááááá - áááááá ááááááááááááááááááááá áááááááááááááááá ááááááááá"
+msgstr "áááááááááá - áááááá host áááááááá ááááááááááááá áááááááá"
 
 #: torbutton.prefs.spoofreresh
 msgid "Spoof Refresh"
-msgstr "ááááááááááááááááááááááááááááááááááááááááááááá"
+msgstr "áááááááááááááááááááá Spoof ááááááá"
 
 #: torbutton.prefs.refereroptions
 msgid "Referer Spoofing Options"
-msgstr "áááááááá ááááááááááááááááá ááááááááááááááá"
+msgstr "ááááááááááááá áááááááááááááááá ááááááááááá"
 
 #: torbutton.prefs.nospoof
 msgid "Do not spoof referer"
-msgstr "áááááááááááááá ááááááááááá"
+msgstr "áááááááááááááááá Spoof  áááááááá"
 
 #: torbutton.prefs.spoofroot
 msgid "Spoof the containing folder of the page"
-msgstr "ááááááááááááááááááááááááááááááááá áááááá"
+msgstr "ááááááááááá áááááá ááááááááááá Spoof  ááááááá"
 
 #: torbutton.prefs.spoofdomain
 msgid "Spoof the domain as referer"
-msgstr "áááááááááááááááá ááááááááááá áááááá"
+msgstr "ááááááááááá áááááááááááááááá Spoof ááááááá"
 
 #: torbutton.prefs.spoofblank
 msgid "Make referer blank"
-msgstr "áááááááááááááááááá ááááááááááááá"
+msgstr "áááááááááááááá ááááááááááá"
 
 #: torbutton.cookiedialog.title
 msgid "Manage Cookie Protections"
-msgstr "ááááááááááááááááááááááá áááááááááááááá"
+msgstr "ááááááá áááááááááááááááá áááááááááááááá"
 
 #: torbutton.cookiedialog.lockCol
 msgid "Protected"
-msgstr "ááááááááááááááááááááá"
+msgstr "áááááááá áááááááááá"
 
 #: torbutton.cookiedialog.domainCol
 msgid "Host"
-msgstr " ááááááááááááááááá"
+msgstr "Host"
 
 #: torbutton.cookiedialog.nameCol
 msgid "Name"
@@ -568,54 +545,53 @@
 
 #: torbutton.cookiedialog.protectCookie
 msgid "Protect Cookie"
-msgstr "áááááááááá ááááááááá"
+msgstr "áááááááááá ááááááááá"
 
 #: torbutton.cookiedialog.removeCookie
 msgid "Remove Cookie"
-msgstr "áááááááááá áááááááááá"
+msgstr "áááááááááá áááááááááá"
 
 #: torbutton.cookiedialog.unprotectCookie
 msgid "Unprotect Cookie"
-msgstr "áááááááááá ááááááááááááá"
+msgstr "áááááááááá áááááááááááá"
 
 #: torbutton.cookiedialog.removeAllBut
 msgid "Remove All But Protected"
-msgstr "áááááááááá áááááááááá áááááááá áááááááááááááááááááááá"
+msgstr "áááááááááá áááááááááá áááááááá áááááááá áááááááááá"
 
 #: torbutton.cookiedialog.saveAllCookies
 msgid "Protect New Cookies"
-msgstr "áááááááááááááááááá ááááááááá"
+msgstr "ááááááááááááááááá ááááááááá"
 
 #: torbutton.cookiedialog.doNotSaveAllCookies
 msgid "Do Not Protect New Cookies"
-msgstr "áááááááááááááááááá áááááááááááááááááá"
+msgstr "ááááááááááááááááá ááááááááááá ááááááá"
 
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
-msgstr "Tor ááá ááááááááááááááááááá Livemark ááááááááááááááááááááááááá ááááááá áááááááááá"
+msgstr "Tor áááááááááááááááááá Livemark áááááááááááááááááá ááááááá"
 
 #: torbutton.prefs.dtd_recommended
 msgid "(recommended)"
-msgstr "(áááááááááááááááááááááááá)"
+msgstr "(ááááááááááááá)"
 
 #: torbutton.prefs.dtd_optional
 msgid "(optional)"
-msgstr "(áááááááááááááááááá)"
+msgstr "(ááááááááááá)"
 
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
-msgstr "(ááááááááááááááááááá)"
+msgstr "(ááááááááááá)"
 
 #: torbutton.prefs.update_torbutton_via_tor
 msgid "Redirect Torbutton updates through Tor"
-msgstr "Tor ááááááá Torbutton ááááááááááááááááááááááááá ááááááá ááááááá"
+msgstr "Torbutton áááááááááááááááááá Tor ááááááá âáááááááááááááá"
 
 #: torbutton.prefs.dodge_google_captcha
 msgid ""
 "Automatically use an alternate search engine when presented with a Google "
 "Captcha:"
-msgstr ""
-"Google Captcha áááááááá áááááááá ááááááááááááá áááááááááááááááááááááááááááááááá ááááááááááá ááááááá"
+msgstr "áááá Captcha áááááááááá ááááááááááááááá ááááá ááááááááá ááááááá ááááááááááá ááááááááááá ááááááááá -"
 
 #: torbutton.prefs.engine1
 msgid "ixquick.com"
@@ -630,8 +606,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -639,10 +615,11 @@
 
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
-msgstr "Google ááááááááááááááááá áááááááááááááá ááááááááááááááá ááááááááááááááá áááááááááá"
+msgstr "áááá ááááááááá áááááááá áááááááááááááá ááááááááááááááá áááááááá ááááááá áááááááááá"
 
 #: torbutton.prefs.transparentTor
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
-msgstr ""
-"áááááááááááááááááá Tor ááááááááááááááááááááá (áááááááááááááá Tor Router ááááááááá transproxy  "
-"áááááááááá áááááááááá)"
+msgstr "áááááááááááááááááá Tor áááááááááá (áááááááááá transproxy ááááá Tor Router ááááááááá)"
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/my/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/my/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/my/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
-"PO-Revision-Date: 2012-05-11 04:26+0000\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
+"PO-Revision-Date: 2012-06-23 09:06+0000\n"
 "Last-Translator: Thura Hlaing <trhura@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "Language: my\n"
@@ -21,43 +21,43 @@
 
 #: torbutton.button.tooltip.disabled
 msgid "Enable Tor"
-msgstr "Tor ááá áááááááááááááááááááá"
+msgstr "Tor áááááááá"
 
 #: torbutton.button.tooltip.enabled
 msgid "Disable Tor"
-msgstr "Tor ááá áááááááááááááááááááá"
+msgstr "Tor ááááááá"
 
 #: torbutton.panel.tooltip.disabled
 msgid "Click to enable Tor"
-msgstr "Tor ááá áááááááááááááááááááááá áááááááá"
+msgstr "Tor ááá áááááááá ááááááá"
 
 #: torbutton.panel.tooltip.enabled
 msgid "Click to disable Tor"
-msgstr "Tor ááá ááááááááááááááááááá ááá áááááááá"
+msgstr "Tor ááá ááááááá ááááááá"
 
 #: torbutton.panel.plugins.disabled
 msgid "Click to enable plugins"
-msgstr "áááááááááááááááááááááááá ááááááááááááááááááá áááááááá"
+msgstr "áááááááááááááá áááááááá ááááááá"
 
 #: torbutton.panel.plugins.enabled
 msgid "Click to disable plugins"
-msgstr "áááááááááááááááááááááááá áááááááááááááááááááá áááááááá"
+msgstr "áááááááááááááá ááááááá ááááááá"
 
 #: torbutton.panel.label.disabled
 msgid "Tor Disabled"
-msgstr " Tor ááá áááááááááááááááááá"
+msgstr "áááááááááá Tor"
 
 #: torbutton.panel.label.enabled
 msgid "Tor Enabled"
-msgstr "Tor ááááááááááááááá"
+msgstr "ááááááááááá Tor"
 
 #: extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description
 msgid ""
 "Torbutton provides a button to easily enable or disable pointing Firefox to "
 "the Tor proxy"
 msgstr ""
-"Torbutton ááá Firefox ááá Tor ááááááááááááá ááááááááá áááááááááááááááááá (áááá) ááááááááááááááááááááááááááááááá "
-"ááááááááááááá ááááááááááááááá"
+"Torbutton ááá ááááááááááááááááá Tor áááááááááá ááááááááááááá áááááááá áááááááááá (áááá) ááááááááááááá ááááááááááááá "
+"ááááááááááááá"
 
 #: torbutton.popup.history.warning
 msgid ""
@@ -71,16 +71,14 @@
 "To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
 "\n"
 msgstr ""
-"Torbutton ááá ááááááááá Tor áááááááááááááááá ááááááááááááá áááááááááááááááá ááááááááááááááá "
-"áááááááááááááá\n"
+"Torbutton ááá ááááá Tor ááááááá ááááááááá áááááááááááá ááááááá ááááááá ááááááááááááááá ááááááááááááá\n"
 "\n"
-"ááááááááááá ááááááááááááááá Firefox áááááááááááááááááá áááááá ááááá áááááá ááááááááá áááááááááááá "
-"áááááááá\n"
+"ááááááá áááááááááááááá áááááááááááááááááá áááááá ááááá áááááá ááááááááá áááááááááááá áááááááá\n"
 "\n"
-"ááááá áááááááááááááááááááá áááááááááááááá ááááááááááá áááááááááááá áááá ááááááááááááááááá áááááááá "
-"ááááááááááá ááááááááá ááááááááááááá áááááááááááááá ááááááá áááááááááááááá\n"
+"ááááá áááááááááá áááááááááááá áááááááááááááá áááááááááá áááá ááááááá áááááááá ááááááááááá ááááááá áááááááá "
+"áááááááááááááááá ááááááá ááááááááááá\n"
 "\n"
-"áááá Tor ááááááááááá áááááááááááá ááááááááááááá URL ááááááááááá ááááááá ááááááááááá 'enter' áááááááá "
+"á Tor ááááááááááá ááááááááááá ááááááááááááá URL ááááááááááá ááááááá ááááááááááá 'áááááááááááá' áááááááá "
 "áááááááá\n"
 "\n"
 
@@ -91,9 +89,9 @@
 "Use Save-As instead.\n"
 "\n"
 msgstr ""
-"Torbutton ááá ááááááááááááááááá áááááááááááá Tor ááá áááááááááááááááááááá ááá ááááááááááá\n"
+"Torbutton ááá ááááááá áááááááááááááá áááááááááá Tor áááááááááááááá ááááááááááááá\n"
 "\n"
-"áááááááá ááááááááááááááááááááááááá ááá ááááááááááá\n"
+"áááááááá Save-As ááá ááááááá\n"
 "\n"
 
 #: torbutton.popup.confirm_ca_certs
@@ -103,10 +101,10 @@
 "Tor toggle. Would you like to disable the isolation of Certificate Authority "
 "certificates? (If you don't understand this, it is safe to click OK)"
 msgstr ""
-"Torbutton ááááááá - áááááááááá áááááááááááááá áááááááááááááá ááááááááááá ááááááá áá áááááááá áááááááááááááá "
-"áááááááááááááá ááááááááá áááááááááááááá ááááááááááááááááá ááááááááááááááááááááááááá Tor áááááááááááááá "
-"áááááááááááááááááá áááááááááááááá áááááááááááááá áááááááááááááááááá áááá áááááááááááááááááá ? (ááááá áááááá "
-"áááááááááááá áááááááááááááá ááááááááá áááááááá áááááááá ááááááááááá)"
+"Torbutton áááááááá - ááááááá áááááááááá ááááááááááá áááááááááááááááááá áááááááááááááá ááááááááááá áááááááááááááá "
+"ááááááááá áááááááááááááá ááááá áááááááááááá ááááááááááááááááTor áááááááááááááá áááááááááááááá ááááááááááá "
+"áááááááááááááá áááááááááááááá ááááááááááááááááááá ááá áááááááááááá (ááááá ááááááááá ááá ááááááááááá ááááááááá "
+"áááááááá ááááááááááá ááááááááááááá)"
 
 #: torbutton.popup.ff3.warning
 msgid ""
@@ -119,23 +117,22 @@
 msgstr ""
 "áááááááááá!\n"
 "\n"
-"Firefox 3 áá Torbutton ááá Tor ááááááá áááá ááááááááááááááá livemarks ááááááá áááááááááááááááá "
-"ááááááááá\n"
+"áááááááááááááá á á áááááá Torbutton ááá Tor áááááá áááá ááâáááááááááááááá livemarks ááááááá "
+"ááááááááááááááááááááá ááááááá\n"
 "\n"
-"áááááá áááááááááááááááááááá ááááááááááááááááá"
+"ááá áááááá áááááááááááááááá?"
 
 #: torbutton.popup.toggle.warning
 msgid "You need to toggle Tor or restart for your settings to take effect."
-msgstr ""
-"Tor ááá áááááááá áááááááááááá áááááááááá áááááááááááá áááá áááááááááááááááááá áááááááááá áááááá áááááááááááá"
+msgstr "Tor ááá áááááááá áááááááááááááááááááá ááááááááááááááááá áááááááá ááááááááááááááááááááá áááááááááá"
 
 #: torbutton.popup.test.success
 msgid "Tor proxy test successful!"
-msgstr "Tor áááááááááááááááááá áááááááááááá!"
+msgstr "Tor áááááááá ááááááááááá áááááááááááá!"
 
 #: torbutton.popup.test.failure
 msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
-msgstr "Tor ááááááááá áááááááááááá ! áááá ááááááááá ááááá Polipo áááá ááááááááááááááááá ááááááááá"
+msgstr "Tor áááááááááá áááááááááááá! áááá ááááááááááááá Polipo ááááááááááááááááááá ááááááááá"
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
@@ -146,24 +143,24 @@
 "Note: If you have fixed the problem, you can rerun the test in the Torbutton "
 "Proxy Preferences window to eliminate this warning."
 msgstr ""
-"Tor ááá ááááááá áááááááááá Tor ááááááááá ááááááááá ááááááááááááá\n"
+"ááááááá Tor áááááááá áááááááááá ááááááááááááá\n"
 "\n"
-"áááááááááááááááááááááááá áááááááááááááá áááááááááááááá ááááááááááá?\n"
+"ááááááá áááááááá áááááááááá?\n"
 "\n"
-"ááááááá - ááááá áááááá áááááááá ááááááááááááááááá áááááá ááá ááááááááááááá ááááááááááááá Torbutton "
-"ááááááááá áááááááááááááá ááááááááááááá ááááááááááááá ááááááááááááááááá"
+"áááááááá - ááááá áááááá áááááááá ááááááááááááááááááá ááááááááááááá Torbutton áááááááá "
+"áááááááááááááááá ááááááááá ááááááááááá áááááááááááááá ááá áááááááááááááááá"
 
 #: torbutton.popup.test.ff3_notice
 msgid ""
 "Click OK to test Tor proxy settings. This test will happen in the "
 "background. Please be patient."
 msgstr ""
-"Tor áááááááááááááááááááááááááááááá ááááááááá áááááááááááá áááááááá áááááááááááááááá ááááááááááá "
-"áááááááááááááááááááááá ááááááááááá áááááááááááááá"
+"Tor áááááááá ááááááááááááááááááá áááááááááá áááááááááááá áááááááá áááááááááááááá áááááááá "
+"ááááááááááááááááááá ááááááááááááááá áááááááá"
 
 #: torbutton.panel.label.verified
 msgid "Tor Verified"
-msgstr "Tor ááááááááááá áááááááá"
+msgstr "Tor áááááááááááááá"
 
 #: torbutton.popup.test.auto_failed
 msgid ""
@@ -171,9 +168,9 @@
 "\n"
 "Are you sure you want to enable anyway?"
 msgstr ""
-"Tor ááá ááááááááááá Tor ááááááááá ááááááááááá ááááááááá ááááááááááááá\n"
+"ááááâááááááá Tor âáááááááá áááááááááá ááááááááááááá\n"
 "\n"
-"áááááá áááááááááááááááááááá áááááááááááááááááááá áááááááááááá"
+"ááááááá ááá áááá áááááááááááá?"
 
 #: torbutton.prefs.recommended
 msgid "(recommended)"
@@ -181,22 +178,22 @@
 
 #: torbutton.prefs.optional
 msgid "(optional)"
-msgstr "(ááááááááá)"
+msgstr "(ááááááááá)"
 
 #: torbutton.prefs.crucial
 msgid "(crucial)"
-msgstr "(ááááááááááá)"
+msgstr "(áááááááááááá)"
 
 #: torbutton.popup.external.title
 msgid "Load external content?"
-msgstr "ááááááá áááááááááááááááááá ááááááááááá?"
+msgstr "ááááááá áááááááááááááá áááááááá"
 
 #: torbutton.popup.external.app
 msgid ""
 "An external application is needed to handle:\n"
 "\n"
 msgstr ""
-"ááááááá áááááááááááááááááááá ááááááááááááááááááááááááá ááááááááá - \n"
+"ááááá áááááááááááááá áááááááá ááááááááááá ááááááááá - \n"
 "\n"
 
 #: torbutton.popup.external.note
@@ -207,8 +204,7 @@
 msgstr ""
 "\n"
 "\n"
-"ááááááá - ááááááá áááááááááááááááááááá ááááááááááááááá Tor ááá ááááááááááááá ááááááá Unmask "
-"áááááááááá\n"
+"áááááááá - ááááá ááááááááááááááááááááá ááááááááááááááá áááááááááá Tor áááááááá ááááá ááááááá ááááááááááááá\n"
 
 #: torbutton.popup.external.suggest
 msgid ""
@@ -218,50 +214,52 @@
 "or consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n"
 msgstr ""
 "\n"
-"ááááá áááááááááááá áááááááááááááááááááá ááááááááááááááááááááá ááááááááá VM áááááááááááá áááááááááááááááá áááááááá "
-"áááááááááááá ááááá ááááááááááááá \n"
-"áááááááááááááááá Tails LiveCD ááááááááá torsock ááááááááááá áááááááááááááááááá Tor áááááááááááá áááááááááááááá\n"
+"ááááá ááááááááá ááááááááááá ááá áááááááááááá ááááááááááá (áááá) VM ááááááááááá\n"
+" áááááááááááááá ááááááá áááááááá ááá áááááááááááááááááááá (áááá) Tails LiveCD ááááááááá\n"
+" torsocks áááááááááááááá Tor ááááááááááá áááááááááá áááááááááá\n"
 
 #: torbutton.popup.launch
 msgid "Launch application"
-msgstr "áááááááááááááááááááá áááááá áááááááááááááááááááá"
+msgstr "ááááááááááááááááá áááááááá"
 
 #: torbutton.popup.cancel
 msgid "Cancel"
-msgstr "áááááááááá"
+msgstr "áááááááááááá"
 
 #: torbutton.popup.dontask
 msgid "Always launch applications from now on"
-msgstr "ááááááááááá áááááááááááááááááááááááá áááááááá áááááááááááááááááááááááá"
+msgstr "áááááááááááááááá ááááááááááááááááááááá áááá áááááááá"
 
 #: torbutton.popup.test.no_http_proxy
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
-"Tor ááááááááá ááááááááá - áááááá HTTP ááááááááá ááá ááááááááááááááááá Polipo ááááááááá "
-"áááááááááááááááááááá?"
+"Tor áááááááá ááááááááááá - áááááá HTTP ááááááááááá áááááááá áááááááááááá Polipo ááá ááááááááááááá ááááá "
+"áááááááááááá?"
 
 #: torbutton.popup.captcha.title
 msgid "Avoid Google Captchas?"
-msgstr "Google Captchas ááááááááááá ááááááááááááááá?"
+msgstr "áááá Captchas ááá áááááááááááááá?"
 
 #: 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 ááá Google Captcha ááááááááááá ááááááááááááááááááá "
+msgstr ""
+"Torbutton ááá áááá Captcha ááá ááááááááááááááááá áááááááááááááááá ááááá ááááááááá ááááááááá "
+"áááááááááááááá?"
 
 #: torbutton.popup.captcha.always
 msgid "Always perform this action from now on"
-msgstr "ááááááááááá áááááááááááááááááá áááááááá áááááááááááá"
+msgstr "áááááááááááááááá áááááááááá áááááááá áááááááááááá"
 
 #: torbutton.popup.redirect
 msgid "Redirect"
-msgstr "ááááááááááááááááááááá"
+msgstr "ááááááááááá"
 
 #: torbutton.popup.no_redirect
 msgid "Don't Redirect"
-msgstr "áááááááááááááááááááááá"
+msgstr "ááááááááááá"
 
 #: torbutton.popup.prompted_language
 msgid ""
@@ -271,10 +269,11 @@
 "\n"
 "Would you like to request English language web pages for better privacy?"
 msgstr ""
-"áááá ááááááááááááááááááááá áááááá ááááááá ááááááááááááááááááá áááááááááááááááááááááááááááá Torbutton á "
-"áááááááááááááááááá ááááááááááááááááááááááá áááááááááááááááááááááááááá áááá áááááááááááááááááá áááááááááá "
-"áááááááááááááááááááááááááááááááááááááááááá ááááááááááááááááááááá áááááááááááááááááááááá ááááááááááá áááá "
-"áááááááááááááááááá ááááááááááááá "
+"áááá ááááááááááááááá ááááááááááááá áááááá áááááááá Torbutton ááá ááááááá áááááááááááááááá ááááááááá áááá "
+"ááááááááááááá áááááááááááááááááááá ááááááááááááááááááááááá áááá ááááááááá áááááááááááá ááááááá áááááááááááááááá "
+"ááááááááá áááááááááá ááááááááááá áááááááá\n"
+"\n"
+"áááááááááá áááááááááááááá ááááááááá ááááááááá ááááááááááááááááááááááá ááá ááááááááááááááá?"
 
 #: torbutton.popup.no_newnym
 msgid ""
@@ -283,10 +282,10 @@
 "\n"
 "Are you running Tor Browser Bundle?"
 msgstr ""
-"Torbutton ááá ááááááá áááááááááááááá ááááááááááááááááá áááááááááááá ááááááá Tor áááááááááá áááááááááááááááá "
-"áááááááááááá\n"
+"Torbutton ááá ááááááá áááááááááá ááááááá áááááááááááááá áááááááááááá ááááááá Tor ááááááááááááá Port "
+"áá ááááááááááááááááá\n"
 "\n"
-"áááááá Tor ááááááááá áááááááááá áááááááááááááá ?"
+"Tor Browser Bundle ááá ááá ááááááááááááá?"
 
 #: torbutton.popup.use_tbb
 msgid ""
@@ -296,26 +295,58 @@
 "Instead, we recommend that you obtain the latest Tor Browser Bundle by "
 "sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following "
 "URL: "
-msgstr "áá"
+msgstr ""
+"áááááá Torbutton ááá áááâáááááááááááááááá ááááááááááááááááááááá ááááááá ááááááááááááá ááááááááááá "
+"ááááááááááá áááááááááááá\n"
+"\n"
+"ááááááááá ááááááááááááá Tor Browser Bundle ááá gettor@xxxxxxxxxxxxxx áá áááááááá "
+"ááááááááááááááááá (áááá) ááááááá URL á âáááááááááá ááááááááááááá áááááááááá áááááááááááá ááááááááááááá -"
 
 #: torbutton.popup.pref_error
 msgid ""
 "Torbutton cannot update preferences in the Tor Browser profile directory."
-msgstr ""
-"Tor áááááááááááááááá  ááááááááá ááááááááááááááááá ááááááááááááááááá Torbutton á áááááááááááááááááááááááááá"
+msgstr "Torbutton ááá ááâááááááááááááááááá Tor Browser ááááááááááááá ááááááááááááááááááá"
 
 #: torbutton.popup.permission_denied
 msgid ""
 "Please either reset the permissions of the Tor Browser directory or copy it "
 "to a new location."
 msgstr ""
-"ááááááááááá Tor áááááááááááááááá ááááááááááááááááá ááááááááááááááááááá ááááááá áááááááááá áááááááááááá Tor "
-"áááááááááááááááá ááááááááááááááááááá ááááááááááááááá áááááááá"
+"Tor Browser ááááááááááááááááááááá ááááááááááááááááááá ááááááááááá ááááááááá ááááááá áááááááááááá áááááááááááá"
 
 #: torbutton.popup.device_full
 msgid ""
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
-"áááááááááááá áááááááááááááááááááááááá ááááááááááá áááááááááááááááááááááááááááááááá ááááááááá ááááááááááá Tor "
-"áááááááááááááááá ááá áááááááááááááá"
+"Disk áááááááááááááááááá ááááááá áááááááááá (áááá) Tor Browser ááá ááááááááá ááááááááááá ááááááááááááá"
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/nah/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/nah/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/nah/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/nah/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/nah/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/nah/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/nap/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/nap/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/nap/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/nap/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/nap/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/nap/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/nb/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/nb/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/nb/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -612,8 +612,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -626,3 +626,6 @@
 #: torbutton.prefs.transparentTor
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
 msgstr ""
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/nb/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/nb/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/nb/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -288,3 +288,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ne/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ne/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ne/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/ne/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ne/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ne/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/nl/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/nl/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/nl/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: Shondoit Walker <shondoit+transifex@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -625,8 +625,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -642,3 +642,6 @@
 msgstr ""
 "Transparante Torificatie (Heeft aangepaste transparente proxy of Tor router "
 "nodig)"
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/nl/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/nl/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/nl/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: Shondoit Walker <shondoit+transifex@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -326,3 +326,33 @@
 msgstr ""
 "De schijf lijkt vol te zijn. Maak ruimte vrij of verplaats Tor Browser naar "
 "een nieuw apparaat."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/nn/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/nn/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/nn/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/nn/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/nn/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/nn/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/nso/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/nso/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/nso/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/nso/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/nso/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/nso/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/oc/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/oc/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/oc/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/oc/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/oc/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/oc/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/or/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/or/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/or/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/or/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/or/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/or/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/pa/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/pa/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/pa/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/pa/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/pa/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/pa/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/pap/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/pap/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/pap/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/pap/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/pap/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/pap/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/pl/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/pl/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/pl/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: bogdrozd <bog.d@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -625,8 +625,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -640,3 +640,6 @@
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
 msgstr ""
 "Przezroczysta toryfikacja (wymaga wÅasnego transproxy lub routera Tora)"
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/pl/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/pl/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/pl/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: bogdrozd <bog.d@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -325,3 +325,33 @@
 msgstr ""
 "Dysk zdaje siÄ byÄ peÅny. ProszÄ zwolniÄ miejsce lub przenieÅÄ PrzeglÄdarkÄ "
 "Tora na nowe urzÄdzenie."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/pms/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/pms/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/pms/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/pms/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/pms/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/pms/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ps/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ps/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ps/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/ps/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ps/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ps/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/pt/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/pt/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/pt/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: Zeca Gatilho <paulo.mosh@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -637,8 +637,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -652,3 +652,6 @@
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
 msgstr ""
 "TorificaÃÃo transparente (Necessita transpoxy customizado ou router Tor)"
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/pt/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/pt/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/pt/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -291,3 +291,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/pt_BR/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/pt_BR/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/pt_BR/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: brunogola <brunogola@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -640,8 +640,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.com"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -655,3 +655,6 @@
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
 msgstr ""
 "TorificaÃÃo Transparente (Requer transpoxy customizado ou roteador Tor)"
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.com"

Modified: translation/trunk/projects/torbutton/po/pt_BR/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/pt_BR/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/pt_BR/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: SÃrgio <theparish2@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -326,3 +326,33 @@
 msgstr ""
 "Este disco parece estar cheio. Por favor, libere espaÃo ou mova o Tor "
 "Browser para um novo dispositivo."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ro/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ro/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ro/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -621,8 +621,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.com"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -637,3 +637,6 @@
 #: torbutton.prefs.transparentTor
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
 msgstr ""
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.com"

Modified: translation/trunk/projects/torbutton/po/ro/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ro/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ro/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -1,15 +1,16 @@
 #
 # Translators:
 # bog b1 <bogbone@xxxxxxxxx>, 2012.
+#   <mihaidimoiu@xxxxxxxxx>, 2012.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 #. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
-"PO-Revision-Date: 2012-05-04 07:54+0000\n"
-"Last-Translator: bog b1 <bogbone@xxxxxxxxx>\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
+"PO-Revision-Date: 2012-06-20 22:44+0000\n"
+"Last-Translator: mihai10 <mihaidimoiu@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +23,7 @@
 
 #: torbutton.button.tooltip.disabled
 msgid "Enable Tor"
-msgstr "PorneÅte Tor"
+msgstr "Activeaza Tor"
 
 #: torbutton.button.tooltip.enabled
 msgid "Disable Tor"
@@ -330,3 +331,33 @@
 msgstr ""
 "Discul pare sa fie plin. Va rugam sa asigurati mai mult spatiu liber pe disc "
 "sau sa mutati Tor browser pe un nou dispozitiv."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ru/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ru/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ru/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: liquixis <liquixis@xxxxxxxxx>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/";
@@ -635,8 +635,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -651,3 +651,6 @@
 msgstr ""
 "ÐÑÐÐÑÐÑÐÐÑ ÑÐÑÐÑÐÐÐÑÐÑ (ÐÑÐÐÑÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑÑÐÐÑ transproxy ÐÐÐ Tor-"
 "ÐÐÑÑÑÑÑÐÐÐÑÐÑÐ)"
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/ru/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ru/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ru/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: liquixis <liquixis@xxxxxxxxx>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/";
@@ -328,3 +328,33 @@
 msgstr ""
 "ÐÐÑÐÐÐ, ÑÑÐ ÐÐÑÐ ÐÐÐÐÐÐÐÐ. ÐÐÐÐÐÑÐÑÑÐ, ÐÑÐÐÐÐÐÐÑÐ ÐÐÑÑÐ ÐÐÐ ÐÐÑÐÐÐÑÑÐÑÐ Tor "
 "Browser ÐÐ ÐÑÑÐÐÐ ÐÐÑÐ."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/sco/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/sco/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/sco/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/sco/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/sco/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/sco/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/sk/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/sk/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/sk/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/sk/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/sk/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/sk/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: martinstrucel <martin.strucel@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -262,3 +262,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/sl/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/sl/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/sl/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-04-22 14:05+0000\n"
 "Last-Translator: mihaelersic <miha.elersic@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -620,7 +620,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/sl/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/sl/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/sl/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-04-22 14:20+0000\n"
 "Last-Translator: mihaelersic <miha.elersic@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -275,3 +275,33 @@
 msgstr ""
 "Na disku ni veÄ prostora. Naredite prostor ali premaknite Tor brskalnik na "
 "drugo napravo."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/so/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/so/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/so/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/so/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/so/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/so/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/son/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/son/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/son/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/son/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/son/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/son/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/sq/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/sq/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/sq/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/sq/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/sq/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/sq/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/sr/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/sr/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/sr/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -1,14 +1,15 @@
 #
 # Translators:
 #   <branislavhorvat@xxxxxxxxx>, 2012.
+#   <mahavidyas@xxxxxxxxx>, 2012.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 #. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
-"PO-Revision-Date: 2012-02-18 10:40+0000\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
+"PO-Revision-Date: 2012-06-20 23:51+0000\n"
 "Last-Translator: mahavidyas <mahavidyas@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "Language: sr\n"
@@ -90,7 +91,7 @@
 
 #: torbutton.about.title
 msgid "About Torbutton"
-msgstr "Ð ÐÐÐÐÑÐÑ"
+msgstr "Ð Torbutton"
 
 #: torbutton.about.version
 msgid "Version:"
@@ -102,11 +103,11 @@
 
 #: torbutton.about.code
 msgid "Code Contributors:"
-msgstr ""
+msgstr "Kodiranje pomogli:"
 
 #: torbutton.about.maintainer
 msgid "Maintainer:"
-msgstr ""
+msgstr "OdrÅava:"
 
 #: torbutton.about.security_review
 msgid "Security Review:"
@@ -546,7 +547,7 @@
 
 #: torbutton.cookiedialog.domainCol
 msgid "Host"
-msgstr ""
+msgstr "Host"
 
 #: torbutton.cookiedialog.nameCol
 msgid "Name"
@@ -620,8 +621,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "Scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -634,3 +635,6 @@
 #: torbutton.prefs.transparentTor
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
 msgstr "ÐÑÐÐÑÐÐÑÐÐÑÐ ÐÐÑÐÑÐÐÐÑÐÑÐ (ÐÐÑÑÐÐÐ ÐÐÑÐÐÐÐ Tor ÐÑÐÐÑÐ ÐÐÐ Tor ÑÑÑÐÑ)"
+
+#~ msgid "scroogle.org"
+#~ msgstr "Scroogle.org"

Modified: translation/trunk/projects/torbutton/po/sr/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/sr/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/sr/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -2,14 +2,15 @@
 # Translators:
 #   <branislavhorvat@xxxxxxxxx>, 2012.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
+#   <theranchcowboy@xxxxxxxxx>, 2012.
 #. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
-"PO-Revision-Date: 2012-02-18 10:19+0000\n"
-"Last-Translator: mahavidyas <mahavidyas@xxxxxxxxx>\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
+"PO-Revision-Date: 2012-08-10 12:48+0000\n"
+"Last-Translator: Rancher <theranchcowboy@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
@@ -22,19 +23,19 @@
 
 #: torbutton.button.tooltip.disabled
 msgid "Enable Tor"
-msgstr "ÐÐÐÐÑÑÐ Tor"
+msgstr "ÐÐÐÐÑÑÐ ÐÐÑ"
 
 #: torbutton.button.tooltip.enabled
 msgid "Disable Tor"
-msgstr "ÐÐÐÐÐÐÑÑÐ Tor"
+msgstr "ÐÐÐÐÐÐÑÑÐ ÐÐÑ"
 
 #: torbutton.panel.tooltip.disabled
 msgid "Click to enable Tor"
-msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐ ÐÐÐÐÑÑÐÐÐ Tor"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐ ÐÐÐÐÑÑÐÐÐ ÐÐÑ"
 
 #: torbutton.panel.tooltip.enabled
 msgid "Click to disable Tor"
-msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐ ÐÐÐÐÐÐÑÑÐÐÐ Tor"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐ ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÑ"
 
 #: torbutton.panel.plugins.disabled
 msgid "Click to enable plugins"
@@ -46,19 +47,19 @@
 
 #: torbutton.panel.label.disabled
 msgid "Tor Disabled"
-msgstr "Tor ÑÐ ÐÐÐÐÐÐÑÑÐÐ"
+msgstr "ÐÐÑ ÑÐ ÐÐÐÐÐÐÑÑÐÐ"
 
 #: torbutton.panel.label.enabled
 msgid "Tor Enabled"
-msgstr "Tor ÑÐ ÐÐÐÐÑÑÐÐ"
+msgstr "ÐÐÑ ÑÐ ÐÐÐÐÑÑÐÐ"
 
 #: extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description
 msgid ""
 "Torbutton provides a button to easily enable or disable pointing Firefox to "
 "the Tor proxy"
 msgstr ""
-"Torbutton ÑÑÐÐÑÐ ÐÑÐÐÐ ÐÐ ÐÐÐÑÐ ÑÐÑÑÑÐÐÐÑÐ Ð ÐÑÐÑÑÑÐÐÐÑÐ ÐÐÑÑÐÐÐÐÑÐÐ ÐÑÐÐÐ "
-"Tor ÐÐ ÐÑÐÐÑÐÐÑ ÑÐÑÐÑÑÐÐÑ."
+"ÐÐÑÐÐÑÐÐ ÐÑÑÐÐ ÐÑÐÐÐ ÐÐ ÐÐÐÑÐ ÑÐÑÑÑÐÐÐÑÐ Ð ÐÑÐÑÑÑÐÐÐÑÐ ÐÐÑÑÐÐÐÐÑÐÐ ÐÑÐÐÐ ÐÐÑ "
+"ÐÐ ÐÐÑÐÑÑÐÐÑÑ."
 
 #: torbutton.popup.history.warning
 msgid ""
@@ -72,17 +73,17 @@
 "To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
 "\n"
 msgstr ""
-"Torbutton ÑÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÐÐ ÐÐÑÐ ÑÐ ÑÑÐÑÐÐ Ñ ÐÑÑÐÐÑÐÑÐ Tor "
-"ÑÑÐÑÐ.\n"
+"ÐÐÑÐÐÑÐÐ ÑÐ ÐÐÐÐÐÑÐÐ ÐÐÑÐÐÐÐÑÑÐ ÐÐ ÑÐÐÐÑÐÐ ÐÐÑÐ ÑÐ ÑÑÐÑÐÐ Ñ ÐÑÑÐÐÑÐÑÐÐ ÐÐÑ "
+"ÑÑÐÑÑ.\n"
 "\n"
-"ÐÐÐ ÑÐ ÐÐÑÐÐÐ ÐÐÐÐ ÐÐÑÐÐ ÑÐÑÐÐÐ ÑÐÑÐÑÑÐÐÑ ÐÑÐÑÐÐ 409737 Ð 417869.\n"
+"ÐÐÐ ÑÐ ÐÐÑÐÐÐ Ñ ÑÐÑÑ ÑÐÑÐÐÐÑÐ ÐÐÑÐÑÑÐÐÑÐÐÐÑ ÐÑÐÑÐÐÐ 409737 Ð 417869.\n"
 "\n"
 "ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐÑÐ ÐÐ ÑÐ ÐÐÐÑ ÐÑÐÐÑÑÑÐ ÐÑÐÐÐÑ ÐÐÑÐÐÑÑÑÐ ÐÐÐ ÐÐÐÐÐÐÐ ÑÐÐÐÐÐÐ, "
-"ÑÐ ÐÐÐÑÐ ÐÐ ÑÐÐÐÐ ÐÐ ÐÐÑÐÑ ÑÐÐÐÑÐÐÐ ÐÐÐÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ ÑÑÐÑÐ ÑÐÐ ÐÐ ÑÐÐÐ, "
-"Ð ÑÐ ÑÐ ÐÐÐÑÐÑÐÐÐ.\n"
+"ÑÐ ÐÐÐÑÐ ÐÐ ÑÐÐÐÐ ÐÐ ÐÐÑÐÑ ÑÐÐÐÑÐÐÐ ÐÐÐÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ ÑÑÐÑÐ ÑÐÐ ÐÐ ÑÐÐÐ, "
+"Ð ÑÐ ÑÐ ÐÐÐÐÐÑÐÐÐ.\n"
 "\n"
-"ÐÐ ÐÐÑÑÐ ÐÐÐÐÐÐ ÑÑÐÑÐÐÐ ÑÐÐÐÑÐÐ Ñ ÐÐÐÐ Tor ÑÑÐÑÑ, ÐÑÐÑÐÑÐÐÑÐ âenterâ Ñ "
-"ÐÐÑÐÑÐ ÐÐÐÐÑÐÑÐ ÐÐÑÐ.\n"
+"ÐÐ ÐÐÑÑÐ ÐÐÐÐÐÐ ÑÑÐÑÐÐÐ ÑÐÐÐÑÐÐ Ñ ÐÐÐÐ ÐÐÑ ÑÑÐÑÑ, ÐÑÐÑÐÑÐÐÑÐ Enter Ñ ÐÐÑÑ ÐÐ "
+"ÑÐÐÑ ÐÐÐ ÐÐÑÐÑÐ.\n"
 "\n"
 
 #: torbutton.popup.plugin.warning
@@ -92,9 +93,9 @@
 "Use Save-As instead.\n"
 "\n"
 msgstr ""
-"Torbutton ÑÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐÐ ÑÑÐÑÐÐÐÑÐ ÑÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐ.\n"
+"ÐÐÑÐÐÑÐÐ ÑÐ ÐÐÐÐÐÑÐÐ ÐÐÑÐÐÑÐÐ ÑÑÐÑÐÐÐÑÐ ÑÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐ.\n"
 "\n"
-"ÐÐÐÑÑÐ ÑÐÐÐ, ÐÐÑÐÑÑÐÑÐ âÐÐÑÑÐÐÑ ÐÐÐ...â.\n"
+"ÐÐÐÑÑÐ ÑÐÐÐ, ÐÐÑÐÑÑÐÑÐ âÐÐÑÑÐÐÑ ÐÐÐââ.\n"
 "\n"
 
 #: torbutton.popup.confirm_ca_certs
@@ -127,7 +128,7 @@
 
 #: torbutton.popup.toggle.warning
 msgid "You need to toggle Tor or restart for your settings to take effect."
-msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐ ÐÐÐÑÐÐÐÑÐ Tor ÐÐÐÐ ÐÐ ÐÐÑÑÐÐÐÐ ÑÑÑÐÐÐÐ ÐÐ ÑÐÐÐÑ."
+msgstr "ÐÐÐÐÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÑ ÐÐ ÐÐ ÐÐÐÐÐÐ ÑÑÑÐÐÐÐ ÐÐ ÑÐÐÐÑ."
 
 #: torbutton.popup.test.success
 msgid "Tor proxy test successful!"
@@ -136,7 +137,8 @@
 #: torbutton.popup.test.failure
 msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
-"ÐÐÑÑÐÑÐÑÐ ÑÐÑÐÐÑÐ ÐÐÑÐ ÑÑÐÐÐÐ! ÐÑÐÐÐÑÐÑÐ ÑÐÐÑÐ ÐÐÑÑÐÐÐÐÑÐÐ Ð Polipo ÐÐÑÑÐÐÐÐ."
+"ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÑÐÐ ÑÐÑÐÐÑ. ÐÑÐÐÐÑÐÑÐ ÐÐÑÑÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐÐÑÐ Ð ÐÐÐÐÑÐÐÐÑÐ "
+"ÐÐÐÐÐÐ."
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
@@ -147,24 +149,24 @@
 "Note: If you have fixed the problem, you can rerun the test in the Torbutton "
 "Proxy Preferences window to eliminate this warning."
 msgstr ""
-"ÐÐÑÐÐÐÐÑÐ ÑÐÑÑÐÑÐÑÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐÑÐ ÑÑÐÐÐÐ ÐÐ ÑÐ ÑÑÐÐÐÐÐ Ñ Tor ÐÑÐÐÐÐ.\n"
+"ÐÐÑÐÐÐÐÑÐ ÑÐÑÑÐÑÐÑÐ ÐÐÑ ÐÐÑÑÐÐÐÐÐÐ ÐÐÑÐ ÑÑÐÐÐÐ ÐÐ ÑÐ ÑÑÐÐÐÐÐ Ñ ÐÐÑ ÐÑÐÐÐÐ.\n"
 "\n"
-"ÐÐ ÐÐ ÑÑÐ ÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÐÐÑÑÐÑÐ?\n"
+"ÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÐ ÐÐÐÐÑÑÐÑÐ?\n"
 "\n"
-"ÐÐÐÐÐÐÐÐ: ÐÐÐ ÑÑÐ ÐÑÐÐÐÑÐÐ ÑÐÑÐÑÐ ÐÑÐÐÐÐÐÐ, ÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÑÐ ÑÐÑÑ Ñ "
-"Torbutton ÐÐÐÐÑÐÐÐÑÐÐÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐ ÐÐÑÑÐ ÑÐÐÐÐÐÐÐ ÐÐÐ ÑÐÐÐÐÑÐÑÐ."
+"ÐÐÐÐÐÐÐÐ: ÐÐÐ ÑÑÐ ÐÑÐÐÐÑÐÐ ÑÐÑÐÑÐ ÐÑÐÐÐÐÐÐ, ÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑ "
+"Ñ ÐÐÐÐÑÐÐÐÑÐÐÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐÑÐÐÑÐÐÐ ÐÐ ÐÐÑÑÐ ÑÐ ÑÐÑÐÐÐ ÐÐÐÐ ÑÐÐÐÐÑÐÑÐ."
 
 #: torbutton.popup.test.ff3_notice
 msgid ""
 "Click OK to test Tor proxy settings. This test will happen in the "
 "background. Please be patient."
 msgstr ""
-"ÐÐÐÐÐÐÑÐ ÐÐ âÐ ÑÐÐÑâ ÐÐ ÐÐÑÑÐ ÑÐÑÑÐÑÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ. ÐÐÐÑ ÑÐÑÑ ÑÐ ÑÐ "
-"ÐÐÐÐÑÐÑÐ Ñ ÐÐÐÐÐÐÐÐ. ÐÐÐÐÐÐ, ÐÑÐÐÑÐ ÑÑÑÐÑÐÐÐ."
+"ÐÐÐÐÐÐÑÐ ÐÐ âÐ ÑÐÐÑâ ÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑ ÐÐÑÑÐÐÐÐÐÐ. ÐÐÐ ÐÑÐÐÐ ÑÐ ÑÐ "
+"ÐÐÐÐÑÐÑÐ Ñ ÐÐÐÐÐÐÐÐ. ÐÑÐÐÑÐ ÑÑÑÐÑÐÐÐ."
 
 #: torbutton.panel.label.verified
 msgid "Tor Verified"
-msgstr "Tor ÑÐ ÐÑÐÐÐÑÐÐ"
+msgstr "ÐÐÑ ÑÐ ÐÑÐÐÐÑÐÐ"
 
 #: torbutton.popup.test.auto_failed
 msgid ""
@@ -172,9 +174,9 @@
 "\n"
 "Are you sure you want to enable anyway?"
 msgstr ""
-"ÐÑÑÐÐÐÑÑÐÐ ÑÐÑÑ ÐÐÑÑÐÐÐÐÐÐ ÐÐÑÐ ÑÑÐÐÐ ÐÐ ÑÐ ÑÑÐÐÐÐÐ Ñ Tor-ÐÐ.\n"
+"ÐÑÑÐÐÐÑÑÐÐ ÑÐÑÑ ÐÐÑ ÐÐÑÑÐÐÐÐÐÐ ÐÐÑÐ ÑÑÐÐÐ ÐÐ ÑÐ ÑÑÐÐÐÐÐ Ñ ÐÐÑ ÐÑÐÐÐÐ.\n"
 "\n"
-"ÐÐ ÐÐ ÑÑÐ ÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÐÐÑÑÐÑÐ?"
+"ÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÐ ÐÐÐÐÑÑÐÑÐ?"
 
 #: torbutton.prefs.recommended
 msgid "(recommended)"
@@ -190,7 +192,7 @@
 
 #: torbutton.popup.external.title
 msgid "Load external content?"
-msgstr "ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÑÐÑÐÑÐ ÑÐÐÑÐÐ ÑÐÐÑÐÐÑ?"
+msgstr "ÐÑÐÑÐÑÐ ÑÐÐÑÐÐ ÑÐÐÑÐÐÑ?"
 
 #: torbutton.popup.external.app
 msgid ""
@@ -208,7 +210,7 @@
 msgstr ""
 "\n"
 "\n"
-"ÐÐÐÐÐÐÐÐ: ÑÐÐÑÐÐ ÐÑÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÑÑÑ ÐÐÐÐÐÐÐÐÑÑ Ð ÐÐÐÑ ÐÐÑ ÐÑÐÑÐÑÐ!\n"
+"ÐÐÐÐÐÐÐÐ: ÑÐÐÑÐÐ ÐÑÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐÑÑÑÑ ÐÐÐÐÐÐÐÐÑÑ Ð ÐÐÐÑ ÐÐÑ ÐÑÐÑÐÑÐ!\n"
 
 #: torbutton.popup.external.suggest
 msgid ""
@@ -218,9 +220,10 @@
 "or consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n"
 msgstr ""
 "\n"
-"ÐÐÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐÐÐÑÐÑÐ Ñ ÐÐÐÑ ÑÐÑÐ, ÑÑÐÐÐ ÐÐÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐ ÐÐ ÐÐ "
-"ÐÑÐÐÑÐÑÐ ÐÐÐ ÐÐÑÑÐ ÐÑÐÐÑÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÑ ÐÐÐ Ñ ÐÐÑÑÑÐÐÐÐÑ ÐÐÑÐÐÐ, ÐÐÐ ÐÐ "
-"ÐÐÑÐÑÑÐÑÐ ÑÑÐÐÑÐÐÑÐÐÑÐÐ Tor ÐÑÐÐÑÐ ÐÐÐ ÑÑÐ ÑÑ Tails LiveCD ÐÐÐ torsocks.\n"
+"ÐÐÐ ÐÐÐÐÑÐ ÐÐÐÐÑÐÑÐ Ñ ÐÐÑ ÐÐÑÐÑÐÐÑ, ÐÐÐ ÑÐ ÑÐÑÑÐÐÑÑÐ ÐÐÐ ÑÑÐ ÐÐÐ ÐÑÐÐÐ ÐÐÐ Ñ "
+"ÐÐÑÑÑÐÐÐÐÑ ÐÐÑÐÐÐ,\n"
+"ÐÐÐ ÐÐÑÐÑÑÐÑÐ ÑÑÐÐÑÐÐÑÐÐÑÐÐ ÐÐÑ ÐÐÑÑÐÐÐÐÐÐ ÐÐÐ ÑÑÐ ÑÑ Tails LiveCD ÐÐÐ "
+"torsocks.\n"
 
 #: torbutton.popup.launch
 msgid "Launch application"
@@ -232,30 +235,30 @@
 
 #: torbutton.popup.dontask
 msgid "Always launch applications from now on"
-msgstr "ÐÐÐÐ ÐÐÐÑÐÑÐ ÐÑÐÐÑÐÐÐ ÐÐ ÑÐÐÐ ÐÐ ÐÐÐÐÑÐ"
+msgstr "ÐÐÑÐÐ ÑÐÐÐ ÐÐÐÑÐÑÐ ÐÑÐÐÑÐÐÐ"
 
 #: torbutton.popup.test.no_http_proxy
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
-"ÐÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐÐ: ÐÐÐÐÐÐÐ HTTP ÐÐÑÑÐÐÐÐÐ ÑÐ ÐÐÐÑÐÑÑÑÐÐÑÐÐ. ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐ "
-"ÑÐ Polipo ÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐ."
+"ÐÑÐÐÐ ÐÐÑ ÐÐÑÑÐÐÐÐÐÐ: ÐÐÐÐÐÐÐ HTTP ÐÐÑÑÐÐÐÐÐ ÑÐ ÐÐÐÐÑÑÑÐÐÐ. ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐ "
+"ÑÐ ÐÐÐÐÐÐ ÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐ."
 
 #: torbutton.popup.captcha.title
 msgid "Avoid Google Captchas?"
-msgstr "ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÐÐÑÐ Google-ÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐ?"
+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 ÑÐ ÑÐÑÐÐ Google ÐÐÑÐÑÐÐÐ ÐÐÐ. ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐ ÐÑÐÑÑÐÐÑÐÐÐ "
-"ÐÐ ÐÑÑÐÐ ÐÑÐÑÑÐÐÐÐÐÑ ÐÐ ÐÐÐÑ ÑÐÐÑ?"
+"ÐÐÑÐÐÑÐÐ ÑÐ ÐÑÐÐÐÑÐÐ ÐÑÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐ. ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÑÐÐÑÐ ÐÑÐÑÑÐÐÑÐÐÐ ÐÐ "
+"ÐÑÑÐÐ ÐÑÐÑÑÐÐÐÐÐÑ ÐÐ ÐÐÐÑ ÑÐÐÑ?"
 
 #: torbutton.popup.captcha.always
 msgid "Always perform this action from now on"
-msgstr "ÐÐÐÐ ÐÐÐÑÑÐ ÐÐÑ ÑÐÐÑÑ ÐÐ ÑÐÐÐ ÐÐ ÐÐÐÐÑÐ."
+msgstr "ÐÐÑÐÐ ÑÐÐÐ ÐÐÐÑÑÐ ÐÐÑ ÑÐÐÑÑ"
 
 #: torbutton.popup.redirect
 msgid "Redirect"
@@ -273,13 +276,11 @@
 "\n"
 "Would you like to request English language web pages for better privacy?"
 msgstr ""
-"ÐÐ ÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÑÑ ÐÑÐÐÐÑÐÐÑÑ, Torbutton ÐÐÐÐ ÐÐ ÐÐÑÑÐÐÐ ÐÐÐÐÐÑÐÑ "
-"ÐÐÑÐÐÑÑ ÐÐÑÐÑÐÐÑ ÑÑÑÐÐÐÑÐ. ÐÐÐÐ ÑÐÐÐ, ÐÐÐÑÑÐ ÑÐ ÐÐ ÑÐ ÑÑÑÐÐÐÑÐ ÐÐÑÐ ÐÐÑÑÐ "
-"ÐÐÐÑÐ ÑÐÑÐÐÐ ÐÐ ÐÐÑÐÑÑÐÐ ÑÐÐÐÐÑ, ÑÐÐÑÑÐ ÑÐÐÐ ÐÑÐÐÐÐÑ ÑÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐ "
-"ÑÐÐÐÐÑ.\n"
+"ÐÐ ÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÑÑ ÐÑÐÐÐÑÐÐÑÑ, ÐÐÑÐÐÑÐÐ ÐÐÐÐ ÐÐ ÐÐÑÑÐÐÐ ÐÐÐÐÐÑÐÑ "
+"ÐÐÑÐÐÑÑ ÐÐÑÐÑÐÐÑ ÑÑÑÐÐÐÑÐ. ÐÐÐÐ ÑÐÐÐ, ÐÐÐÑÑÐ ÑÐ ÐÐ ÑÐ ÑÐ ÑÑÑÐÐÐÑÐ ÐÐÑÐ ÐÐÑÑÐ "
+"ÐÐÐÑÐ ÑÐÑÐÐÐ ÐÐ ÐÐÑÐÑÑÐÐ ÑÐÐÐÐÑ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐ ÑÐÐÐÐÑ.\n"
 "\n"
-"ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐÐÑÐ ÑÑÑÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐ ÑÐÐÐÐÑ Ñ ÑÐÑÑ ÐÐÑÐ "
-"ÐÑÐÐÐÑÐÐÑÑÐ?"
+"ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÑÐÐÐÑÐ ÑÑÑÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐ ÑÐÐÐÐÑ Ñ ÑÐÑÑ ÐÐÑÐ ÐÑÐÐÐÑÐÐÑÑÐ?"
 
 #: torbutton.popup.no_newnym
 msgid ""
@@ -288,10 +289,10 @@
 "\n"
 "Are you running Tor Browser Bundle?"
 msgstr ""
-"Torbutton ÐÐ ÐÐÐÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐ ÐÐÐÐÑÐÑÐÑ ÑÐÑ ÐÐÐÐ ÐÑÐÑÑÑÐ Tor "
-"ÐÐÐÑÑÐÐÐÐÐ ÐÐÑÑÑ.\n"
+"ÐÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐ ÐÐÐÐÑÐÑÐÑ ÑÐÑ ÐÐÐÐ ÐÑÐÑÑÑÐ ÐÐÑ "
+"ÐÐÐÑÑÐÐÐÐÐ ÐÐÑÑÑ.\n"
 "\n"
-"ÐÐ ÐÐ ÐÐÑÐÑÑÐÑÐ Ðor Browser Bundle?"
+"ÐÐÑÐÑÑÐÑÐ ÐÐ ÐÐÑ ÐÑÐÐÐÐÐÐÑ?"
 
 #: torbutton.popup.use_tbb
 msgid ""
@@ -302,31 +303,60 @@
 "sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following "
 "URL: "
 msgstr ""
-"ÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÑÐÑÐ Torbutton Ð Firefox, Ð ÑÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐÑÑÑÑÑÐÐÐ ÐÐÐ "
-"ÐÐÐÐÐÐÐÑ ÐÐÑÑÐÐÐÑ.\n"
+"ÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÑÐÑÐ ÐÐÑÐÐÑÐÐ Ð ÐÐÑÐÑÑÐÐÑ, Ð ÑÐ ÐÐÑÐ ÐÐÑÐ ÐÑÐÐÐÑÑÑÑÐÐÐ ÐÐÐ "
+"ÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐ.\n"
 "\n"
-"ÐÐÐÑÑÐ ÑÐÐÐ, ÐÑÐÐÐÑÑÑÑÑÐÐÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÐÑÐ Tor Browser Bundle ÑÐÐÑÐÐ "
-"ÐÐÑÑÐÐ ÐÐ gettor@xxxxxxxxxxxxxx ÐÐÐ ÑÐÐÐÐÑÐÐ ÑÐ ÑÐÐÐÐÑÐ ÐÐÑÐÑÐ: "
+"ÐÐÐÑÑÐ ÑÐÐÐ, ÐÑÐÐÐÑÑÑÑÑÐÐÐ ÐÐÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÐÑÐ ÐÐÑ ÐÑÐÐÐÐÐÐÑ ÑÐÐÑÐÐ "
+"ÐÐÑÑÐÐ ÐÐ gettor@xxxxxxxxxxxxxx ÐÐÐ ÐÑÐÑÐÐÐÐÑÐÐ ÑÐ ÑÐÐÐÐÑÐ ÐÐÑÐÑÐ: "
 
 #: torbutton.popup.pref_error
 msgid ""
 "Torbutton cannot update preferences in the Tor Browser profile directory."
 msgstr ""
-"Torbutton ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐÑÐ Ñ ÐÐÑÐÐÑÐÑÐÑÑÐÑ ÐÐ Tor Browser "
-"ÐÑÐÑÐÐÐ."
+"ÐÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐ ÐÐ ÐÐÑÑÐÑÐ ÐÐÐÐÑÐÐÐÑÐ Ñ ÑÐÑÑÐÐÐÐ ÐÐ ÐÑÐÑÐÐÐ ÐÐÑ ÐÑÐÐÐÐÐÐÑÐ."
 
 #: torbutton.popup.permission_denied
 msgid ""
 "Please either reset the permissions of the Tor Browser directory or copy it "
 "to a new location."
 msgstr ""
-"ÐÐÐÐÐÐ ÐÐÑ ÐÐ ÑÐÑÐÑÑÑÐÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ Ñ ÐÐÐÐ ÑÐ ÐÐÐÐÐÐ Tor "
-"Browser ÐÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐÑÐ ÐÐ ÐÑÑÐÑ ÐÐÐÐÑÐÑÑ."
+"ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ Ñ ÐÐÑÐÑ ÑÐ ÐÐÐÐÐÐ ÐÐÑ ÐÑÐÐÐÐÐÐÑ ÐÐÐ ÑÐ ÐÑÐÐÐÑÑÐÑÐ "
+"ÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑÑ."
 
 #: torbutton.popup.device_full
 msgid ""
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
-"ÐÐÐÐÐÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÑÐ. ÐÐÐÐÐÐ ÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐÑÐ ÐÑÐÑÑÐÑ ÐÐÐ ÐÐ ÐÑÐÐÐÑÐÑÐ  "
-"Tor Browser ÐÐ ÐÐÐÐ ÑÑÐÑÐÑ."
+"ÐÐÐÐÐÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÑÐ. ÐÑÐÐÐÐÐÐÑÐ ÐÐÑÑÐ ÐÑÐÑÑÐÑÐ ÐÐÐ ÐÑÐÐÐÑÑÐÑÐ ÐÐÑ "
+"ÐÑÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐ ÑÑÐÑÐÑ."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/st/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/st/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/st/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/st/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/st/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/st/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/su/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/su/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/su/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/su/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/su/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/su/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/sv/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/sv/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/sv/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -599,7 +599,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/sv/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/sv/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/sv/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -253,3 +253,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/sw/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/sw/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/sw/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/sw/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/sw/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/sw/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ta/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ta/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ta/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/ta/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ta/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ta/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/te/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/te/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/te/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/te/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/te/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/te/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/templates/torbutton.dtd.pot
===================================================================
--- translation/trunk/projects/torbutton/po/templates/torbutton.dtd.pot	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/templates/torbutton.dtd.pot	2012-08-30 22:09:48 UTC (rev 25777)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-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"
@@ -592,7 +592,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/templates/torbutton.properties.pot
===================================================================
--- translation/trunk/projects/torbutton/po/templates/torbutton.properties.pot	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/templates/torbutton.properties.pot	2012-08-30 22:09:48 UTC (rev 25777)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-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"
@@ -247,3 +247,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/tg/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/tg/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/tg/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/tg/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/tg/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/tg/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/th/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/th/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/th/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -597,7 +597,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/th/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/th/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/th/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ti/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ti/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ti/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/ti/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ti/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ti/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/tk/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/tk/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/tk/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/tk/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/tk/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/tk/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/tr/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/tr/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/tr/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -607,8 +607,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -621,3 +621,6 @@
 #: torbutton.prefs.transparentTor
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
 msgstr ""
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/tr/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/tr/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/tr/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-04-08 19:40+0000\n"
 "Last-Translator: ZahMeTR <zahmetr@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -338,3 +338,33 @@
 msgstr ""
 "Disk dolu gÃzÃkÃyor. LÃtfen diskte yer aÃÄn ya da Tor Browser i farklÄ bir "
 "konuma taÅÄyÄn. "
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/uk/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/uk/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/uk/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -1,5 +1,6 @@
 #
 # Translators:
+# Oleksandr Kravchuk <>, 2012.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
 # ÐÐÑÐÑÐ ÐÐÐÑÐÐÐÐ <sergiovana@xxxxxxxxxx>, 2011.
 #. extracted from ../src/chrome/locale/en/torbutton.dtd
@@ -7,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
-"PO-Revision-Date: 2012-02-14 09:44+0000\n"
-"Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
+"PO-Revision-Date: 2012-07-01 22:21+0000\n"
+"Last-Translator: Oleksandr Kravchuk <>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
@@ -94,31 +95,31 @@
 
 #: torbutton.about.version
 msgid "Version:"
-msgstr ""
+msgstr "ÐÐÑÑÑÑ:"
 
 #: torbutton.about.summary
 msgid "Protects the privacy of your Tor browsing."
-msgstr ""
+msgstr "ÐÐÑÐÑÐÑ ÐÑÐÐÐÑÐÑÑÑÑ ÐÐÑÐÐÐ ÐÐÑÐÐÐÐÑ ÑÐÐÐÑÐÐÐ Ð Tor."
 
 #: torbutton.about.code
 msgid "Code Contributors:"
-msgstr ""
+msgstr "ÐÑÐÑÐÐÐÐ:"
 
 #: torbutton.about.maintainer
 msgid "Maintainer:"
-msgstr ""
+msgstr "ÐÑÐÑÐÐÐÐÐÑÐÐÑ:"
 
 #: torbutton.about.security_review
 msgid "Security Review:"
-msgstr ""
+msgstr "ÐÐÐÑÐ ÐÐÐÐÐÐÐ:"
 
 #: torbutton.about.donate
 msgid "If you like using Tor, you might consider"
-msgstr ""
+msgstr "ÐÐÑÐ ÐÐÐ ÐÐÐÐÐÐÑÑÑÑÑ Tor â ÐÐ ÐÐÐÐÐ Ð"
 
 #: torbutton.about.make_donation
 msgid "making a donation."
-msgstr ""
+msgstr "ÐÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑ."
 
 #: torbutton.pref_connection.notice
 msgid "Disable Torbutton to change these settings."
@@ -149,7 +150,7 @@
 
 #: torbutton.context_menu.new_identity_key
 msgid "I"
-msgstr ""
+msgstr "I"
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -378,7 +379,7 @@
 
 #: torbutton.prefs.startup_tor
 msgid "On browser startup, set Tor state to:"
-msgstr ""
+msgstr "ÐÑÐ ÐÐÐÑÑÐÑ ÐÐÐ-ÐÐÐÑÐÐÑÐ, ÐÑÑÐÐÐÐÐÑÐÐÑÐ ÑÑÐÐ Tor Ñ:"
 
 #: torbutton.prefs.reload_crashed_jar
 msgid "Reload cookie jar/clear cookies on Firefox crash (recommended)"
@@ -402,11 +403,11 @@
 
 #: torbutton.prefs.close_tor
 msgid "Close all Tor windows and tabs on toggle (optional)"
-msgstr ""
+msgstr "ÐÐÐÑÐÑÐ ÑÑÑ ÐÑÐÐÐ ÑÐ ÐÐÐÐÐÐÐ Tor ÐÑÐ ÐÐÑÐÐÐÐÐÐÐÑ (ÐÐ ÐÐÐÐâÐÐÐÐÐ)"
 
 #: torbutton.prefs.close_nontor
 msgid "Close all Non-Tor windows and tabs on toggle (optional)"
-msgstr ""
+msgstr "ÐÐÐÑÐÑÐ ÑÑÑ ÐÐ Tor ÐÑÐÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÑÐ ÐÐÑÐÐÐÐÐÐÐÑ (ÐÐ ÐÐÐÐâÐÐÐÐÐ)"
 
 #: torbutton.prefs.block_links
 msgid "Block link clicks and page reloads from different Tor states (optional)"
@@ -415,10 +416,12 @@
 #: torbutton.prefs.jar_certs
 msgid "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"
 msgstr ""
+"ÐÐÐÑÑÐÐÑÐ ÑÐÑÑÐÑÑÐÐÑÐ SSL Ñ ÑÑÐÐÐÑ jar`ÐÑ ÐÐÑ Tor/ÐÐ Tor (ÑÐÐÐÐÐÐÐÐÐÐÐÐ)"
 
 #: torbutton.prefs.jar_ca_certs
 msgid "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"
 msgstr ""
+"ÐÐÐÑÑÐÐÑÐ ÑÐÑÑÐÑÑÐÐÑÐ CA Ñ ÑÑÐÐÐÑ jar`ÐÑ ÐÐÑ Tor/ÐÐ Tor (ÑÐÐÐÐÐÐÐÐÐÐÐÐ)"
 
 #: torbutton.prefs.locked_mode
 msgid "Disable Button and Hotkeys to prevent accidental toggle"
@@ -426,7 +429,7 @@
 
 #: torbutton.prefs.startup_state
 msgid "On normal startup, set Tor state to:"
-msgstr ""
+msgstr "ÐÑÐ ÐÐÑÐÐÐÑÐÐÐÑ ÐÐÐÑÑÐÑ â ÐÑÑÐÐÐÐÐÑÐÐÑÐ ÑÑÐÐ Tor Ñ:"
 
 #: torbutton.prefs.shutdown_state
 msgid "Shutdown state"
@@ -434,7 +437,7 @@
 
 #: torbutton.prefs.startup
 msgid "Startup"
-msgstr ""
+msgstr "ÐÐÐÑÑÐ"
 
 #: torbutton.prefs.block_tor_file_net
 msgid "Block Tor access to network from file:// urls (recommended)"
@@ -446,11 +449,11 @@
 
 #: torbutton.prefs.restore_defaults
 msgid "Restore Defaults"
-msgstr ""
+msgstr "ÐÐ ÐÐÐÐÐÑÑÐÐÐÐÑÐ"
 
 #: torbutton.prefs.test_settings
 msgid "Test Settings"
-msgstr ""
+msgstr "ÐÐÑÐÐÑÑÐÑÐ ÐÐÑÑÑÐÐÐÐ"
 
 #: torbutton.prefs.test_auto
 msgid ""
@@ -463,11 +466,11 @@
 
 #: torbutton.prefs.tor_memory_jar
 msgid "Do not write Tor cookies to disk"
-msgstr ""
+msgstr "ÐÐ ÐÐÐÐÑÑÐÐÑÐ ÐÑÐÐ Tor ÐÐ ÐÐÑÐ"
 
 #: torbutton.prefs.nontor_memory_jar
 msgid "Do not write Non-Tor cookies to disk"
-msgstr ""
+msgstr "ÐÐ ÐÐÐÐÑÑÐÐÑÐ ÐÐ Tor ÐÑÐÐ ÐÐ ÐÐÑÐ"
 
 #: torbutton.prefs.session_restore
 msgid "Have the session store save and restore these tabs:"
@@ -475,27 +478,27 @@
 
 #: torbutton.prefs.nontor_tabs
 msgid "Tabs loaded in Non-Tor"
-msgstr ""
+msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÐÑÐÐÐÐÑ ÐÐ Ð Tor"
 
 #: torbutton.prefs.tor_tabs
 msgid "Tabs loaded in Tor"
-msgstr ""
+msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÐÑÐÐÐÐÑ Ð Tor"
 
 #: torbutton.prefs.socks_vfour
 msgid "SOCKS v4"
-msgstr ""
+msgstr "SOCKS v4"
 
 #: torbutton.prefs.socks_vfive
 msgid "SOCKS v5"
-msgstr ""
+msgstr "SOCKS v5"
 
 #: torbutton.prefs.no_proxies_on
 msgid "No Proxies for: "
-msgstr ""
+msgstr "ÐÐ ÐÐÐÐÑÐÑÑÐÐÑÐÐÑÐ ÐÑÐÐÑÑ ÐÐÑ: "
 
 #: torbutton.prefs.no_proxy_warning
 msgid "Warning: Avoid using any hostnames above"
-msgstr ""
+msgstr "ÐÐÐÐÐ: ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÑÑÐÐÐÑ ÐÑÐÑ ÑÐÐÐÐ Ð ÐÐÑÐÐÐÐÐÐÑÐÐÐÑ ÑÐÑÑÑÐ"
 
 #: torbutton.prefs.spoofreresh
 msgid "Spoof Refresh"
@@ -523,47 +526,47 @@
 
 #: torbutton.cookiedialog.title
 msgid "Manage Cookie Protections"
-msgstr ""
+msgstr "ÐÐÑÑÐÐÑÐ ÐÐÑÐÑÑÐÐ ÐÑÐÑÐ"
 
 #: torbutton.cookiedialog.lockCol
 msgid "Protected"
-msgstr ""
+msgstr "ÐÐÑÐÑÐÐÐ"
 
 #: torbutton.cookiedialog.domainCol
 msgid "Host"
-msgstr ""
+msgstr "ÐÐÑÑ"
 
 #: torbutton.cookiedialog.nameCol
 msgid "Name"
-msgstr ""
+msgstr "ÐÐâÑ"
 
 #: torbutton.cookiedialog.pathCol
 msgid "Path"
-msgstr ""
+msgstr "ÐÐÑÑ"
 
 #: torbutton.cookiedialog.protectCookie
 msgid "Protect Cookie"
-msgstr ""
+msgstr "ÐÐÑÐÑÑÐÑÐ ÐÑÐÐ"
 
 #: torbutton.cookiedialog.removeCookie
 msgid "Remove Cookie"
-msgstr ""
+msgstr "ÐÐÐÐÐÐÑÐ ÐÑÐÐ"
 
 #: torbutton.cookiedialog.unprotectCookie
 msgid "Unprotect Cookie"
-msgstr ""
+msgstr "ÐÐÐÐÑÐÑÐÐÑ ÐÑÐÐ"
 
 #: torbutton.cookiedialog.removeAllBut
 msgid "Remove All But Protected"
-msgstr ""
+msgstr "ÐÐÐÐÐÐÑÐ ÐÑÑ, ÐÐÑÑÐ ÐÐÑÐÑÐÐÐÑ"
 
 #: torbutton.cookiedialog.saveAllCookies
 msgid "Protect New Cookies"
-msgstr ""
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÑ ÐÑÐÐ"
 
 #: torbutton.cookiedialog.doNotSaveAllCookies
 msgid "Do Not Protect New Cookies"
-msgstr ""
+msgstr "ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÑ ÐÑÐÐ"
 
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
@@ -571,15 +574,15 @@
 
 #: torbutton.prefs.dtd_recommended
 msgid "(recommended)"
-msgstr ""
+msgstr "(ÑÐÐÐÐÐÐÐÐÐÐÐÐ)"
 
 #: torbutton.prefs.dtd_optional
 msgid "(optional)"
-msgstr ""
+msgstr "(ÐÐ ÐÐÐÐâÐÐÐÐÐ)"
 
 #: torbutton.prefs.dtd_crucial
 msgid "(crucial)"
-msgstr ""
+msgstr "(ÐÑÐÑÐÑÐÐ)"
 
 #: torbutton.prefs.update_torbutton_via_tor
 msgid "Redirect Torbutton updates through Tor"
@@ -593,23 +596,23 @@
 
 #: torbutton.prefs.engine1
 msgid "ixquick.com"
-msgstr ""
+msgstr "ixquick.com"
 
 #: torbutton.prefs.engine2
 msgid "Bing.com"
-msgstr ""
+msgstr "Bing.com"
 
 #: torbutton.prefs.engine3
 msgid "Yahoo.com"
-msgstr ""
+msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
-msgstr ""
+msgstr "duckduckgo.com"
 
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
@@ -618,3 +621,6 @@
 #: torbutton.prefs.transparentTor
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
 msgstr ""
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/uk/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/uk/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/uk/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -1,13 +1,14 @@
 #
 # Translators:
+# Oleksandr Kravchuk <>, 2012.
 #. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
-"PO-Revision-Date: 2010-12-05 19:40+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
+"PO-Revision-Date: 2012-07-01 14:05+0000\n"
+"Last-Translator: Oleksandr Kravchuk <>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
@@ -20,41 +21,43 @@
 
 #: torbutton.button.tooltip.disabled
 msgid "Enable Tor"
-msgstr ""
+msgstr "ÐÐÑÐÐÐÑÑÐ Tor"
 
 #: torbutton.button.tooltip.enabled
 msgid "Disable Tor"
-msgstr ""
+msgstr "ÐÐÐÐÐÑÑÐ Tor"
 
 #: torbutton.panel.tooltip.disabled
 msgid "Click to enable Tor"
-msgstr ""
+msgstr "ÐÐÑÐÑÐÑÑÑ ÐÐÐ ÑÐÑÐÐÐÑÑÐ Tor"
 
 #: torbutton.panel.tooltip.enabled
 msgid "Click to disable Tor"
-msgstr ""
+msgstr "ÐÐÑÐÑÐÑÑÑ ÐÐÐ ÐÐÐÐÐÑÑÐ Tor"
 
 #: torbutton.panel.plugins.disabled
 msgid "Click to enable plugins"
-msgstr ""
+msgstr "ÐÐÑÐÑÐÑÑÑ ÐÐÐ ÑÐÑÐÐÐÑÑÐ ÑÐÐÑÐÑÐÐÐÑ"
 
 #: torbutton.panel.plugins.enabled
 msgid "Click to disable plugins"
-msgstr ""
+msgstr "ÐÐÑÐÑÐÑÑÑ ÐÐÐ "
 
 #: torbutton.panel.label.disabled
 msgid "Tor Disabled"
-msgstr ""
+msgstr "Tor ÐÐÐÐÐÐÐÐ"
 
 #: torbutton.panel.label.enabled
 msgid "Tor Enabled"
-msgstr ""
+msgstr "Tor ÐÐÑÐÐÐÐÐÐ"
 
 #: extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description
 msgid ""
 "Torbutton provides a button to easily enable or disable pointing Firefox to "
 "the Tor proxy"
 msgstr ""
+"Torbutton ÐÐÐÐÑ ÐÐÐÐÐÑ ÐÐÑ ÐÑÑÑÐÐÐÐ ÑÐÑÐÐÐÐÐÐÑ ÑÐ ÐÐÐÐÐÐÐÐÑ ÐÐÐÐÑÐÑÑÐÐÐÑ Tor "
+"ÐÐÐ-ÐÐÐÑÐÐÑÐÐ Firefox"
 
 #: torbutton.popup.history.warning
 msgid ""
@@ -94,18 +97,27 @@
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
+"ÐÐÐÐÐ!\n"
+"\n"
+"Torbutton ÐÐ Firefox 3 ÐÑÐÐÐÐÐ ÑÐÐ, ÑÐ ÐÐÐÐ ÐÐÐÐÑÐ ÐÐÑ ÑÐÑÐÐÐÐ ÐÐÑÑ ÑÐ ÐÐÐÑ "
+"ÐÐÐÐÐÐÐÐ ÑÐÑÐÐ Tor.\n"
+"\n"
+"ÐÐ ÐÐÐÐÑÑÐ ÐÐ ÐÑÐÐÐÐÐÑÐÐÑÐ Ñ ÐÑÐÑ ÑÐÐÐÑ ÑÐÐÑ?"
 
 #: torbutton.popup.toggle.warning
 msgid "You need to toggle Tor or restart for your settings to take effect."
 msgstr ""
+"ÐÐ ÐÐÐÐÐÐÑ ÐÐÑÐÐÐÐÐÑÑÐ ÐÐÐ ÐÐÑÐÐÐÐÑÑÑÐÑÐ Tor ÐÐÐ ÐÐÑÐÐÑÐÐÑÐ ÐÐÐÑ ÐÐÑÐÐÐÑÑÐ. "
 
 #: torbutton.popup.test.success
 msgid "Tor proxy test successful!"
-msgstr ""
+msgstr "ÐÐÑÑ ÐÑÐÐÑÑ-ÑÐÑÐÐÑÐ Tor ÐÑÐÐÑÐÐ ÑÑÐÑÑÐÐ!"
 
 #: torbutton.popup.test.failure
 msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
+"ÐÐÑÑ ÐÑÐÐÑÑ-ÑÐÑÐÐÑÐ ÐÐ ÐÐÐÐÐÐÐÐ! ÐÐÑÐÐÑÑÑÐ ÑÐÑÐ ÐÑÐÐÑÑ-ÑÐÑÐÐÑ ÑÐ ÐÐÑÐÐÐÑÑÐ "
+"Polipo."
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
@@ -173,11 +185,11 @@
 
 #: torbutton.popup.launch
 msgid "Launch application"
-msgstr ""
+msgstr "ÐÐÐÑÑÑÐÑÐ ÐÐÐÐÑÐÐ"
 
 #: torbutton.popup.cancel
 msgid "Cancel"
-msgstr ""
+msgstr "ÐÑÐÐÐÐÐ"
 
 #: torbutton.popup.dontask
 msgid "Always launch applications from now on"
@@ -190,7 +202,7 @@
 
 #: torbutton.popup.captcha.title
 msgid "Avoid Google Captchas?"
-msgstr ""
+msgstr "ÐÐÐÐÐÑÐ ÐÐÐÑÑÑ Google?"
 
 #: torbutton.popup.captcha.ask
 msgid ""
@@ -204,11 +216,11 @@
 
 #: torbutton.popup.redirect
 msgid "Redirect"
-msgstr ""
+msgstr "ÐÐÑÐÐÐÐÑÐÐÐÑÑÐ"
 
 #: torbutton.popup.no_redirect
 msgid "Don't Redirect"
-msgstr ""
+msgstr "ÐÐ ÐÐÑÐÐÐÐÑÐÐÐÑÑÐ"
 
 #: torbutton.popup.prompted_language
 msgid ""
@@ -253,3 +265,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ur/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ur/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ur/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/ur/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ur/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ur/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/ve/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/ve/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ve/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/ve/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/ve/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/ve/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/vi/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/vi/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/vi/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -1,14 +1,15 @@
 #
 # Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
+#   <truongvan1507@xxxxxxxxxxxx>, 2012.
 #. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
-"PO-Revision-Date: 2012-02-14 09:44+0000\n"
-"Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
+"PO-Revision-Date: 2012-06-03 07:26+0000\n"
+"Last-Translator: truongvan <truongvan@xxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
@@ -375,7 +376,7 @@
 
 #: torbutton.prefs.startup_tor
 msgid "On browser startup, set Tor state to:"
-msgstr ""
+msgstr "Khi trÃnh duyát khái Äáng, thiát láp tráng thÃi Tor thÃnh:"
 
 #: torbutton.prefs.reload_crashed_jar
 msgid "Reload cookie jar/clear cookies on Firefox crash (recommended)"
@@ -612,7 +613,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/vi/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/vi/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/vi/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -1,14 +1,15 @@
 #
 # Translators:
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
+#   <truongvan1507@xxxxxxxxxxxx>, 2012.
 #. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
-"PO-Revision-Date: 2012-02-14 09:45+0000\n"
-"Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
+"PO-Revision-Date: 2012-06-03 08:01+0000\n"
+"Last-Translator: truongvan <truongvan@xxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "Language: vi\n"
 "MIME-Version: 1.0\n"
@@ -70,6 +71,17 @@
 "To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
 "\n"
 msgstr ""
+"Torbutton khÃa nháng thá trÃnh duyát ÄÃ tái trong mát tráng thÃi khÃc cáa "
+"Tor.\n"
+"\n"
+"CÃi nÃy lÃ Äá ván hÃnh xung quanh lái Firefox 409737 vÃ 417869.\n"
+"\n"
+"Náu thÃng bÃo nÃy hián ra cháng vÃ lÃ do nÃo, thÃ mát trong nháng thá trÃnh "
+"duyát Äang cá tá tái lái mÃ khÃng thÃng bÃo, vÃ Äiáu nÃy ÄÃ bá ngÄn chán.\n"
+"\n"
+"Tor tái lái thá trÃnh duyát trong tráng thÃi nÃy cáa Tor, gÃ 'enter' trÃn "
+"thanh Äáa chá.\n"
+"\n"
 
 #: torbutton.popup.plugin.warning
 msgid ""
@@ -122,6 +134,8 @@
 #: torbutton.popup.test.failure
 msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
+"Tor proxy kiám tra cÃ lái! Kiám tra proxy vÃ nháng cÃi Äát cáa Polipo cáa "
+"bán."
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
@@ -204,6 +218,11 @@
 "or in a VM,\n"
 "or consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n"
 msgstr ""
+"\n"
+"Náu táp tin nÃy khÃng an toÃn, bán nÃn lÆu nÃ lái Äá sá dáng khi \n"
+"khÃng kát nái máng hoác trong mÃy áo.\n"
+"hoác cÃn nhác sá dáng mÃi trÆáng hoÃn toÃn dÃng Tor proxy nhÆ  Tails LiveCD "
+"hoác torsocks.\n"
 
 #: torbutton.popup.launch
 msgid "Launch application"
@@ -226,25 +245,27 @@
 
 #: torbutton.popup.captcha.title
 msgid "Avoid Google Captchas?"
-msgstr ""
+msgstr "Muán trÃnh xÃc nhán Google Captchas?"
 
 #: 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 phÃt hián cÃ Google Captchas. Bán cÃ muán chuyán qua bá mÃy tÃm "
+"kiám khÃc cho cÃu hái nÃy?"
 
 #: torbutton.popup.captcha.always
 msgid "Always perform this action from now on"
-msgstr ""
+msgstr "tá bÃy giá, luÃn thác hián hÃnh Äáng nÃy"
 
 #: torbutton.popup.redirect
 msgid "Redirect"
-msgstr ""
+msgstr "Chuyán hÆáng"
 
 #: torbutton.popup.no_redirect
 msgid "Don't Redirect"
-msgstr ""
+msgstr "Äáng chuyán hÆáng"
 
 #: torbutton.popup.prompted_language
 msgid ""
@@ -254,6 +275,11 @@
 "\n"
 "Would you like to request English language web pages for better privacy?"
 msgstr ""
+"Äá bán cÃ thÃm sÆ riÃng tÆ, Torbutton cÃ thá yÃu cáu trang máng sá dáng "
+"phiÃn bán Tiáng Anh. ÄÃy cÃ thá lÃ nguyÃn nhÃn trang máng mÃ bán Äá nghá "
+"hián thá tián bán Äáa lái hián thá Tiáng Anh.\n"
+"\n"
+"Bán cÃ muán yÃu cáu trang máng tiáng anh Äá cÃ thÃm sá riÃng tÆ?"
 
 #: torbutton.popup.no_newnym
 msgid ""
@@ -262,6 +288,10 @@
 "\n"
 "Are you running Tor Browser Bundle?"
 msgstr ""
+"Torbutton cÃ thá ÄÆa bán mát danh tÃnh mái mát cÃch khÃng an toÃn. NÃ khÃng "
+"há truy cáp vÃo Tor Control Port.\n"
+"\n"
+"CÃ phái bán Äang dÃng Tor Browser Bundle?"
 
 #: torbutton.popup.use_tbb
 msgid ""
@@ -272,20 +302,60 @@
 "sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following "
 "URL: "
 msgstr ""
+"DÆáng nhÆ bán Äang sá dáng Torbutton vái Firefox, nÃ khÃng cÃn lÃ mát Äá "
+"xuát thiát láp an toÃn.\n"
+"\n"
+"Thác ra, chÃng tÃi Äá nghá bán sá dáng phiÃn bán mái nhát cáa Tor Browser "
+"Bundle báng cÃch gái email vÃo gettor@xxxxxxxxxxxxxx hoác tái vá theo Äáa "
+"chá:"
 
 #: torbutton.popup.pref_error
 msgid ""
 "Torbutton cannot update preferences in the Tor Browser profile directory."
-msgstr ""
+msgstr "Torbutton khÃng thá cáp nhát thiát láp trong thÆ mác há sÆ."
 
 #: torbutton.popup.permission_denied
 msgid ""
 "Please either reset the permissions of the Tor Browser directory or copy it "
 "to a new location."
 msgstr ""
+"Háy cÃi lái quyán truy cáp cho thÆ mác cáa trÃnh duyát Tor hoác chÃp nÃ vÃ "
+"mát thÆ mác mái."
 
 #: torbutton.popup.device_full
 msgid ""
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+"á lÆu trá ÄÃ Äáy, Háy chuán bá thÃm chá tráng hoác di chuyán trÃnh duyát Tor "
+"qua mát thiát bá mái."
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/wa/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/wa/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/wa/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/wa/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/wa/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/wa/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/wo/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/wo/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/wo/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/wo/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/wo/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/wo/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/zh_CN/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/zh_CN/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/zh_CN/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -1,5 +1,7 @@
 #
 # Translators:
+# Christopher Meng <cickumqt@xxxxxxxxx>, 2012.
+# Curtis Stone <cstone@xxxxxxxxxxx>, 2012.
 #   <hua5679@xxxxxxxxx>, 2012.
 # jhk <j_hk001@xxxxxxx>, 2011.
 # runasand <runa.sandvik@xxxxxxxxx>, 2011.
@@ -11,9 +13,9 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
-"PO-Revision-Date: 2012-02-14 09:44+0000\n"
-"Last-Translator: zhenghua1991 <hua5679@xxxxxxxxx>\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
+"PO-Revision-Date: 2012-08-01 09:59+0000\n"
+"Last-Translator: Christopher Meng <cickumqt@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -101,7 +103,7 @@
 
 #: torbutton.about.summary
 msgid "Protects the privacy of your Tor browsing."
-msgstr ""
+msgstr "äææäç Tor èèæèçéçã"
 
 #: torbutton.about.code
 msgid "Code Contributors:"
@@ -113,11 +115,11 @@
 
 #: torbutton.about.security_review
 msgid "Security Review:"
-msgstr ""
+msgstr "åååæï"
 
 #: torbutton.about.donate
 msgid "If you like using Tor, you might consider"
-msgstr ""
+msgstr "åææåæäç Torïæäåäèè"
 
 #: torbutton.about.make_donation
 msgid "making a donation."
@@ -203,7 +205,7 @@
 
 #: torbutton.context_menu.openTorWindow
 msgid "Open Tor URL in new Window"
-msgstr "åæçåäæåTor URL"
+msgstr "åæçåäæå Tor URL"
 
 #: torbutton.context_menu.openTorWindow.key
 msgid "d"
@@ -311,7 +313,7 @@
 
 #: torbutton.prefs.tor_shutdown
 msgid "Clear Tor cookies during Tor-enabled browser shutdown"
-msgstr "æ Tor åéæèåææéç Tor æèäçç Cookies"
+msgstr "å Tor åéæèåææéç Tor æèäçç Cookies"
 
 #: torbutton.prefs.all_shutdown
 msgid "Clear cookies during any browser shutdown"
@@ -339,15 +341,15 @@
 
 #: torbutton.prefs.spoofblank
 msgid "Spoof blank referer during Tor usage (may break some sites)"
-msgstr "äçToræåéççReferer(ääççåèæçåå)"
+msgstr "äç Tor æåéçç Referer(ääççåèæçåå)"
 
 #: torbutton.prefs.smartspoof
 msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
-msgstr "äçTorææèæéReferer(æéèåReferer)"
+msgstr "äç Tor ææèæé Referer(æéèå Referer)"
 
 #: torbutton.prefs.nospoof
 msgid "No referer spoof during Tor usage (sends referers as normal)"
-msgstr "äçToræççæææé(åéæåReferer)"
+msgstr "ä çToræççæææé(åéæåReferer)"
 
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
@@ -379,7 +381,7 @@
 
 #: torbutton.prefs.startup_tor
 msgid "On browser startup, set Tor state to:"
-msgstr "æèåååæ,èçTorççæä:"
+msgstr "æèåååæ,èç Tor ççæä:"
 
 #: torbutton.prefs.reload_crashed_jar
 msgid "Reload cookie jar/clear cookies on Firefox crash (recommended)"
@@ -472,11 +474,11 @@
 
 #: torbutton.prefs.session_restore
 msgid "Have the session store save and restore these tabs:"
-msgstr "è Firefox äèäååèäååæååäæçéï"
+msgstr "è Firefox çäèäååèäååæååäæçéï"
 
 #: torbutton.prefs.nontor_tabs
 msgid "Tabs loaded in Non-Tor"
-msgstr "äç Tor çæçé"
+msgstr "ääç Tor çæçé"
 
 #: torbutton.prefs.tor_tabs
 msgid "Tabs loaded in Tor"
@@ -544,23 +546,23 @@
 
 #: torbutton.cookiedialog.protectCookie
 msgid "Protect Cookie"
-msgstr "äæCookie"
+msgstr "äæ Cookie"
 
 #: torbutton.cookiedialog.removeCookie
 msgid "Remove Cookie"
-msgstr "çéCookie"
+msgstr "ç éCookie"
 
 #: torbutton.cookiedialog.unprotectCookie
 msgid "Unprotect Cookie"
-msgstr "åæäæCookie"
+msgstr "åæäæ Cookie"
 
 #: torbutton.cookiedialog.removeAllBut
 msgid "Remove All But Protected"
-msgstr "ääçåäæçCookieïåäçéåé"
+msgstr "ääçåäæç Cookieïåäçéåé"
 
 #: torbutton.cookiedialog.saveAllCookies
 msgid "Protect New Cookies"
-msgstr "äææçCookies"
+msgstr "äææç Cookies"
 
 #: torbutton.cookiedialog.doNotSaveAllCookies
 msgid "Do Not Protect New Cookies"
@@ -568,7 +570,7 @@
 
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
-msgstr "äç Tor æçç Livemark ææ(RSSäç)"
+msgstr "äç Tor æçç Livemark ææ(RSS äç)"
 
 #: torbutton.prefs.dtd_recommended
 msgid "(recommended)"
@@ -605,8 +607,8 @@
 msgstr "Yahoo.com"
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
-msgstr "scroogle.org"
+msgid "startpage.com"
+msgstr ""
 
 #: torbutton.prefs.engine5
 msgid "duckduckgo.com"
@@ -618,4 +620,7 @@
 
 #: torbutton.prefs.transparentTor
 msgid "Transparent Torification (Requires custom transproxy or Tor router)"
-msgstr "Toréæäç(éèèèéæäçæTorèççåçææ)"
+msgstr "Tor éæäç(éèèèéæäçæTorèççåçææ)"
+
+#~ msgid "scroogle.org"
+#~ msgstr "scroogle.org"

Modified: translation/trunk/projects/torbutton/po/zh_CN/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/zh_CN/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/zh_CN/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: mikeperry <mikeperry-trans@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -290,3 +290,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/zh_HK/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/zh_HK/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/zh_HK/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/zh_HK/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/zh_HK/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/zh_HK/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/zh_TW/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/zh_TW/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/zh_TW/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:44+0000\n"
 "Last-Translator: whyme <random3098@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -600,7 +600,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/zh_TW/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/zh_TW/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/zh_TW/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2012-02-14 09:45+0000\n"
 "Last-Translator: whyme <random3098@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -260,3 +260,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr "çççéåèåæãèçåääçéææå Tor Browser æçèåäåèçã"
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

Modified: translation/trunk/projects/torbutton/po/zu/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton/po/zu/torbutton.dtd.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/zu/torbutton.dtd.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -596,7 +596,7 @@
 msgstr ""
 
 #: torbutton.prefs.engine4
-msgid "scroogle.org"
+msgid "startpage.com"
 msgstr ""
 
 #: torbutton.prefs.engine5

Modified: translation/trunk/projects/torbutton/po/zu/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton/po/zu/torbutton.properties.po	2012-08-29 17:34:47 UTC (rev 25776)
+++ translation/trunk/projects/torbutton/po/zu/torbutton.properties.po	2012-08-30 22:09:48 UTC (rev 25777)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 14:15-0700\n"
+"POT-Creation-Date: 2012-08-30 14:54-0700\n"
 "PO-Revision-Date: 2010-12-05 19:40+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -252,3 +252,33 @@
 "The disk appears to be full. Please free up space or move Tor Browser to a "
 "new device."
 msgstr ""
+
+#: torbutton.title.prompt_torbrowser
+msgid "Important Torbutton Information"
+msgstr ""
+
+#: torbutton.popup.prompt_torbrowser
+msgid ""
+"Torbutton works differently now: you can't turn it off any more.\n"
+"\n"
+"We made this change because it isn't safe to use Torbutton in a browser "
+"that's also used for non-Tor browsing. There were too many bugs there that "
+"we couldn't fix any other way.\n"
+"\n"
+"If you want to keep using Firefox normally, you should uninstall Torbutton "
+"and download Tor Browser Bundle. The privacy properties of Tor Browser are "
+"also superior to those of normal Firefox, even when Firefox is used with "
+"Torbutton.\n"
+"\n"
+"To remove Torbutton, go to Tools->Addons->Extensions and then click the "
+"Remove button next to Torbutton."
+msgstr ""
+
+#: torbutton.popup.short_torbrowser
+msgid ""
+"Important Torbutton Information!\n"
+"\n"
+"Torbutton is now always enabled.\n"
+"\n"
+"Click on the Torbutton for more information."
+msgstr ""

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
Prev by Author: [tor-commits] r25764: {website} Add tor2web to the list of applications using Onionoo. (website/trunk/projects/en)
Next by Author: [tor-commits] r25778: {website} Update website for Torbutton 1.4.6.1. (in website/trunk: include torbutton)
Previous by thread: [tor-commits] [flashproxy/master] Make the install target .PHONY.
Next by thread: [tor-commits] [torbutton/master] Update versions and changelog.
Index(es):
- Author
- Thread