[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r23359: {translation} Update alpha branch .po files for 1.3.0-alpha. (in translation/trunk/projects/torbutton-alpha/po: af ak am ar arn ast az be bg bms 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 lg ln lo lt lv mg mi mk ml mn mr ms mt 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)



Author: mikeperry
Date: 2010-09-30 19:51:06 +0000 (Thu, 30 Sep 2010)
New Revision: 23359

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



Modified: translation/trunk/projects/torbutton-alpha/po/af/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/af/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/af/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/af/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/af/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/af/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ak/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ak/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ak/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ak/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ak/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ak/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/am/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/am/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/am/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/am/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/am/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/am/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ar/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ar/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ar/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,11 +1,11 @@
 # extracted from en-US/torbutton.dtd, ar/torbutton.dtd
 # Osama Khalid <osamak@xxxxxxx>, 2010.
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-09-29 05:58+0300\n"
 "Last-Translator: Osama Khalid <osamak@xxxxxxx>\n"
 "Language-Team: Ø\n"
@@ -108,9 +108,9 @@
 "proxy settings, please disable Torbutton and return here.  If you would like "
 "to change your Tor settings, please use the Torbutton preference window."
 msgstr ""
-"ØØ ØÙØ ÙÙØÙÙ ØØÙÙÙØ. ØÙ ÙÙØ ØØÙØ ØØÙÙØ ØØØØØØØ ØÙÙØÙØ ØÙØ ØÙÙØØÙÙØ ØØÙØØ "
-"ÙØÙØÙ ØØÙ ØØ ØÙØ ØÙÙØÙ ØÙ ØØ ØÙÙ ÙÙØ. ØÙ ÙÙØ ØØÙØ ØØØÙÙ ØØØØØØØ ØØ ØÙØ "
-"ÙØØØØØÙ ÙØÙØØ ØÙØÙÙØØ ØØ ØÙØ."
+"ØØ ØÙØ ÙÙØÙÙ ØØÙÙÙØ. ØÙ ÙÙØ ØØÙØ ØØÙÙØ ØØØØØØØ ØÙÙØÙØ ØÙØ ØÙÙØØÙÙØ ØØÙØØ ÙØÙØÙ "
+"ØØÙ ØØ ØÙØ ØÙÙØÙ ØÙ ØØ ØÙÙ ÙÙØ. ØÙ ÙÙØ ØØÙØ ØØØÙÙ ØØØØØØØ ØØ ØÙØ ÙØØØØØÙ "
+"ÙØÙØØ ØÙØÙÙØØ ØØ ØÙØ."
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -136,6 +136,38 @@
 msgid "A"
 msgstr "Ø"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "ØØ ØÙØ"
@@ -180,6 +212,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "ØØÙØ ÙØÙØØ ØÙÙ ØÙØ ÙÙ ÙØØØ ØÙÙ "
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "ØØØÙØ ØÙÙØÙØØ ÙØÙÙÙØ (ØÙØÙØ)"
@@ -256,10 +292,24 @@
 msgid "Spoof US English Browser"
 msgstr "ØÙØØÙ ÙØØÙØÙØ ØÙØÙÙØÙÙØ ØÙØÙÙÙÙØ"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
 msgstr "ÙØ ØØØÙ ØÙÙØÙÙ ØØÙØØ ØÙÙ ØÙØÙØ (ÙØ ÙØØÙ ØØØ ØÙÙÙØÙØ)"
 
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr "ÙØ ØØØÙ ØÙÙØÙÙ ØØÙØØ ØÙÙ ØÙØÙØ (ÙØ ÙØØÙ ØØØ ØÙÙÙØÙØ)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "ØØÙÙ ØØØÙÙ DOM ØØÙØØ ØÙÙ ØÙØÙØ (ØÙØÙØ)"
@@ -406,6 +456,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "ØØØÙØ: ØØÙØ ØØØØØØÙ ØÙ ÙÙ ØØÙØØ ØÙÙØÙÙ ØÙÙØÙÙØØ ØØÙØÙ"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "ØÙÙØÙØØ"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr "ØØØÙÙ ØÙØÙØÙØØ ØÙØÙØ ØÙØÙ ØØØØÙØÙ ØÙØÙØ"
@@ -450,10 +569,18 @@
 msgid "scroogle.org"
 msgstr "scroogle.org"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr "ØØÙ ØÙÙÙØØ ÙØÙÙØØ ÙÙ ØØØÙØØØØØ ÙØØÙ ØØØ ØÙØÙ"
 
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr "ØÙÙØ ØÙØØØÙØØØ ØØÙØØ ØÙÙ ØÙØ (ÙØØØ)"
 

Modified: translation/trunk/projects/torbutton-alpha/po/ar/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ar/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ar/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from en-US/torbutton.properties, ar/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-05-03 12:16-0600\n"
 "Last-Translator: Anas Qtiesh <anasqtiesh@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -96,16 +97,17 @@
 "Tor toggle. Would you like to disable the isolation of Certificate Authority "
 "certificates? (If you don't understand this, it is safe to click OK)"
 msgstr ""
-"ÙÙØØØØ ÙÙØØØ ØÙØ: ØÙØ ØÙÙÙ ÙØ ØÙÙÙ ÙÙØØÙ ØØØØØ ØÙØÙØØØ ØÙØÙÙÙØ ÙØÙØ ØÙÙ "
-"ØÙÙÙØ ÙØØ ÙØØÙØ ÙØØØ ØÙØÙØØØ ØÙØÙÙÙ ØÙÙÙØ ØØÙØØ ÙØØØØ ØØØØ ÙÙ ØÙÙ ÙÙØØØ ØÙØØ "
-"ÙÙÙ ØØØØ ÙÙ ØØØÙÙ ØÙÙÙØ ØØÙ ØÙØØØØ ØÙØØØØØ ØÙØÙÙÙØ (ØÙ ÙÙØ ÙØ ØØÙÙ ØÙ ÙØ "
-"ØÙÙÙ ÙØÙÙ ØÙÙØ ÙØÙÙ ÙÙ ØÙÙØØØØÙ ØÙ ØØØØØ ØÙØØ ØÙÙÙØÙÙØ) "
+"ÙÙØØØØ ÙÙØØØ ØÙØ: ØÙØ ØÙÙÙ ÙØ ØÙÙÙ ÙÙØØÙ ØØØØØ ØÙØÙØØØ ØÙØÙÙÙØ ÙØÙØ ØÙÙ ØÙÙÙØ "
+"ÙØØ ÙØØÙØ ÙØØØ ØÙØÙØØØ ØÙØÙÙÙ ØÙÙÙØ ØØÙØØ ÙØØØØ ØØØØ ÙÙ ØÙÙ ÙÙØØØ ØÙØØ ÙÙÙ "
+"ØØØØ ÙÙ ØØØÙÙ ØÙÙÙØ ØØÙ ØÙØØØØ ØÙØØØØØ ØÙØÙÙÙØ (ØÙ ÙÙØ ÙØ ØØÙÙ ØÙ ÙØ ØÙÙÙ "
+"ÙØÙÙ ØÙÙØ ÙØÙÙ ÙÙ ØÙÙØØØØÙ ØÙ ØØØØØ ØÙØØ ØÙÙÙØÙÙØ) "
 
 #: torbutton.popup.ff3.warning
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/arn/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/arn/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/arn/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/arn/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/arn/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/arn/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ast/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ast/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ast/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ast/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ast/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ast/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/az/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/az/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/az/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/az/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/az/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/az/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/be/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/be/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/be/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/be/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/be/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/be/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/bg/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/bg/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/bg/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/bg/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/bg/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/bg/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/bms/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/bms/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/bms/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-09-07 08:02+0200\n"
 "Last-Translator: H2A <htaike2aung@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -46,9 +46,7 @@
 
 #: torbutton.prefs.recommended_settings
 msgid "Use the recommended proxy settings for my version of Firefox"
-msgstr ""
-"ááááááá áááááááááá proxy ááááááááááááááááááá ááááá Firefox version áááá "
-"ááááááááááá"
+msgstr "ááááááá áááááááááá proxy ááááááááááááááááááá ááááá Firefox version áááá ááááááááááá"
 
 #: torbutton.prefs.use_privoxy
 msgid "Use Privoxy"
@@ -108,9 +106,8 @@
 "proxy settings, please disable Torbutton and return here.  If you would like "
 "to change your Tor settings, please use the Torbutton preference window."
 msgstr ""
-"Torbutton ááá áááááááááá ááááááááááááááááááá Tor Proxy áááááááá "
-"ááááááááááááááááááá ááááááááá ááááááááááááááááááááá Torbutton ááá "
-"ááááááááááááááááááá ááááá ááááááááááá ááááááááá Tor ááááááááááááááááááá "
+"Torbutton ááá áááááááááá ááááááááááááááááááá Tor Proxy áááááááá ááááááááááááááááááá ááááááááá "
+"ááááááááááááááááááááá Torbutton ááá ááááááááááááááááááá ááááá ááááááááááá ááááááááá Tor ááááááááááááááááááá "
 "ááááááááááááááá Torbutton áááááááááááááááááááááááááá ááá ááááááááááá"
 
 #: torbutton.context_menu.toggle
@@ -137,6 +134,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -151,48 +180,41 @@
 
 #: torbutton.prefs.block_thread
 msgid "Block history reads during Tor (crucial)"
-msgstr ""
-"Tor ááááááááááááááááá history ááááááááááááá ááááááááááááá (ááááááááááááá)"
+msgstr "Tor ááááááááááááááááá history ááááááááááááá ááááááááááááá (ááááááááááááá)"
 
 #: torbutton.prefs.block_thwrite
 msgid "Block history writes during Tor (recommended)"
-msgstr ""
-"Tor ááááááááááááááááá history ááááááááááá ááááááááááááá "
-"(ááááááááááááááááááá)"
+msgstr "Tor ááááááááááááááááá history ááááááááááá ááááááááááááá (ááááááááááááááááááá)"
 
 #: torbutton.prefs.block_nthread
 msgid "Block history reads during Non-Tor (optional)"
-msgstr ""
-"Tor áááááááááááááááááá history ááááááááááá ááááááááááááá "
-"(áááááááááááááááááá)"
+msgstr "Tor áááááááááááááááááá history ááááááááááá ááááááááááááá (áááááááááááááááááá)"
 
 #: torbutton.prefs.block_nthwrite
 msgid "Block history writes during Non-Tor (optional)"
-msgstr ""
-"Tor áááááááááááááááááá history ááááááááááá ááááááááááááá "
-"(áááááááááááááááááá)"
+msgstr "Tor áááááááááááááááááá history ááááááááááá ááááááááááááá (áááááááááááááááááá)"
 
 #: torbutton.prefs.clear_history
 msgid "Clear history on Tor toggle (optional)"
-msgstr ""
-"Tor áááááááá/áááá áááááááááááááááááá history ááá áááááááááááá "
-"(áááááááááááááááááá)"
+msgstr "Tor áááááááá/áááá áááááááááááááááááá history ááá áááááááááááá (áááááááááááááááááá)"
 
 #: torbutton.prefs.clear_cache
 msgid "Block Tor disk cache and clear all cache on Tor toggle"
 msgstr ""
-"Tor áááááááá/áááá áááááááááááááááááá Disk cache áááááááááááááá cache "
-"áááááááááááááááááá ááááááááááááá"
+"Tor áááááááá/áááá áááááááááááááááááá Disk cache áááááááááááááá cache áááááááááááááááááá ááááááááááááá"
 
 #: torbutton.prefs.block_cache
 msgid "Block disk and memory cache access during Tor"
-msgstr ""
-"Tor ááááááááááááááááá disk ááááá memory cache ááááááááááááá ááááááááááááá"
+msgstr "Tor ááááááááááááááááá disk ááááá memory cache ááááááááááááá ááááááááááááá"
 
 #: torbutton.prefs.cookie_jars
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "Tor áááááááá cookies ááááááá ááááááááááááá jar áááááá ááááááááááááááá"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "áááááááá cookies ááááááá áááááááááááááááááááá (áááááá áááááááá)"
@@ -203,19 +225,15 @@
 
 #: torbutton.prefs.disable_plugins
 msgid "Disable plugins during Tor usage (crucial)"
-msgstr ""
-"Tor áááááááááááááááááááááááá plugins ááááááá ááááááááááááá (ááááááááááááá)"
+msgstr "Tor áááááááááááááááááááááááá plugins ááááááá ááááááááááááá (ááááááááááááá)"
 
 #: torbutton.prefs.kill_bad_js
 msgid "Hook dangerous javascript (crucial)"
-msgstr ""
-"áááááááááááá javascript ááááááá hook áááááááááááááááááááááááááá áááááááááá "
-"(ááááááááááááá)"
+msgstr "áááááááááááá javascript ááááááá hook áááááááááááááááááááááááááá áááááááááá (ááááááááááááá)"
 
 #: torbutton.prefs.isolate_content
 msgid "Isolate dynamic content to Tor state (crucial)"
-msgstr ""
-"Tor ááááááááááá dynamic content ááááááá ááááááá ááááááááá (ááááááááááááá)"
+msgstr "Tor ááááááááááá dynamic content ááááááá ááááááá ááááááááá (ááááááááááááá)"
 
 #: torbutton.prefs.no_updates
 msgid "Disable updates during Tor usage"
@@ -223,8 +241,7 @@
 
 #: torbutton.prefs.set_uagent
 msgid "Set user agent for Tor usage (crucial)"
-msgstr ""
-"Tor ááááááááááááááá áááááááááá ááááááááááááááá áááááááááá (ááááááááááááá)"
+msgstr "Tor ááááááááááááááá áááááááááá ááááááááááááááá áááááááááá (ááááááááááááá)"
 
 #: torbutton.prefs.dynamic
 msgid "Dynamic Content"
@@ -244,9 +261,7 @@
 
 #: torbutton.prefs.no_search
 msgid "Disable search suggestions during Tor (recommended)"
-msgstr ""
-"Tor ááááááááááááááááá ááááááááá áááááááááááááááá ááááááááááááá "
-"(ááááááááááááááááááá)"
+msgstr "Tor ááááááááááááááááá ááááááááá áááááááááááááááá ááááááááááááá (ááááááááááááááááááá)"
 
 #: torbutton.prefs.shutdown
 msgid "Shutdown"
@@ -254,9 +269,7 @@
 
 #: torbutton.prefs.tor_shutdown
 msgid "Clear Tor cookies during Tor-enabled browser shutdown"
-msgstr ""
-"Tor áááááááááááááááá browser ááá ááááááááááááááá Tor Cookies ááááááá "
-"áááááááááááá"
+msgstr "Tor áááááááááááááááá browser ááá ááááááááááááááá Tor Cookies ááááááá áááááááááááá"
 
 #: torbutton.prefs.all_shutdown
 msgid "Clear cookies during any browser shutdown"
@@ -278,12 +291,26 @@
 msgid "Spoof US English Browser"
 msgstr "US ááááááá browser ááá Spoof ááááááá"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
-"Tor ááááááááááááááááááá ááááááááááááá áááááááááááá ááááááá (áááááá "
-"áááááááááááá ááááááááááááááááááááá)"
 
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+"Tor ááááááááááááááááááá ááááááááááááá áááááááááááá ááááááá (áááááá áááááááááááá ááááááááááááááááááááá)"
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+"Tor ááááááááááááááááááá ááááááááááááá áááááááááááá ááááááá (áááááá áááááááááááá ááááááááááááááááááááá)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "Tor ááááááááááááááááá DOM áááááááááááááá ááááááááááááá (ááááááááááááá)"
@@ -295,14 +322,12 @@
 #: torbutton.prefs.block_tforms
 msgid "Block password+form saving during Tor (recommended)"
 msgstr ""
-"Tor ááááááááááááááááá áááááááá ááááá áááááááááááááááááá ááááááááááááááááá "
-"ááááááááááááá (ááááááááááááááááááá)"
+"Tor ááááááááááááááááá áááááááá ááááá áááááááááááááááááá ááááááááááááááááá ááááááááááááá (ááááááááááááááááááá)"
 
 #: torbutton.prefs.block_ntforms
 msgid "Block password+form saving during Non-Tor (optional)"
 msgstr ""
-"Tor áááááááááááááááááá áááááááá ááááá áááááááááááááááááá ááááááááááááááááá "
-"ááááááááááááá (áááááááááááááááááá)"
+"Tor áááááááááááááááááá áááááááá ááááá áááááááááááááááááá ááááááááááááááááá ááááááááááááá (áááááááááááááááááá)"
 
 #: torbutton.prefs.tor
 msgid "Tor"
@@ -319,14 +344,12 @@
 #: torbutton.prefs.reload_crashed_jar
 msgid "Reload cookie jar/clear cookies on Firefox crash (recommended)"
 msgstr ""
-"Firefox ááááááááááááááááááááááááá cookie jar ááá ááááááá áááááááááááá/ "
-"áááááááááááá (ááááááááááááááááááá)"
+"Firefox ááááááááááááááááááááááááá cookie jar ááá ááááááá áááááááááááá/ áááááááááááá "
+"(ááááááááááááááááááá)"
 
 #: torbutton.prefs.dual_cookie_jars
 msgid "Store both Tor and Non-Tor cookies in protected jars (dangerous)"
-msgstr ""
-"Tor ááááá Tor áááááááá cookies ááááááá áááááááááááá jars áááááááááá "
-"ááááááááááááááá"
+msgstr "Tor ááááá Tor áááááááá cookies ááááááá áááááááááááá jars áááááááááá ááááááááááááááá"
 
 #: torbutton.prefs.clear_http_auth
 msgid "Clear HTTP auth sessions (recommended)"
@@ -335,49 +358,46 @@
 #: torbutton.prefs.block_js_history
 msgid "Isolate access to history navigation to Tor state (crucial)"
 msgstr ""
-"Tor ááááááááááá history áááááááááááááá áááááááááááááááá ááááááá ááááááá "
-"áááááá (ááááááááááááá)"
+"Tor ááááááááááá history áááááááááááááá áááááááááááááááá ááááááá ááááááá áááááá "
+"(ááááááááááááá)"
 
 #: torbutton.prefs.resize_on_toggle
 msgid "Resize windows to multiples of 50px during Tor usage (recommended)"
-msgstr ""
-"Tor ááááááááááááááááááá windows ááá 50 px áááá ááááááááá ááááááááá "
-"(ááááááááááááááááááá)"
+msgstr "Tor ááááááááááááááááááá windows ááá 50 px áááá ááááááááá ááááááááá (ááááááááááááááááááá)"
 
 #: torbutton.prefs.close_tor
 msgid "Close all Tor windows and tabs on toggle (optional)"
 msgstr ""
-"áááááááááá áááááááááááááááááá Tor windows ááááááááá tabs áááá áááááááááá "
-"áááááááááááá (áááááááááááááááááá)"
+"áááááááááá áááááááááááááááááá Tor windows ááááááááá tabs áááá áááááááááá áááááááááááá "
+"(áááááááááááááááááá)"
 
 #: torbutton.prefs.close_nontor
 msgid "Close all Non-Tor windows and tabs on toggle (optional)"
 msgstr ""
-"áááááááááá áááááááááááááááááá Tor áááááááá windows ááááááááá tabs áááá "
-"áááááááááá áááááááááááá (áááááááááááááááááá)"
+"áááááááááá áááááááááááááááááá Tor áááááááá windows ááááááááá tabs áááá áááááááááá áááááááááááá "
+"(áááááááááááááááááá)"
 
 #: torbutton.prefs.block_links
 msgid "Block link clicks and page reloads from different Tor states (optional)"
 msgstr ""
-"áááááááá Tor ááááááááááááááá ááááááááááááááááááááá ááá áááááááááááááááááá "
-"ááááááááááááá ááááááá ááááááááááááá áááááááááá (áááááááááááááááááá)"
+"áááááááá Tor ááááááááááááááá ááááááááááááááááááááá ááá áááááááááááááááááá ááááááááááááá ááááááá ááááááááááááá "
+"áááááááááá (áááááááááááááááááá)"
 
 #: torbutton.prefs.jar_certs
 msgid "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"
 msgstr ""
-"Tor ááááááááááá ááááááááá Tor áááááááááááá ááááááááááá SSL certs ááááááá "
-"ááááááá jars áááááááá áááááááááááá (ááááááááááááááááááá)"
+"Tor ááááááááááá ááááááááá Tor áááááááááááá ááááááááááá SSL certs ááááááá ááááááá jars "
+"áááááááá áááááááááááá (ááááááááááááááááááá)"
 
 #: torbutton.prefs.jar_ca_certs
 msgid "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"
 msgstr ""
-"Tor ááááááááááá ááááááááá Tor áááááááááááá ááááááááááá CA certs ááááááá "
-"ááááááá jars áááááááá áááááááááááá (ááááááááááááááááááá)"
+"Tor ááááááááááá ááááááááá Tor áááááááááááá ááááááááááá CA certs ááááááá ááááááá jars áááááááá "
+"áááááááááááá (ááááááááááááááááááá)"
 
 #: torbutton.prefs.locked_mode
 msgid "Disable Button and Hotkeys to prevent accidental toggle"
-msgstr ""
-"ááááááá ááááááááááá áááááááááá Button ááááá Hotkeys ááááááá ááááááááááááá"
+msgstr "ááááááá ááááááááááá áááááááááá Button ááááá Hotkeys ááááááá ááááááááááááá"
 
 #: torbutton.prefs.startup_state
 msgid "On normal startup, set Tor state to:"
@@ -393,8 +413,7 @@
 
 #: torbutton.prefs.block_tor_file_net
 msgid "Block Tor access to network from file:// urls (recommended)"
-msgstr ""
-"Network áááá Tor ááááááááááááá áááááááááá file:// urls (ááááááááááááááááááá)"
+msgstr "Network áááá Tor ááááááááááááá áááááááááá file:// urls (ááááááááááááááááááá)"
 
 #: torbutton.prefs.block_nontor_file_net
 msgid "Block Non-Tor access to network from file:// urls"
@@ -412,8 +431,7 @@
 msgid ""
 "Test my Tor settings after the first time I toggle on every Firefox start"
 msgstr ""
-"Firefox áááááááá ááááááá áááááááááááááááááááááááááááá ááááá Tor "
-"ááááááááááááááááá ááááááá áááááááááá"
+"Firefox áááááááá ááááááá áááááááááááááááááááááááááááá ááááá Tor ááááááááááááááááá ááááááá áááááááááá"
 
 #: torbutton.prefs.disable_livemarks
 msgid "Disable livemarks updates during Tor usage"
@@ -429,8 +447,7 @@
 
 #: torbutton.prefs.session_restore
 msgid "Have the session store save and restore these tabs:"
-msgstr ""
-"session áááááááááááááááá áááááááááááá áááááááá ááááááá áááááááá tabs áááá :"
+msgstr "session áááááááááááááááá áááááááááááá áááááááá ááááááá áááááááá tabs áááá :"
 
 #: torbutton.prefs.nontor_tabs
 msgid "Tabs loaded in Non-Tor"
@@ -456,6 +473,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "áááááááááá: áááááááááááá hostname áááááááááááááááá"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "Cookies áááá"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr "Tor ááááááááááááááááááá livemarks áááááááááááááááááááááá ááááááááááááá"
@@ -480,9 +566,7 @@
 msgid ""
 "Automatically use an alternate search engine when presented with a Google "
 "Captcha:"
-msgstr ""
-"Google Captcha áááááááááááá ááááá search engine ááááá "
-"áááááááááááááááááááááááááá"
+msgstr "Google Captcha áááááááááááá ááááá search engine ááááá áááááááááááááááááááááááááá"
 
 #: torbutton.prefs.engine1
 msgid "ixquick.com"
@@ -500,6 +584,14 @@
 msgid "scroogle.org"
 msgstr "scroogle.org"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr "Google Search Box queries áá platform ááááá language áááááááááááááá"
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/bms/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/bms/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/bms/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-09-29 08:30+0200\n"
 "Last-Translator: carolyn anhalt <carolyn@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -53,8 +53,8 @@
 "Torbutton provides a button to easily enable or disable pointing Firefox to "
 "the Tor proxy"
 msgstr ""
-"Tor proxy ááá Firefox áááá áááááááá ááááááááááááá áááááá/ ááááááá Torbutton "
-"áá ááááááááááááá ááááááááááááááááá"
+"Tor proxy ááá Firefox áááá áááááááá ááááááááááááá áááááá/ ááááááá Torbutton áá ááááááááááááá "
+"ááááááááááááááááá"
 
 #: torbutton.popup.history.warning
 msgid ""
@@ -85,8 +85,7 @@
 "Use Save-As instead.\n"
 "\n"
 msgstr ""
-"plugin áááááááááááááááá Tor áá áááááááááá ááááááááááááá Torbutton áá "
-"ááááááááááááá \n"
+"plugin áááááááááááááááá Tor áá áááááááááá ááááááááááááá Torbutton áá ááááááááááááá \n"
 "\n"
 "Save-As ááá áááááááá ááááááááááá \n"
 "\n"
@@ -98,33 +97,33 @@
 "Tor toggle. Would you like to disable the isolation of Certificate Authority "
 "certificates? (If you don't understand this, it is safe to click OK)"
 msgstr ""
-"Torbutton áááááááá: ááááááááá  ááááááááááááá Certificate Authorities "
-"ááááááááááááá Certificate Authority áááááá áááááááááááááááááááá Tor "
-"ááááááááá ááááááááááááá ááááááááááááááááááá ááááááááááááááá "
-"ááááááááááááááááááááá Certificate Authority certificates áááá "
-"ááááááááááááááááááááá áááááááááááááááá ? (ááá ááááááááááááááááá ááááááááááá "
+"Torbutton áááááááá: ááááááááá  ááááááááááááá Certificate Authorities ááááááááááááá "
+"Certificate Authority áááááá áááááááááááááááááááá Tor ááááááááá ááááááááááááá "
+"ááááááááááááááááááá ááááááááááááááá ááááááááááááááááááááá Certificate Authority "
+"certificates áááá ááááááááááááááááááááá áááááááááááááááá ? (ááá ááááááááááááááááá ááááááááááá "
 "ááááááááááá OK ááá ááááááááááááááááááá ááááááááááááááááááááááá)"
 
 #: torbutton.popup.ff3.warning
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
 "áááááááááá!\n"
 "\n"
-"áááá áááááááááááááááááá livemarks áááá ááááááááááááááááá Firefox 3 áááá "
-"Torbutton ááá Tor ááááááá áááááááááááááááááááá \n"
+"áááá áááááááááááááááááá livemarks áááá ááááááááááááááááá Firefox 3 áááá Torbutton ááá Tor "
+"ááááááá áááááááááááááááááááá \n"
 "\n"
 "áááááááááááááááá áááááááá ááááááááááááááá ááááááááá ?"
 
 #: torbutton.popup.toggle.warning
 msgid "You need to toggle Tor or restart for your settings to take effect."
 msgstr ""
-"áááááááááááá áááááááááááááááá áááááááá Tor ááááááááááááááá ááááááááááá "
-"áááááááááááá ááááááááá áááááááááááááá ááááááááááá"
+"áááááááááááá áááááááááááááááá áááááááá Tor ááááááááááááááá ááááááááááá áááááááááááá ááááááááá áááááááááááááá "
+"ááááááááááá"
 
 #: torbutton.popup.test.success
 msgid "Tor proxy test successful!"
@@ -133,8 +132,7 @@
 #: torbutton.popup.test.failure
 msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
-"Tor proxy ááááááááá áááááááááááá ! áááá proxy ááááá Privoxy "
-"ááááááááááááááááá ááááááááá"
+"Tor proxy ááááááááá áááááááááááá ! áááá proxy ááááá Privoxy ááááááááááááááááá ááááááááá"
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""
@@ -149,16 +147,16 @@
 "\n"
 "Tor ááá enable ááááááááááááááááááá\n"
 "\n"
-"ááááááááá-áááááááááááááááááááááááááááááááá Torbutton Proxy Preferences "
-"window áá áááááááááááááá ááááááááááááááááááá"
+"ááááááááá-áááááááááááááááááááááááááááááááá Torbutton Proxy Preferences window áá áááááááááááááá "
+"ááááááááááááááááááá"
 
 #: torbutton.popup.test.ff3_notice
 msgid ""
 "Click OK to test Tor proxy settings. This test will happen in the "
 "background. Please be patient."
 msgstr ""
-"Tor proxy ááááááááááááááááá áááááááááá OK ááá áááááááááááá áááááááááááá "
-"ááááááááááááá ááááááááááááá ááááááááááá ááááááááááááááááááááááááááá"
+"Tor proxy ááááááááááááááááá áááááááááá OK ááá áááááááááááá áááááááááááá ááááááááááááá ááááááááááááá "
+"ááááááááááá ááááááááááááááááááááááááááá"
 
 #: torbutton.panel.label.verified
 msgid "Tor Verified"
@@ -258,8 +256,8 @@
 #~ "Hit 'enter' in the location box or open a new window or tab instead.\n"
 #~ "\n"
 #~ msgstr ""
-#~ "ááááááááááá ááááááá History ááááááááááááááááááááá ááá Torbutton áá "
-#~ "ááááááááááááááááFirefox ááááááááá bug áááá ááááááááááááááááá áááááááááá \n"
+#~ "ááááááááááá ááááááá History ááááááááááááááááááááá ááá Torbutton áá ááááááááááááááááFirefox "
+#~ "ááááááááá bug áááá ááááááááááááááááá áááááááááá \n"
 #~ "\n"
 #~ "location box áááááááá enter ááá ááááááá ááááááááá window  ááááááááá ááááááááá tab ááááá "
 #~ "áááááááá áááááááááááá \n"

Modified: translation/trunk/projects/torbutton-alpha/po/bn/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/bn/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/bn/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/bn/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/bn/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/bn/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/bn_IN/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/bn_IN/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/bn_IN/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/bn_IN/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/bn_IN/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/bn_IN/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/bo/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/bo/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/bo/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/bo/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/bo/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/bo/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/br/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/br/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/br/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/br/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/br/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/br/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/bs/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/bs/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/bs/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/bs/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/bs/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/bs/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ca/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ca/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ca/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ca/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ca/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ca/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/cs/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/cs/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/cs/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-08-22 22:31+0200\n"
 "Last-Translator: Martin <martinbarta@xxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -131,6 +131,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -175,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -251,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -400,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -442,6 +558,14 @@
 msgid "scroogle.org"
 msgstr "scroogle.org"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/cs/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/cs/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/cs/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-08-22 22:14+0200\n"
 "Last-Translator: Martin <martinbarta@xxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -87,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/csb/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/csb/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/csb/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/csb/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/csb/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/csb/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/cy/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/cy/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/cy/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/cy/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/cy/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/cy/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/da/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/da/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/da/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-06-11 19:03-0600\n"
 "Last-Translator: Hans-JÃrgen Martinus Hansen <hans-jorgen@xxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -161,6 +162,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 # ok
 #: torbutton.button.label
 msgid "Torbutton"
@@ -216,6 +249,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "Gem Ikke-Tor cookies i en beskyttet krukke"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 # ok
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
@@ -311,11 +348,26 @@
 msgid "Spoof US English Browser"
 msgstr "Spoof US Engelsk Browser"
 
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
+msgstr ""
+
 # ok
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
 msgstr "Send ikke henviser ved brug af Tor (kan ÃdelÃgge visse sider)"
 
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+# ok
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr "Send ikke henviser ved brug af Tor (kan ÃdelÃgge visse sider)"
+
 # Done  - Manuel Ojeda ; ojeda@xxxxxxxx
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
@@ -498,6 +550,76 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "Advarsel: Undgà at bruge enhver vÃrtsnavne ovenfor"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+# ok
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "Cookies"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 # Done  - Manuel Ojeda ; ojeda@xxxxxxxx
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
@@ -541,6 +663,14 @@
 msgid "scroogle.org"
 msgstr "scroogle.org"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/da/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/da/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/da/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-03-02 05:32-0700\n"
 "Last-Translator: Hans-JÃrgen Martinus Hansen <hans-jorgen@xxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -107,7 +108,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/de/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/de/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/de/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from en-US/torbutton.dtd, de-DE/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-04-10 06:38-0600\n"
 "Last-Translator: CS <cs@xxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -107,8 +108,8 @@
 msgstr ""
 "Torbutten ist momentan aktiv. Wenn Sie die Proxy-Einstellungen fÃr den "
 "Betrieb ohne Tor Ãndern mÃchten, deaktivieren Sie bitte zuerst Torbutton. "
-"FÃr Ãnderungen der Tor-Einstellungen verwenden Sie bitte das Fenster &quot"
-";Torbutton-Einstellungen&quot;."
+"FÃr Ãnderungen der Tor-Einstellungen verwenden Sie bitte das Fenster &quot;"
+"Torbutton-Einstellungen&quot;."
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -134,6 +135,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -194,6 +227,10 @@
 "Speichern von Cookies, die nicht zu Tor gehÃren in einer gesicherten jar-"
 "Datei"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "Ich verwalte meine Cookies manuell (gefÃhrlich)"
@@ -213,8 +250,7 @@
 #: torbutton.prefs.isolate_content
 msgid "Isolate dynamic content to Tor state (crucial)"
 msgstr ""
-"Dynamisch generierte Daten wÃhrend der Benutzung von Tor separieren "
-"(wichtig)"
+"Dynamisch generierte Daten wÃhrend der Benutzung von Tor separieren (wichtig)"
 
 #: torbutton.prefs.no_updates
 msgid "Disable updates during Tor usage"
@@ -274,15 +310,32 @@
 msgid "Spoof US English Browser"
 msgstr "Englischen Browser (US) vortÃuschen"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
+
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
 "Keine Informationen Ãber vorher besuchte Seiten (Referrer) senden (fÃhrt zu "
 "Problemen mit manchen Seiten)"
 
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+"Keine Informationen Ãber vorher besuchte Seiten (Referrer) senden (fÃhrt zu "
+"Problemen mit manchen Seiten)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
-msgstr "Deaktiviere die DOM-Speicherung wÃhrend der Benutzung von Tor (wichtig)"
+msgstr ""
+"Deaktiviere die DOM-Speicherung wÃhrend der Benutzung von Tor (wichtig)"
 
 #: torbutton.prefs.forms
 msgid "Forms"
@@ -442,6 +495,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "Warnung: Vermeiden Sie es, oben irgendwelche Host Namen zu verwenden"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "Cookies"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -487,10 +609,18 @@
 msgid "scroogle.org"
 msgstr "scroogle.org"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr "Betriebssystem und Sprache bei Google Suchabfragen nicht Ãbermitteln"
 
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""
+
 # typo
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/de/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/de/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/de/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from en-US/torbutton.properties, de-DE/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-04-10 06:46-0600\n"
 "Last-Translator: CS <cs@xxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -109,7 +110,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/dz/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/dz/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/dz/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/dz/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/dz/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/dz/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/el/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/el/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/el/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from en-US/torbutton.dtd, el-GR/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-07-15 15:39-0600\n"
 "Last-Translator: mashua <masiakos@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -135,6 +136,38 @@
 msgid "A"
 msgstr "Î"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -183,6 +216,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "ÎÏÎÎÎÎÎÏÏÎ cookies ÎÎÏÏÏ Tor ÏÎ ÏÏÎÏÏÎÏÎÏÎÎÎÎ ÎÏÏÎÎÎ jar"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "ÎÎÎÏÏÎÎÎÏÎÎÎ ÎÎÎÏÎÎÏÎÏÎ cookies (ÎÏÎÎÎÎÎÏÎÎ)"
@@ -261,12 +298,28 @@
 msgid "Spoof US English Browser"
 msgstr "ÎÎÏÎÏÎÎÎÎÏÎ ÏÎÏ ÎÎÏÏÏÎÏ US English ÏÎÏ ÎÎÏÎÎÎÎÏÎ"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
+
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
 "ÎÎ ÎÎÎ ÎÏÎÏÏÎÎÎÏÎÎ referer ÎÎÏÎ ÏÎ ÏÏÎÏÎ Tor (ÎÏÎÏÎÎ ÎÎ ÎÎÎ ÎÎÎÏÎÏÏÎÎÏÎ "
 "ÏÏÏÏÎ ÎÏÎÏÎÎÎÎÎ ÎÏÏÏÏÎÏÎÎ)"
 
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+"ÎÎ ÎÎÎ ÎÏÎÏÏÎÎÎÏÎÎ referer ÎÎÏÎ ÏÎ ÏÏÎÏÎ Tor (ÎÏÎÏÎÎ ÎÎ ÎÎÎ ÎÎÎÏÎÏÏÎÎÏÎ "
+"ÏÏÏÏÎ ÎÏÎÏÎÎÎÎÎ ÎÏÏÏÏÎÏÎÎ)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "ÎÏÎÎÎÏÎÎÏÎÎÎÏÎ ÎÏÎÎÎÎÎÏÏÎÏ DOM ÎÎÏÎ ÏÎ ÏÏÎÏÎ Tor (ÎÏÎÏÎÎÎ)"
@@ -307,8 +360,7 @@
 #: torbutton.prefs.dual_cookie_jars
 msgid "Store both Tor and Non-Tor cookies in protected jars (dangerous)"
 msgstr ""
-"ÎÏÎÎÎÎÎÏÏÎ cookies ÎÏÏ ÎÎÎ ÎÎÏÏÏ Tor ÏÎ ÏÏÎÏÏÎÏÎÏÎÎÎÎ ÎÏÏÎÎÎ jar "
-"(ÎÏÎÎÎÎÎÏÎÎ)"
+"ÎÏÎÎÎÎÎÏÏÎ cookies ÎÏÏ ÎÎÎ ÎÎÏÏÏ Tor ÏÎ ÏÏÎÏÏÎÏÎÏÎÎÎÎ ÎÏÏÎÎÎ jar (ÎÏÎÎÎÎÎÏÎÎ)"
 
 #: torbutton.prefs.clear_http_auth
 msgid "Clear HTTP auth sessions (recommended)"
@@ -316,7 +368,8 @@
 
 #: torbutton.prefs.block_js_history
 msgid "Isolate access to history navigation to Tor state (crucial)"
-msgstr "ÎÏÎÎÏÎÏÏÎ ÏÏÏÏÎÎÏÎÏ ÏÏÎ ÎÏÏÎÏÎÎÏ ÏÎÏÎÎÎÎÏÎÏ ÎÎÎ ÎÎÏÎÏÏÎÏÎ Tor (ÎÏÎÏÎÎÎ)"
+msgstr ""
+"ÎÏÎÎÏÎÏÏÎ ÏÏÏÏÎÎÏÎÏ ÏÏÎ ÎÏÏÎÏÎÎÏ ÏÎÏÎÎÎÎÏÎÏ ÎÎÎ ÎÎÏÎÏÏÎÏÎ Tor (ÎÏÎÏÎÎÎ)"
 
 #: torbutton.prefs.resize_on_toggle
 msgid "Resize windows to multiples of 50px during Tor usage (recommended)"
@@ -438,6 +491,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "ÎÎÎÎÏÎÎÎÏÎ: ÎÏÎÏÏÎÎÏÎ ÏÎÎ  ÏÏÎÏÎ hostnames ÏÎÎ ÏÎÎÏ"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "Cookies"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 #, fuzzy
 msgid "Disable Livemark updates during Tor usage"
@@ -483,12 +605,20 @@
 msgid "scroogle.org"
 msgstr "scroogle.org"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
 "ÎÏÎÎÏÎÏÎ ÏÎÎ ÏÎÎÏÏÏÏÎÎ ÎÎÎ ÏÎ ÎÎÏÏÏÎ (ÏÎÏ ÏÏÏÏÎÎÎÏÎÏ) ÎÏÎ ÏÎ ÎÏÏÏÎÎÎÏÎ ÏÏÎ "
 "ÎÎÏÏÎÎ ÎÎÎÎÎÏÎÏÎÏ"
 
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""
+
 #~ msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
 #~ msgstr ""
 #~ "ÎÏÎÎÏÏÎÏÏÎ ÎÏÎÎÎÎÎÏÏÎÏ ÎÎÏÏÎÎÏÎ ÏÎÏÏÏÎÎÎÏÎ ÎÏÏ Tor ÏÏÎ ÎÎÎÏÎÎÏÎÏÏÎ "

Modified: translation/trunk/projects/torbutton-alpha/po/el/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/el/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/el/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from en-US/torbutton.properties, el-GR/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-03-25 06:12-0600\n"
 "Last-Translator: George Fragos <fragos.george@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -98,7 +99,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/en/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/en/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/en/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +130,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +206,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +286,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +447,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +557,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/en/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/en/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/en/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/eo/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/eo/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/eo/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/eo/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/eo/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/eo/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/es/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/es/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/es/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from en-US/torbutton.dtd, es/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-06-06 17:57-0600\n"
 "Last-Translator: carolyn anhalt <carolyn@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,6 +134,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -178,6 +211,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "Almacenar cookies al no usar Tor en un jar protegido"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "Gestionarà manualmente mis cookies (peligroso)"
@@ -256,12 +293,28 @@
 msgid "Spoof US English Browser"
 msgstr "Simular navegador en InglÃs de EEUU"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
+
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
 "No enviar sitio de referencia al usar Tor (puede dejar no operativos algunos "
 "sitios web)"
 
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+"No enviar sitio de referencia al usar Tor (puede dejar no operativos algunos "
+"sitios web)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "Deshabilitar el almacenamiento de DOM al usar Tor (crucial)"
@@ -311,7 +364,8 @@
 
 #: torbutton.prefs.block_js_history
 msgid "Isolate access to history navigation to Tor state (crucial)"
-msgstr "Aislar el acceso del historial de navegaciÃn al estado de Tor (crucial)"
+msgstr ""
+"Aislar el acceso del historial de navegaciÃn al estado de Tor (crucial)"
 
 #: torbutton.prefs.resize_on_toggle
 msgid "Resize windows to multiples of 50px during Tor usage (recommended)"
@@ -342,7 +396,8 @@
 
 #: torbutton.prefs.jar_ca_certs
 msgid "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"
-msgstr "Guardar certificados CA en jars separadas para Tor/No Tor (recomendado)"
+msgstr ""
+"Guardar certificados CA en jars separadas para Tor/No Tor (recomendado)"
 
 #: torbutton.prefs.locked_mode
 msgid "Disable Button and Hotkeys to prevent accidental toggle"
@@ -429,6 +484,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "Advertencia: Evite el uso de nombres de host por encima de"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "Cookies"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr "Deshabilitar las marcas de actualizaciones durante el uso de Tor"
@@ -473,12 +597,19 @@
 msgid "scroogle.org"
 msgstr "scroogle.org"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
-"Quitar plataforma y lenguaje de los Cuadros de peticiÃn de busqueda de "
-"Google"
+"Quitar plataforma y lenguaje de los Cuadros de peticiÃn de busqueda de Google"
 
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr "Deshabilitar actualizaciones al usar Tor (recomendado)"
 

Modified: translation/trunk/projects/torbutton-alpha/po/es/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/es/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/es/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from en-US/torbutton.properties, es/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-06-06 17:59-0600\n"
 "Last-Translator: carolyn anhalt <carolyn@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,15 +109,18 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
-msgstr "ÂAdvertencia!\\nSe ha detectado que el Torbutton de Firefox 3 perdià su zona "
+msgstr ""
+"ÂAdvertencia!\\nSe ha detectado que el Torbutton de Firefox 3 perdià su zona "
 "horaria y la marcas a travÃs de Tor.\\n\\nÂDesea continuar de todos modos?\n"
 
 #: torbutton.popup.toggle.warning
 msgid "You need to toggle Tor or restart for your settings to take effect."
-msgstr "Tiene que conmutar a Tor o reiniciar para que sus preferencias entre en "
+msgstr ""
+"Tiene que conmutar a Tor o reiniciar para que sus preferencias entre en "
 "efecto.\\n. \n"
 
 #: torbutton.popup.test.success

Modified: translation/trunk/projects/torbutton-alpha/po/et/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/et/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/et/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-02-18 02:29-0700\n"
 "Last-Translator: Heiki Ojasild <heiki.ojasild@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +130,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +206,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +286,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +447,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +557,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/et/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/et/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/et/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from src/chrome/locale/en/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-02-18 03:19-0700\n"
 "Last-Translator: Heiki Ojasild <heiki.ojasild@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -98,7 +99,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/eu/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/eu/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/eu/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/eu/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/eu/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/eu/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/fa/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/fa/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/fa/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,9 +1,9 @@
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-09-05 02:54+0200\n"
 "Last-Translator: iranfree <green.dove88@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -133,6 +133,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "ØÚÙÙ ØÙØ"
@@ -177,6 +209,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "ØØÛØÙ ÚØØÙ ÚÙÚÛ ÙØÛ ØÛØ ØÙØ ØØ ÛÚ ÙØÛÙ ØÙØØØ ØØÙ jar"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "ÙØÛØÛØ ØØØÛ ÚÙÚÛ ÙØ(ØØØÙØÚ)"
@@ -253,12 +289,26 @@
 msgid "Spoof US English Browser"
 msgstr "ØØÙ ÙÙÛØ ØÙ ÛÚ ÙØÙØÚØ ØÙØÛÚØÛÛ"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
-" referer ØØ ÙÙÚØÙ ØØØÙØØÙ ØÙØ ÙÙØØØ (ÙÙÚÙ ØØØ ØØØÛ ØØÛØ ÙØ ØÙ ØØØØÛ ØÙÙ "
-"ÙÚÙÙØ)"
 
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+" referer ØØ ÙÙÚØÙ ØØØÙØØÙ ØÙØ ÙÙØØØ (ÙÙÚÙ ØØØ ØØØÛ ØØÛØ ÙØ ØÙ ØØØØÛ ØÙÙ ÙÚÙÙØ)"
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+" referer ØØ ÙÙÚØÙ ØØØÙØØÙ ØÙØ ÙÙØØØ (ÙÙÚÙ ØØØ ØØØÛ ØØÛØ ÙØ ØÙ ØØØØÛ ØÙÙ ÙÚÙÙØ)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "ØÛØØØØÙ ÚØØÙ ØØÛØÙ ÚØÙ DOM ÙÙÚØÙ ØØØÙØØÙ ØÙØ (ØØÛØØ ÙÙÙ)"
@@ -414,6 +464,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "ØØØ: ØØ ØØØÙØØÙ ÚØØÙ ØØ hostname ØØ ØØÙØ ØÙØÙÛØÛØ"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "ÚÙÚÛ ÙØ"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr "ØØØÙÙ ÚØØÙ ØÙ bookmark ØØ ØØ ØÙÙ ØØØÙØØÙ ØØ ØÙØ ØÙØ ÙØØÙ ÚÙ"
@@ -458,10 +577,18 @@
 msgid "scroogle.org"
 msgstr "scroogle.org"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr "Strip platform and language off of Google Search Box queries"
 
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr "ØÛØÙØØÙ ÚØØÙ ØØÙØØØØÙÛ ÙØ ÙÙÚØÙ ØØØÙØØÙ ØÙØ (ØÙØÛÙ ØØÙ)"
 

Modified: translation/trunk/projects/torbutton-alpha/po/fa/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/fa/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/fa/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,9 +1,9 @@
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-09-05 02:49+0200\n"
 "Last-Translator: iranfree <green.dove88@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -52,8 +52,7 @@
 "Torbutton provides a button to easily enable or disable pointing Firefox to "
 "the Tor proxy"
 msgstr ""
-"ØÚÙÙ ØÙØ ØÙ ØØØÙÛ ØÙÚØÙ ÙØØÙ Ù ØÙØÙØØÙ ÚØØÙ ÙØØÚØÛ ØÙØ ØØ ØÚÙÚ ÙÚ ØÚÙÙ ÙÛ "
-"ØÙØ"
+"ØÚÙÙ ØÙØ ØÙ ØØØÙÛ ØÙÚØÙ ÙØØÙ Ù ØÙØÙØØÙ ÚØØÙ ÙØØÚØÛ ØÙØ ØØ ØÚÙÚ ÙÚ ØÚÙÙ ÙÛ ØÙØ"
 
 #: torbutton.popup.history.warning
 msgid ""
@@ -67,8 +66,8 @@
 "To reload the tab in this Tor state, hit 'enter' in the URL location box.\n"
 "\n"
 msgstr ""
-"TorbuttonÙØØÙÙØ ØØ ÙØÙ ÙÙ ØØÙØ ØØ ØÙØ ÙØØÙ ÙÙ ØÙÙØ ØØ ÙØØÙØ ÙÙ ÙÙØ/n/nThis "
-"is to work around Firefox Bugs 409737 and 417869/n/nIf this popup seemed to "
+"TorbuttonÙØØÙÙØ ØØ ÙØÙ ÙÙ ØØÙØ ØØ ØÙØ ÙØØÙ ÙÙ ØÙÙØ ØØ ÙØØÙØ ÙÙ ÙÙØ/n/nThis is "
+"to work around Firefox Bugs 409737 and 417869/n/nIf this popup seemed to "
 "happen for no reason, one of your tabs is attempting to reload itself in the "
 "background, and this was blocked.\n"
 "\n"
@@ -102,7 +101,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -229,8 +229,8 @@
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
 msgstr ""
-"ØØÙÙÙ ÙØØÚØÛ ØÙØ: ÙØØÚØÛ HTTP ÙØÙÛ ÙØØÙ ØØØØØÛ ÙÛØØ. ØÛØ ÙÙÙÛÙÙ ØÙ ØØØØÛ "
-"ØØØØ ØØÙ ØØØØ"
+"ØØÙÙÙ ÙØØÚØÛ ØÙØ: ÙØØÚØÛ HTTP ÙØÙÛ ÙØØÙ ØØØØØÛ ÙÛØØ. ØÛØ ÙÙÙÛÙÙ ØÙ ØØØØÛ ØØØØ "
+"ØØÙ ØØØØ"
 
 #: torbutton.popup.captcha.title
 msgid "Avoid Google Captchas?"

Modified: translation/trunk/projects/torbutton-alpha/po/fi/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/fi/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/fi/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-04-08 09:26-0600\n"
 "Last-Translator: AmaliaH <hilkka39@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,7 +45,8 @@
 
 #: torbutton.prefs.recommended_settings
 msgid "Use the recommended proxy settings for my version of Firefox"
-msgstr "KÃytà suositeltuja vÃlityspalvelin asetuksia minun Firefox versiolleni."
+msgstr ""
+"KÃytà suositeltuja vÃlityspalvelin asetuksia minun Firefox versiolleni."
 
 #: torbutton.prefs.use_privoxy
 msgid "Use Privoxy"
@@ -133,6 +135,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -183,6 +217,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "Talleta ei-Tor kÃytÃnaikaiset evÃsteet suojattuun hakemistoon."
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "Huolehdin evÃsteistà itse manuaalisesti. (vaarallista)"
@@ -261,12 +299,28 @@
 msgid "Spoof US English Browser"
 msgstr "NÃytà selaimen asetus ulospÃin \"US English\""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
+
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
 "Ãlà lÃhetà referer tietoa Tor kÃytÃn aikana (jotkin sivustot eivÃt ehkà "
 "toimi)"
 
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+"Ãlà lÃhetà referer tietoa Tor kÃytÃn aikana (jotkin sivustot eivÃt ehkà "
+"toimi)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "Poista DOM-sÃilytys kÃytÃstà kun Tor on kÃynnissà (kriittinen)"
@@ -349,8 +403,7 @@
 #: torbutton.prefs.locked_mode
 msgid "Disable Button and Hotkeys to prevent accidental toggle"
 msgstr ""
-"Està Tor-button ja pikanÃppÃimet vÃlttÃÃksesi Tor-tilan tahatonta "
-"vaihtamista"
+"Està Tor-button ja pikanÃppÃimet vÃlttÃÃksesi Tor-tilan tahatonta vaihtamista"
 
 #: torbutton.prefs.startup_state
 msgid "On normal startup, set Tor state to:"
@@ -401,7 +454,8 @@
 
 #: torbutton.prefs.session_restore
 msgid "Have the session store save and restore these tabs:"
-msgstr "Salli istunnon talletuksen tallettaa ja palauttaa seuraavat vÃlilehdet:"
+msgstr ""
+"Salli istunnon talletuksen tallettaa ja palauttaa seuraavat vÃlilehdet:"
 
 #: torbutton.prefs.nontor_tabs
 msgid "Tabs loaded in Non-Tor"
@@ -427,6 +481,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "Varoitus: VÃltà yllà olevia osoitteita"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "EvÃsteet"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr "Està vÃlilehtipÃivitykset Torin ollessa kÃytÃssÃ."
@@ -470,8 +593,16 @@
 msgid "scroogle.org"
 msgstr "scroogle.org"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
 "Poista yksilÃintitiedot (laitteisto ja kieliasetukset) Google hakuja "
 "suoritettaessa "
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/fi/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/fi/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/fi/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-04-08 10:59-0600\n"
 "Last-Translator: AmaliaH <hilkka39@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -106,7 +107,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/fil/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/fil/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/fil/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/fil/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/fil/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/fil/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/fo/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/fo/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/fo/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/fo/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/fo/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/fo/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/fr/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/fr/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/fr/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from en-US/torbutton.dtd, fr-FR/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: Torbutton\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-06-02 12:41-0600\n"
 "Last-Translator: Pierre Antoine <pierre.antoine@xxxxxxx>\n"
 "Language-Team: Mfr <mfr (Ã] misericoridia.be>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,7 +46,8 @@
 
 #: torbutton.prefs.recommended_settings
 msgid "Use the recommended proxy settings for my version of Firefox"
-msgstr "Utiliser les paramÃtres de proxy recommandÃs pour ma version de Firefox"
+msgstr ""
+"Utiliser les paramÃtres de proxy recommandÃs pour ma version de Firefox"
 
 #: torbutton.prefs.use_privoxy
 msgid "Use Privoxy"
@@ -134,6 +136,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -185,6 +219,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "Conserver les cookies non-Tor dans une cookie-jar sÃcurisÃe"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "Je gÃrerai mes cookies manuellement (dangereux)"
@@ -266,13 +304,30 @@
 msgid "Spoof US English Browser"
 msgstr "Imiter un navigateur anglais US"
 
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
+msgstr ""
+
 # on ne peut pas traduire le terme technique referer en rÃfÃrenceur (cf. http://fr.wikipedia.org/wiki/HTTP_Referer)
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
 msgstr ""
 "Ne pas envoyer l'url rÃfÃrente pendant l'utilisation de Tor (risque de gÃner "
 "la navigation sur certains sites)"
 
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+# on ne peut pas traduire le terme technique referer en rÃfÃrenceur (cf. http://fr.wikipedia.org/wiki/HTTP_Referer)
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+"Ne pas envoyer l'url rÃfÃrente pendant l'utilisation de Tor (risque de gÃner "
+"la navigation sur certains sites)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "DÃsactiver le stockage DOM pendant l'utilisation de Tor (crucial)"
@@ -290,8 +345,7 @@
 #: torbutton.prefs.block_ntforms
 msgid "Block password+form saving during Non-Tor (optional)"
 msgstr ""
-"Bloquer la sauvegarde de mot de passe+formulaire en mode non-Tor "
-"(facultatif)"
+"Bloquer la sauvegarde de mot de passe+formulaire en mode non-Tor (facultatif)"
 
 #: torbutton.prefs.tor
 msgid "Tor"
@@ -314,8 +368,7 @@
 #: torbutton.prefs.dual_cookie_jars
 msgid "Store both Tor and Non-Tor cookies in protected jars (dangerous)"
 msgstr ""
-"Stocker les cookies Tor et non-Tor dans des cookie-jars sÃcurisÃs "
-"(dangereux)"
+"Stocker les cookies Tor et non-Tor dans des cookie-jars sÃcurisÃs (dangereux)"
 
 #: torbutton.prefs.clear_http_auth
 msgid "Clear HTTP auth sessions (recommended)"
@@ -439,6 +492,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "Attention: Ãvitez d'utiliser les noms d'hÃtes ci-dessus"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "Cookies"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr "DÃsactiver les marques-pages dynamiques durant l'utilisation de Tor"
@@ -483,12 +605,20 @@
 msgid "scroogle.org"
 msgstr "scroogle.org"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
 "Supprimer les informations relatives à la plateforme et à la langue des "
 "champs de recherche Google"
 
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr ""
 #~ "DÃsactiver les mises à jour pendant l'utilisation de Tor (recommandÃ)"

Modified: translation/trunk/projects/torbutton-alpha/po/fr/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/fr/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/fr/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.properties, fr-FR/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: Torbutton\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-07-27 20:16+0200\n"
 "Last-Translator: MÃdÃric <mederic.ribreux@xxxxxxxxx>\n"
 "Language-Team: Mfr <mfr (Ã] misericordia.be>\n"
@@ -109,7 +109,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/fur/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/fur/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/fur/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/fur/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/fur/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/fur/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/fy/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/fy/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/fy/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/fy/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/fy/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/fy/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ga/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ga/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ga/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ga/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ga/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ga/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/gl/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/gl/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/gl/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/gl/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/gl/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/gl/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/gu/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/gu/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/gu/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-09-04 07:16+0200\n"
 "Last-Translator: Kartik <kartik@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -131,6 +131,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "àààààà"
@@ -175,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -251,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr "àààà àààààààà ààààààààà ààààà"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "ààà ààààà àààà DOM àààààà ààààààààà ààà (ààààà)"
@@ -400,6 +448,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "ààààà"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -442,6 +559,14 @@
 msgid "scroogle.org"
 msgstr "scroogle.org"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/gu/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/gu/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/gu/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-09-02 16:54+0200\n"
 "Last-Translator: Kartik <kartik@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -87,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/gun/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/gun/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/gun/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/gun/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/gun/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/gun/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ha/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ha/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ha/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ha/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ha/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ha/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/he/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/he/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/he/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/he/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/he/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/he/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/hi/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/hi/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/hi/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2009-03-18 10:25+0000\n"
 "Last-Translator: Dharmesh Shah <deshah@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -105,10 +106,9 @@
 "proxy settings, please disable Torbutton and return here.  If you would like "
 "to change your Tor settings, please use the Torbutton preference window."
 msgstr ""
-"ààà ààà ààà àààààààà àà à ààà àà àààà àààà (ààà àà ààààà) àààààààà àààààà àà "
-"ààààà ààààà àà àà ààà àà àààààà àààà ààà àààààààà ààà à ààà àà àààà ààà "
-"àààààà àà ààààà ààààà àà àà àààààà ààà ààà àà àààààààààà ààààà àà ààààà ààà "
-"à"
+"ààà ààà ààà àààààààà àà à ààà àà àààà àààà (ààà àà ààààà) àààààààà àààààà àà ààààà "
+"ààààà àà àà ààà àà àààààà àààà ààà àààààààà ààà à ààà àà àààà ààà àààààà àà ààààà "
+"ààààà àà àà àààààà ààà ààà àà àààààààààà ààààà àà ààààà ààà à"
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -134,6 +134,38 @@
 msgid "A"
 msgstr "A/à"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "ààà ààà"
@@ -148,8 +180,7 @@
 
 #: torbutton.prefs.block_thread
 msgid "Block history reads during Tor (crucial)"
-msgstr ""
-"ààà àààà ààà àààà ààààààà àà àààààà ààààààà àà àààà ààà (ààààààà àààààààààà)"
+msgstr "ààà àààà ààà àààà ààààààà àà àààààà ààààààà àà àààà ààà (ààààààà àààààààààà)"
 
 #: torbutton.prefs.block_thwrite
 msgid "Block history writes during Tor (recommended)"
@@ -158,14 +189,12 @@
 #: torbutton.prefs.block_nthread
 #, fuzzy
 msgid "Block history reads during Non-Tor (optional)"
-msgstr ""
-"ààà àààà ààà àààà ààààààà àà àààààà ààààààà àà àààà ààà (ààààààà àààààààààà)"
+msgstr "ààà àààà ààà àààà ààààààà àà àààààà ààààààà àà àààà ààà (ààààààà àààààààààà)"
 
 #: torbutton.prefs.block_nthwrite
 #, fuzzy
 msgid "Block history writes during Non-Tor (optional)"
-msgstr ""
-"ààà àààà ààà àààà ààààààà àà àààààà ààààààà àà àààà ààà (ààààààà àààààààààà)"
+msgstr "ààà àààà ààà àààà ààààààà àà àààààà ààààààà àà àààà ààà (ààààààà àààààààààà)"
 
 #: torbutton.prefs.clear_history
 msgid "Clear history on Tor toggle (optional)"
@@ -183,6 +212,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -259,10 +292,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -408,6 +453,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -450,6 +563,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/hi/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/hi/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/hi/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/hr/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/hr/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/hr/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from en-US/torbutton.dtd, hr-HR/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -136,6 +137,38 @@
 msgid "A"
 msgstr "O"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -180,6 +213,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -256,10 +293,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -405,6 +454,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -447,6 +564,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/hr/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/hr/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/hr/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from en-US/torbutton.properties, hr-HR/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -53,8 +54,7 @@
 "Torbutton provides a button to easily enable or disable pointing Firefox to "
 "the Tor proxy"
 msgstr ""
-"Torbutton omoguÄava gumb za lakÅe omoguÄavanje ili onemoguÄavanje tor "
-"proxy-a"
+"Torbutton omoguÄava gumb za lakÅe omoguÄavanje ili onemoguÄavanje tor proxy-a"
 
 #: torbutton.popup.history.warning
 msgid ""
@@ -89,7 +89,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ht/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ht/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ht/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ht/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ht/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ht/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/hu/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/hu/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/hu/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/hu/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/hu/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/hu/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/hy/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/hy/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/hy/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/hy/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/hy/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/hy/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/id/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/id/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/id/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-07-13 09:57-0600\n"
 "Last-Translator: Iqbal Rush <iqbal_pikachu@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -105,9 +106,8 @@
 "to change your Tor settings, please use the Torbutton preference window."
 msgstr ""
 "Torbutton sedang aktif.  Apabila Anda ingin mengubah pengaturan proxy selain "
-"proxy Tor, Silahkan nonaktifkan Torbutton dan kembali ke sini.  Apabila "
-"Anda ingin mengubah pengaturan Tor, silahkan gunakan jendela preferensi "
-"Torbutton."
+"proxy Tor, Silahkan nonaktifkan Torbutton dan kembali ke sini.  Apabila Anda "
+"ingin mengubah pengaturan Tor, silahkan gunakan jendela preferensi Torbutton."
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -133,6 +133,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -178,6 +210,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "Simpan cookie Non-Tor dalam jar terproteksi"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "Saya akan mengelola cookie saya secara manual (berbahaya)"
@@ -254,12 +290,28 @@
 msgid "Spoof US English Browser"
 msgstr "Aktifkan penyamar untuk browser US-English"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
+
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
 "Jangan mengirimkan referer selama penggunaan Tor (dapat mengganggu hasil "
 "beberapa situs)"
 
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+"Jangan mengirimkan referer selama penggunaan Tor (dapat mengganggu hasil "
+"beberapa situs)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "Nonaktifkan penyimpanan DOM selama penggunaan Tor (krusial)"
@@ -296,7 +348,8 @@
 
 #: torbutton.prefs.dual_cookie_jars
 msgid "Store both Tor and Non-Tor cookies in protected jars (dangerous)"
-msgstr "Simpan baik cookie Tor maupun Non-Tor dalam jar terproteksi (berbahaya)"
+msgstr ""
+"Simpan baik cookie Tor maupun Non-Tor dalam jar terproteksi (berbahaya)"
 
 #: torbutton.prefs.clear_http_auth
 msgid "Clear HTTP auth sessions (recommended)"
@@ -327,7 +380,8 @@
 
 #: torbutton.prefs.jar_certs
 msgid "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)"
-msgstr "Simpan sertifikat SSL dalam jar terpisah untuk Tor/Non-Tor (disarankan)"
+msgstr ""
+"Simpan sertifikat SSL dalam jar terpisah untuk Tor/Non-Tor (disarankan)"
 
 #: torbutton.prefs.jar_ca_certs
 msgid "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"
@@ -412,6 +466,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "Peringatan: Hindari penggunaan hostname di atas"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "Cookie"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr "Nonaktifkan update Livemark selama penggunaan Tor"
@@ -456,6 +579,14 @@
 msgid "scroogle.org"
 msgstr "scroogle.org"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr "Lepaskan serambi dan bahasa dari Kotak Pencarian Google"
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/id/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/id/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/id/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-07-13 10:30-0600\n"
 "Last-Translator: Iqbal Rush <iqbal_pikachu@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -107,7 +108,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/is/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/is/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/is/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/is/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/is/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/is/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/it/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/it/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/it/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.dtd, it-IT/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-09-04 23:25+0200\n"
 "Last-Translator: ringmeister84 <ringmeister84@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -107,9 +107,8 @@
 "to change your Tor settings, please use the Torbutton preference window."
 msgstr ""
 "Torbutton à attualmente attivo. Se vuoi cambiare la configurazione del proxy "
-"quando non usi Tor, disabilita Torbutton e torna qui.  Se vuoi modificare "
-"la configurazione quando usi Tor, usa la finestra delle preferenze di "
-"Torbutton."
+"quando non usi Tor, disabilita Torbutton e torna qui.  Se vuoi modificare la "
+"configurazione quando usi Tor, usa la finestra delle preferenze di Torbutton."
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -135,6 +134,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -153,7 +184,8 @@
 
 #: torbutton.prefs.block_thwrite
 msgid "Block history writes during Tor (recommended)"
-msgstr "Blocca la scrittura della cronologia durante l'uso di Tor (consigliato)"
+msgstr ""
+"Blocca la scrittura della cronologia durante l'uso di Tor (consigliato)"
 
 #: torbutton.prefs.block_nthread
 msgid "Block history reads during Non-Tor (optional)"
@@ -178,12 +210,17 @@
 
 #: torbutton.prefs.block_cache
 msgid "Block disk and memory cache access during Tor"
-msgstr "Blocca l'accesso alla cache sul disco e in memoria durante l'uso di Tor"
+msgstr ""
+"Blocca l'accesso alla cache sul disco e in memoria durante l'uso di Tor"
 
 #: torbutton.prefs.cookie_jars
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "Conserva i cookie non Tor in un archivio protetto"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "Gestione manuale dei cookies (pericoloso)"
@@ -262,11 +299,26 @@
 msgid "Spoof US English Browser"
 msgstr "Simula di essere un browser US English"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
+
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
 "Non inviare i referer usando Tor (alcuni siti potrebbero non funzionare)"
 
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+"Non inviare i referer usando Tor (alcuni siti potrebbero non funzionare)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "Disabilita DOM Storage quando si usa Tor (essenziale)"
@@ -308,8 +360,7 @@
 #: torbutton.prefs.dual_cookie_jars
 msgid "Store both Tor and Non-Tor cookies in protected jars (dangerous)"
 msgstr ""
-"Conserva sia i cookie Tor sia quelli Non-Tor in archivi protetti "
-"(pericoloso)"
+"Conserva sia i cookie Tor sia quelli Non-Tor in archivi protetti (pericoloso)"
 
 #: torbutton.prefs.clear_http_auth
 msgid "Clear HTTP auth sessions (recommended)"
@@ -382,8 +433,7 @@
 #: torbutton.prefs.block_nontor_file_net
 msgid "Block Non-Tor access to network from file:// urls"
 msgstr ""
-"Blocca l'accesso non-Tor alla rete da indirizzi di tipo file:// "
-"(consigliato)"
+"Blocca l'accesso non-Tor alla rete da indirizzi di tipo file:// (consigliato)"
 
 #: torbutton.prefs.restore_defaults
 msgid "Restore Defaults"
@@ -414,7 +464,8 @@
 
 #: torbutton.prefs.session_restore
 msgid "Have the session store save and restore these tabs:"
-msgstr "Imposta il session store per salvataggio e ripristino di queste schede:"
+msgstr ""
+"Imposta il session store per salvataggio e ripristino di queste schede:"
 
 #: torbutton.prefs.nontor_tabs
 msgid "Tabs loaded in Non-Tor"
@@ -440,6 +491,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "Attenzione: Evitare di usare uno degli hostnames di cui sopra"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "Cookies"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr "Disabilita gli aggiornamenti dei livemarks durante l'uso di Tor"
@@ -484,10 +604,18 @@
 msgid "scroogle.org"
 msgstr "scroogle.org"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr "Estrai sistema e idioma dalle interrogazioni di Google Search Box"
 
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr "Disablita gli aggiornamenti usando Tor (consigliato)"
 

Modified: translation/trunk/projects/torbutton-alpha/po/it/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/it/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/it/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.properties, it-IT/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-09-29 09:56+0200\n"
 "Last-Translator: Frate <>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -109,7 +109,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ja/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ja/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ja/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-05-30 23:20-0600\n"
 "Last-Translator: Shinji R. Yamane <s-yamane@xxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +130,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -173,6 +206,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +286,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +447,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "ãããã"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ja/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ja/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ja/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-04-13 22:17-0600\n"
 "Last-Translator: Shinji R. Yamane <s-yamane@xxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +86,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -100,7 +102,8 @@
 
 #: 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 ""

Modified: translation/trunk/projects/torbutton-alpha/po/jv/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/jv/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/jv/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/jv/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/jv/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/jv/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ka/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ka/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ka/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ka/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ka/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ka/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/km/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/km/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/km/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/km/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/km/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/km/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/kn/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/kn/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/kn/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/kn/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/kn/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/kn/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ko/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ko/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ko/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ko/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ko/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ko/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ku/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ku/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ku/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ku/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ku/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ku/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/kw/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/kw/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/kw/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/kw/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/kw/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/kw/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ky/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ky/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ky/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ky/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ky/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ky/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/lb/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/lb/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/lb/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/lb/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/lb/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/lb/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/lg/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/lg/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/lg/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/lg/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/lg/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/lg/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ln/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ln/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ln/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ln/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ln/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ln/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/lo/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/lo/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/lo/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/lo/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/lo/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/lo/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/lt/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/lt/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/lt/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/lt/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/lt/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/lt/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/lv/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/lv/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/lv/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/lv/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/lv/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/lv/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/mg/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/mg/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/mg/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/mg/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/mg/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/mg/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/mi/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/mi/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/mi/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/mi/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/mi/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/mi/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/mk/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/mk/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/mk/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/mk/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/mk/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/mk/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ml/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ml/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ml/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ml/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ml/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ml/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/mn/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/mn/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/mn/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/mn/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/mn/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/mn/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/mr/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/mr/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/mr/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/mr/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/mr/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/mr/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ms/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ms/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ms/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ms/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ms/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ms/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/mt/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/mt/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/mt/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/mt/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/mt/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/mt/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/nah/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/nah/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/nah/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/nah/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/nah/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/nah/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/nap/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/nap/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/nap/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/nap/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/nap/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/nap/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/nb/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/nb/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/nb/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-05-10 03:58-0600\n"
 "Last-Translator: Runa Sandvik <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,6 +134,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -177,6 +210,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "Lagre ikke-Tor informasjonskapsler i en beskyttet jar"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "Jeg vil manuelt administrere mine informasjonskapsler (farlig)"
@@ -254,12 +291,28 @@
 msgid "Spoof US English Browser"
 msgstr "Parodier US Engelsk nettleser"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
+
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
 "Ikke sende referer-forespÃrsel under Tor (kan gjÃre at enkelte sider ikke "
 "fungerer)"
 
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+"Ikke sende referer-forespÃrsel under Tor (kan gjÃre at enkelte sider ikke "
+"fungerer)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "Deaktiver DOM-lagring under Tor (avgjÃrende)"
@@ -298,8 +351,7 @@
 #: torbutton.prefs.dual_cookie_jars
 msgid "Store both Tor and Non-Tor cookies in protected jars (dangerous)"
 msgstr ""
-"Lagre informasjonskapsler for bÃde Tor og ikke-Tor i beskyttende jar "
-"(farlig)"
+"Lagre informasjonskapsler for bÃde Tor og ikke-Tor i beskyttende jar (farlig)"
 
 #: torbutton.prefs.clear_http_auth
 msgid "Clear HTTP auth sessions (recommended)"
@@ -415,6 +467,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "Advarsel: Unngà à bruke noen av vertsnavnene ovenfor"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "Informasjonskapsler"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr "Deaktiver oppdateringer av live-bokmerker under Tor"
@@ -458,6 +579,14 @@
 msgid "scroogle.org"
 msgstr "scroogle.org"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr "Fjern platform og sprÃk fra Google Search Box sÃk."
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/nb/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/nb/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/nb/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-05-10 03:59-0600\n"
 "Last-Translator: Runa Sandvik <runa.sandvik@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -95,7 +96,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -216,7 +218,8 @@
 #: torbutton.popup.test.no_http_proxy
 msgid ""
 "Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?"
-msgstr "Tor-proxy test: Lokal HTTP-proxy kan ikke nÃs. KjÃrer Polipo skikkelig?"
+msgstr ""
+"Tor-proxy test: Lokal HTTP-proxy kan ikke nÃs. KjÃrer Polipo skikkelig?"
 
 #: torbutton.popup.captcha.title
 msgid "Avoid Google Captchas?"

Modified: translation/trunk/projects/torbutton-alpha/po/ne/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ne/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ne/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ne/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ne/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ne/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/nl/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/nl/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/nl/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from en-US/torbutton.dtd, nl-NL/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-04-13 01:30-0600\n"
 "Last-Translator: Flabber <flabber@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,7 +46,8 @@
 
 #: torbutton.prefs.recommended_settings
 msgid "Use the recommended proxy settings for my version of Firefox"
-msgstr "De aanbevolen proxy-instellingen voor mijn versie van Firefox gebruiken"
+msgstr ""
+"De aanbevolen proxy-instellingen voor mijn versie van Firefox gebruiken"
 
 #: torbutton.prefs.use_privoxy
 msgid "Use Privoxy"
@@ -136,6 +138,38 @@
 msgid "A"
 msgstr "O"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -181,6 +215,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "Sla de niet-Tor cookies op op een beveiligde plaats"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "Ik beheer de cookies handmatig (gevaarlijk)"
@@ -257,11 +295,26 @@
 msgid "Spoof US English Browser"
 msgstr "Imiteer een US Engelse browser"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
+
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
 "Stuur geen verwijzer tijdens Tor gebruik (sommige sites kunnen niet werken)"
 
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+"Stuur geen verwijzer tijdens Tor gebruik (sommige sites kunnen niet werken)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "Verhinder DOM opslag tijdens Tor gebruik (cruciaal)"
@@ -422,6 +475,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "Opgelet: gebruik van bovenstaande hostnamen vermijden"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "Cookies"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr "Livemark-updates tijdens Tor verhinderen"
@@ -465,6 +587,15 @@
 msgid "scroogle.org"
 msgstr "scroogle.org"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
-msgstr "Systeem- en taalgegevens verwijderen bij gebruik van de Google zoekbalk"
+msgstr ""
+"Systeem- en taalgegevens verwijderen bij gebruik van de Google zoekbalk"
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/nl/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/nl/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/nl/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from en-US/torbutton.properties, nl-NL/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-04-16 04:13-0600\n"
 "Last-Translator: Flabber <flabber@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +109,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/nn/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/nn/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/nn/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/nn/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/nn/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/nn/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/nso/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/nso/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/nso/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/nso/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/nso/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/nso/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/oc/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/oc/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/oc/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/oc/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/oc/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/oc/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/or/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/or/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/or/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/or/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/or/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/or/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/pa/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/pa/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/pa/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/pa/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/pa/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/pa/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/pap/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/pap/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/pap/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/pap/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/pap/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/pap/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/pl/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/pl/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/pl/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from en-US/torbutton.dtd, pl-PL/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: Torbutton\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-04-27 11:30-0700\n"
 "Last-Translator: saint <kochambrowar@xxxxxxxxx>\n"
 "Language-Team: pl\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -134,6 +135,38 @@
 msgid "A"
 msgstr "T"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -172,12 +205,17 @@
 
 #: torbutton.prefs.block_cache
 msgid "Block disk and memory cache access during Tor"
-msgstr "Blokuj dostÄp do pamiÄci podrÄcznej (dysk/pamiÄÄ) gdy Tor jest wÅÄczony"
+msgstr ""
+"Blokuj dostÄp do pamiÄci podrÄcznej (dysk/pamiÄÄ) gdy Tor jest wÅÄczony"
 
 #: torbutton.prefs.cookie_jars
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "ZapamiÄtuj ciasteczka z trybu zwykÅego w zabezpieczonych magazynach"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "BÄdÄ sam zarzÄdzaÅ ciasteczkami (niebezpieczne)"
@@ -255,12 +293,28 @@
 msgid "Spoof US English Browser"
 msgstr "Udawaj przeglÄdarkÄ z USA"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
+
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
 "Nie wysyÅaj adresu polecajÄcego podczas uÅywania Tora (niektÃre strony mogÄ "
 "nie dziaÅaÄ)"
 
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+"Nie wysyÅaj adresu polecajÄcego podczas uÅywania Tora (niektÃre strony mogÄ "
+"nie dziaÅaÄ)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "Blokuj zapisywanie DOM podczas uÅywania Tora (krytyczne)"
@@ -420,6 +474,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "Uwaga: Unikaj podawania nazw hostÃw powyÅej"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "Ciasteczka"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr "WyÅÄcz aktualizacje livemarks podczas uÅywania Tora"
@@ -464,10 +587,18 @@
 msgid "scroogle.org"
 msgstr "scroogle.org"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr "UsuÅ nazwÄ systemu i jÄzyk z zapytaÅ Google"
 
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr "Zablokuj aktualizacje podczas uÅywania Tora (zalecane)"
 

Modified: translation/trunk/projects/torbutton-alpha/po/pl/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/pl/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/pl/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from en-US/torbutton.properties, pl-PL/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: Torbutton\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-04-27 12:18-0700\n"
 "Last-Translator: saint <kochambrowar@xxxxxxxxx>\n"
 "Language-Team: pl\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -52,7 +53,8 @@
 msgid ""
 "Torbutton provides a button to easily enable or disable pointing Firefox to "
 "the Tor proxy"
-msgstr "Rozszerzenie posiada przycisk do Åatwego wÅÄczania/wyÅÄczania proxy Tor"
+msgstr ""
+"Rozszerzenie posiada przycisk do Åatwego wÅÄczania/wyÅÄczania proxy Tor"
 
 #: torbutton.popup.history.warning
 msgid ""
@@ -103,7 +105,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/pms/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/pms/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/pms/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/pms/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/pms/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/pms/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ps/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ps/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ps/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ps/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ps/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ps/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/pt/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/pt/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/pt/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from en-US/torbutton.dtd, pt-BR/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2009-12-16 18:33-0700\n"
 "Last-Translator: Tiago Faria <gouki@xxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -135,6 +136,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -153,7 +186,8 @@
 
 #: torbutton.prefs.block_thwrite
 msgid "Block history writes during Tor (recommended)"
-msgstr "Bloquear escrita no histÃrico durante a utilizaÃÃo do Tor (recomendado)"
+msgstr ""
+"Bloquear escrita no histÃrico durante a utilizaÃÃo do Tor (recomendado)"
 
 #: torbutton.prefs.block_nthread
 msgid "Block history reads during Non-Tor (optional)"
@@ -171,7 +205,8 @@
 
 #: torbutton.prefs.clear_cache
 msgid "Block Tor disk cache and clear all cache on Tor toggle"
-msgstr "Bloquear a cÃpia local e limpar todos as cÃpias ao alterar o uso do Tor"
+msgstr ""
+"Bloquear a cÃpia local e limpar todos as cÃpias ao alterar o uso do Tor"
 
 #: torbutton.prefs.block_cache
 msgid "Block disk and memory cache access during Tor"
@@ -182,6 +217,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "Armazenar todos os cookies nÃo-Tor num local protegido"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "Eu manualmente administrarei os meus cookies (perigoso)"
@@ -261,12 +300,28 @@
 msgid "Spoof US English Browser"
 msgstr "Mimetizar o navegador para InglÃs dos EUA"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
+
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
 "NÃo enviar informaÃÃo sobre o referente durante a utilizaÃÃo do Tor (pode "
 "bloquear alguns sites)"
 
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+"NÃo enviar informaÃÃo sobre o referente durante a utilizaÃÃo do Tor (pode "
+"bloquear alguns sites)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "Desactivar o armazenamento DOM durante o uso do Tor (crucial)"
@@ -284,8 +339,7 @@
 #: torbutton.prefs.block_ntforms
 msgid "Block password+form saving during Non-Tor (optional)"
 msgstr ""
-"Bloquear senhas + informaÃÃes de formulÃrios quando nÃo usar o Tor "
-"(opcional)"
+"Bloquear senhas + informaÃÃes de formulÃrios quando nÃo usar o Tor (opcional)"
 
 #: torbutton.prefs.tor
 msgid "Tor"
@@ -436,6 +490,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "Evite utilizar o nome da mÃquina no campo a cima"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "Cookies"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr "Desactivar actualizaÃÃes durante a utilizaÃÃo do Tor"
@@ -478,10 +601,18 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
 
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr "Desabilitar updates durante o uso do TOR (recomendado)"
 

Modified: translation/trunk/projects/torbutton-alpha/po/pt/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/pt/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/pt/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from en-US/torbutton.properties, pt-BR/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2009-12-13 13:07-0700\n"
 "Last-Translator: Tiago Faria <gouki@xxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -52,8 +53,7 @@
 "Torbutton provides a button to easily enable or disable pointing Firefox to "
 "the Tor proxy"
 msgstr ""
-"Torbutton fornece um Ãcone para activar ou desactivar rapidamente o proxy "
-"Tor"
+"Torbutton fornece um Ãcone para activar ou desactivar rapidamente o proxy Tor"
 
 #: torbutton.popup.history.warning
 msgid ""
@@ -97,7 +97,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/pt_BR/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/pt_BR/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/pt_BR/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from en-US/torbutton.dtd, pt-BR/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-02-02 16:11-0700\n"
 "Last-Translator: AnÃbal Deboni Neto <anibaldeboni@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -109,8 +110,8 @@
 msgstr ""
 "Torbutton està habilitado. Se vocà deseja mudar as configuraÃÃes de Proxy "
 "que nÃo sejam do Tor, por favor desabilite Torbutton e retorne aqui. Se vocà "
-"deseja mudar as configuraÃÃes do Tor, por favor, use a janela de "
-"preferÃncia do Torbutton."
+"deseja mudar as configuraÃÃes do Tor, por favor, use a janela de preferÃncia "
+"do Torbutton."
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -136,6 +137,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -154,7 +187,8 @@
 
 #: torbutton.prefs.block_thwrite
 msgid "Block history writes during Tor (recommended)"
-msgstr "Bloquear escrita no histÃrico durante a utilizaÃÃo do TOR (recomendado)"
+msgstr ""
+"Bloquear escrita no histÃrico durante a utilizaÃÃo do TOR (recomendado)"
 
 #: torbutton.prefs.block_nthread
 msgid "Block history reads during Non-Tor (optional)"
@@ -185,6 +219,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "Armazenar todos os cookies nÃo-Tor num contÃiner protegido"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "I manualmente gerenciarei meus cookies (atenÃÃo)"
@@ -266,11 +304,26 @@
 msgid "Spoof US English Browser"
 msgstr "Mimetizar o navegador para InglÃs US"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
+
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
 "NÃo enviar referer headers durante o uso de Tor (pode truncar alguns sites)"
 
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+"NÃo enviar referer headers durante o uso de Tor (pode truncar alguns sites)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "Desabilitar armazenamento DOM durante o uso do TOR (importante)"
@@ -288,8 +341,7 @@
 #: torbutton.prefs.block_ntforms
 msgid "Block password+form saving during Non-Tor (optional)"
 msgstr ""
-"Bloquear senhas + informaÃÃes de formulÃrios quando nÃo usar o TOR "
-"(opcional)"
+"Bloquear senhas + informaÃÃes de formulÃrios quando nÃo usar o TOR (opcional)"
 
 #: torbutton.prefs.tor
 msgid "Tor"
@@ -373,7 +425,8 @@
 
 #: torbutton.prefs.block_tor_file_net
 msgid "Block Tor access to network from file:// urls (recommended)"
-msgstr "Bloquear o acesso à rede a partir de urls do tipo file:// (recomendado)"
+msgstr ""
+"Bloquear o acesso à rede a partir de urls do tipo file:// (recomendado)"
 
 #: torbutton.prefs.block_nontor_file_net
 msgid "Block Non-Tor access to network from file:// urls"
@@ -435,6 +488,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "Aviso: evite usar quaisquer dos hosts acima"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "Cookies"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 #, fuzzy
 msgid "Disable Livemark updates during Tor usage"
@@ -478,10 +600,18 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
 
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""
+
 #~ msgid "Prevent session store from saving Tor-loaded tabs (recommended)"
 #~ msgstr ""
 #~ "Prevenir que o armazenamento de sessÃo salve as abas carregadas com Tor "

Modified: translation/trunk/projects/torbutton-alpha/po/pt_BR/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/pt_BR/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/pt_BR/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from en-US/torbutton.properties, pt-BR/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2009-12-03 14:49-0700\n"
 "Last-Translator: Bruno G Oliveira <bruno.mphx2@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -96,7 +97,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ro/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ro/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ro/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-08-15 20:45+0200\n"
 "Last-Translator: m3ta user <zugravu.gheorghe@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -137,6 +137,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Butonul Tor"
@@ -181,6 +213,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "PÄstreazÄ cookie-urile non-Tor Ãntr-o cutie protejate"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "Eu voi gestiona manual cookie-urile mele (periculos)"
@@ -258,12 +294,28 @@
 msgid "Spoof US English Browser"
 msgstr "ImiteazÄ browser-ul Ãn Limba EnglezÄ"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
+
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
 "Nu trimite url-ul referent Ãn timpul utilizÄrii Tor (poate Ãmpiedica unor "
 "pagini web sÄ lucreze normal)"
 
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+"Nu trimite url-ul referent Ãn timpul utilizÄrii Tor (poate Ãmpiedica unor "
+"pagini web sÄ lucreze normal)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "OpreÈte DOM Storage Ãn timpul funcÈionÄrii Tor (important)"
@@ -324,7 +376,8 @@
 
 #: torbutton.prefs.close_nontor
 msgid "Close all Non-Tor windows and tabs on toggle (optional)"
-msgstr "Ãnchide toate ferestrele Èi filele Non-Tor la oprire/pornire (opÈional)"
+msgstr ""
+"Ãnchide toate ferestrele Èi filele Non-Tor la oprire/pornire (opÈional)"
 
 #: torbutton.prefs.block_links
 msgid "Block link clicks and page reloads from different Tor states (optional)"
@@ -425,6 +478,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "ATENÈIE: EvitaÈi sÄ folosiÈi unul din hostname-le de mai sus"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "Cookies"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr "OpreÅte actualizÄrile Livemark Ãn timpul funcÅionÄri lui Tor"
@@ -467,8 +589,16 @@
 msgid "scroogle.org"
 msgstr "scroogle.com"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
 "EliminaÈi informaÈii despre platformÄ Èi limbÄ din cererile cÃmpurilor de "
 "cÄutare Google"
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ro/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ro/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ro/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,10 +1,10 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-08-19 19:27+0200\n"
 "Last-Translator: m3ta user <zugravu.gheorghe@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -100,14 +100,14 @@
 "ObservaÅie Torbutton: Se pare cÄ nu aveÅi nici un Certificat de autoritate. "
 "Examinarea listei cu Certificate de Autoritate este o operaÅie lentÄ Åi "
 "ÃncetineÅte comutare Tor. DoriÅi sÄ dezactivaÅi izolarea Certificatelelor de "
-"autoritate? (DacÄ nu ÃnÅelegem acest lucru, este sigur sÄ faceÅi clic pe "
-"OK)"
+"autoritate? (DacÄ nu ÃnÅelegem acest lucru, este sigur sÄ faceÅi clic pe OK)"
 
 #: torbutton.popup.ff3.warning
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ru/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ru/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ru/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.dtd, ru/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-08-02 20:11+0200\n"
 "Last-Translator: achu <alex@xxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -12,8 +12,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 "X-Accelerator-Marker: &\n"
 
@@ -137,6 +137,38 @@
 msgid "A"
 msgstr "Ð"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -183,6 +215,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "ÐÑÐÐÐÑÑ cookies Ð ÑÐÐÐÐÐ ÐÐ-Tor Ð ÐÐÑÐÑÐÐÐÐÐ ÑÐÐÐÐ"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "ÐÑÑÐÐÐ ÑÐÑÐÐÐÐÐÐÐ cookies (ÐÐÐÑÐÐ)"
@@ -259,12 +295,28 @@
 msgid "Spoof US English Browser"
 msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐÐ Ð ÐÐÑÑÐÐ ÐÑÐÑÐÐÑÐ US English"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
+
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
 "ÐÐ ÐÐÐÐÐÑÐÐÑÑ ÐÑÑÐÐÐ, ÐÑÐÑÐÐ ÐÑ ÐÑÐÑÐÐ (ÐÐÐÐÑ ÐÐÑÑÑÐÑÑ ÑÐÐÐÑÑ ÐÐÐÐÑÐÑÑÑ "
 "ÑÐÐÑÐÐ)"
 
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+"ÐÐ ÐÐÐÐÐÑÐÐÑÑ ÐÑÑÐÐÐ, ÐÑÐÑÐÐ ÐÑ ÐÑÐÑÐÐ (ÐÐÐÐÑ ÐÐÑÑÑÐÑÑ ÑÐÐÐÑÑ ÐÐÐÐÑÐÑÑÑ "
+"ÑÐÐÑÐÐ)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "ÐÑÐÐÑÑÐÑÑ DOM Storage ÐÑÐ ÐÑÐÐÐÑÐÐÐÐÐÐ Tor (ÐÐÐÐÐ)"
@@ -429,6 +481,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "ÐÐÐÐÐÐÐÐ: ÐÐ ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐÐÐ ÐÐÐÐÐÐÐ Ð ÐÐÐÐ ÐÑÑÐ"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "Cookies"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr "ÐÑÐÐÑÑÐÑÑ ÐÐÐÐÐÐÐÐÐÐ Livemarks ÐÐ ÐÑÐÐÑ ÑÐÐÐÑÑ Ð Tor"
@@ -473,10 +594,18 @@
 msgid "scroogle.org"
 msgstr "scroogle.org"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr "ÐÐÐÐÑÑÑ ÑÐÐÐÐÐÐÑ Ð ÐÐÐÑÑÐÑÐÐ Ð ÑÐÑÐÐ ÐÐ ÐÐÐÑÐÑÐÐ ÑÑÑÐÐÐ ÐÐÐÑÐÐ Google"
 
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""
+
 #~ msgid "Disable updates during Tor usage (recommended)"
 #~ msgstr "ÐÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐÑ ÐÑÐ ÐÑÐÐÐÑÐÐÐÐÐÐÐ Tor (ÐÐÐÐÑÐÐÑÐÐ)"
 

Modified: translation/trunk/projects/torbutton-alpha/po/ru/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ru/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ru/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,10 +1,10 @@
 # extracted from en-US/torbutton.properties, ru/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-08-02 20:21+0200\n"
 "Last-Translator: achu <alex@xxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -12,8 +12,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 "X-Accelerator-Marker: &\n"
 
@@ -108,7 +108,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/sco/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/sco/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/sco/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/sco/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/sco/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/sco/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/sk/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/sk/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/sk/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/sk/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/sk/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/sk/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/sl/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/sl/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/sl/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,18 +1,19 @@
 # extracted from en-US/torbutton.dtd, sl-SI/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-03-04 06:02-0700\n"
 "Last-Translator: yeah right <telingit.howitis@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
-"n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 "X-Accelerator-Marker: &\n"
 
@@ -138,6 +139,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -186,6 +219,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "Shrani ne-Tor piÅkotke v zaÅÄiten predal"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "Samodejno bom upravljal z piÅkotki (nevarno)"
@@ -262,10 +299,26 @@
 msgid "Spoof US English Browser"
 msgstr "Navidezno \"US English\" brskalnik"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
-msgstr "Ne poÅiljaj \"referer\" med uporabo Tor-a (lahko prekine doloÄene strani)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
+msgstr ""
 
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+"Ne poÅiljaj \"referer\" med uporabo Tor-a (lahko prekine doloÄene strani)"
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+"Ne poÅiljaj \"referer\" med uporabo Tor-a (lahko prekine doloÄene strani)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "OnemogoÄi DOM shranjevanje med uporabo Tor-a (obvezno)"
@@ -318,7 +371,8 @@
 
 #: torbutton.prefs.resize_on_toggle
 msgid "Resize windows to multiples of 50px during Tor usage (recommended)"
-msgstr "Spremeni velikost oken na veÄ 50px oken med uporabo Tor-a (priporoÄeno)"
+msgstr ""
+"Spremeni velikost oken na veÄ 50px oken med uporabo Tor-a (priporoÄeno)"
 
 #: torbutton.prefs.close_tor
 msgid "Close all Tor windows and tabs on toggle (optional)"
@@ -420,6 +474,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "Opozorilo: izogibaj se uporabi zgornjih oznak (hostname)"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "PiÅkotki"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr "OnemogoÄi RSS posodobitve med uporaboTor-a "
@@ -462,6 +585,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/sl/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/sl/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/sl/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,18 +1,19 @@
 # extracted from en-US/torbutton.properties, sl-SI/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-03-04 06:03-0700\n"
 "Last-Translator: yeah right <telingit.howitis@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
-"n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
 "X-Generator: Translate Toolkit 1.5.3\n"
 "X-Accelerator-Marker: &\n"
 
@@ -93,7 +94,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/so/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/so/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/so/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/so/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/so/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/so/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/son/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/son/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/son/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/son/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/son/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/son/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/sq/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/sq/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/sq/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/sq/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/sq/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/sq/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/sr/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/sr/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/sr/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-06-20 16:36-0600\n"
 "Last-Translator: George Bush <theranchcowboy@xxxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,6 +134,38 @@
 msgid "A"
 msgstr "Ð"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -179,6 +212,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "ÐÐÐÑÑÐ ÐÐÐÐÑÐÑÐ Ñ ÐÐÑÑÐÑÐÐÐ ÑÐÐÐÐÐÑÑÐ"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "ÐÑÑÐÐ ÑÑ ÑÐÑÐÐÑÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÑÐÐÐ (ÐÐÐÑÐÐ)"
@@ -255,12 +292,28 @@
 msgid "Spoof US English Browser"
 msgstr "ÐÐÐÑÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÑÐÐÐÐÐÐÑ"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
+
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
 "ÐÐ ÑÐÑÐ ÑÐÑÑÐÐÐÑÐ ÐÐÐÐ ÑÐ Tor ÐÐÐÐÑÑÐÐ (ÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÑÑ Ñ ÐÐÐÐÐ "
 "ÐÐÑÐÑÐÐÑ ÑÑÑÐÐÐÑÐÐÐ)"
 
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+"ÐÐ ÑÐÑÐ ÑÐÑÑÐÐÐÑÐ ÐÐÐÐ ÑÐ Tor ÐÐÐÐÑÑÐÐ (ÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÑÑ Ñ ÐÐÐÐÐ "
+"ÐÐÑÐÑÐÐÑ ÑÑÑÐÐÐÑÐÐÐ)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "ÐÐÐÐÐÐÑÑÐ DOM ÑÐÐÐÐÐÑÑÐ ÐÐÐÐ ÑÐ Tor ÐÐÐÑÐÐÑÑ (ÐÑÑÑÐÐ)"
@@ -416,6 +469,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "ÐÐÐÐÐÑÐÑÐ: ÐÐÐÐÐÐÐ ÐÐÑÐÑÑÐÑÐ ÐÐÐÐÐ ÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "ÐÐÐÐÑÐÑÐ"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr "ÐÐÐÐÐÐÑÑÐ ÐÐÑÑÐÑÐÑÐ ÐÐÐÐÐÐ ÐÐÐÐ ÑÐ Tor ÐÐÐÑÐÐÑÑ"
@@ -459,6 +581,14 @@
 msgid "scroogle.org"
 msgstr "Scroogle.org"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr "ÐÐÐÐÐ ÐÐÐÑÑÐÑÐÑ Ð ÑÐÐÐÐ ÑÐ Google ÐÑÐÑÑÐÐÐÐÐÑÐ"
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/sr/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/sr/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/sr/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from src/chrome/locale/en/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-06-20 13:51-0600\n"
 "Last-Translator: George Bush <theranchcowboy@xxxxxxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -107,7 +108,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -129,8 +131,7 @@
 #: torbutton.popup.test.failure
 msgid "Tor proxy test FAILED! Check your proxy and Polipo settings."
 msgstr ""
-"ÐÐÑÑÐÑÐÑÐ ÑÐÑÐÐÑÐ ÐÐÑÐ ÑÑÐÐÐÐ! ÐÑÐÐÐÑÐÑÐ ÑÐÐÑÐ ÐÐÑÑÐÐÐÐÑÐÐ Ð Polipo "
-"ÐÐÑÑÐÐÐÐ."
+"ÐÐÑÑÐÑÐÑÐ ÑÐÑÐÐÑÐ ÐÐÑÐ ÑÑÐÐÐÐ! ÐÑÐÐÐÑÐÑÐ ÑÐÐÑÐ ÐÐÑÑÐÐÐÐÑÐÐ Ð Polipo ÐÐÑÑÐÐÐÐ."
 
 #: torbutton.popup.test.confirm_toggle
 msgid ""

Modified: translation/trunk/projects/torbutton-alpha/po/st/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/st/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/st/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/st/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/st/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/st/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/su/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/su/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/su/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/su/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/su/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/su/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/sv/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/sv/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/sv/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-06-27 08:47-0600\n"
 "Last-Translator: Yosh Marklund <torproject@xxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -141,6 +142,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -188,6 +221,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "Jag skÃter cookies manuellt (farligt)"
@@ -265,10 +302,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 #, fuzzy
 msgid "Disable DOM Storage during Tor usage (crucial)"
@@ -416,6 +465,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "Kakor"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 #, fuzzy
 msgid "Disable Livemark updates during Tor usage"
@@ -459,6 +577,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/sv/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/sv/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/sv/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-06-27 08:49-0600\n"
 "Last-Translator: Yosh Marklund <torproject@xxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +86,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/sw/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/sw/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/sw/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/sw/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/sw/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/sw/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ta/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ta/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ta/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ta/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ta/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ta/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/te/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/te/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/te/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/te/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/te/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/te/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/templates/torbutton.dtd.pot
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/templates/torbutton.dtd.pot	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/templates/torbutton.dtd.pot	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,17 +1,16 @@
-#. extracted from src/chrome/locale/en/torbutton.dtd
-#, fuzzy
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"X-Generator: Translate Toolkit 1.8.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.prefs.title
@@ -129,6 +128,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +204,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +284,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +445,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +555,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/templates/torbutton.properties.pot
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/templates/torbutton.properties.pot	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/templates/torbutton.properties.pot	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,17 +1,16 @@
-#. extracted from src/chrome/locale/en/torbutton.properties
-#, fuzzy
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"X-Generator: Translate Toolkit 1.8.0\n"
 "X-Accelerator-Marker: &\n"
 
 #: torbutton.button.tooltip.disabled

Modified: translation/trunk/projects/torbutton-alpha/po/tg/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/tg/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/tg/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/tg/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/tg/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/tg/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/th/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/th/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/th/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2009-07-17 16:02+0000\n"
 "Last-Translator: Teerawat Kunlayanopakorn <deutsche3289@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/th/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/th/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/th/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ti/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ti/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ti/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ti/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ti/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ti/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/tk/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/tk/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/tk/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/tk/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/tk/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/tk/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/tr/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/tr/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/tr/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -2,12 +2,12 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-08-28 01:29+0200\n"
 "Last-Translator: Necdet <necdetyucel@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -137,6 +137,38 @@
 msgid "A"
 msgstr "H"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbuton"
@@ -181,6 +213,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "Ãerezleri korumalÄ \"jar\" dosyasÄnda tut"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "Ãerezlerimi kendim yÃnetmek istiyorum (tehlikeli)"
@@ -227,7 +263,8 @@
 
 #: torbutton.prefs.no_search
 msgid "Disable search suggestions during Tor (recommended)"
-msgstr "Arama yaparken \"Ãneriler\" ÃzelliÄini devredÄÅÄ bÄrak(tavsiye edilen)\\"
+msgstr ""
+"Arama yaparken \"Ãneriler\" ÃzelliÄini devredÄÅÄ bÄrak(tavsiye edilen)\\"
 
 #: torbutton.prefs.shutdown
 msgid "Shutdown"
@@ -257,10 +294,24 @@
 msgid "Spoof US English Browser"
 msgstr "Ängilizce web gezginlerini denetle"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
 msgstr "Ästatistiki bilgileri gÃnderme(GÃvenlik)"
 
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr "Ästatistiki bilgileri gÃnderme(GÃvenlik)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "Tor ÃalÄÅÄrken DCOM belleÄini devredÄÅÄ bÄrak(kritik)"
@@ -292,7 +343,8 @@
 #: torbutton.prefs.reload_crashed_jar
 msgid "Reload cookie jar/clear cookies on Firefox crash (recommended)"
 msgstr ""
-"Firefox ÃÃktÃÄÃnde, Ãerezleri \"jar\" dosyalarÄndan geri yÃkle(Tavsiye edilen)"
+"Firefox ÃÃktÃÄÃnde, Ãerezleri \"jar\" dosyalarÄndan geri yÃkle(Tavsiye "
+"edilen)"
 
 #: torbutton.prefs.dual_cookie_jars
 msgid "Store both Tor and Non-Tor cookies in protected jars (dangerous)"
@@ -331,8 +383,7 @@
 #: torbutton.prefs.jar_ca_certs
 msgid "Store CA certs in seperate jars for Tor/Non-Tor (recommended)"
 msgstr ""
-"Tor / Non-Tor iÃin ayrÄ kavanozlarda saklayÄn CA certs (Ãnerilir) "
-"           "
+"Tor / Non-Tor iÃin ayrÄ kavanozlarda saklayÄn CA certs (Ãnerilir)            "
 
 #: torbutton.prefs.locked_mode
 msgid "Disable Button and Hotkeys to prevent accidental toggle"
@@ -411,6 +462,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "UyarÄ: kaÃÄnÄn Ãzerinde herhangi bir sunucu isimleri kullanarak"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "Ãerezler"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr "Tor kullanÄmÄ sÄrasÄnda devre dÄÅÄ Livemark gÃncellemeleri"
@@ -436,8 +556,7 @@
 "Automatically use an alternate search engine when presented with a Google "
 "Captcha:"
 msgstr ""
-"Otomatik olarak alternatif bir arama motoru Google Captcha baÅvurdu "
-"kullanÄn:"
+"Otomatik olarak alternatif bir arama motoru Google Captcha baÅvurdu kullanÄn:"
 
 #: torbutton.prefs.engine1
 msgid "ixquick.com"
@@ -455,6 +574,14 @@
 msgid "scroogle.org"
 msgstr "scroogle.org"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr "KaldÄr platform ve Google Arama Kutusu gelen dil sorgular"
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/tr/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/tr/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/tr/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -2,12 +2,12 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-08-26 03:00+0200\n"
 "Last-Translator: Necdet <necdetyucel@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -110,7 +110,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
@@ -158,8 +159,8 @@
 "Click OK to test Tor proxy settings. This test will happen in the "
 "background. Please be patient."
 msgstr ""
-"Tamama tÄklayarak proxy ayarlarÄnÄ test edin. Test arkaplanda "
-"gerÃekleÅiyor.LÃtfen bekleyin."
+"Tamama tÄklayarak proxy ayarlarÄnÄ test edin. Test arkaplanda gerÃekleÅiyor."
+"LÃtfen bekleyin."
 
 #: torbutton.panel.label.verified
 msgid "Tor Verified"

Modified: translation/trunk/projects/torbutton-alpha/po/uk/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/uk/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/uk/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2009-12-12 17:39-0700\n"
 "Last-Translator: Stepan <stepafix@xxxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -134,6 +135,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -178,6 +211,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "ÐÐÐÑÑÐÐÑÐ ÐÐ-Tor ÐÑÐÐ Ñ ÐÐÑÐÑÐÐÐÐÑ ÑÑÐÐÑ"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "Ð ÑÐÑÑ ÑÐÐ ÐÐÑÑÐÐÑÐ ÑÐÐÑÐÐ ÐÑÐÐÐÐ (ÐÐÐÐÐÐÐÑÐÐ)"
@@ -254,12 +291,28 @@
 msgid "Spoof US English Browser"
 msgstr "ÐÑÐÐÐÐÐÑÐÑÑ ÐÐÑÐÐÐÑÐÐÑÐÐ US English"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
+
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
 "ÐÐ ÐÐÑÐÐÐÑÐ ÑÐÑÐÑÐÐÑÑÐ ÐÑÐ ÐÐÐÐÑÐÑÑÐÐÐÑ Tor (ÐÐÐÐ ÐÐÐÐÐÐÑÐ ÑÐÐÐÑÑ ÐÐÑÐÐÑ "
 "ÑÑÐÑÑÐÐÐ)"
 
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+"ÐÐ ÐÐÑÐÐÐÑÐ ÑÐÑÐÑÐÐÑÑÐ ÐÑÐ ÐÐÐÐÑÐÑÑÐÐÐÑ Tor (ÐÐÐÐ ÐÐÐÐÐÐÑÐ ÑÐÐÐÑÑ ÐÐÑÐÐÑ "
+"ÑÑÐÑÑÐÐÐ)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "ÐÐÐÐÐÑÑÐ ÐÐÐÑÐÐÐÐÐÑ DOM ÐÑÐ ÐÐÐÐÑÐÑÑÐÐÐÑ Tor (ÐÑÐÑÐÑÐÐ)"
@@ -407,6 +460,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "ÐÑÐÐ"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 #, fuzzy
 msgid "Disable Livemark updates during Tor usage"
@@ -450,6 +572,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/uk/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/uk/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/uk/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ur/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ur/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ur/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ur/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ur/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ur/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ve/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ve/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ve/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/ve/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/ve/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/ve/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/vi/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/vi/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/vi/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-03-08 03:33-0700\n"
 "Last-Translator: Steve Wang <doctorswan@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -132,6 +133,38 @@
 msgid "A"
 msgstr "T"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -176,6 +209,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "LÆu trá cookie KhÃng-Tor trong mát táp tin jar ÄÆác báo vá"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "TÃi sá tá quán là cookie cáa tÃi (nguy hiám)"
@@ -252,12 +289,26 @@
 msgid "Spoof US English Browser"
 msgstr "Bát chÆác TrÃnh duyát Tiáng Anh-Má"
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
-"KhÃng gái referer trong quà trÃnh dÃng Tor (cà thá gÃy lái trÃn mát sá "
-"trang)"
 
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+"KhÃng gái referer trong quà trÃnh dÃng Tor (cà thá gÃy lái trÃn mát sá trang)"
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+"KhÃng gái referer trong quà trÃnh dÃng Tor (cà thá gÃy lái trÃn mát sá trang)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "Và hiáu hÃa LÆu trá DOM trong quà trÃnh dÃng Tor (cáp thiát)"
@@ -415,6 +466,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "Cánh bÃo: TrÃnh sá dáng bát ká tÃn mÃy chá á trÃn"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "Cookie"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 #, fuzzy
 msgid "Disable Livemark updates during Tor usage"
@@ -458,6 +578,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/vi/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/vi/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/vi/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-03-05 23:05+0930\n"
 "Last-Translator: Lyndon Johnson <lyndon.johnson58@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -95,7 +96,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/wa/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/wa/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/wa/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/wa/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/wa/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/wa/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/wo/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/wo/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/wo/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/wo/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/wo/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/wo/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/zh_CN/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/zh_CN/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/zh_CN/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -2,18 +2,19 @@
 # Copyright (C) Free Software Foundation, Inc.
 # This file is distributed under the same license as torbutton package.
 # extracted from en-US/torbutton.dtd, zh-CN/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
 #
 # shco shin <chaosdemon386@xxxxxxxxx>, 2010.
 # Aron Xu <happyaron.xu@xxxxxxxxx>, 2010
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: torbutton\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-09-19 15:35+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@xxxxxxxxx>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@xxxxxxxxxxxxxxxx>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -109,8 +110,8 @@
 "proxy settings, please disable Torbutton and return here.  If you would like "
 "to change your Tor settings, please use the Torbutton preference window."
 msgstr ""
-"Torbutton çåäçäãåææææåé Tor äçèçïèçç Torbutton åååèéãåææææå Tor äçèçïèäç "
-"Torbutton ååèçã"
+"Torbutton çåäçäãåææææåé Tor äçèçïèçç Torbutton åååè"
+"éãåææææå Tor äçèçïèäç Torbutton ååèçã"
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -136,6 +137,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -182,6 +215,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr "ååäæçjarääåäç Tor æçcookie"
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "æèèåæåçç cookies (åé)"
@@ -258,11 +295,26 @@
 msgid "Spoof US English Browser"
 msgstr "äèæèåèèäçåèè"
 
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
+msgstr ""
+
 # referer äççè
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.spoofblank
+#, fuzzy
+msgid "Spoof blank referer during Tor usage (may break some sites)"
 msgstr "äç Tor æäåé Referer (åèååæäçççèé)"
 
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+# referer äççè
+#: torbutton.prefs.nospoof
+#, fuzzy
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr "äç Tor æäåé Referer (åèååæäçççèé)"
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr "äç Tor æççæèåç DOM åå(éè)"
@@ -411,6 +463,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr "èåïèäèäçäèäääæåã"
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "Cookies"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr "äç Tor æçç Livemark ææ(RSSäç)"
@@ -453,6 +574,14 @@
 msgid "scroogle.org"
 msgstr "scroogle.org"
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr "å Google æçææçæåååååèèäæã"
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/zh_CN/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/zh_CN/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/zh_CN/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -2,18 +2,19 @@
 # Copyright (C) Free Software Foundation, Inc.
 # This file is distributed under the same license as torbutton package.
 # extracted from en-US/torbutton.properties, zh-CN/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
 #
 # Ben <zhazhenzhong@xxxxxxxxx>, 2009.
 # Aron Xu <happyaron.xu@xxxxxxxxx>, 2010.
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 msgid ""
 msgstr ""
 "Project-Id-Version: torbutton\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2010-09-19 15:26+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@xxxxxxxxx>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@xxxxxxxxxxxxxxxx>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -72,8 +73,8 @@
 "Torbutton åèäååä Tor çæäåèçæççæåã\n"
 "\n"
 "èæçäææèå Firefox Bug 409737 å 417869ã\n"
-"åæèäååçååæäçæçæåäååïåæçæçääæèååååéæèå"
-"èåïçèèæçèäæèåèçã\n"
+"åæèäååçååæäçæçæåäååïåæçæçääæèååååéæèåè"
+"åïçèèæçèäæèåèçã\n"
 "\n"
 "èåæåå Tor çæäçæçïåçççäåååæåæåèéã\n"
 "\n"
@@ -98,21 +99,24 @@
 "Tor toggle. Would you like to disable the isolation of Certificate Authority "
 "certificates? (If you don't understand this, it is safe to click OK)"
 msgstr ""
-"Torbutton ææïæèåääçåèåäçCA(èäéåææ)ãææCAåèæäéèæçæäïéçTorçåæãææååæççåCAèäçéçï)"
-"åææäæïåäéæâçåâ)"
+"Torbutton ææïæèåääçåèåäçCA(èäéåææ)ãææCAåèæäéèæ"
+"çæäïéçTorçåæãææååæççåCAèäçéçï)åææäæïåäéæâç"
+"åâ)"
 
 # TorbuttonèèäèæFirefox3çéé
 #: torbutton.popup.ff3.warning
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""
 "èåï\n"
 "\n"
-"Firefox 3 äéè Tor æéæçæåå Livemark (äçæçRSSéæ)ïTorbutton åææèäåã\n"
+"Firefox 3 äéè Tor æéæçæåå Livemark (äçæçRSSéæ)ïTorbutton å"
+"ææèäåã\n"
 "\n"
 "ææåèççï"
 
@@ -235,8 +239,8 @@
 "Torbutton detected a Google Captcha. Would you like to be redirected to "
 "another search engine for this query?"
 msgstr ""
-"Torbutton ææåäää Google Captchaïææåææææææçéåååäç"
-"åäæçåæï"
+"Torbutton ææåäää Google Captchaïææåææææææçéåååäçåäæ"
+"çåæï"
 
 #: torbutton.popup.captcha.always
 msgid "Always perform this action from now on"

Modified: translation/trunk/projects/torbutton-alpha/po/zh_HK/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/zh_HK/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/zh_HK/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -174,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -250,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -399,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -441,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/zh_HK/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/zh_HK/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/zh_HK/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from ../src/chrome/locale/en-US/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/zh_TW/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/zh_TW/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/zh_TW/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,14 @@
 # extracted from en-US/torbutton.dtd, zh-TW/torbutton.dtd
-#. extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-0700\n"
 "PO-Revision-Date: 2009-07-09 12:24+0000\n"
 "Last-Translator: Ravi Wu <raviwu@xxxxxxxxx>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -106,8 +107,8 @@
 "proxy settings, please disable Torbutton and return here.  If you would like "
 "to change your Tor settings, please use the Torbutton preference window."
 msgstr ""
-"Torbutton çååçåçãåææææèé-Tor "
-"ProxyçèåïèåçTorbuttonäååéèãåææææèTorçèåïèäçTorbutton èçèçã"
+"Torbutton çååçåçãåææææèé-Tor ProxyçèåïèåçTorbuttonäåå"
+"éèãåææææèTorçèåïèäçTorbutton èçèçã"
 
 #: torbutton.context_menu.toggle
 msgid "Toggle Tor status"
@@ -133,6 +134,38 @@
 msgid "A"
 msgstr "A"
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr "Torbutton"
@@ -177,6 +210,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr "æåæåççæçcookies (åé)"
@@ -254,10 +291,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 #, fuzzy
 msgid "Disable DOM Storage during Tor usage (crucial)"
@@ -405,6 +454,75 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+#, fuzzy
+msgid "Remove Cookie"
+msgstr "Coolies"
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 #, fuzzy
 msgid "Disable Livemark updates during Tor usage"
@@ -448,6 +566,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/zh_TW/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/zh_TW/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/zh_TW/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,14 +1,15 @@
 # extracted from en-US/torbutton.properties, zh-TW/torbutton.properties
-#. extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -87,7 +88,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/zu/torbutton.dtd.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/zu/torbutton.dtd.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/zu/torbutton.dtd.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.dtd
+#. extracted from ../src/chrome/locale/en/torbutton.dtd
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -129,6 +131,38 @@
 msgid "A"
 msgstr ""
 
+#: torbutton.context_menu.cookieProtections
+msgid "Cookie Protections"
+msgstr ""
+
+#: torbutton.context_menu.cookieProtections.key
+msgid "C"
+msgstr ""
+
+#: torbutton.context_menu.copyTor
+msgid "Copy Tor URL"
+msgstr ""
+
+#: torbutton.context_menu.copyTor.key
+msgid "p"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab
+msgid "Open Tor URL in new Tab"
+msgstr ""
+
+#: torbutton.context_menu.openTorTab.key
+msgid "r"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow
+msgid "Open Tor URL in new Window"
+msgstr ""
+
+#: torbutton.context_menu.openTorWindow.key
+msgid "d"
+msgstr ""
+
 #: torbutton.button.label
 msgid "Torbutton"
 msgstr ""
@@ -173,6 +207,10 @@
 msgid "Store Non-Tor cookies in a protected jar"
 msgstr ""
 
+#: torbutton.prefs.cookie_protection
+msgid "Use the Cookie Protections Dialog to choose"
+msgstr ""
+
 #: torbutton.prefs.mmm_cookies
 msgid "I will manually manage my cookies (dangerous)"
 msgstr ""
@@ -249,10 +287,22 @@
 msgid "Spoof US English Browser"
 msgstr ""
 
-#: torbutton.prefs.disable_referer
-msgid "Don't send referer during Tor usage (may break some sites)"
+#: torbutton.prefs.refererspoofing
+msgid "Referer spoofing"
 msgstr ""
 
+#: torbutton.prefs.spoofblank
+msgid "Spoof blank referer during Tor usage (may break some sites)"
+msgstr ""
+
+#: torbutton.prefs.smartspoof
+msgid "Smart referer spoof during Tor usage (spoofs cross domain referers)"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "No referer spoof during Tor usage (sends referers as normal)"
+msgstr ""
+
 #: torbutton.prefs.disable_domstorage
 msgid "Disable DOM Storage during Tor usage (crucial)"
 msgstr ""
@@ -398,6 +448,74 @@
 msgid "Warning: Avoid using any hostnames above"
 msgstr ""
 
+#: torbutton.prefs.spoofreresh
+msgid "Spoof Refresh"
+msgstr ""
+
+#: torbutton.prefs.refereroptions
+msgid "Referer Spoofing Options"
+msgstr ""
+
+#: torbutton.prefs.nospoof
+msgid "Do not spoof referer"
+msgstr ""
+
+#: torbutton.prefs.spoofroot
+msgid "Spoof the containing folder of the page"
+msgstr ""
+
+#: torbutton.prefs.spoofdomain
+msgid "Spoof the domain as referer"
+msgstr ""
+
+#: torbutton.prefs.spoofblank
+msgid "Make referer blank"
+msgstr ""
+
+#: torbutton.cookiedialog.title
+msgid "Manage Cookie Protections"
+msgstr ""
+
+#: torbutton.cookiedialog.lockCol
+msgid "Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.domainCol
+msgid "Host"
+msgstr ""
+
+#: torbutton.cookiedialog.nameCol
+msgid "Name"
+msgstr ""
+
+#: torbutton.cookiedialog.pathCol
+msgid "Path"
+msgstr ""
+
+#: torbutton.cookiedialog.protectCookie
+msgid "Protect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeCookie
+msgid "Remove Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.unprotectCookie
+msgid "Unprotect Cookie"
+msgstr ""
+
+#: torbutton.cookiedialog.removeAllBut
+msgid "Remove All But Protected"
+msgstr ""
+
+#: torbutton.cookiedialog.saveAllCookies
+msgid "Protect New Cookies"
+msgstr ""
+
+#: torbutton.cookiedialog.doNotSaveAllCookies
+msgid "Do Not Protect New Cookies"
+msgstr ""
+
 #: torbutton.prefs.disable_livemarks
 msgid "Disable Livemark updates during Tor usage"
 msgstr ""
@@ -440,6 +558,14 @@
 msgid "scroogle.org"
 msgstr ""
 
+#: torbutton.prefs.engine5
+msgid "duckduckgo.com"
+msgstr ""
+
 #: torbutton.prefs.fix_google_srch
 msgid "Strip platform and language off of Google Search Box queries"
 msgstr ""
+
+#: torbutton.prefs.transparentTor
+msgid "Transparent Torification (Requires custom transproxy or Tor router)"
+msgstr ""

Modified: translation/trunk/projects/torbutton-alpha/po/zu/torbutton.properties.po
===================================================================
--- translation/trunk/projects/torbutton-alpha/po/zu/torbutton.properties.po	2010-09-30 17:28:20 UTC (rev 23358)
+++ translation/trunk/projects/torbutton-alpha/po/zu/torbutton.properties.po	2010-09-30 19:51:06 UTC (rev 23359)
@@ -1,13 +1,15 @@
 # extracted from src/chrome/locale/en/torbutton.properties
+#. extracted from ../src/chrome/locale/en/torbutton.properties
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 15:30-0700\n"
+"POT-Creation-Date: 2010-09-30 12:32-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +87,8 @@
 msgid ""
 "Warning!\n"
 "\n"
-"Torbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n"
+"Torbutton on Firefox 3 is known to leak your timezone and livemarks via "
+"Tor.\n"
 "\n"
 "Do you wish to continue anyway?"
 msgstr ""