[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] [torbutton/master 3/4] Update all translated strings from transifex.

To: or-cvs@xxxxxxxxxxxxx
Subject: [or-cvs] [torbutton/master 3/4] Update all translated strings from transifex.
From: mikeperry@xxxxxxxxxxxxxx
Date: Thu, 30 Sep 2010 20:16:35 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivered-to: or-cvs-outgoing@xxxxxxxx
Delivered-to: or-cvs@xxxxxxxx
Delivery-date: Thu, 30 Sep 2010 16:17:22 -0400
Reply-to: or-dev@xxxxxxxxxxxxx
Sender: owner-or-cvs@xxxxxxxxxxxxx
Author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Date: Thu, 30 Sep 2010 13:03:10 -0700
Subject: Update all translated strings from transifex.
Commit: 06f674b74ce900440745105c0479aa36efed9f04

---
 src/chrome/locale/af/torbutton.dtd           |   33 ++++-
 src/chrome/locale/ar/torbutton.dtd           |  187 +++++++++++++----------
 src/chrome/locale/ar/torbutton.properties    |   28 ++--
 src/chrome/locale/bg/torbutton.dtd           |   33 ++++-
 src/chrome/locale/bms/torbutton.dtd          |   51 +++++--
 src/chrome/locale/bms/torbutton.properties   |    6 +-
 src/chrome/locale/bo/torbutton.dtd           |   33 ++++-
 src/chrome/locale/ca/torbutton.dtd           |   33 ++++-
 src/chrome/locale/cs/torbutton.dtd           |   81 +++++++---
 src/chrome/locale/cs/torbutton.properties    |   12 +-
 src/chrome/locale/da/torbutton.dtd           |   33 ++++-
 src/chrome/locale/de/torbutton.dtd           |   39 +++++-
 src/chrome/locale/de/torbutton.properties    |   14 +-
 src/chrome/locale/el/torbutton.dtd           |   43 +++++-
 src/chrome/locale/en/torbutton.dtd.orig      |  135 ++++++++++++++++
 src/chrome/locale/en/torbutton.dtd.rej       |   10 ++
 src/chrome/locale/es/torbutton.dtd           |   41 +++++-
 src/chrome/locale/es/torbutton.properties    |   22 ++--
 src/chrome/locale/eu/torbutton.dtd           |   33 ++++-
 src/chrome/locale/fa/torbutton.dtd           |   83 +++++++---
 src/chrome/locale/fa/torbutton.properties    |   46 +++---
 src/chrome/locale/fi/torbutton.dtd           |  121 +++++++++------
 src/chrome/locale/fi/torbutton.properties    |   44 +++---
 src/chrome/locale/fr/torbutton.dtd           |   43 +++++-
 src/chrome/locale/fr/torbutton.properties    |   14 +-
 src/chrome/locale/fur/torbutton.dtd          |   33 ++++-
 src/chrome/locale/gl/torbutton.dtd           |   33 ++++-
 src/chrome/locale/gu/torbutton.dtd           |  135 ++++++++++-------
 src/chrome/locale/gu/torbutton.properties    |   32 ++--
 src/chrome/locale/he/torbutton.dtd           |   33 ++++-
 src/chrome/locale/hi/torbutton.dtd           |   33 ++++-
 src/chrome/locale/hr/torbutton.dtd           |   33 ++++-
 src/chrome/locale/hu/torbutton.dtd           |   33 ++++-
 src/chrome/locale/id/torbutton.dtd           |  205 ++++++++++++++-----------
 src/chrome/locale/id/torbutton.properties    |   72 +++++-----
 src/chrome/locale/is/torbutton.dtd           |   33 ++++-
 src/chrome/locale/it/torbutton.dtd           |  123 ++++++++++------
 src/chrome/locale/it/torbutton.properties    |   26 ++--
 src/chrome/locale/ja/torbutton.dtd           |   97 ++++++++----
 src/chrome/locale/ja/torbutton.properties    |   24 ++--
 src/chrome/locale/ka/torbutton.dtd           |   33 ++++-
 src/chrome/locale/km/torbutton.dtd           |   33 ++++-
 src/chrome/locale/ko/torbutton.dtd           |   33 ++++-
 src/chrome/locale/ku/torbutton.dtd           |   33 ++++-
 src/chrome/locale/mt/torbutton.dtd           |   33 ++++-
 src/chrome/locale/nb/torbutton.dtd           |   39 +++++-
 src/chrome/locale/nb/torbutton.properties    |    2 +-
 src/chrome/locale/nl/torbutton.dtd           |  137 ++++++++++-------
 src/chrome/locale/nl/torbutton.properties    |   62 ++++----
 src/chrome/locale/pa/torbutton.dtd           |   33 ++++-
 src/chrome/locale/pl/torbutton.dtd           |   49 +++++-
 src/chrome/locale/pl/torbutton.properties    |   28 ++--
 src/chrome/locale/pt-BR/torbutton.dtd        |   33 ++++-
 src/chrome/locale/pt/torbutton.dtd           |   33 ++++-
 src/chrome/locale/ro/torbutton.dtd           |  161 ++++++++++++--------
 src/chrome/locale/ro/torbutton.properties    |   62 ++++----
 src/chrome/locale/ru/torbutton.dtd           |   59 ++++++--
 src/chrome/locale/ru/torbutton.properties    |   34 ++--
 src/chrome/locale/sl/torbutton.dtd           |   33 ++++-
 src/chrome/locale/sq/torbutton.dtd           |   33 ++++-
 src/chrome/locale/sv/torbutton.dtd           |   33 ++++-
 src/chrome/locale/sv/torbutton.properties    |   36 +++---
 src/chrome/locale/sw/torbutton.dtd           |   33 ++++-
 src/chrome/locale/th/torbutton.dtd           |   33 ++++-
 src/chrome/locale/tr/torbutton.dtd           |  211 +++++++++++++++-----------
 src/chrome/locale/tr/torbutton.properties    |   62 ++++----
 src/chrome/locale/uk/torbutton.dtd           |   33 ++++-
 src/chrome/locale/vi/torbutton.dtd           |   33 ++++-
 src/chrome/locale/zh-CN/torbutton.dtd        |   81 +++++++---
 src/chrome/locale/zh-CN/torbutton.properties |   26 ++--
 src/chrome/locale/zh-HK/torbutton.dtd        |   33 ++++-
 src/chrome/locale/zh-TW/torbutton.dtd        |   33 ++++-
 72 files changed, 2734 insertions(+), 1039 deletions(-)
 create mode 100644 src/chrome/locale/en/torbutton.dtd.orig
 create mode 100644 src/chrome/locale/en/torbutton.dtd.rej

diff --git a/src/chrome/locale/af/torbutton.dtd b/src/chrome/locale/af/torbutton.dtd
index 8dcfb2b..7e1fb3b 100644
--- a/src/chrome/locale/af/torbutton.dtd
+++ b/src/chrome/locale/af/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "About Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ar/torbutton.dtd b/src/chrome/locale/ar/torbutton.dtd
index 2d45c31..d1af503 100644
--- a/src/chrome/locale/ar/torbutton.dtd
+++ b/src/chrome/locale/ar/torbutton.dtd
@@ -1,106 +1,137 @@
-<!ENTITY torbutton.prefs.title "ØªÙ?Ø¶Ù?Ù?Ø§Øª Ù?Ù?ØªØ§Ø ØªÙ?Ø±">
+<!ENTITY torbutton.prefs.title "ØªÙ?Ø¶Ù?Ù?Ø§Øª Ø²Ø± ØªÙ?Ø±">
 <!ENTITY torbutton.prefs.display_settings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø¹Ø±Ø¶">
-<!ENTITY torbutton.prefs.display_panel "Ø£Ø¸Ù?Ø± ØØ§Ù?Ø© Ù?Ø³Ù?Ø· ØªÙ?Ø± Ù?Ù? Ø´Ø±Ù?Ø· Ø§Ù?ØØ§Ù?Ø©">
+<!ENTITY torbutton.prefs.display_panel "Ø£Ø¸Ù?Ø± ØØ§Ù?Ø© Ø§Ù?Ù?Ø³Ù?Ø· Ù?Ù? Ø´Ø±Ù?Ø· Ø§Ù?Ù?ØªØµÙ?Ø">
 <!ENTITY torbutton.prefs.panel_format "ØµÙ?ØºØ© Ø¹Ø±Ø¶ Ø§Ù?ØØ§Ù?Ø© Ù?Ù? Ø§Ù?Ø´Ø±Ù?Ø·:">
-<!ENTITY torbutton.prefs.panel_text_format "Ù?ØµÙ?Ø©">
+<!ENTITY torbutton.prefs.panel_text_format "Ù?Øµ">
 <!ENTITY torbutton.prefs.panel_icon_format "Ø£Ù?Ù?Ù?Ù?Ø©">
 <!ENTITY torbutton.prefs.tor_settings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ù?Ø³Ù?Ø·">
-<!ENTITY torbutton.prefs.recommended_settings "Ø§Ø³ØªØ®Ø¯Ù? Ø§Ù?Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ù?Ù?Ø¶Ù?Ø© Ù?Ù?Ø³Ø®ØªÙ? Ù?Ù? Ù?Ø§Ù?Ø±Ù?Ù?Ù?Ø³">
-<!ENTITY torbutton.prefs.use_privoxy "Ø§Ø³ØªØ®Ø¯Ù? Ø¨Ø±Ù?Ú¤Ù?Ù?Ø³Ù?">
-<!ENTITY torbutton.prefs.use_polipo "Ø§Ø³ØªØ®Ø¯Ù? Ø¨Ù?Ù?Ù?Ø¨Ù?">
-<!ENTITY torbutton.prefs.custom_settings "Ø§Ø³ØªØ®Ø¯Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ù?Ø³Ù?Ø· Ù?Ø¹Ø±Ù?Ù?Ø© ">
+<!ENTITY torbutton.prefs.recommended_settings "Ø§Ø³ØªØ®Ø¯Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ù?Ø³Ù?Ø· Ø§Ù?Ù?ØØ¨Ù?Ø°Ø© Ù?Ù?Ø³Ø®ØªÙ? Ù?Ù? Ù?Ù?Ø±Ù?Ù?Ø³">
+<!ENTITY torbutton.prefs.use_privoxy "Ø§Ø³ØªØ®Ø¯Ù? Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Ø§Ø³ØªØ®Ø¯Ù? Polipo">
+<!ENTITY torbutton.prefs.custom_settings "Ø§Ø³ØªØ®Ø¯Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ù?Ø³Ù?Ø· Ù?Ø®ØµØµØ©">
 <!ENTITY torbutton.prefs.proxy.host.http "Ù?Ø³Ù?Ø· HTTP:">
-<!ENTITY torbutton.prefs.proxy.host.https "Ù?Ø³Ù?Ø· SLL:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "Ù?Ø³Ù?Ø· SSL:">
+<!ENTITY torbutton.prefs.proxy.host.https "Ù?Ø³Ù?Ø· SSL:">
+<!ENTITY torbutton.prefs.proxy.host.ftp "Ù?Ø³Ù?Ø· FTP:">
 <!ENTITY torbutton.prefs.proxy.host.gopher "Ù?Ø³Ù?Ø· Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Ù?Ø¶Ù?Ù? SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Ù?Ù?Ù?Ø°:">
-<!ENTITY torbutton.about.title "Ø¹Ù? Ù?Ù?ØªØ§Ø ØªÙ?Ø±">
-<!ENTITY torbutton.pref_connection.notice "Ø£Ù?Ù?Ù? ØªÙ?Ø¹Ù?Ù? Ù?Ù?ØªØ§Ø ØªÙ?Ø± Ù?ØªØºÙ?Ù?Ø± Ù?Ø°Ù? Ø§Ù?Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª.">
+<!ENTITY torbutton.prefs.proxy.host.socks "Ù?Ø³Ù?Ø· SOCKS:">
+<!ENTITY torbutton.prefs.proxy.port "Ø§Ù?Ù?Ù?Ù?Ø°:">
+<!ENTITY torbutton.about.title "Ø¹Ù? Ø²Ø± ØªÙ?Ø±">
+<!ENTITY torbutton.pref_connection.notice "Ø¹Ø·Ù? Ø²Ø± ØªÙ?Ø± Ù?ØªØºÙ?Ù?Ø± Ù?Ø°Ù? Ø§Ù?Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª.">
 <!ENTITY torbutton.pref_connection.more_info "Ù?Ø²Ù?Ø¯ Ù?Ù? Ø§Ù?Ù?Ø¹Ù?Ù?Ù?Ø§Øª">
-<!ENTITY torbutton.pref_connection_more_info.title "Ù?Ø³Ø§Ø¹Ø¯Ø©">
-<!ENTITY torbutton.pref_connection_more_info.text "Ù?Ù?ØªØ§Ø ØªÙ?Ø± ØØ§Ù?Ù?Ø§ Ù?Ù?Ø¹Ù?Ù?. Ø¥Ù? Ù?Ù?Øª ØªØ±Ù?Ø¯ ØªØºÙ?Ù?Ø± Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø¨Ø±Ù?Ù?Ø³Ù? ØºÙ?Ø± Ø§Ù?Ù?ØªØ¹Ù?Ù?Ø© Ø¨ØªÙ?Ø± Ø£Ù?Ù?Ù? ØªÙ?Ø¹Ù?Ù? Ù?Ù?ØªØ§Ø ØªÙ?Ø± Ø£Ù?Ù?Ø§Ù? Ø«Ù? Ø¹Ø¯ Ø¥Ù?Ù? Ù?Ù?Ø§. Ø¥Ù? Ù?Ù?Øª ØªØ±Ù?Ø¯ ØªØ¹Ø¯Ù?Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ù?Ù?ØªØ§Ø ØªÙ?Ø± Ù?Ø§Ø³ØªØ®Ø¯Ù? Ù?Ø§Ù?Ø°Ø© ØªÙ?Ø¶Ù?Ù?Ø§Øª Ù?Ù?ØªØ§Ø ØªÙ?Ø±.">
-<!ENTITY torbutton.context_menu.toggle "Ø§Ø¹Ù?Ø³ ØØ§Ù?Ø© Ù?Ù?ØªØ§Ø ØªÙ?Ø±">
+<!ENTITY torbutton.pref_connection_more_info.title "Ø§Ù?ØªØ¹Ù?Ù?Ù?Ø§Øª">
+<!ENTITY torbutton.pref_connection_more_info.text "Ø²Ø± ØªÙ?Ø± Ù?Ù?Ø¹Ù?Ù? ØØ§Ù?Ù?Ù?Ø§. Ø¥Ù? Ù?Ù?Øª ØªØ±Ù?Ø¯ ØªØºÙ?Ù?Ø± Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ù?Ø³Ù?Ø· ØºÙ?Ø± Ø§Ù?Ù?ØªØ¹Ù?Ù?Ø© Ø¨ØªÙ?Ø±Ø? Ù?Ø¶Ù?Ø§Ù? Ø¹Ø·Ù? Ø²Ø± ØªÙ?Ø± Ø£Ù?Ù?Ø§Ù? Ø«Ù? Ø¹Ø¯ Ø¥Ù?Ù? Ù?Ù?Ø§. Ø¥Ù? Ù?Ù?Øª ØªØ±Ù?Ø¯ ØªØ¹Ø¯Ù?Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø²Ø± ØªÙ?Ø± Ù?Ø§Ø³ØªØ®Ø¯Ù? Ù?Ø§Ù?Ø°Ø© ØªÙ?Ø¶Ù?Ù?Ø§Øª Ø²Ø± ØªÙ?Ø±.">
+<!ENTITY torbutton.context_menu.toggle "Ø¨Ø¯Ù?Ù? ØØ§Ù?Ø© ØªÙ?Ø±">
 <!ENTITY torbutton.context_menu.toggle.key "Øª">
-<!ENTITY torbutton.context_menu.preferences "ØªÙ?Ø¶Ù?Ù?Ø§Øªâ?¦">
+<!ENTITY torbutton.context_menu.preferences "Ø§Ù?ØªÙ?Ø¶Ù?Ù?Ø§Øª...">
 <!ENTITY torbutton.context_menu.preferences.key "Ù?">
-<!ENTITY torbutton.context_menu.about "ØÙ?Ù? Ù?Ù?ØªØ§Ø ØªÙ?Ø±â?¦">
+<!ENTITY torbutton.context_menu.about "Ø¹Ù? Ø²Ø± ØªÙ?Ø±...">
 <!ENTITY torbutton.context_menu.about.key "Ø">
-<!ENTITY torbutton.button.label "Ù?Ù?ØªØ§Ø ØªÙ?Ø±">
-<!ENTITY torbutton.button.tooltip "Ø§Ù?Ù?Ø± Ù?Ø¨Ø¯Ø¡ Ù?Ù?ØªØ§Ø ØªÙ?Ø±">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
+<!ENTITY torbutton.button.label "Ø²Ø± ØªÙ?Ø±">
+<!ENTITY torbutton.button.tooltip "Ø§Ù?Ù?Ø± Ù?Ø¨Ø¯Ø¡ Ø²Ø± ØªÙ?Ø±">
 <!ENTITY torbutton.prefs.sec_settings "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø£Ù?Ø§Ù?">
-<!ENTITY torbutton.prefs.block_thread "Ø§Ù?Ù?Ø¹ Ù?Ø±Ø§Ø¡Ø© ØªØ§Ø±Ù?Ø® Ø§Ù?ØªØµÙ?Ø Ø£Ø«Ù?Ø§Ø¡ Ø¹Ù?Ù? ØªÙ?Ø± (Ø£Ø³Ø§Ø³Ù?)">
-<!ENTITY torbutton.prefs.block_thwrite "Ø§Ù?Ù?Ø¹ Ù?ØªØ§Ø¨Ø© ØªØ§Ø±Ù?Ø® Ø§Ù?ØªØµÙ?Ø Ø£Ø«Ù?Ø§Ø¡ Ø¹Ù?Ù? ØªÙ?Ø± (Ù?ØØ¨Ø°)">
+<!ENTITY torbutton.prefs.block_thread "Ø§Ù?Ù?Ø¹ Ù?Ø±Ø§Ø¡Ø© ØªØ§Ø±Ù?Ø® Ø§Ù?ØªØµÙ?Ø Ø£Ø«Ù?Ø§Ø¡ Ø¹Ù?Ù? ØªÙ?Ø± (ØÙ?Ø±Ù?Ø¬)">
+<!ENTITY torbutton.prefs.block_thwrite "Ø§Ù?Ù?Ø¹ Ù?ØªØ§Ø¨Ø© ØªØ§Ø±Ù?Ø® Ø§Ù?ØªØµÙ?Ø Ø£Ø«Ù?Ø§Ø¡ Ø¹Ù?Ù? ØªÙ?Ø± (Ù?ØØ¨Ù?Ø°)">
 <!ENTITY torbutton.prefs.block_nthread "Ø§Ù?Ù?Ø¹ Ù?Ø±Ø§Ø¡Ø© ØªØ§Ø±Ù?Ø® Ø§Ù?ØªØµÙ?Ø Ø£Ø«Ù?Ø§Ø¡ ØªÙ?Ù?Ù? ØªÙ?Ø± (Ø§Ø®ØªÙ?Ø§Ø±Ù?)">
 <!ENTITY torbutton.prefs.block_nthwrite "Ø§Ù?Ù?Ø¹ Ù?ØªØ§Ø¨Ø© ØªØ§Ø±Ù?Ø® Ø§Ù?ØªØµÙ?Ø Ø£Ø«Ù?Ø§Ø¡ ØªÙ?Ù?Ù? ØªÙ?Ø± (Ø§Ø®ØªÙ?Ø§Ø±Ù?)">
 <!ENTITY torbutton.prefs.clear_history "Ø§Ù?Ø³Ø ØªØ§Ø±Ù?Ø® Ø§Ù?ØªØµÙ?Ø Ø¹Ù?Ø¯ ØªØºÙ?Ø± ØØ§Ù?Ø© ØªÙ?Ø± (Ø§Ø®ØªÙ?Ø§Ø±Ù?)">
-<!ENTITY torbutton.prefs.clear_cache "Ø§Ù?Ù?Ø¹ Ø§Ù?Ù?Ù?Ø§Ø° Ø¥Ù?Ù? Ù?Ø®Ø¨Ø¦Ù?Ø© ØªÙ?Ø± Ø¹Ù?Ù? Ø§Ù?Ù?Ø±Øµ Ù? Ø£Ø®Ù? Ù?Ù? Ø§Ù?Ù?Ø®Ø¨Ø¦Ù?Ø© Ø¹Ù?Ø¯ ØªØºÙ?Ø± ØØ§Ù?Ø© ØªÙ?Ø±">
-<!ENTITY torbutton.prefs.block_cache "Ø§Ù?Ù?Ø¹ Ø§Ù?Ù?Ù?Ø§Ø° Ø¥Ù?Ù? Ù?Ø®Ø¨Ø¦Ù?Ø© ØªÙ?Ø± Ø¹Ù?Ù? Ø§Ù?Ù?Ø±Øµ Ù? Ø§Ù?Ø°Ø§Ù?Ø±Ø© Ø£Ø«Ù?Ø§Ø¡ Ø¹Ù?Ù? ØªÙ?Ø±">
-<!ENTITY torbutton.prefs.cookie_jars "Ø®Ø²Ù? Ù?Ø¹Ù?Ø§Øª ØºÙ?Ø± ØªÙ?Ø± Ù?Ù? Ø¬Ø±Ø© Ù?ØÙ?Ù?Ø©">
-<!ENTITY torbutton.prefs.mmm_cookies "Ø³Ø£Ø¯Ù?Ø± Ø§Ù?Ù?Ø¹Ù?Ø§Øª Ù?Ø¯Ù?Ù?Ø§ (Ø®Ø·Ø±)">
-<!ENTITY torbutton.prefs.clear_cookies "Ø§Ù?Ø³Ø Ø§Ù?Ù?Ø¹Ù?Ø§Øª Ø¹Ù?Ø¯ ØªØºÙ?Ø± ØØ§Ù?Ø© ØªÙ?Ø±">
-<!ENTITY torbutton.prefs.disable_plugins "Ø§Ù?Ù?Ø¹ Ø§Ù?Ù?Ù?ØÙ?Ø§Øª Ø£Ø«Ù?Ø§Ø¡ Ø¹Ù?Ù? ØªÙ?Ø± (Ø£Ø³Ø§Ø³Ù?)">
-<!ENTITY torbutton.prefs.kill_bad_js "Ø§Ù?ØªÙ?Ø· Ø¬Ø§Ù?Ø§Ø³Ø±Ù?Ø¨Øª Ø§Ù?Ø®Ø·Ø± (Ø£Ø³Ø§Ø³Ù?)">
-<!ENTITY torbutton.prefs.isolate_content "Ø§Ø¹Ø²Ù? Ø§Ù?Ù?ØØªÙ?Ù? Ø§Ù?Ø¯Ù?Ù?Ø§Ù?Ù?Ù?Ù? Ù?ØµØ±Ø§ Ø¹Ù?Ù? ØØ§Ù?Ø© ØªÙ?Ø± (Ø£Ø³Ø§Ø³Ù?)">
-<!ENTITY torbutton.prefs.no_updates "Ø£Ù?Ù?Ù? Ø§Ù?ØªØØ¯Ù?Ø« Ø®Ù?Ø§Ù? Ø¥Ø³ØªØ¹Ù?Ø§Ù? ØªÙ?Ø±">
-<!ENTITY torbutton.prefs.set_uagent "Ø§Ø¶Ø¨Ø· Ø¹Ù?Ù?Ù? Ø§Ù?Ù?Ø³ØªØ®Ø¯Ù? Ù?Ø¹Ù?Ù? ØªÙ?Ø± (Ø£Ø³Ø§Ø³Ù?)">
-<!ENTITY torbutton.prefs.dynamic "Ø§Ù?Ù?ØØªÙ?Ù? Ø§Ù?Ø¯Ù?Ù?Ø§Ù?Ù?Ù?Ù?">
+<!ENTITY torbutton.prefs.clear_cache "Ø§Ù?Ù?Ø¹ Ø§Ù?Ø§Ø®ØªØ²Ø§Ù? Ø¹Ù?Ù? Ø§Ù?Ù?Ø±Øµ Ù?Ø¹ ØªÙ?Ø± Ù?Ø§Ù?Ø³Ø Ù?Ù? Ø§Ù?Ø¨Ù?Ø§Ù?Ø§Øª Ø¹Ù?Ø¯ ØªØ¨Ø¯Ù?Ù? ØØ§Ù?Ø© ØªÙ?Ø±">
+<!ENTITY torbutton.prefs.block_cache "Ø§Ù?Ù?Ø¹ Ø§Ù?Ù?Ù?Ù?Ø¬ Ø¥Ù?Ù? Ø¨Ù?Ø§Ù?Ø§Øª ØªÙ?Ø± Ø¹Ù?Ù? Ø§Ù?Ù?Ø±Øµ Ù? Ø§Ù?Ø°Ø§Ù?Ø±Ø© Ø£Ø«Ù?Ø§Ø¡ Ø¹Ù?Ù? ØªÙ?Ø±">
+<!ENTITY torbutton.prefs.cookie_jars "Ø§ØÙ?Ø¸ Ù?Ø¹Ù?Ø§Øª Ø³Ù?Ù? ØªÙ?Ø± Ù?Ù? Ù?Ø¹Ø§Ø¡ Ø¢Ù?Ù? ">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
+<!ENTITY torbutton.prefs.mmm_cookies "Ø³Ø£Ø¯Ù?Ø± Ø§Ù?Ù?Ø¹Ù?Ø§Øª Ù?Ø¯Ù?Ù?Ù?Ø§ (ØÙ?Ø±Ù?Ø¬)">
+<!ENTITY torbutton.prefs.clear_cookies "Ø§Ù?Ø³Ø Ø§Ù?Ù?Ø¹Ù?Ø§Øª Ø¹Ù?Ø¯ ØªØ¨Ø¯Ù?Ù? ØØ§Ù?Ø© ØªÙ?Ø±">
+<!ENTITY torbutton.prefs.disable_plugins "Ø¹Ø·Ù?Ù? Ø§Ù?Ù?Ù?ØÙ?Ø§Øª Ø£Ø«Ù?Ø§Ø¡ Ø¹Ù?Ù? Ø§Ù?ØªÙ?Ø± (ØÙ?Ø±Ù?Ø¬)">
+<!ENTITY torbutton.prefs.kill_bad_js "Ø§ØØ¬Ø² Ø¬Ø§Ù?Ø§Ø³Ù?Ø±Ø¨Øª Ø§Ù?Ø®Ø·Ø±Ø© (ØÙ?Ø±Ù?Ø¬)">
+<!ENTITY torbutton.prefs.isolate_content "Ø§Ø¹Ø²Ù? Ø§Ù?Ù?ØØªÙ?Ù? Ø§Ù?ØØ±Ù?Ù? Ø¹Ù? ØØ§Ù?Ø© ØªÙ?Ø± (ØÙ?Ø±Ù?Ø¬)">
+<!ENTITY torbutton.prefs.no_updates "Ø¹Ø·Ù? Ø§Ù?ØªØØ¯Ù?Ø«Ø§Øª Ø£Ø«Ù?Ø§Ø¡ Ø§Ø³ØªØ®Ø¯Ø§Ù? ØªÙ?Ø±">
+<!ENTITY torbutton.prefs.set_uagent "Ø§Ø¶Ø¨Ø· Ù?Ù?Ø¨Ù? Ø§Ù?Ù?Ø³ØªØ®Ø¯Ù? Ù?Ø¹Ù?Ù? Ø§Ù?ØªÙ?Ø± (ØÙ?Ø±Ù?Ø¬)">
+<!ENTITY torbutton.prefs.dynamic "Ø§Ù?Ù?ØØªÙ?Ù? Ø§Ù?ØØ±Ù?Ù?">
 <!ENTITY torbutton.prefs.cookies "Ø§Ù?Ù?Ø¹Ù?Ø§Øª">
-<!ENTITY torbutton.prefs.cache "Ø§Ù?Ù?Ø®Ø¨Ø¦Ù?Ø©">
-<!ENTITY torbutton.prefs.history "Ø§Ù?ØªØ£Ø±Ù?Ø®">
-<!ENTITY torbutton.prefs.no_search "Ø§Ù?Ù?Ø¹ Ø§Ù?ØªØ±Ø§ØØ§Øª Ø§Ù?Ø¨ØØ« Ø£Ø«Ù?Ø§Ø¡ Ø¹Ù?Ù? ØªÙ?Ø± (Ù?ØØ¨Ø°)">
-<!ENTITY torbutton.prefs.shutdown "ØºÙ?Ù? Ø§Ù?Ù?ØªØµÙ?Ø">
-<!ENTITY torbutton.prefs.tor_shutdown "Ø§Ù?Ø³Ø Ø§Ù?Ù?Ù?Ù?Ù?Ø² Ø¹Ù?Ø¯ Ø¥ØºÙ?Ø§Ù? Ø§Ù?Ù?ØªØµÙ?Ø Ø£Ø«Ù?Ø§Ø¡ Ø¹Ù?Ù? ØªÙ?Ø±">
-<!ENTITY torbutton.prefs.all_shutdown "Ø§Ù?Ø³Ø Ø§Ù?Ù?Ù?Ù?Ù?Ø² Ø¹Ù?Ø¯ Ø£Ù? Ø¥ØºÙ?Ø§Ù? Ù?Ù?Ù?ØªØµÙ?Ø">
-<!ENTITY torbutton.prefs.no_shutdown "Ù?Ø§ ØªÙ?Ø³Ø Ø§Ù?Ù?Ù?Ù?Ù?Ø² Ø¹Ù?Ø¯ Ø¥ØºÙ?Ø§Ù? Ø§Ù?Ù?ØªØµÙ?Ø">
-<!ENTITY torbutton.prefs.disable_sessionstore "Ø¹Ø·Ù?Ù? ØÙ?Ø¸ Ø§Ù?Ø¬Ù?Ø³Ø© (Ù?ØØ¨Ø°)">
+<!ENTITY torbutton.prefs.cache "Ø§Ù?Ù?Ø®Ø¨Ø£">
+<!ENTITY torbutton.prefs.history "Ø§Ù?Ø³Ø¬Ù?">
+<!ENTITY torbutton.prefs.no_search "Ø§Ù?Ù?Ø¹ Ø§Ù?ØªØ±Ø§ØØ§Øª Ø§Ù?Ø¨ØØ« Ø£Ø«Ù?Ø§Ø¡ Ø¹Ù?Ù? Ø§Ù?ØªÙ?Ø± (Ù?ØØ¨Ù?Ø°)">
+<!ENTITY torbutton.prefs.shutdown "Ø£ØºÙ?Ù? Ø§Ù?Ù?ØªØµÙ?Ø">
+<!ENTITY torbutton.prefs.tor_shutdown "Ø§Ù?Ø³Ø Ø§Ù?Ù?Ø¹Ù?Ø§Øª Ø¹Ù?Ø¯ Ø¥ØºÙ?Ø§Ù? Ø§Ù?Ù?ØªØµÙ?Ø Ø£Ø«Ù?Ø§Ø¡ Ø¹Ù?Ù? Ø§Ù?ØªÙ?Ø±">
+<!ENTITY torbutton.prefs.all_shutdown "Ø§Ù?Ø³Ø Ø§Ù?Ù?Ø¹Ù?Ø§Øª Ø¹Ù?Ø¯ Ø£Ù? Ø¥ØºÙ?Ø§Ù? Ù?Ù?Ù?ØªØµÙ?Ø">
+<!ENTITY torbutton.prefs.no_shutdown "Ù?Ø§ ØªÙ?Ø³Ø Ø§Ù?Ù?Ø¹Ù?Ø§Øª Ø¹Ù?Ø¯ Ø¥ØºÙ?Ø§Ù? Ø§Ù?Ù?ØªØµÙ?Ø">
+<!ENTITY torbutton.prefs.disable_sessionstore "Ø¹Ø·Ù?Ù? ØÙ?Ø¸ Ø§Ù?Ø¬Ù?Ø³Ø© (Ù?ØØ¨Ù?Ø°)">
 <!ENTITY torbutton.prefs.headers "Ø§Ù?ØªØ±Ù?Ù?Ø³Ø§Øª">
-<!ENTITY torbutton.prefs.spoof_english "Ø§Ù?ØªØÙ? Ù?ØªØµÙ?ØØ§ Ø¥Ù?Ø¬Ù?Ù?Ø²Ù?Ø§_Ø£Ù?Ø±Ù?Ù?Ù?Ø§">
-<!ENTITY torbutton.prefs.disable_referer "Ù?Ø§ ØªØ±Ø³Ù? Ø§Ù?Ù?ØÙ?Ù? Ø£Ø«Ù?Ø§Ø¡ Ø¹Ù?Ù? ØªÙ?Ø± (Ù?Ø¯ Ù?Ø¹Ø·Ù? Ø¨Ø¹Ø¶ Ø§Ù?Ù?Ù?Ø§Ù?Ø¹)">
-<!ENTITY torbutton.prefs.disable_domstorage "Ø¹Ø·Ù?Ù? ØªØ®Ø²Ù?Ù? DOM Ø£Ø«Ù?Ø§Ø¡ Ø¹Ù?Ù? ØªÙ?Ø± (Ø£Ø³Ø§Ø³Ù?)">
-<!ENTITY torbutton.prefs.forms "Ø§Ù?Ø§Ø³ØªÙ?Ø§Ø±Ø§Øª">
-<!ENTITY torbutton.prefs.block_tforms "Ø§Ù?Ù?Ø¹ ØÙ?Ø¸ Ù?Ù?Ù?Ø§Øª Ø§Ù?Ø³Ø± Ù? Ù?Ø¯Ø®Ù?Ø§Øª Ø§Ù?Ø§Ø³ØªÙ?Ø§Ø±Ø§Øª Ø£Ø«Ù?Ø§Ø¡ Ø¹Ù?Ù? ØªÙ?Ø± (Ù?ØØ¨Ø°)">
-<!ENTITY torbutton.prefs.block_ntforms "Ø§Ù?Ù?Ø¹ ØÙ?Ø¸ Ù?Ù?Ù?Ø§Øª Ø§Ù?Ø³Ø± Ù? Ù?Ø¯Ø®Ù?Ø§Øª Ø§Ù?Ø§Ø³ØªÙ?Ø§Ø±Ø§Øª Ø£Ø«Ù?Ø§Ø¡ Ø¹Ø¯Ù? Ø¹Ù?Ù? ØªÙ?Ø± (Ø§Ø®ØªÙ?Ø§Ø±Ù?)">
-<!ENTITY torbutton.prefs.tor "ØªÙ?Ø±">
-<!ENTITY torbutton.prefs.non_tor "ØºÙ?Ø± ØªÙ?Ø±">
-<!ENTITY torbutton.prefs.restore_tor "Ø®Ù?Ø§Ù? Ø¨Ø¯Ø¡ Ø¥Ø³ØªØ¹Ø§Ø¯Ø© Ø§Ù?Ø¬Ù?Ø³Ø©Ø? Ø§Ø¶Ø¨Ø· ØØ§Ù?Ø© ØªÙ?Ø± Ø¥Ù?Ù?:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "ØÙ?Ù? Ø¬Ø±Ø© Ø§Ù?Ù?Ù?Ù?Ù?Ø²/Ø£Ø®Ù? Ø§Ù?Ù?Ù?Ù?Ù?Ø² Ø¹Ù?Ø¯ Ø§Ù?Ù?Ù?Ø§Ø± Ù?Ù?Ø±Ù?Ù?Ø³ (Ù?ØØ¨Ø°)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Ø§ØÙ?Ø¸ Ù?Ù?Ø§ Ù?Ù? Ù?Ù?Ù?Ù?Ø² ØªÙ?Ø± Ù? ØºÙ?Ø± ØªÙ?Ø± Ù?Ù? Ù?Ù?Ù?Ø§Øª Ù?ØÙ?Ù?Ø© (Ø®Ø·Ø±)">
-<!ENTITY torbutton.prefs.clear_http_auth "Ø§Ù?Ø³Ø Ø¬Ù?Ø³Ø§Øª HTTP auth (Ù?ØØ¨Ø°)">
-<!ENTITY torbutton.prefs.block_js_history "Ø§Ù?Ù?Ø¹ Ù?Ù?Ø§Ø° Ø¬Ø§Ù?Ø§Ø³Ù?Ø±Ø¨Øª Ø¥Ù?Ù? ØªØµÙ?Ø Ø§Ù?ØªØ§Ø±Ù?Ø® (Ù?ØØ¨Ø°)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Ø£Ø¹Ø¯ ØªØØ¬Ù?Ù? Ø§Ù?Ù?Ù?Ø§Ù?Ø° Ø¥Ù?Ù? Ù?Ø¶Ø§Ø¹Ù?Ø§Øª 50 Ø¨Ù?Ù?Ø³Ù? Ø¹Ù?Ø¯ ØªØºÙ?Ø± Ø§Ù?ØØ§Ù?Ø© (Ù?ØØ¨Ø°)">
-<!ENTITY torbutton.prefs.close_tor "Ø£ØºÙ?Ù? Ù?Ù? Ù?Ù?Ø§Ù?Ø° Ù?ØªØ¨Ù?Ù?Ø¨Ø§Øª ØªÙ?Ø± Ø¹Ù?Ø¯ ØªØºÙ?Ù?Ø± Ø§Ù?ØØ§Ù?Ø© (Ø§Ø®ØªÙ?Ø§Ø±Ù?)">
-<!ENTITY torbutton.prefs.close_nontor "Ø£ØºÙ?Ù? Ù?Ù? Ù?Ù?Ø§Ù?Ø° Ù? ØªØ¨Ù?Ù?Ø¨Ø§Øª ØºÙ?Ø± ØªÙ?Ø± Ø¹Ù?Ø¯ ØªØºÙ?Ù?Ø± Ø§Ù?ØØ§Ù?Ø© (Ø§Ø®ØªÙ?Ø§Ø±Ù?)">
-<!ENTITY torbutton.prefs.block_links "Ø§Ù?Ù?Ø¹ Ù?Ù?Ø± Ø§Ù?Ø±Ù?Ø§Ø¨Ø· Ù? Ø¥Ø¹Ø§Ø¯Ø© ØªØÙ?Ù?Ù? Ø§Ù?ØµÙ?ØØ§Øª Ø¨Ù?Ù? ØØ§Ù?Ø§Øª ØªÙ?Ø± Ø§Ù?Ù?Ø®ØªÙ?Ù?Ø© (Ø§Ø®ØªÙ?Ø§Ø±Ù?)">
-<!ENTITY torbutton.prefs.jar_certs "ØÙ?Ø¸ Ø¨Ù?Ø§Ù?Ø§Øª SSL Ù?Ù? Ù?Ù?Ù?Ø§Øª Ù?Ø®ØªÙ?Ù?Ø© Ù?Ø£Ø¬Ù? ØªÙ?Ø±/ØºÙ?Ø± ØªÙ?Ø±(Ù?ØØ¨Ù?Ø°) ">
-<!ENTITY torbutton.prefs.jar_ca_certs "ØÙ?Ø¸ Ø¨Ù?Ø§Ù?Ø§Øª CA Ù?Ù? Ù?Ù?Ù?Ø§Øª Ù?Ø®ØªÙ?Ù?Ø© Ù?Ø£Ø¬Ù? ØªÙ?Ø±/ØºÙ?Ø± ØªÙ?Ø±(Ù?ØØ¨Ù?Ø°) ">
-<!ENTITY torbutton.prefs.locked_mode "Ø¹Ø·Ù? Ø§Ù?Ù?Ù?Ø§ØªÙ?Ø Ù?Ø¥Ø®ØªØµØ§Ø±Ø§Øª Ø§Ù?Ù?Ù?Ø§ØªÙ?Ø  Ù?ØªØ¬Ù?Ø¨ ØªØºÙ?Ù?Ø± ØØ§Ù?Ø© ØªÙ?Ø± Ø¨Ø§Ù?Ø®Ø·Ø£">
-<!ENTITY torbutton.prefs.startup_state "Ø®Ù?Ø§Ù? Ø¹Ù?Ù?Ù?Ø§Øª Ø§Ù?Ø¨Ø¯Ø¡ Ø§Ù?Ø¹Ø§Ø¯Ù?Ø©, Ø¶Ø¹ ØØ§Ù?Ø© Ø§Ù?ØªÙ?Ø±:">
-<!ENTITY torbutton.prefs.shutdown_state "ØØ§Ù?Ø© Ø§Ù?ØªÙ?Ù?Ù?">
+<!ENTITY torbutton.prefs.spoof_english "Ø§Ù?ØªØÙ? Ù?ØªØµÙ?ØÙ?Ø§ Ø¥Ù?Ø¬Ù?Ù?Ø²Ù?Ù?Ø§ Ø£Ù?Ø±Ù?Ù?Ù?Ù?Ø§">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.disable_domstorage "Ø¹Ø·Ù?Ù? ØªØ®Ø²Ù?Ù? DOM Ø£Ø«Ù?Ø§Ø¡ Ø¹Ù?Ù? Ø§Ù?ØªÙ?Ø± (ØÙ?Ø±Ù?Ø¬)">
+<!ENTITY torbutton.prefs.forms "Ø§Ù?Ø¥Ù?Ù?Ø§Ù? Ø§Ù?ØªÙ?Ù?Ø§Ø¦Ù?">
+<!ENTITY torbutton.prefs.block_tforms "Ø§Ù?Ù?Ø¹ ØÙ?Ø¸ Ù?Ù?Ù?Ø§Øª Ø§Ù?Ø³Ø± Ù? Ù?Ø§Ù?Ø¥Ù?Ù?Ø§Ù? Ø§Ù?ØªÙ?Ù?Ø§Ø¦Ù? Ø£Ø«Ù?Ø§Ø¡ Ø¹Ù?Ù? Ø§Ù?ØªÙ?Ø± (Ù?ØØ¨Ù?Ø°)">
+<!ENTITY torbutton.prefs.block_ntforms "Ø§Ù?Ù?Ø¹ ØÙ?Ø¸ Ù?Ù?Ù?Ø§Øª Ø§Ù?Ø³Ø± Ù?Ø§Ù?Ø¥Ù?Ù?Ø§Ù? Ø§Ù?ØªÙ?Ù?Ø§Ø¦Ù? Ø£Ø«Ù?Ø§Ø¡ ØªØ¹Ø·Ù? Ø§Ù?ØªÙ?Ø± (Ø§Ø®ØªÙ?Ø§Ø±Ù?)">
+<!ENTITY torbutton.prefs.tor "Ø§Ù?ØªÙ?Ø±">
+<!ENTITY torbutton.prefs.non_tor "Ø§Ù?ØªÙ?Ø± Ù?Ø¹Ø·Ù?">
+<!ENTITY torbutton.prefs.restore_tor "Ø®Ù?Ø§Ù? Ø¨Ø¯Ø¡ Ø§Ø³ØªØ¹Ø§Ø¯Ø© Ø§Ù?Ø¬Ù?Ø³Ø©Ø? Ø§Ø¶Ø¨Ø· ØØ§Ù?Ø© Ø§Ù?ØªÙ?Ø± Ø¥Ù?Ù?:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Ø£Ø¹Ø¯ ØªØÙ?Ù?Ù? Ù?Ø¹Ø§Ø¡ Ø§Ù?Ù?Ø¹Ù?Ø§Øª/Ø§Ù?Ø³Ø Ø§Ù?Ù?Ø¹Ù?Ø§Øª Ø¹Ù?Ø¯ Ø§Ù?Ù?Ù?Ø§Ø± Ù?Ù?Ø±Ù?Ù?Ø³ (Ù?ØØ¨Ù?Ø°)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Ø§ØÙ?Ø¸ Ø§Ù?Ù?Ø¹Ù?Ø§Øª Ø¹Ù? ØªÙ?Ø¹Ù?Ù? ØªÙ?Ø± Ù?Ø¹Ù?Ø¯ ØªØ¹Ø·Ù?Ù?Ù? Ù?Ù? Ø£Ù?Ø¹Ù?Ø© Ù?ØÙ?Ù?Ø© (Ø®Ø·Ø±)">
+<!ENTITY torbutton.prefs.clear_http_auth "Ø§Ù?Ø³Ø Ø¬Ù?Ø³Ø§Øª Ø§Ù?Ù?ØµØ§Ø¯Ù?Ø© Ù?Ù? HTTP (Ù?ØØ¨Ù?Ø°)">
+<!ENTITY torbutton.prefs.block_js_history "Ø§Ù?Ù?Ø¹ Ù?Ù?Ø§Ø° Ø¬Ø§Ù?Ø§Ø³Ù?Ø±Ø¨Øª Ø¥Ù?Ù? ØªØµÙ?Ø Ø§Ù?ØªØ§Ø±Ù?Ø® (ØÙ?Ø±Ù?Ø¬)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Ø£Ø¹Ø¯ ØªØØ¬Ù?Ù? Ø§Ù?Ù?Ù?Ø§Ù?Ø° Ø¥Ù?Ù? Ù?Ø¶Ø§Ø¹Ù?Ø§Øª 50 Ø¨Ù?Ù?Ø³Ù? Ø¹Ù?Ø¯ ØªØºÙ?Ø± Ø§Ù?ØØ§Ù?Ø© (Ù?ØØ¨Ù?Ø°)">
+<!ENTITY torbutton.prefs.close_tor "Ø£ØºÙ?Ù? Ù?Ù? Ù?Ù?Ø§Ù?Ø° Ù?ØªØ¨Ù?Ù?Ø¨Ø§Øª Ø§Ù?ØªÙ?Ø± Ø¹Ù?Ø¯ ØªØºÙ?Ù?Ø± Ø§Ù?ØØ§Ù?Ø© (Ø§Ø®ØªÙ?Ø§Ø±Ù?)">
+<!ENTITY torbutton.prefs.close_nontor "Ø£ØºÙ?Ù? Ù?Ù? Ù?Ù?Ø§Ù?Ø° Ù? ØªØ¨Ù?Ù?Ø¨Ø§Øª ØºÙ?Ø± Ø§Ù?ØªÙ?Ø± Ø¹Ù?Ø¯ ØªØºÙ?Ù?Ø± Ø§Ù?ØØ§Ù?Ø© (Ø§Ø®ØªÙ?Ø§Ø±Ù?)">
+<!ENTITY torbutton.prefs.block_links "Ø§Ù?Ù?Ø¹ Ù?Ù?Ø± Ø§Ù?Ø±Ù?Ø§Ø¨Ø· Ù? Ø¥Ø¹Ø§Ø¯Ø© ØªØÙ?Ù?Ù? Ø§Ù?ØµÙ?ØØ§Øª Ø¨Ù?Ù? ØØ§Ù?Ø§Øª Ø§Ù?ØªÙ?Ø± Ø§Ù?Ù?Ø®ØªÙ?Ù?Ø© (Ø§Ø®ØªÙ?Ø§Ø±Ù?)">
+<!ENTITY torbutton.prefs.jar_certs "ØÙ?Ø¸ Ø¨Ù?Ø§Ù?Ø§Øª SSL Ù?Ù? Ù?Ù?Ù?Ø§Øª Ù?Ø®ØªÙ?Ù?Ø© Ù?Ø£Ø¬Ù? Ø§Ù?ØªÙ?Ø±/Ø§Ù?ØªÙ?Ø± Ù?Ø¹Ø·Ù? (Ù?ØØ¨Ù?Ø°) ">
+<!ENTITY torbutton.prefs.jar_ca_certs "ØÙ?Ø¸ Ø¨Ù?Ø§Ù?Ø§Øª CA Ù?Ù? Ù?Ù?Ù?Ø§Øª Ù?Ø®ØªÙ?Ù?Ø© Ù?Ø£Ø¬Ù? Ø§Ù?ØªÙ?Ø±/Ø§Ù?ØªÙ?Ø± Ù?Ø¹Ø·Ù? (Ù?ØØ¨Ù?Ø°) ">
+<!ENTITY torbutton.prefs.locked_mode "Ø¹Ø·Ù?Ù? Ø§Ù?Ù?Ù?Ø§ØªÙ?Ø Ù?Ø¥Ø®ØªØµØ§Ø±Ø§Øª Ø§Ù?Ù?Ù?Ø§ØªÙ?Ø  Ù?ØªØ¬Ù?Ø¨ ØªØºÙ?Ù?Ø± ØØ§Ù?Ø© Ø§Ù?ØªÙ?Ø± Ø¨Ø§Ù?Ø®Ø·Ø£">
+<!ENTITY torbutton.prefs.startup_state "Ø®Ù?Ø§Ù? Ø¹Ù?Ù?Ù?Ø§Øª Ø§Ù?Ø¨Ø¯Ø¡ Ø§Ù?Ø¹Ø§Ø¯Ù?Ø©Ø? Ø§Ø¶Ø¨Ø· ØØ§Ù?Ø© ØªÙ?Ø±:">
+<!ENTITY torbutton.prefs.shutdown_state "ØØ§Ù?Ø© Ø§Ù?Ø¥Ù?Ù?Ø§Ù?">
 <!ENTITY torbutton.prefs.startup "Ø§Ù?Ø¨Ø¯Ø¡">
 <!ENTITY torbutton.prefs.block_tor_file_net "Ø§Ù?Ù?Ø¹ Ø§Ù?Ù?Ù?Ø§Ø° Ø¥Ù?Ù? Ø§Ù?Ø´Ø¨Ù?Ø© Ù?Ù? Ù?Ø³Ø§Ø±Ø§Øª file:// (Ù?ØØ¨Ù?Ø°)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Ø§Ù?Ù?Ø¹ Ù?ØµÙ?Ù? ØºÙ?Ø±-ØªÙ?Ø± Ø¥Ù?Ù? Ø§Ù?Ø´Ø¨Ù?Ø© Ù?Ù? Ù?Ø³Ø§Ø±Ø§Øª file:// urls">
-<!ENTITY torbutton.prefs.restore_defaults "Ø¥Ø³ØªØ¹Ø§Ø¯Ø© Ø§Ù?Ù?Ø¶Ø¹ Ø§Ù?Ø¥Ù?ØªØ±Ø§Ø¶Ù?">
-<!ENTITY torbutton.prefs.test_settings "Ù?ØØµ Ø§Ù?Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ">
-<!ENTITY torbutton.prefs.test_auto "Ø¥Ù?ØØµ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØªÙ?Ø± Ø¨Ø¹Ø¯ Ø£Ù?Ù? ØªØ´ØºÙ?Ù? Ù?Ù? Ù?Ø±Ø© Ù?ØªÙ? ØªØ´ØºÙ?Ù? Ø§Ù?Ù?Ø§Ù?Ø±Ù?Ù?Ù?Ø³">
+<!ENTITY torbutton.prefs.block_nontor_file_net "Ø§Ù?Ù?Ø¹ Ù?ØµÙ?Ù? Ø§Ù?ØªÙ?Ø± Ù?Ø¹Ø·Ù? Ø¥Ù?Ù? Ø§Ù?Ø´Ø¨Ù?Ø© Ù?Ù? Ø¹Ù?Ø§Ù?Ù? file://">
+<!ENTITY torbutton.prefs.restore_defaults "Ø§Ø³ØªØ¹Ø§Ø¯Ø© Ø§Ù?Ø§Ù?ØªØ±Ø§Ø¶Ù?Ø§Øª">
+<!ENTITY torbutton.prefs.test_settings "Ù?ØØµ Ø§Ù?Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª">
+<!ENTITY torbutton.prefs.test_auto "Ø§Ù?ØØµ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØªÙ?Ø± Ø¨Ø¹Ø¯ Ø£Ù?Ù? ØªØ´ØºÙ?Ù? Ù?Ù? Ù?Ø±Ø© Ù?ØªÙ? ØªØ´ØºÙ?Ù? Ù?Ù?Ø±Ù?Ù?Ø³">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Ù?Ø§ ØªØÙ?Ø¸ Ù?Ø¹Ù?Ø§Øª ØªÙ?Ø± Ù?Ù? Ø§Ù?Ù?Ø±Øµ">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Ù?Ø§ ØªØÙ?Ø¸ Ø§Ù?Ù?Ø¹Ù?Ø§Øª Ø§Ù?Ø¹Ø§Ø¯Ù?Ø© Ù?Ù? Ø§Ù?Ù?Ø±Øµ">
-<!ENTITY torbutton.prefs.session_restore "ØÙ?Ø¸ Ø§Ù?Ø¬Ù?Ø³Ø© Ù?Ø§Ø³ØªØ¹Ø§Ø¯Ø© Ù?Ø°Ù? Ù?Ø°Ù? Ø§Ù?ØªØ¨Ù?Ù?Ø¨Ø§Øª:">
-<!ENTITY torbutton.prefs.nontor_tabs "ØªØ¨Ù?Ù?Ø¨Ø§Øª Ù?ØÙ?Ù?Ø© Ù?Ù? Ø§Ù?Ù?Ø¶Ø¹ Ø§Ù?Ø¹Ø§Ø¯Ù?">
-<!ENTITY torbutton.prefs.tor_tabs "ØªØ¨Ù?Ù?Ø¨Ø§Øª Ù?ØÙ?Ù?Ø© Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù? ØªÙ?Ø±">
+<!ENTITY torbutton.prefs.tor_memory_jar "Ù?Ø§ ØªØÙ?Ø¸ Ø§Ù?Ù?Ø¹Ù?Ø§Øª Ù?Ù? Ø§Ù?Ù?Ø±Øµ Ø¥Ø°Ø§ Ù?Ø§Ù? Ø§Ù?ØªÙ?Ø± Ù?Ù?Ø¹Ù?Ù?Ø§">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Ù?Ø§ ØªØÙ?Ø¸ Ø§Ù?Ù?Ø¹Ù?Ø§Øª Ù?Ù? Ø§Ù?Ù?Ø±Øµ Ø¥Ù? Ù?Ø§Ù? ØªÙ?Ø± Ù?Ø¹Ø·Ù?Ù?Ø§">
+<!ENTITY torbutton.prefs.session_restore "ØÙ?Ø¸ Ø§Ù?Ø¬Ù?Ø³Ø© Ù?Ø§Ø³ØªØ¹Ø§Ø¯Ø© Ù?Ø°Ù?  Ø§Ù?ØªØ¨Ù?Ù?Ø¨Ø§Øª:">
+<!ENTITY torbutton.prefs.nontor_tabs "ØªØ¨Ù?Ù?Ø¨Ø§Øª Ù?ØÙ?Ù?Ø© Ù?Ù? Ù?Ø¶Ø¹ Ø§Ù?ØªÙ?Ø± Ù?Ø¹Ø·Ù?">
+<!ENTITY torbutton.prefs.tor_tabs "ØªØ¨Ù?Ù?Ø¨Ø§Øª Ù?ØÙ?Ù?Ø© Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù? Ø§Ù?ØªÙ?Ø±">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Ù?Ø§ Ø¨Ø±Ù?Ù?Ø³Ù?Ø§Øª Ù?Ù?:_">
+<!ENTITY torbutton.prefs.no_proxies_on "Ù?Ø§ Ù?Ø³Ù?Ø· Ù?:">
 <!ENTITY torbutton.prefs.no_proxy_warning "ØªØØ°Ù?Ø±: ØªØ¬Ù?Ø¨ Ø§Ø³ØªØ®Ø¯Ø§Ù? Ø£Ù? Ù?Ù? Ø£Ø³Ù?Ø§Ø¡ Ø§Ù?Ù?Ø¶Ù?Ù? Ø§Ù?Ù?Ø°Ù?Ù?Ø±Ø© Ø£Ø¹Ù?Ø§Ù?">
-<!ENTITY torbutton.prefs.disable_livemarks "ØªØ¹Ø·Ù?Ù? Ø§Ù?livemarks Ø®Ù?Ø§Ù? Ø¥Ø³ØªØ¹Ù?Ø§Ù? ØªÙ?Ø±">
-<!ENTITY torbutton.prefs.dtd_recommended "(Ù?Ù?ØµÙ? Ø¨Ù?)">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
+<!ENTITY torbutton.prefs.disable_livemarks "ØªØ¹Ø·Ù?Ù? Ø§Ù?Ø¹Ù?Ø§Ù?Ø§Øª Ø§Ù?ØÙ?Ø© Ø®Ù?Ø§Ù? Ø¥Ø³ØªØ¹Ù?Ø§Ù? Ø§Ù?ØªÙ?Ø±">
+<!ENTITY torbutton.prefs.dtd_recommended "(Ù?ØØ¨Ù?Ø°)">
 <!ENTITY torbutton.prefs.dtd_optional "(Ø§Ø®ØªÙ?Ø§Ø±Ù?)">
 <!ENTITY torbutton.prefs.dtd_crucial "(ØÙ?Ø±Ù?Ø¬)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Ø£Ø¹Ø¯ ØªÙ?Ø¬Ù?Ù? ØªØØ¯Ù?Ø«Ø§Øª Ø²Ø± ØªÙ?Ø± Ø®Ù?Ø§Ù? Ø´Ø¨Ù?Ø© Ø§Ù?ØªÙ?Ø±">
+<!ENTITY torbutton.prefs.dodge_google_captcha "ØªÙ?Ù?Ø§Ø¦Ù?Ø§Ù? Ø§Ø³ØªØ®Ø¯Ù? Ù?ØØ±Ù? Ø¨ØØ« Ø¨Ø¯Ù?Ù? Ø¹Ù?Ø¯Ù?Ø§ Ù?ØªÙ? Ø¥Ø¸Ù?Ø§Ø± Ù?Ù?Ù?Ø© Ø§Ù?ØªØÙ?Ù? Ø§Ù?Ø®Ø§ØµØ© Ø¨Ù?Ù?Ù?Ù? (Google):">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
-<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
+<!ENTITY torbutton.prefs.fix_google_srch "Ø£Ø²Ù? Ø§Ù?Ù?Ù?ØµØ© Ù?Ø§Ù?Ù?ØºØ© Ù?Ù? Ø§Ø³ØªÙ?Ø³Ø§Ø±Ø§Øª Ù?ØØ±Ù? Ø¨ØØ« ØºÙ?ØºÙ?">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties
index 83cddce..cc6ee5b 100644
--- a/src/chrome/locale/ar/torbutton.properties
+++ b/src/chrome/locale/ar/torbutton.properties
@@ -6,31 +6,31 @@ torbutton.panel.plugins.disabled = Ø§Ù?Ù?Ø± Ù?ØªÙ?Ø¹Ù?Ù? Ø§Ù?Ù?Ù?ØÙ?Ø§Øª
 torbutton.panel.plugins.enabled = Ø§Ù?Ù?Ø± Ù?ØªØ¹Ø·Ù?Ù? Ø§Ù?Ù?Ù?ØÙ?Ø§Øª
 torbutton.panel.label.disabled = ØªÙ?Ø± Ù?Ø¹Ø·Ù?Ù?
 torbutton.panel.label.enabled = ØªÙ?Ø± Ù?Ù?Ø¹Ù?Ù?
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Ù?Ù?Ù?Ø± Ù?Ù?ØªØ§Ø ØªÙ?Ø± ØªØÙ?Ù?Ø§ Ø³Ù?Ù?Ø§ Ù?Ù? Ø§Ø³ØªØ®Ø¯Ø§Ù? Ù?Ù?Ø±Ù?Ù?Ù?Ø³ Ù?Ù?Ø³Ù?Ø· ØªÙ?Ø±
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Ù?Ù?Ù?Ø± Ù?Ù?ØªØ§Ø ØªÙ?Ø± ØªØÙ?Ù?Ø§ Ø³Ù?Ù?Ø§ Ù?Ù? Ø§Ø³ØªØ®Ø¯Ø§Ù? Ù?Ù?Ø±Ù?Ù?Ù?Ø³ Ù?Ù?Ù?Ù?Ù? ØªÙ?Ø±
+torbutton.popup.history.warning = ØØ¬Ø¨ Ù?Ù?ØªØ§Ø ØªÙ?Ø± Ù?Ø´Ø§Ø·Ø§Ù? Ù?Ù? Ø§Ù?ØªØ¨Ù?Ù?Ø¨Ø© Ø§Ù?Ù?ØÙ?Ù?Ø© Ù?Ù? Ù?Ø¶Ø¹ ØªÙ?Ø± Ù?Ø®ØªÙ?Ù?.\n\nÙ?Ø°Ø§ Ø§Ù?Ø£Ù?Ø± Ù?Ù?Ø§Ù?ØªÙ?Ø§Ù? ØÙ?Ù? Ù?Ø´Ø§Ù?Ù? Ù?Ø§Ù?Ø±Ù?Ù?Ù?Ø³ Ø±Ù?Ù? 409737 Ù?417869.\n\nØ¥Ø°Ø§ Ø¸Ù?Ø±Øª Ù?Ø°Ù? Ø§Ù?Ø±Ø³Ø§Ù?Ø© Ø§Ù?Ù?Ù?Ø¨Ø«Ù?Ø© Ø¯Ù?Ù? Ø³Ø¨Ø¨ Ø¸Ø§Ù?Ø±Ù?Ø? Ù?Ù?Ø§Ù? Ø¥ØØ¯Ù? ØªØ¨Ù?Ù?Ø¨Ø§ØªÙ? ØªØØ§Ù?Ù? Ø¥Ø¹Ø§Ø¯Ø© ØªØÙ?Ù?Ù? Ù?Ù?Ø³Ù?Ø§ Ù?Ù? Ø§Ù?Ø®Ù?Ù?Ù?Ø©Ø? Ù?ØªÙ? ØØ¬Ø¨ Ù?Ø°Ø§.\n\nÙ?Ø¥Ø¹Ø§Ø¯Ø© ØªØÙ?Ù?Ù? Ø§Ù?ØªØ¨Ù?Ù?Ø¨Ø© Ù?Ù? ØØ§Ù?Ø© ØªÙ?Ø± Ù?Ø°Ù? Ù?Ø±Ø¬Ù? Ø£Ù? ØªØ¶ØºØ· 'Enter' Ù?Ù? ØµÙ?Ø¯Ù?Ù? Ø´Ø±Ù?Ø· Ø§Ù?Ø¹Ù?Ù?Ø§Ù?.\n\n
 torbutton.popup.plugin.warning = Ù?Ù?Ø¹ Ù?Ù?ØªØ§Ø ØªÙ?Ø± ØªØÙ?Ù?Ù?Ø§ Ù?Ø¨Ø§Ø´Ø±Ø§ Ù?Ù?ØØªÙ?Ù? Ù?Ù?ØÙ?Ø©.\n\nØ§Ø³ØªØ®Ø¯Ù? 'Ø§ØÙ?Ø¸ Ø¨Ø§Ø³Ù?' Ø¨Ø¯Ù?Ø§ Ø¹Ù? Ù?Ø°Ø§.\n\n
 torbutton.popup.confirm_ca_certs = Ù?Ù?Ø§ØØ¸Ø© Ù?Ù?ØªØ§Ø ØªÙ?Ø±: Ø¨Ù?Ø§ Ø£Ù?Ù?Ù? Ù?Ø§ ØªÙ?Ù?Ù? Ù?Ù?Ø«Ø§Ù? Ø¥ØµØ¯Ø§Ø± Ø§Ù?Ø´Ù?Ø§Ø¯Ø© Ø§Ù?Ø±Ù?Ù?Ù?Ø? Ù?ØÙ?Ø« Ø£Ù?Ù? Ø¹Ù?Ù?Ù?Ø© Ù?ØØµ Ù?Ø§Ø¦Ù?Ø© Ù?ØµØ¯Ø± Ø§Ù?Ø´Ù?Ø§Ø¯Ø© Ø§Ù?Ø±Ù?Ù?Ù? Ø¹Ù?Ù?Ù?Ø© Ø¨Ø·Ù?Ø¦Ø© Ù?ØªØ³Ø¨Ø¨ Ø¨Ø·Ø¦Ø§ Ù?Ù? Ø¹Ù?Ù? Ù?Ù?ØªØ§Ø ØªÙ?Ø±Ø? Ù?Ù?Ù? ØªØ±ØºØ¨ Ù?Ù? ØªØ¹Ø·Ù?Ù? Ø¹Ù?Ù?Ù?Ø© Ø¹Ø²Ù? Ø´Ù?Ø§Ø¯Ø§Øª Ø§Ù?Ø¥ØµØ¯Ø§Ø± Ø§Ù?Ø±Ù?Ù?Ù?Ø? (Ø¥Ù? Ù?Ù?Øª Ù?Ø§ ØªØ¹Ù?Ù? Ø§Ù? Ù?Ø§ ØªÙ?Ù?Ù? Ù?Ø¹Ù?Ù? Ø°Ù?Ù?Ø? Ù?Ø¥Ù?Ù? Ù?Ù? Ø§Ù?Ù?Ø³ØªØØ³Ù? Ø£Ù? ØªØ®ØªØ§Ø± Ø®Ù?Ø§Ø± Ø§Ù?Ù?Ù?Ø§Ù?Ù?Ø©) 
 torbutton.popup.ff3.warning = ØªØØ°Ù?Ø±! \n\nÙ?Ù? Ø§Ù?Ù?Ø¹Ø±Ù?Ù? Ø£Ù? Ù?Ù?ØªØ§Ø ØªÙ?Ø± Ù?Ù? Ø¨Ø±Ù?Ø§Ù?Ø¬ Ù?Ø§Ù?Ø±Ù?Ù?Ù?Ø³ 3 Ù?Ù?Ù?Ù? Ø¨ØªØ³Ø±Ù?Ø¨ Ù?Ø¹Ù?Ù?Ù?Ø§Øª Ø¹Ù? Ø§Ù?Ù?Ù?Ø·Ù?Ø© Ø§Ù?Ø²Ù?Ù?Ù?Ø© Ø§Ù?ØªÙ? Ø£Ù?Øª Ù?Ù?Ù?Ø§ Ù?Ø¹Ù? ØµÙ?ØØ§ØªÙ? Ø§Ù?Ù?Ù?Ø¶Ù?Ø© Ø§Ù?ØÙ?Ø©. \n\nÙ?Ù? ØªØ±ØºØ¨ Ø¨Ø§Ù?Ù?ØªØ§Ø¨Ø¹Ø© Ø¹Ù?Ù? Ø£Ù?Ù? ØØ§Ù?Ø? 
 torbutton.popup.toggle.warning = ØªØØªØ§Ø¬ Ù?Ø¥Ø¹Ø§Ø¯Ø© ØªØ´ØºÙ?Ù? ØªÙ?Ø± Ù?ØªÙ?Ø¹Ù?Ù? Ø§Ù?Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ø¬Ø¯Ù?Ø¯Ø©
-torbutton.popup.test.success = ØªÙ?Ù? ØªÙ?ØØµ Ù?Ù?Ù?Ù? ØªÙ?Ø± Ø¨Ù?Ø¬Ø§Ø!
-torbutton.popup.test.failure = Ù?Ø´Ù?Øª Ø¹Ù?Ù?Ù?Ø© ØªÙ?ØØµ Ù?Ù?Ù?Ù? ØªÙ?Ø±! ØªØ£Ù?Ø¯ Ù?Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ù?Ø³Ù?Ø· Ù?Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø¨Ù?Ù?Ù?Ø¨Ù?. 
-torbutton.popup.test.confirm_toggle = Ù?Ø´Ù? Ø¢Ø®Ø± ØªÙ?ØØµ Ù?Ù?Ù?Ù?Ù? ØªÙ?Ø± Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù? ØªÙ?Ø±.\n\nÙ?Ù? Ø£Ù?Øª Ù?ØªØ£Ù?Ø¯ Ù?Ù? Ø£Ù?Ù? ØªØ±Ù?Ø¯ ØªÙ?Ø¹Ù?Ù?Ù? Ø¹Ù?Ù? Ø£Ù? ØØ§Ù?Ø?\n\nÙ?Ù?Ø§ØØ¸Ø©: Ø¥Ù? Ù?Ù?Øª Ù?Ø¯ Ø¹Ø§Ù?Ø¬Øª Ø§Ù?Ù?Ø´Ù?Ù?Ø©Ø? Ù?Ù?Ù?Ù?Ù? Ø¥Ø¹Ø§Ø¯Ø© Ø¥Ø¬Ø±Ø§Ø¡ Ø§Ù?Ù?ØØµ Ù?Ù? Ù?Ø§Ù?Ø°Ø© Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ù?Ù?Ù?Ù? Ù?Ù?ØªØ§Ø ØªÙ?Ø± ØØªÙ? Ù?Ø®ØªÙ?Ù? Ù?Ø°Ø§ Ø§Ù?ØªÙ?Ø¨Ù?Ù?.
-torbutton.popup.test.ff3_notice = Ø¥Ø¶ØºØ· "Ù?Ù?Ø§Ù?Ù?" Ù?ØªÙ?ØØµ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ù?Ù?Ù?Ù? ØªÙ?Ø±. Ø¹Ù?Ù?Ù?Ø© Ø§Ù?ØªÙ?ØØµ Ø³ØªØªÙ? Ù?Ù? Ø§Ù?Ø®Ù?Ù?Ù?Ø©. Ù?Ø±Ø¬Ù? Ø§Ù?Ø§Ù?ØªØ¸Ø§Ø±.
+torbutton.popup.test.success = ØªÙ?Ù? Ø§Ø®ØªØ¨Ø§Ø± Ù?Ù?Ù?Ù? ØªÙ?Ø± Ø¨Ù?Ø¬Ø§Ø!
+torbutton.popup.test.failure = Ù?Ø´Ù?Øª Ø¹Ù?Ù?Ù?Ø© Ø§Ø®ØªØ¨Ø§Ø± Ù?Ù?Ù?Ù? ØªÙ?Ø±! ØªØ£Ù?Ø¯ Ù?Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù?Ù?Ù?Ù?Ù? Ù?Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Polipo.
+torbutton.popup.test.confirm_toggle = Ù?Ø´Ù? Ø¢Ø®Ø± Ø§Ø®ØªØ¨Ø§Ø± Ù?Ù?Ù?Ù?Ù? ØªÙ?Ø± Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù? ØªÙ?Ø±.\n\nÙ?Ù? Ø£Ù?Øª Ù?ØªØ£Ù?Ø¯ Ù?Ù? Ø£Ù?Ù? ØªØ±Ù?Ø¯ ØªÙ?Ø¹Ù?Ù?Ù? Ø¹Ù?Ù? Ø£Ù? ØØ§Ù?Ø?\n\nÙ?Ù?Ø§ØØ¸Ø©: Ø¥Ù? Ù?Ù?Øª Ù?Ø¯ Ø¹Ø§Ù?Ø¬Øª Ø§Ù?Ù?Ø´Ù?Ù?Ø©Ø? Ù?Ù?Ù?Ù?Ù? Ø¥Ø¹Ø§Ø¯Ø© Ø¥Ø¬Ø±Ø§Ø¡ Ø§Ù?Ù?ØØµ Ù?Ù? Ù?Ø§Ù?Ø°Ø© Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ù?Ù?Ù?Ù? Ù?Ù?ØªØ§Ø ØªÙ?Ø± ØØªÙ? Ù?Ø®ØªÙ?Ù? Ù?Ø°Ø§ Ø§Ù?ØªÙ?Ø¨Ù?Ù?.
+torbutton.popup.test.ff3_notice = Ø§Ø¶ØºØ· "Ù?Ù?Ø§Ù?Ù?" Ù?ØªÙ?ØØµ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ù?Ù?Ù?Ù? ØªÙ?Ø±. Ø¹Ù?Ù?Ù?Ø© Ø§Ù?ØªÙ?ØØµ Ø³ØªØªÙ? Ù?Ù? Ø§Ù?Ø®Ù?Ù?Ù?Ø©. Ù?Ø±Ø¬Ù? Ø§Ù?Ø§Ù?ØªØ¸Ø§Ø±.
 torbutton.panel.label.verified = ØªÙ? Ø§Ù?ØªØÙ?Ù? Ù?Ø§Ù?Ù?ØµØ§Ø¯Ù?Ø© Ø¹Ù?Ù? ØªÙ?Ø±
 torbutton.popup.test.auto_failed = Ø§Ù?Ù?ØØµ Ø§Ù?Ø¢Ù?Ù? Ù?Ù?Ù?Ù?Ù? ØªÙ?Ø± Ù?Ø´Ù?.\n\nÙ?Ù? Ø£Ù?Øª Ù?ØªØ£Ù?Ø¯ Ø§Ù?Ù? ØªØ±Ù?Ø¯ ØªÙ?Ø¹Ù?Ù?Ù? Ø¹Ù?Ù? Ø£Ù? ØØ§Ù?Ø?
 torbutton.prefs.recommended = (Ù?ØØ¨Ø°)
 torbutton.prefs.optional = (Ø¥Ø®ØªÙ?Ø§Ø±Ù?)
-torbutton.prefs.crucial = (ØØ±Ø¬)
+torbutton.prefs.crucial = (Ø£Ø³Ø§Ø³Ù?)
 torbutton.popup.external.title = ØªØÙ?Ù?Ù? Ù?ØØªÙ?Ù? Ø®Ø§Ø±Ø¬Ù?Ø?
 torbutton.popup.external.app = Ù?Ù?Ø§Ù? ØØ§Ø¬Ø© Ù?Ø§Ø³ØªØ®Ø¯Ø§Ù? ØªØ·Ø¨Ù?Ù? Ø®Ø§Ø±Ø¬Ù? Ù?Ù?ØªØ¹Ø§Ù?Ù? Ù?Ø¹:\n\n
 torbutton.popup.external.note = \n\nÙ?Ù?Ø§ØØ¸Ø©: Ø§Ù?ØªØ·Ø¨Ù?Ù?Ø§Øª Ø§Ù?Ø®Ø§Ø±Ø¬Ù?Ø© Ù?Ù?Ø³Øª Ø¢Ù?Ù?Ø© Ù?Ø¹ ØªÙ?Ø± Ø¨Ø´Ù?Ù? Ø§Ù?ØªØ±Ø§Ø¶Ù? Ù?Ù?Ù?Ù?Ù? Ø£Ù? ØªÙ?Ø´Ù? Ù?Ù?Ù?ØªÙ?!\n
-torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
+torbutton.popup.external.suggest = \nØ¥Ø°Ø§ Ù?Ø§Ù? Ù?Ø°Ø§ Ø§Ù?Ù?Ù?Ù? ØºÙ?Ø± Ù?Ù?Ø«Ù?Ù?Ø? Ù?Ø¬Ø¨ Ø£Ù? ØªØÙ?Ø¸Ù? Ù?ØªØ´Ø§Ù?Ø¯Ù? Ø¯Ù?Ù? Ø§ØªØµØ§Ù? Ø¨Ø§Ù?Ø§Ù?ØªØ±Ù?Øª Ø£Ù? Ø¯Ø§Ø®Ù? Ø¬Ù?Ø§Ø² Ø§Ù?ØªØ±Ø§Ø¶Ù? VMØ?\nØ£Ù? Ø®Ø° Ø¨Ø¹Ù?Ù? Ø§Ù?Ø§Ø¹ØªØ¨Ø§Ø± Ø§Ø³ØªØ®Ø¯Ø§Ù? Ù?Ù?Ù?Ù? ØªÙ?Ø± Ø´Ù?Ø§Ù? Ù?Ø«Ù? Amnesia LiveCDØ? torsocksØ? Ø£Ù? TorVM.\n
 torbutton.popup.launch = Ø¥Ø·Ù?Ø§Ù? Ø§Ù?ØªØ·Ø¨Ù?Ù?
 torbutton.popup.cancel = Ø¥Ù?ØºØ§Ø¡
 torbutton.popup.dontask = Ø¯Ø§Ø¦Ù?Ø§Ù? Ø£Ø·Ù?Ù? Ø§Ù?ØªØ·Ø¨Ù?Ù?Ø§Øª Ø§Ø¨ØªØ¯Ø§Ø¡Ù? Ù?Ù? Ø§Ù?Ø¢Ù?
-torbutton.popup.test.no_http_proxy = Ù?ØØµ Ù?Ù?Ù?Ù? ØªÙ?Ø±: Ù?Ø§ Ù?Ù?Ù?Ù? Ø§Ù?Ù?ØµÙ?Ù? Ø¥Ù?Ù? Ù?Ù?Ù?Ù? HTTP Ø§Ù?Ù?ØÙ?Ù?. Ù?Ù? Ø¨Ù?Ù?Ù?Ø¨Ù? Ù?Ø¹Ù?Ù? Ø¨Ø´Ù?Ù? ØµØÙ?ØØ?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.test.no_http_proxy = Ù?ØØµ Ù?Ù?Ù?Ù? ØªÙ?Ø±: Ù?Ø§ Ù?Ù?Ù?Ù? Ø§Ù?Ù?ØµÙ?Ù? Ø¥Ù?Ù? Ù?Ù?Ù?Ù? HTTP Ø§Ù?Ù?ØÙ?Ù?. Ù?Ù? Polipo Ù?Ø¹Ù?Ù? Ø¨Ø´Ù?Ù? ØµØÙ?ØØ?
+torbutton.popup.captcha.title = ØªØ¬Ù?Ø¨ Captcha ØºÙ?ØºÙ?Ø?
+torbutton.popup.captcha.ask = ØªØÙ?Ù? Ù?Ù?ØªØ§Ø ØªÙ?Ø± Ù?Ù? Ù?Ø¬Ù?Ø¯ Captcha ØºÙ?ØºÙ?. Ù?Ù? ØªØ±Ù?Ø¯ Ø£Ù? Ù?ØªÙ? ØªÙ?Ø¬Ù?Ù?Ù? Ø¥Ù?Ù? Ù?ØØ±Ù? Ø¨ØØ« Ø¢Ø®Ø± Ù?Ø¹Ù?Ù?Ù?Ø© Ø§Ù?Ø¨ØØ« Ù?Ø°Ù?Ø?
+torbutton.popup.captcha.always = Ø¯Ø§Ø¦Ù?Ø§Ù? Ø£Ø¯ Ù?Ø°Ù? Ø§Ù?Ø¹Ù?Ù?Ù?Ø© Ù?Ù? Ø§Ù?Ø¢Ù? Ù?ØµØ§Ø¹Ø¯Ø§Ù?
+torbutton.popup.redirect = Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù?ØªÙ?Ø¬Ù?Ù?
+torbutton.popup.no_redirect = Ù?Ø§ ØªÙ?Ù? Ø¨Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù?ØªÙ?Ø¬Ù?Ù?
diff --git a/src/chrome/locale/bg/torbutton.dtd b/src/chrome/locale/bg/torbutton.dtd
index 8dcfb2b..7e1fb3b 100644
--- a/src/chrome/locale/bg/torbutton.dtd
+++ b/src/chrome/locale/bg/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "About Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/bms/torbutton.dtd b/src/chrome/locale/bms/torbutton.dtd
index 3945b72..32d822a 100644
--- a/src/chrome/locale/bms/torbutton.dtd
+++ b/src/chrome/locale/bms/torbutton.dtd
@@ -7,7 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy á??á?ºá?á??á?¹á??á??á?á??á?ºá??á?¹á??á?ºá?¬á?¸">
 <!ENTITY torbutton.prefs.recommended_settings "á?¡á?¾á??á?¶á?»á??á?³ á?±á??á?¬á??á?¹á??á?¶á?±á??á?¬ proxy á??á?ºá?á??á?¹á??á?á??á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?á?¯ á??á?á??á?á?? Firefox version á??á?¼á??á?¹ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹">
 <!ENTITY torbutton.prefs.use_privoxy "Privoxy á??á?á?¯ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
+<!ENTITY torbutton.prefs.use_polipo "Polipo á??á?á?¯ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹">
 <!ENTITY torbutton.prefs.custom_settings "proxy á??á?ºá?á??á?¹á??á?á??á??á?ºá??á?¹á??á?ºá?¬á?¸á??á?á?¯ á??á?á??á?¹á?¾á??á?á?³á??á?¹á?»á??á?³á?»á??á??á?¹á?? á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP á??á?±á??á?¬á?·á??á?® :">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL á??á?±á??á?¬á?·á??á?® :">
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Torbutton á?¡á?±á?¾á??á?¬á??á?¹á?¸">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Torbutton á??á??á??á?¹á??á??á?¹ á??á??á??á?¹á??á?¯á??á?¹á??á?«">
 <!ENTITY torbutton.prefs.sec_settings "á??á?¶á?¯á?»á??á?¶á?³á??á??á?¡á??á?¼á??á?¹ á??á?ºá?á??á?¹á??á?á??á??á?ºá??á?¹á??á?ºá?¬á?¸">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³/á??á?»á??á?³ á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?ºá?á??á?¹á??á?¼á??á?¹ Disk cache á?»á??á?³á??á?¯á??á?¹á??á??á??á?½á??á?¹á?· cache á??á?½á??á?¹á?¸á??á??á?¹á?¸á??á??á??á?ºá?¬á?¸á??á?¯á? á??á?á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹">
 <!ENTITY torbutton.prefs.block_cache "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ disk á??á?½á??á?¹á?· memory cache á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á??á?á?¯ á??á?á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹">
 <!ENTITY torbutton.prefs.cookie_jars "Tor á??á??á?¯á??á?¹á?±á??á?¬ cookies á??á?ºá?¬á?¸á??á?á?¯ á??á?¬á??á?¼á??á?¹á??á?¬á?¸á??á??á?¹á?· jar á??á?²á??á?¼á??á?¹ á??á?á??á?¹á?¸á??á??á?¹á?¸á??á?¬á?¸á??á??á?¹">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "á??á?á??á?á??á?¬á??á?¬ cookies á??á?ºá?¬á?¸á??á?¯á? á??á?®á??á?¥á?¹á??á??á?»á??á?³á??á?¯á??á?¹á??á?«á??á??á?¹á?? (á?¡á??á?±á??á??á?¹ á??á?½á?á??á?«á??á??á?¹)">
 <!ENTITY torbutton.prefs.clear_cookies "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³/á??á?»á??á?³ á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á?ºá?á??á?¹á??á?¼á??á?¹ cookies á??á?ºá?¬á?¸á??á?¯á? á??á?½á??á?¹á?¸á??á??á?¹á?¸á??á??á?¹">
 <!ENTITY torbutton.prefs.disable_plugins "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á??á?½á?á?±á??á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ plugins á??á?ºá?¬á?¸á??á?¯á? á??á?á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?¡á?±á??á?¸á?¾á??á?®á?¸á??á?«á??á??á?¹)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "á??á?á??á?¹á?¸á??á??á?¹á?¸á?±á??á??á?¥á?¹ Session á??á?¯á? á??á?á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
 <!ENTITY torbutton.prefs.headers "á?±á??á?«á??á?¹á?¸á??á??á?¹á?¸á??á?ºá?¬á?¸">
 <!ENTITY torbutton.prefs.spoof_english "US á?¡á??á?¤á??á?á??á?¹ browser á??á?¯á? Spoof á??á?¯á??á?¹á??á??á?¹">
-<!ENTITY torbutton.prefs.disable_referer "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á?±á??á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ á??á??á?¹á??á??á??á?¹á?¸á??á?°á??á?á?¯ á?±á??á?¸á??á?á?¯á??á?»á??á??á?¹á?¸ á??á?»á??á?³á??á??á?¹ (á?¡á??á?ºá?á?³á?? á??á?¯á?á??á?¹á??á?ºá?¬á?¸á??á?á?¯ á?»á??á??á?¹á?±á??á?¬á??á?¹á?±á??á??á?¯á?á??á?¹á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ DOM á??á?á??á?¹á?¸á??á??á?¹á?¸á??á??á??á?á?¯ á??á?á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?¡á?±á??á?¸á?¾á??á?®á?¸á??á?«á??á??á?¹)">
 <!ENTITY torbutton.prefs.forms "á?»á??á??á?·á?¹á??á?¼á??á?¹á??á?¶á?¯á??á?¶á??á?¼á??á?¹á??á?ºá?¬á?¸">
 <!ENTITY torbutton.prefs.block_tforms "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ á??á??á?¬á?¸á??á?½á??á?¹ á??á?½á??á?¹á?· á?»á??á??á?·á?¹á??á?¼á??á?¹á??á?¶á?¯á??á?¶á??á?ºá?¬á?¸ á??á?á??á?¹á?¸á??á??á?¹á?¸á?»á??á??á?¹á?¸á??á?¯á? á??á?á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹ (á?¡á?¾á??á?¶á?»á??á?³á?±á??á?¬á??á?¹á??á?¶á??á?«á??á??á?¹)">
@@ -91,16 +103,35 @@
 <!ENTITY torbutton.prefs.tor_tabs "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³ á??á??á?¹á??á?°á??á?¬á?¸á??á??á?¹á?· tabs á??á?ºá?¬á?¸">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.no_proxies_on "á??á??á?¹á?¸á??á?á?¯á??á?¡á??á?¼á??á?¹ proxy á??á??á?½á?á??á?«:">
+<!ENTITY torbutton.prefs.no_proxy_warning "á??á??á?á?±á??á?¸á??á?ºá??á?¹: á?¡á??á??á?¹á?±á??á?¬á?¹á?»á??á??á?« hostname á??á?ºá?¬á?¸á?¡á??á?¶á?¯á?¸á??á?»á??á?³á??á??á?¹">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á?±á??á??á?¥á?¹á?¡á??á?¼á??á?¹á?¸ livemarks á?¡á??á??á?¹á??á??á?¹á?·á??á?¼á??á?¹á?¸á??á??á??á?ºá?¬á?¸á??á?¯á? á??á?á??á?¹á??á??á?¹á??á?¬á?¸á??á??á?¹">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
+<!ENTITY torbutton.prefs.dtd_recommended "(á?¡á?¾á??á?¶á?»á??á?³á??á?«á??á??á?¹)">
+<!ENTITY torbutton.prefs.dtd_optional "(á?±á??á?¬á??á?¹á??á??á?¹á??á??á?¹á??á??á?¹á?¸)">
+<!ENTITY torbutton.prefs.dtd_crucial "(á?¡á?±á??á?¸á?¾á??á?®á?¸á?±á??á?¬)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Torbutton Updates á??á?ºá?¬á?¸á?¡á?¬á?¸ Tor á??á?½á??á??á??á?¹á?·á??á?¼á?¬á?¸á??á??á?¹">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Google Captcha á??á?½á??á?¹á?·á??á?á?¯á?¸á??á?«á?? á??á?»á??á?¬á?¸ search engine á??á??á?¹á??á?¯ á?¡á??á?á?¯á?¡á?±á??á?½á?ºá?¬á??á?¹á?±á?»á??á?¬á??á?¹á?¸á??á?¶á?¯á?¸á??á??á?¹">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
-<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
+<!ENTITY torbutton.prefs.fix_google_srch "Google Search Box queries á??á?½ platform á??á?½á??á?¹á?· language á??á?ºá?¬á?¸á?±á?»á??á?¬á??á?¹á?¸á??á??á?¹">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/bms/torbutton.properties b/src/chrome/locale/bms/torbutton.properties
index 4737218..54523bd 100644
--- a/src/chrome/locale/bms/torbutton.properties
+++ b/src/chrome/locale/bms/torbutton.properties
@@ -7,14 +7,14 @@ torbutton.panel.plugins.enabled = Plugins á??á?ºá?¬á?¸ á??á?á??á?¹á??á??á?¹á??
 torbutton.panel.label.disabled = Tor á?¡á??á?¶á?¯á?¸á??á?»á??á?³á??á?¯á?á??á?¹á??á?«
 torbutton.panel.label.enabled = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¯á?á??á?¹á??á?«á??á??á?¹á??
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Tor proxy á??á?¯á? Firefox á??á?¼á??á?¹ á?¡á??á?¼á??á?¹á??á??á?° á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?· á?»á??á?³á??á??á?¹/ á??á?»á??á?³á??á??á?¹ Torbutton á??á?½ á??á??á?¯á??á?¹á??á??á?¹á??á?¯á??á?¯á? á??á??á?¹á?·á??á?¼á??á?¹á?¸á??á?¬á?¸á??á?«á??á??á?¹
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.history.warning = á?¡á?»á??á?¬á?¸ Tor state á??á?½ loading á??á??á?¹á?±á??á?±á??á?¬ á?¡á??á?¬á??á?ºá?¬á?¸á?¡á?¬á?¸ Torbutton á??á?½ á??á?á??á?¹á??á?á?¯á??á?¹á??á?«á??á??á?¹á??\n\nFirefox Bugs 409737 á??á?½á??á?¹á?· 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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = plugin á?¡á??á?ºá??á?¹á?¡á??á??á?¹á??á?ºá?¬á?¸á??á?¯á? Tor á??á?½ á??á?¯á?á??á?¹á??á?¯á?á??á?¹ á??á??á?¹á??á?°á?»á??á??á?¹á?¸á??á?¯á? Torbutton á??á?½ á??á?á??á?¹á??á??á?¹á??á?«á??á??á?¹á?? \n\nSave-As á??á?á?¯ á?¡á??á?¬á?¸á??á?¯á?á?¸ á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?«á?? \n\n
 torbutton.popup.confirm_ca_certs = Torbutton á??á?½á??á?¹á??á?ºá??á?¹: á??á??á?¹á?·á?¡á??á?¼á??á?¹  á?»á??á?³á??á?¯á??á?¹á??á?¬á?¸á?±á??á?¬ Certificate Authorities á??á?±á??á?¬á?¹á?»á??á??á?¬á?¸á??á?«á?? Certificate Authority á??á?¬á??á??á?¹á?¸ á??á??á?¹á?±á??á?¸á??á?½á?¬á?±á??á?¼á?»á??á??á?¹á?¸á??á??á?¹ Tor á?±á?»á??á?¬á??á?¹á?¸á??á?² á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á??á?á?¯ á?±á??á?½á?¸á?±á??á?¼á?¸á?±á??á??á?¯á?á??á?¹á?»á??á?®á?¸ á?¡á??á?¯á??á?¹á??á?¯á??á?¹á??á?¬á??á?¼á??á?¹ á?±á??á?½á?¸á?±á??á?¼á?¸á?±á??á??á?¯á?á??á?¹á??á?«á??á??á?¹á?? Certificate Authority certificates á??á?ºá?¬á?¸ á??á?²á?¼á?»á??á?¬á?¸á??á?¬á?¸á??á?½á?á?»á??á??á?¹á?¸á??á?¯á? á??á?á??á?¹á??á??á?¹á??á?á?¯á??á?«á??á??á?¬á?¸ ? (á??á??á?¹ á??á?¯á?á?¡á?±á?¾á??á?¬á??á?¹á?¸á?¡á??á?¬á??á?¯á? á??á?¬á?¸á??á??á?¹á?»á??á??á?¹á?¸ á??á??á?½á?á??á?«á??á?½á?ºá??á?¹ OK á??á?¯á? á??á??á??á?¹á??á?½á?á??á?¹á?»á??á??á?¹á?¸á?»á??á??á?¹á?· á??á?¶á?¯á?»á??á?¶á?³á??á?á??á?¹á??á?ºá??á?¯á?á??á?¹á??á?«á??á??á?¹)
 torbutton.popup.ff3.warning = á??á??á?á?±á??á?¸á??á?ºá??á?¹!\n\ná??á??á?¹á?? á?¡á??á?ºá?á??á?¹á?±á??á??á??á?¯á??á?¹á??á?½á??á?¹á?· livemarks á??á?ºá?¬á?¸ á?±á??á?«á??á?¹á?¾á??á?¬á?¸á?»á??á??á?¹á?¸á??á?á?¯ Firefox 3 á??á?¼á??á?¹ Torbutton á??á??á?¹ Tor á??á?½á??á??á??á?¹á?· á?»á??á??á?¹á?±á??á??á?±á??á??á?¯á?á??á?¹á??á?«á??á??á?¹á?? \n\ná??á??á?¹á??á?¯á?á??á??á??á?¹á?»á??á??á?¹á?±á?? á?±á??á?½á??á??á?á?¯á?? á??á??á?¹á??á??á?¹á??á?¯á??á?¹á?±á??á?¬á??á?¹ á??á?¯á?á??á?«á??á??á?¬á?¸ ?
 torbutton.popup.toggle.warning = á??á?ºá?á??á?á??á??á??á??á?ºá?¬á?¸ á?¡á??á?ºá?á?³á?¸á??á??á?¹á?±á??á?¬á??á?¹á??á?? á??á?½á?á?±á??á??á??á?¹ Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á??á?½á??á?¹á?· á?¡á??á?¶á?¯á?¸á??á?»á??á?³á??á?? á?±á?»á??á?¬á??á?¹á?¸á??á?²á??á??á?¹ á??á?á?¯á??á??á??á?¯á??á?¹ á?»á??á??á?¹á??á??á?¹á??á??á??á?¹á??á??á?¹ á??á?á?¯á?¡á??á?¹á??á?«á??á??á?¹
 torbutton.popup.test.success = Tor proxy á??á??á?¹á?¸á??á??á?¹á??á?? á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?«á??á??á?¹ !
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.failure = Tor proxy á??á??á?¹á?¸á??á??á?¹á??á?? á??á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?« ! á??á??á?¹á?? proxy á??á?½á??á?¹á?· Privoxy á??á?ºá?á??á?¹á??á?á??á??á??á??á?ºá?¬á?¸á??á?á?¯ á??á??á?¹á?±á??á?¸á??á?«á??
+torbutton.popup.test.confirm_toggle = á?±á??á?¬á??á?¹á??á?¶á?¯á?¸á??á??á?¹á?¸á??á??á?¹á??á?¬á?¸á?±á??á?¬ Proxy Test á??á?½ Tor á??á?á?¯á??á??á??á??á?¹á??á?á?¯á??á?¹á??á?«á?? \n\nTor á??á?á?¯ enable á??á?¯á??á?¹á??á??á?¹á?±á??á??á?ºá?¬á??á?«á??á??á?¬á?¸á??\n\ná??á??á?á?»á??á?³á??á??á?¹-á?»á??á??á?¹á??á??á?¹á??á?½á?³á??á?ºá?¬á?¸á??á?á?¯á?»á??á?³á??á?¯á??á?¹á?»á??á?®á?¸á??á?«á??á?? Torbutton Proxy Preferences window á??á?½ á?¤á??á??á?á?±á??á?¸á??á?ºá??á?¹á??á?á?¯ á??á?á??á?¹á??á??á?¹á??á?á?¯á?¹á??á?¹á??á?«á??á??á?¹á??
 torbutton.popup.test.ff3_notice = Tor proxy á??á?ºá?á??á?¹á??á?á??á??á??á??á?ºá?¬á?¸á??á?¯á? á??á??á?¹á?¸á??á??á?¹á??á??á?¹ OK á??á?¯á? á??á??á??á?¹á??á?½á?á??á?¹á??á?«á?? á??á??á?¹á?¸á??á??á?¹á??á??á??á??á?¹ á?±á??á?¬á??á?¹á??á?¼á??á?¹á??á?¼á??á?¹ á?»á??á?³á??á?¯á??á?¹á??á?«á??á??á?¹á?? á?±á??á?ºá?¸á??á?°á?¸á?»á??á?³á?? á??á??á?¹á?¸á??á?¶á?±á??á?¬á??á?¹á?·á??á?¯á?á??á?¹á?¸á?±á??á?¸á??á?«á??á??á?¹á??
 torbutton.panel.label.verified = Tor á??á?½á??á?¹á??á??á?¹á?±á?¾á??á?¬á??á?¹á?¸ á?¡á??á??á?¹á?»á??á?³á??á?«á??á??á?¹
 torbutton.popup.test.auto_failed = Tor á?¡á??á?¶á?¯á?¸á?»á??á?³á??á??á?¹ á?¡á??á?á?¯á?¡á?±á??á?ºá?¬á??á?¹ Tor proxy á??á??á?¹á?±á??á?¸á??á?? á??á?±á?¡á?¬á??á?¹á?»á??á??á?¹á??á?«á?? \n\ná??á??á?¹á??á?á?¯á??á??á??á?¹á?»á??á??á?¹á?±á?? á?¡á??á?¶á?¯á?¸á?»á??á?³á??á?¼á??á?¹á?·á?»á??á?³á??á??á?¹ á?±á??á??á?ºá?¬á??á?«á??á??á?¬á?¸ ?
diff --git a/src/chrome/locale/bo/torbutton.dtd b/src/chrome/locale/bo/torbutton.dtd
index 8dcfb2b..7e1fb3b 100644
--- a/src/chrome/locale/bo/torbutton.dtd
+++ b/src/chrome/locale/bo/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "About Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd
index 8dcfb2b..7e1fb3b 100644
--- a/src/chrome/locale/ca/torbutton.dtd
+++ b/src/chrome/locale/ca/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "About Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/cs/torbutton.dtd b/src/chrome/locale/cs/torbutton.dtd
index 8dcfb2b..5c31197 100644
--- a/src/chrome/locale/cs/torbutton.dtd
+++ b/src/chrome/locale/cs/torbutton.dtd
@@ -1,34 +1,42 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
+<!ENTITY torbutton.prefs.title "NastavenÃ Torbutton">
 <!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
+<!ENTITY torbutton.prefs.display_panel "Zobrazit nastavenÃ proxy serveru ve stavovÃ©m Å?Ã¡dku">
+<!ENTITY torbutton.prefs.panel_format "FormÃ¡t zobrazenÃ status baru">
 <!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
-<!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
-<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
+<!ENTITY torbutton.prefs.panel_icon_format "Ikona">
+<!ENTITY torbutton.prefs.tor_settings "NastavenÃ Proxy">
+<!ENTITY torbutton.prefs.recommended_settings "PouÅ¾Ãt doporuÄ?enÃ¡ nastavenÃ proxy pro mou verzi Firefoxu">
+<!ENTITY torbutton.prefs.use_privoxy "PouÅ¾itÃ Proxy">
+<!ENTITY torbutton.prefs.use_polipo "PouÅ¾itÃ Polipo">
+<!ENTITY torbutton.prefs.custom_settings "PouÅ¾Ãt vlastnÃ nastavenÃ proxy">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
+<!ENTITY torbutton.about.title "O Torbutton">
+<!ENTITY torbutton.pref_connection.notice "ZakÃ¡zat aplikaci Torbutton toto nastavenÃ mÄ?nit.">
+<!ENTITY torbutton.pref_connection.more_info "VÃce informacÃ">
+<!ENTITY torbutton.pref_connection_more_info.title "NÃ¡povÄ?da">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
+<!ENTITY torbutton.context_menu.toggle "ZmÄ?nit Tor status">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
+<!ENTITY torbutton.context_menu.preferences "NastavenÃ...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
+<!ENTITY torbutton.context_menu.about "O Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.button.tooltip "KliknÄ?te pro inicializaci Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "BezpeÄ?nostnÃ nastavenÃ">
 <!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
 <!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
 <!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -44,21 +53,24 @@
 <!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
 <!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
 <!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.dynamic "DynamickÃ½ obsah">
 <!ENTITY torbutton.prefs.cookies "Cookies">
 <!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.history "Historie">
 <!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.shutdown "Vypnout">
 <!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
 <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.headers "Hlava">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
+<!ENTITY torbutton.prefs.forms "FormulÃ¡Å?">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
 <!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
 <!ENTITY torbutton.prefs.tor "Tor">
@@ -81,7 +93,7 @@
 <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
 <!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
+<!ENTITY torbutton.prefs.test_settings "Test nastavenÃ">
 <!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/cs/torbutton.properties b/src/chrome/locale/cs/torbutton.properties
index e2e8754..6d0b8bb 100644
--- a/src/chrome/locale/cs/torbutton.properties
+++ b/src/chrome/locale/cs/torbutton.properties
@@ -1,11 +1,11 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
-torbutton.panel.tooltip.disabled = Click to enable Tor
-torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.button.tooltip.disabled = Povolit Tor
+torbutton.button.tooltip.enabled = ZakÃ¡zat Tor
+torbutton.panel.tooltip.disabled = Klikni pro povolenÃ Tor
+torbutton.panel.tooltip.enabled = Klikni pro zakÃ¡zÃ¡nÃ Tor
 torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
-torbutton.panel.label.disabled = Tor Disabled
-torbutton.panel.label.enabled = Tor Enabled
+torbutton.panel.label.disabled = Tor Zapnut
+torbutton.panel.label.enabled = Tor Vypnut
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd
index e4b0891..d857f19 100644
--- a/src/chrome/locale/da/torbutton.dtd
+++ b/src/chrome/locale/da/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Om Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klik for at starte Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Sikkerhedsindstillinger">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Bloker Tor disk cache og ryd alt cache ved Ã¦ndring af Tor status">
 <!ENTITY torbutton.prefs.block_cache "Bloker disk og hukommelse cache adgang under Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Gem Ikke-Tor cookies i en beskyttet krukke">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "Jeg vil manuelt administrere mine cookies (farligt)">
 <!ENTITY torbutton.prefs.clear_cookies "Ryd cookies ved skift af Tor status">
 <!ENTITY torbutton.prefs.disable_plugins "Deaktiver plugins nÃ¥r Tor kÃ¸rer (afgÃ¸rende)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Deaktiver Sessions Lagring (anbefales)">
 <!ENTITY torbutton.prefs.headers "Hoveder">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US Engelsk Browser">
-<!ENTITY torbutton.prefs.disable_referer "Send ikke henviser ved brug af Tor (kan Ã¸delÃ¦gge visse sider)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Deaktiver DOM Lager nÃ¥r Tor kÃ¸rer (afgÃ¸rende)">
 <!ENTITY torbutton.prefs.forms "Formulare">
 <!ENTITY torbutton.prefs.block_tforms "Bloker kodeord+formulare for at gemme, nÃ¥r Tor kÃ¸rer (anbefales)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Ingen Proxies for:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Advarsel: UndgÃ¥ at bruge enhver vÃ¦rtsnavne ovenfor">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Deaktiver opdatering af livemarks, nÃ¥r Tor kÃ¸rer">
 <!ENTITY torbutton.prefs.dtd_recommended "(anbefalet)">
 <!ENTITY torbutton.prefs.dtd_optional "(Valg frit)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd
index 8e20969..762dc07 100644
--- a/src/chrome/locale/de/torbutton.dtd
+++ b/src/chrome/locale/de/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Ã?ber Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klicken, um Torbutton zu aktivieren">
 <!ENTITY torbutton.prefs.sec_settings "Sicherheitseinstellungen">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Zugriff auf Festplatten-Cache verhindern und Cache-Informationen bei An- und Abschalten von Tor lÃ¶schen">
 <!ENTITY torbutton.prefs.block_cache "Verhindere den Zugriff auf Festplatten- und Speicher-Cache wÃ¤hrend Tor aktiviert ist">
 <!ENTITY torbutton.prefs.cookie_jars "Speichern von Cookies, die nicht zu Tor gehÃ¶ren in einer gesicherten jar-Datei">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "Ich verwalte meine Cookies manuell (gefÃ¤hrlich)">
 <!ENTITY torbutton.prefs.clear_cookies "Cookies beim An- und Abschalten von Tor lÃ¶schen">
 <!ENTITY torbutton.prefs.disable_plugins "Plugins wÃ¤hrend der Benutzung von Tor deaktivieren (wichtig)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Speichern des Browserzustandes zwischen Programmaufrufen deaktivieren (empfohlen)">
 <!ENTITY torbutton.prefs.headers "Ã?berschriften">
 <!ENTITY torbutton.prefs.spoof_english "Englischen Browser (US) vortÃ¤uschen">
-<!ENTITY torbutton.prefs.disable_referer "Keine Informationen Ã¼ber vorher besuchte Seiten (Referrer) senden (fÃ¼hrt zu Problemen mit manchen Seiten)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Deaktiviere die DOM-Speicherung wÃ¤hrend der Benutzung von Tor (wichtig)">
 <!ENTITY torbutton.prefs.forms "Formulare">
 <!ENTITY torbutton.prefs.block_tforms "Speichern von Passworten und Formularen wÃ¤hrend Benutzung von Tor deaktivieren (empfohlen)">
@@ -93,14 +105,33 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Keine Proxies fÃ¼r: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warnung: Vermeiden Sie es, oben irgendwelche Host Namen zu verwenden">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Aktualisierungen von Livemarks wÃ¤hrend der Benutzung von Tor deaktivieren.">
 <!ENTITY torbutton.prefs.dtd_recommended "(empfohlen)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(kritisch)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Aktualisierung von Torbutton nur Ã¼ber das Tor Netzwerk">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatisch eine andere Suchmaschine benutzen, wenn Google ein Captcha abfragen will:">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
-<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
+<!ENTITY torbutton.prefs.fix_google_srch "Betriebssystem und Sprache bei Google Suchabfragen nicht Ã¼bermitteln">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties
index 87e994a..f5cb836 100644
--- a/src/chrome/locale/de/torbutton.properties
+++ b/src/chrome/locale/de/torbutton.properties
@@ -7,7 +7,7 @@ torbutton.panel.plugins.enabled = Klicken, um Plugins zu deaktivieren
 torbutton.panel.label.disabled = Tor deaktiviert
 torbutton.panel.label.enabled = Tor aktiviert
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Dank Torbutton kÃ¶nnen Sie den Tor-Proxy mit einem Klick ein- und ausschalten
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.history.warning = Torbutton blockierte eine AktivitÃ¤t eines Tabs welcher in einem anderen Torstatus geladen wurde.\n\nDies wurde getan, um die Firefox Fehler 409737 und 417869 zu umgehen.\n\nFalls dieses Popup Fenster ohne Grund aufgerufen wurde, kÃ¶nnte einer Ihrer Tabs versucht haben sich selber wieder zu neu im Hintergrund zu laden -- was von Torbutton verhindert wurde.\n\nUm den Tab im aktuellen Torstatus zu laden, drÃ¼cken Sie die 'Enter' Taste im URL Addressfeld.\n\n
 torbutton.popup.plugin.warning = Der Inhalt des Plugins konnte nicht direkt heruntergeladen werden, weil Torbutton dies verhinderte.\n\nBitte stattdessen "Speichern als" verwenden.\n
 torbutton.popup.confirm_ca_certs = Anmerkung: Es scheint, als seien keinerlei eigene ZertifikatsautoritÃ¤ten in Ihrer Konfiguration vorhanden. Die Auswertung der globalen ZertifikationsautoritÃ¤ten-Liste ist aufwÃ¤ndig und verlangsamt das schnelle An- und Abschalten von Tor. MÃ¶chten Sie die Isolation von ZertifikatsautoritÃ¤ten abschalten? (Wenn Sie nicht wissen, was gemeint ist, kÃ¶nnen Sie ruhig auf OK klicken)
 torbutton.popup.ff3.warning = Warnung!\n\nEs ist bekannt, dass Torbutton auf Firefox 3 deine Zeitzone und Livemarks via Tor mitteilt.\n\nWillst du trotzem fortfahren?
@@ -24,13 +24,13 @@ torbutton.prefs.crucial = (kritisch)
 torbutton.popup.external.title = Externen Inhalt laden?
 torbutton.popup.external.app = Eine externe Applikation wird benÃ¶tigt, um mit dem folgenden Objekt umzugehen:\n\n
 torbutton.popup.external.note = \n\nAnmerkung: Externe Applikationen sind im Allgemeinen NICHT Tor gesichert und kÃ¶nnen Sie verraten!\n
-torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
+torbutton.popup.external.suggest = \nFalls diese Datei nicht vertrauenswÃ¼rdig ist, sollten Sie diese entweder speichern und offline ansehen oder in einer VM Ã¶ffnen.\nAndernfalls kÃ¶nnen Sie auch einen transparenten Tor Proxy, wie zum Beispiel Amnesia LiveCD, torsocks oder TorVM benÃ¼tzen.\n
 torbutton.popup.launch = Applikation starten
 torbutton.popup.cancel = Abbrechen
 torbutton.popup.dontask = Von nun an immer Applikationen laden
 torbutton.popup.test.no_http_proxy = Tor proxy test: Lokaler HTTP Proxy ist unerreichbar. LÃ¤uft Polipo korrekt?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.captcha.title = Google Captchas vermeiden?
+torbutton.popup.captcha.ask = Torbutton hat ein Google Captcha festgestellt. MÃ¶chten Sie fÃ¼r Ihre Suchanfrage zu einer anderen Suchmaschine umgeleitet werden?
+torbutton.popup.captcha.always = Von nun an immer diese Aktion durchfÃ¼hren
+torbutton.popup.redirect = Umleiten
+torbutton.popup.no_redirect = Nicht umleiten
diff --git a/src/chrome/locale/el/torbutton.dtd b/src/chrome/locale/el/torbutton.dtd
index c378677..c96f424 100644
--- a/src/chrome/locale/el/torbutton.dtd
+++ b/src/chrome/locale/el/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "Î?">
 <!ENTITY torbutton.context_menu.about "Î ÎµÏ?Î¯ Torbutton">
 <!ENTITY torbutton.context_menu.about.key "Î ">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Î?Î¬Î½Ï?Îµ ÎºÎ»Î¹Îº Î³Î¹Î± Î½Î± ÎµÎºÎºÎ¯Î½Î·Ï?Î· Ï?Î¿Ï? Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï? Î±Ï?Ï?Î±Î»ÎµÎ¯Î±Ï?">
@@ -37,12 +45,13 @@
 <!ENTITY torbutton.prefs.clear_cache "Î?Ï?Î±Î³Ï?Ï?ÎµÏ?Ï?Î· Ï?Ï?Î®Ï?Î·Ï? Î»Î±Î½Î¸Î¬Î½Î¿Ï?Ï?Î±Ï? Î´Î¯Ï?ÎºÎ¿Ï? ÎºÎ±Ï?Î¬ Ï?Î· Î»ÎµÎ¹Ï?Î¿Ï?Ï?Î³Î¯Î± Tor ÎºÎ±Î¹ ÎµÎºÎºÎ±Î¸Î¬Ï?Î¹Ï?Î· Ï?Î·Ï? Ï?Ï?Î·Î½ ÎµÎ½Î±Î»Î»Î±Î³Î® Tor">
 <!ENTITY torbutton.prefs.block_cache "Î?Ï?Î±Î³Ï?Ï?ÎµÏ?Ï?Î· Î»Î±Î½Î¸Î¬Î½Î¿Ï?Ï?Î±Ï? Î¼Î½Î®Î¼Î·Ï? ÎºÎ±Î¹ Î´Î¯Ï?ÎºÎ¿Ï? ÎºÎ±Ï?Î¬ Ï?Î· Î»ÎµÎ¹Ï?Î¿Ï?Ï?Î³Î¯Î± Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Î?Ï?Î¿Î¸Î®ÎºÎµÏ?Ï?Î· cookies ÎµÎºÏ?Ï?Ï? Tor Ï?Îµ Ï?Ï?Î¿Ï?Ï?Î±Ï?ÎµÏ?Î¼ÎÎ½Î¿ Î±Ï?Ï?ÎµÎ¯Î¿ jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "Î§ÎµÎ¹Ï?Ï?Î½Î±ÎºÏ?Î¹ÎºÎ® Î´Î¹Î±Ï?ÎµÎ¯Ï?Î¹Ï?Î· cookies (ÎµÏ?Î¹ÎºÎ¯Î½Î´Ï?Î½Î¿)">
 <!ENTITY torbutton.prefs.clear_cookies "Î?ÎºÎºÎ±Î¸Î¬Ï?Î¹Ï?Î· cookies ÎºÎ±Ï?Î¬ Ï?Î·Î½ ÎµÎ½Î±Î»Î»Î±Î³Î® Ï?Ï?Î®Ï?Î·Ï? Tor">
 <!ENTITY torbutton.prefs.disable_plugins "Î?Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¯Î·Ï?Î· Ï?Ï?Ï?Ï?Î¸ÎµÏ?Ï?Î½ Î»ÎµÎ¹Ï?Î¿Ï?Ï?Î³Î¹Ï?Î½ ÎºÎ±Ï?Î¬ Ï?Î· Ï?Ï?Î®Ï?Î· Tor (ÎºÏ?Î¯Ï?Î¹Î¼Î¿)">
 <!ENTITY torbutton.prefs.kill_bad_js "Î?Î³Î³Ï?Ï?Ï?Ï?Î· ÎµÏ?Î¹ÎºÎ¯Î½Î´Ï?Î½Î·Ï? javascript (ÎºÏ?Î¯Ï?Î¹Î¼Î¿)">
 <!ENTITY torbutton.prefs.isolate_content "Î?Ï?Î¿Î¼Ï?Î½Ï?Ï?Î· Î´Ï?Î½Î±Î¼Î¹ÎºÎ¿Ï? Ï?ÎµÏ?Î¹ÎµÏ?Ï?Î¼ÎµÎ½Î¿Ï? Î±Î½Î¬ ÎºÎ±Ï?Î¬Ï?Ï?Î±Ï?Î· Î»ÎµÎ¹Ï?Î¿Ï?Ï?Î³Î¯Î±Ï? Tor (ÎºÏ?Î¯Ï?Î¹Î¼Î¿)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
+<!ENTITY torbutton.prefs.no_updates "Î?Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¯Î·Ï?Î· ÎµÎ½Î·Î¼ÎµÏ?Ï?Ï?ÎµÏ?Î½ ÎºÎ±Ï?Î± Ï?Î· Ï?Ï?Î®Ï?Î· Ï?Î¿Ï? Tor">
 <!ENTITY torbutton.prefs.set_uagent "Î?Ï?Î¹Ï?Î¼Ï?Ï? user agent Î³Î¹Î± Ï?Ï?Î®Ï?Î·  Tor (ÎºÏ?Î¯Ï?Î¹Î¼Î¿)">
 <!ENTITY torbutton.prefs.dynamic "Î?Ï?Î½Î±Î¼Î¹ÎºÏ? Ï?ÎµÏ?Î¹ÎµÏ?Ï?Î¼ÎµÎ½Î¿">
 <!ENTITY torbutton.prefs.cookies "Cookies">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Î?Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¯Î·Ï?Î· Î±Ï?Î¿Î¸Î®ÎºÎµÏ?Ï?Î·Ï? Ï?Ï?Î½ÎµÎ´Ï?Î¯Î±Ï? (Ï?Ï?Î½Î¹Ï?Ï?Î¬Ï?Î±Î¹)">
 <!ENTITY torbutton.prefs.headers "Î?ÎµÏ?Î±Î»Î¯Î´ÎµÏ?">
 <!ENTITY torbutton.prefs.spoof_english "Î Î±Ï?Î±Ï?Î»Î¬Î½Î·Ï?Î· Ï?Î·Ï? Î³Î»Ï?Ï?Ï?Î±Ï? US English Ï?Î¿Ï? Î ÎµÏ?Î¹Î·Î³Î·Ï?Î®">
-<!ENTITY torbutton.prefs.disable_referer "Î?Î± Î¼Î·Î½ Î±Ï?Î¿Ï?Ï?ÎÎ»ÎµÏ?Î±Î¹ referer ÎºÎ±Ï?Î¬ Ï?Î· Ï?Ï?Î®Ï?Î· Tor (Î¼Ï?Î¿Ï?ÎµÎ¯ Î½Î± Î¼Î·Î½ Î»ÎµÎ¹Ï?Î¿Ï?Ï?Î³Î¿Ï?Î½ Ï?Ï?Ï?Ï?Î¬ Î¿Ï?Î¹Ï?Î¼ÎÎ½Î¿Î¹ Î¹Ï?Ï?Ï?Ï?Î¿Ï?Î¿Î¹)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Î?Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¯Î·Ï?Î· Î±Ï?Î¿Î¸Î®ÎºÎµÏ?Ï?Î·Ï? DOM ÎºÎ±Ï?Î¬ Ï?Î· Ï?Ï?Î®Ï?Î· Tor (ÎºÏ?Î¯Ï?Î¹Î¼Î¿)">
 <!ENTITY torbutton.prefs.forms "Î¦Ï?Ï?Î¼ÎµÏ?">
 <!ENTITY torbutton.prefs.block_tforms "Î?Ï?Î»Î¿ÎºÎ¬Ï?Î¹Ï?Î¼Î± ÎºÏ?Î´Î¹ÎºÏ?Î½ + Î´ÎµÎ´Î¿Î¼ÎÎ½Ï?Î½ Ï?Î¿Ï?Î¼Ï?Î½ ÎºÎ±Ï?Î¬ Ï?Î· Ï?Ï?Î®Ï?Î· Tor (Ï?Ï?Î½Î¹Ï?Ï?Î¬Ï?Î±Î¹)">
@@ -78,7 +90,7 @@
 <!ENTITY torbutton.prefs.startup_state "Î?Ï?Î±Î½ Î³Î¯Î½ÎµÎ¹ ÎºÎ±Î½Î¿Î½Î¹ÎºÎ® ÎµÎºÎºÎ¯Î½Î·Ï?Î·, Ï?Î¿Ï?Î¿Î¸ÎÏ?Î·Ï?Î· Ï?Î¿Ï? Tor Ï?Îµ ÎºÎ±Ï?Î¬Ï?Ï?Î±Ï?Î·:">
 <!ENTITY torbutton.prefs.shutdown_state "Î?Î±Ï?Î¬Ï?Ï?Î±Ï?Î· Î´Î¹Î±ÎºÎ¿Ï?Î®Ï? Î»ÎµÎ¹Ï?Î¿Ï?Ï?Î³Î¯Î±Ï?">
 <!ENTITY torbutton.prefs.startup "Î?ÎºÎºÎ¯Î½Î·Ï?Î·">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
+<!ENTITY torbutton.prefs.block_tor_file_net "Î?Ï?Î±Î³Ï?Ï?ÎµÏ?Ï?Î· Ï?Ï?Ï?Ï?Î²Î±Ï?Î·Ï? Ï?Î¿Ï? Tor Ï?Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿ Î±Ï?Ï? url Î¼Î¿Ï?Ï?Î®Ï? file:// (Ï?Ï?Î½Î¹Ï?Ï?Î¬Ï?Î±Î¹)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Î?Ï?Î±Î³Ï?Ï?ÎµÏ?Ï?Î· Ï?Ï?Ï?Ï?Î²Î±Ï?Î·Ï? Ï?Ï?Î¿ Î´Î¯ÎºÏ?Ï?Î¿ Î¼Îµ Î¼Î· Tor Ï?Ï?Ï?Ï?Î²Î±Ï?Î· Î±Ï?Ï? URLs Ï?Î·Ï? Î¼Î¿Ï?Ï?Î®Ï? file://">
 <!ENTITY torbutton.prefs.restore_defaults "Î?Ï?Î¿ÎºÎ±Ï?Î¬Ï?Ï?Î±Ï?Î· Î±Ï?Ï?Î¹ÎºÏ?Î½ Ï?Ï?Î¸Î¼Î¯Ï?ÎµÏ?Î½">
 <!ENTITY torbutton.prefs.test_settings "Î?Î»ÎµÎ³Ï?Î¿Ï? Ï?Ï?Î¸Î¼Î¯Ï?ÎµÏ?Î½">
@@ -93,14 +105,33 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Î?ÎµÎ½ Ï?Ï?Î¬Ï?Ï?Î¿Ï?Î½ Ï?Î»Î·Ï?ÎµÎ¾Î¿Ï?Ï?Î¹Î¿Î¹ Î´Î¹Î±ÎºÎ¿Î¼Î¹Ï?Ï?ÎÏ? proxy Î³Î¹Î±:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Î?Î¹Î´Î¿Ï?Î¿Î¯Î·Ï?Î·: Î?Ï?Î¿Ï?Ï?Î³ÎµÏ?Îµ Ï?Î·Î½  Ï?Ï?Î®Ï?Î· hostnames Ï?Î¹Î¿ Ï?Î¬Î½Ï?">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Î?Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¯Î·Ï?Î· Ï?Ï?Î½ ÎµÎ½Î·Î¼ÎµÏ?Ï?Ï?ÎµÏ?Î½ Ï?Î¿Ï? livemark Ï?Ï?Î¿ Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¹ÎµÎ¯Ï?Î±Î¹ Ï?Î¿ Tor">
 <!ENTITY torbutton.prefs.dtd_recommended "(Ï?Ï?Î½Î¯Ï?Ï?Î±Ï?Î±Î¹)">
 <!ENTITY torbutton.prefs.dtd_optional "(Ï?Ï?Î¿ÎµÏ?Î±Î¹Ï?Î¹ÎºÏ?)">
 <!ENTITY torbutton.prefs.dtd_crucial "(ÎºÏ?Î¯Ï?Î¹Î¼Î¿)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Î?Î½Î±Î´Ï?Î¿Î¼Î¿Î»Ï?Î³Î·Ï?Îµ Ï?Î¹Ï? ÎµÎ½Î·Î¼ÎµÏ?Ï?Ï?ÎµÎ¹Ï? Ï?Î¿Ï? Torbutton Î¼ÎÎµÏ?Ï? Ï?Î¿Ï? Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Î?Ï?Ï?Ï?Î¼Î±Ï?Î± Ï?Ï?Î·Ï?Î¹Î¼Î¿Ï?Î¿Î¯Î·Ï?Îµ Î¼Î¹Î± ÎµÎ½Î±Î»Î»Î±ÎºÏ?Î¹ÎºÎ® Î¼Î·Ï?Î±Î½Î® Î±Î½Î±Î¶Î®Ï?Î·Ï?Î·Ï? Ï?Ï?Î±Î½ Ï?Î±Ï?Î¿Ï?Ï?Î¹Î±Ï?Ï?ÎµÎ¯ ÎµÎ½Î± Google Captcha:">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
-<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
+<!ENTITY torbutton.prefs.fix_google_srch "Î?Ï?Î±Î¯Ï?ÎµÏ?Îµ Ï?Î·Î½ Ï?Î»Î±Ï?Ï?Ï?Ï?Î¼Î± ÎºÎ±Î¹ Ï?Î· Î³Î»Ï?Ï?Ï?Î± (Ï?Î¿Ï? Ï?Ï?Ï?Ï?Î®Î¼Î±Ï?Î¿Ï?) Î±Ï?Î¿ Ï?Î± ÎµÏ?Ï?Ï?Î®Î¼Î±Ï?Î± Ï?Ï?Î± ÎºÎ¿Ï?Ï?Î¹Î¬ Î±Î½Î±Î¶Î®Ï?Î·Ï?Î·Ï?">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/en/torbutton.dtd.orig b/src/chrome/locale/en/torbutton.dtd.orig
new file mode 100644
index 0000000..e6a5caf
--- /dev/null
+++ b/src/chrome/locale/en/torbutton.dtd.orig
@@ -0,0 +1,135 @@
+<!ENTITY torbutton.prefs.title "Torbutton Preferences">
+<!ENTITY torbutton.prefs.display_settings "Display Settings">
+<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
+<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
+<!ENTITY torbutton.prefs.panel_text_format "Text">
+<!ENTITY torbutton.prefs.panel_icon_format "Icon">
+<!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
+<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
+<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
+<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
+<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
+<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
+<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
+<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
+<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
+<!ENTITY torbutton.prefs.proxy.port "Port:">
+<!ENTITY torbutton.about.title "About Torbutton">
+<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
+<!ENTITY torbutton.pref_connection.more_info "More information">
+<!ENTITY torbutton.pref_connection_more_info.title "Help">
+<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
+<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
+<!ENTITY torbutton.context_menu.toggle.key "T">
+<!ENTITY torbutton.context_menu.preferences "Preferences...">
+<!ENTITY torbutton.context_menu.preferences.key "P">
+<!ENTITY torbutton.context_menu.about "About Torbutton...">
+<!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
+<!ENTITY torbutton.button.label "Torbutton">
+<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
+<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
+<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
+<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
+<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
+<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
+<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.prefs.cache "Cache">
+<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
+<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
+<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
+<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
+<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
+<!ENTITY torbutton.prefs.forms "Forms">
+<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
+<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.tor "Tor">
+<!ENTITY torbutton.prefs.non_tor "Non-Tor">
+<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
+<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
+<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
+<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
+<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
+<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
+<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
+<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
+<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
+<!ENTITY torbutton.prefs.test_settings "Test Settings">
+<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
+<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
+<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
+<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
+<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
+<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
+<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
+<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
+<!ENTITY torbutton.prefs.engine1 "ixquick.com">
+<!ENTITY torbutton.prefs.engine2 "Bing.com">
+<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
+<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
diff --git a/src/chrome/locale/en/torbutton.dtd.rej b/src/chrome/locale/en/torbutton.dtd.rej
new file mode 100644
index 0000000..dda8b26
--- /dev/null
+++ b/src/chrome/locale/en/torbutton.dtd.rej
@@ -0,0 +1,10 @@
+--- src/chrome/locale/en/torbutton.dtd
++++ src/chrome/locale/en/torbutton.dtd
+@@ -93,6 +93,7 @@
+ <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
+ <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
+ <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
++<!ENTITY torbutton.prefs.transparentTor "Enable Transparent Torification">
+ <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+ <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
+ <!ENTITY torbutton.prefs.dtd_optional "(optional)">
diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd
index 37d65dd..5d10f6e 100644
--- a/src/chrome/locale/es/torbutton.dtd
+++ b/src/chrome/locale/es/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Acerca de Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Haga clic para iniciar Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "ConfiguraciÃ³n de seguridad">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Bloquear el cachÃ© de disco de Tor y limpiarlo al cambiar el estado de Tor">
 <!ENTITY torbutton.prefs.block_cache "Bloquear el acceso a cachÃ© de memoria y disco al usar Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Almacenar cookies al no usar Tor en un jar protegido">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "GestionarÃ© manualmente mis cookies (peligroso)">
 <!ENTITY torbutton.prefs.clear_cookies "Borrar cookies al cambiar el estado de Tor">
 <!ENTITY torbutton.prefs.disable_plugins "Deshabilitar plugins al usar Tor (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Deshabilitar el guardado de sesiÃ³n (recomendado)">
 <!ENTITY torbutton.prefs.headers "Cabeceras">
 <!ENTITY torbutton.prefs.spoof_english "Simular navegador en InglÃ©s de EEUU">
-<!ENTITY torbutton.prefs.disable_referer "No enviar sitio de referencia al usar Tor (puede dejar no operativos algunos sitios web)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Deshabilitar el almacenamiento de DOM al usar Tor (crucial)">
 <!ENTITY torbutton.prefs.forms "Formularios">
 <!ENTITY torbutton.prefs.block_tforms "Bloquear el almacenamiento de contraseÃ±as y formularios al usar Tor (recomendado)">
@@ -92,15 +104,34 @@
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No hay proxies para:">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.no_proxy_warning "Advertencia: Evite el uso de nombres de host por encima de">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Deshabilitar las marcas de actualizaciones durante el uso de Tor">
 <!ENTITY torbutton.prefs.dtd_recommended "(recomendado)">
 <!ENTITY torbutton.prefs.dtd_optional "(opcional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redireccionar las actualizaciones de Torbutton a travÃ©s de Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "AutomÃ¡ticamente utilice un motor de busqueda alterno cuando se presente con un Captcha de Google">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
-<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
+<!ENTITY torbutton.prefs.fix_google_srch "Quitar plataforma y lenguaje de los Cuadros de peticiÃ³n de busqueda de Google">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties
index 6fa358a..aee805e 100644
--- a/src/chrome/locale/es/torbutton.properties
+++ b/src/chrome/locale/es/torbutton.properties
@@ -7,14 +7,14 @@ torbutton.panel.plugins.enabled = Haga clic para deshabilitar componentes.
 torbutton.panel.label.disabled = Tor deshabilitado
 torbutton.panel.label.enabled = Tor habilitado
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton proporciona un botÃ³n para habilitar y deshabilitar el acceso al proxy Tor desde el Firefox de manera fÃ¡cil.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.history.warning = Torbutton bloqueo actividad de una pestaÃ±a cargada en un estado diferente de Tor.\n\nEsto es para circunvenir los errores de programaciÃ³n 409737 y 417869 de Firefox.\n\nSi esta ventana aparece sin ninguna razÃ³n aparente, una de sus pestaÃ±as esta intentando recargarse en el background  y esta operaciÃ³n ha sido bloqueada.\n\nPara recargar esta pestaÃ±a en el estado actual de Tor, presione la tecla  'enter' en el cuadro 
 torbutton.popup.plugin.warning = Torbutton bloqueÃ³ la carga directa por Tor del contenido de un componente.\n\nUse la alternativa de â??Guardar Comoâ??.\n\n
 torbutton.popup.confirm_ca_certs = Nota de Torbutton: Parece que usted no tiene Autoridades de Certificado personalizadas. Examinar el listado de Autoridades de Certificado es una operaciÃ³n lenta y hace mÃ¡s lento el conmutador Tor. Â¿Desea deshabilitar el aislamiento de los certificados de Autoridades de Certificado? (Si no entiende esto, se mÃ¡s seguro hacer clic en Aceptar)
 torbutton.popup.ff3.warning = Â¡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 = Tiene que conmutar a Tor o reiniciar para que sus preferencias entre en efecto.\\n. \n
 torbutton.popup.test.success = Â¡La prueba del proxy Tor finalizÃ³ con Ã©xito!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.failure = Â¡La prueba del proxy Tor FALLÃ?! Revise las preferencias de su Proxy y de Polipo.
+torbutton.popup.test.confirm_toggle = La prueba mÃ¡s reciente de Tor proxy fallo al usar Tor.\n\nÂ¿EstÃ¡s seguro de que desea habilitar de todos modos?\n\nNota: Si usted ha solucionado el problema, puede volver a ejecutar la prueba en la ventana de Preferencias de Proxy Torbutton para eliminar esta advertencia.
 torbutton.popup.test.ff3_notice = Haga clic en Aceptar para probar las preferencias del proxy Tor. Esta prueba se harÃ¡ en segundo plano. Por favor, tenga paciencia.
 torbutton.panel.label.verified = El Tor se verificÃ³
 torbutton.popup.test.auto_failed = Las prueba automÃ¡tica del proxy Tor no pudo usar el Tor.\n Â¿EstÃ¡ seguro de que desea habilitarlo de todos modos?
@@ -22,15 +22,15 @@ torbutton.prefs.recommended = (recomendado)
 torbutton.prefs.optional = (opcional)
 torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Cargar contenido externo?
-torbutton.popup.external.app = An external application is needed to handle:\n\n
-torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
+torbutton.popup.external.app = Una aplicaciÃ³n externa es necesaria para manejar:\n\n
+torbutton.popup.external.note = \n\nNOTA: Las aplicaciones externasa NO son de uso seguro para Tor por defecto y podrÃan desenmascararlo!\n
+torbutton.popup.external.suggest = \nSi este archivo no es de confiable, usted deberÃa o guardarlo para verlo fuera de linea, en una MV\no considere utilizar un proxy de Tor transparente como el LiveCD Amnesia, torsocks o TorVM.\n
 torbutton.popup.launch = Iniciar la aplicaciÃ³n
 torbutton.popup.cancel = Cancelar
 torbutton.popup.dontask = A partir de ahora, siempre iniciar la aplicaciÃ³n
 torbutton.popup.test.no_http_proxy = Prueba de Tor proxy: Local Proxy HTTP es inalcanzable. Polipo estÃ¡ funcionando correctamente?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.captcha.title = Evitar los Captchas de Google?
+torbutton.popup.captcha.ask = Torbutton detectÃ³ un Captcha Google. QuerrÃa ser redirecionado a otro motor de busqueda para esta?
+torbutton.popup.captcha.always = Siempre realice esta acciÃ³n a partir de este momento.
+torbutton.popup.redirect = Redireccionar
+torbutton.popup.no_redirect = No redireccionar
diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd
index 8dcfb2b..7e1fb3b 100644
--- a/src/chrome/locale/eu/torbutton.dtd
+++ b/src/chrome/locale/eu/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "About Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd
index e81cebf..d9ab6bd 100644
--- a/src/chrome/locale/fa/torbutton.dtd
+++ b/src/chrome/locale/fa/torbutton.dtd
@@ -1,33 +1,41 @@
-<!ENTITY torbutton.prefs.title "ØªÙ?Ø¸Û?Ù?Ø§Øª Ø¯Ú©Ù?Ù? ØªÙ?Ø±">
-<!ENTITY torbutton.prefs.display_settings "ØªÙ?Ø¸Û?Ù?Ø§Øª Ù?Ù?Ø§Û?Ø´">
-<!ENTITY torbutton.prefs.display_panel "Ù?Ù?Ø§Û?Ø´ ØªÙ?Ø¸Ø¨Ù?Ø§Øª Ù¾Ø±Ø§Ú©Ø³Û? ØªÙ?Ø± Ø¯Ø± Ù?Ù?Ø§Ø± Ù?Ø¶Ø¹Ù?Øª">
-<!ENTITY torbutton.prefs.panel_format "Ú?Ú¯Ù?Ù?Ú¯Û? Ù?Ù?Ø§Û?Ø´ Ø¯Ø± Ù?Ù?Ø§Ø± Ù?Ø¶Ø¹Û?Øª:">
+<!ENTITY torbutton.prefs.title "ØªÙ?Ø¸Ù?Ù?Ø§Øª Ø¯Ú©Ù?Ù? ØªÙ?Ø±">
+<!ENTITY torbutton.prefs.display_settings "Ù?Ù?Ø§Ù?Ø´ ØªÙ?Ø¸Ù?Ù?Ø§Øª">
+<!ENTITY torbutton.prefs.display_panel "Ù?Ù?Ø§Ù?Ø´ ØªÙ?Ø¸Ù?Ù?Ø§Øª Ù¾Ø±Ø§Ú©Ø³Û? ØªÙ?Ø± Ø¯Ø± Ù?Ù?Ø§Ø± Ù?Ø¶Ø¹Ù?Øª">
+<!ENTITY torbutton.prefs.panel_format "Ú?Ú¯Ù?Ù?Ú¯Û? Ù?Ù?Ø§Ù?Ø´ Ù?Ù?Ø§Ø± Ù?Ø¶Ø¹Ù?Øª:">
 <!ENTITY torbutton.prefs.panel_text_format "Ù?ØªÙ?">
 <!ENTITY torbutton.prefs.panel_icon_format "Ù?Ø´Ø§Ù?Ù?">
-<!ENTITY torbutton.prefs.tor_settings "ØªÙ?Ø¸Û?Ù?Ø§Øª Ù¾Ø±Ø§Ú©Ø³Û?">
-<!ENTITY torbutton.prefs.recommended_settings "Ø¨Ú©Ø§Ø±Ø¨Ø±Ø¯Ù? ØªÙ?Ø¸Û?Ù?Ø§Øª Ù¾Ø±Ø§Ú©Ø³Û? Ù¾Û?Ø´Ù?Ù?Ø§Ø¯Û? Ø¯Ø±Ù?Ø§Û?Ø±Ù?Ø§Ú©Ø³">
-<!ENTITY torbutton.prefs.use_privoxy "Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø§Ø² Ù¾Ø±Û?Ù?Ú©Ø³Û?">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Ø¨Ú©Ø§Ø±Ø¨Ø±Ø¯Ù? ØªÙ?Ø¸Û?Ù?Ø§Øª Ø³Ù?Ø§Ø±Ø´Û? Ø¨Ø±Ø§Û? Ù¾Ø±Ø§Ú©Ø³Û?">
+<!ENTITY torbutton.prefs.tor_settings "ØªÙ?Ø¸Ù?Ù?Ø§Øª Ù¾Ø±Ø§Ú©Ø³Û?">
+<!ENTITY torbutton.prefs.recommended_settings "Ø¨Ú©Ø§Ø±Ø¨Ø±Ø¯Ù? ØªÙ?Ø¸Ù?Ù?Ø§Øª Ù¾Ø±Ø§Ú©Ø³Û? Ù¾Ù?Ø´Ù?Ù?Ø§Ø¯Û? Ø¯Ø±Ù?Ø§Ù?Ø±Ù?Ø§Ú©Ø³">
+<!ENTITY torbutton.prefs.use_privoxy "Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø§Ø² Ù¾Ø±Ø§Ù?Ù?Ø§Ú©Ø³Û?">
+<!ENTITY torbutton.prefs.use_polipo "Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø§Ø² Ù¾Ù?Ù?Ù?Ù¾Ù?">
+<!ENTITY torbutton.prefs.custom_settings "Ø¨Ú©Ø§Ø±Ø¨Ø±Ø¯Ù? ØªÙ?Ø¸Ù?Ù?Ø§Øª Ø³Ù?Ø§Ø±Ø´Û? Ø¨Ø±Ø§Û? Ù¾Ø±Ø§Ú©Ø³Û?">
 <!ENTITY torbutton.prefs.proxy.host.http "Ù¾Ø±Ø§Ú©Ø³Û? HTTP:">
 <!ENTITY torbutton.prefs.proxy.host.https "Ù¾Ø±Ø§Ú©Ø³Û? SSL:">
 <!ENTITY torbutton.prefs.proxy.host.ftp "Ù¾Ø±Ø§Ú©Ø³Û? FTP:">
 <!ENTITY torbutton.prefs.proxy.host.gopher "Ù¾Ø±Ø§Ú©Ø³Û? Gopher:">
-<!ENTITY torbutton.prefs.proxy.host.socks "Ù?Û?Ø²Ø¨Ø§Ù? SOCKS:">
-<!ENTITY torbutton.prefs.proxy.port "Ø¯Ø±Ú¯Ø§Ù?:">
-<!ENTITY torbutton.about.title "Ø¯Ø±Ø¨Ø§Ø±Ù? Ø¯Ú©Ù?Ù? ØªÙ?Ø±">
-<!ENTITY torbutton.pref_connection.notice "ØºÛ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? Ø¯Ú©Ù?Ù? ØªÙ?Ø± Ø¬Ù?Øª ØªØºÛ?Û?Ø± Ø¯Ø±Ø§Û?Ù? ØªÙ?Ø¸Û?Ù?Ø§Øª.">
-<!ENTITY torbutton.pref_connection.more_info "Ø§Ø·Ù?Ø§Ø¹Ø§Øª Ø¨Û?Ø´ØªØ±">
+<!ENTITY torbutton.prefs.proxy.host.socks "Ù?Ø§Ø³Øª SOCKS:">
+<!ENTITY torbutton.prefs.proxy.port "Ù¾Ù?Ø±Øª:">
+<!ENTITY torbutton.about.title "Ø¯Ø±Ø¨Ø§Ø±Ù? Ø§Ù?Ø²Ù?Ù?Ù?Torbutton ">
+<!ENTITY torbutton.pref_connection.notice "ØºÙ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? Ø¯Ú©Ù?Ù? ØªÙ?Ø± Ø¬Ù?Øª ØªØºÙ?Ù?Ø± Ø¯Ø±Ø§Ù?Ù? ØªÙ?Ø¸Ù?Ù?Ø§Øª.">
+<!ENTITY torbutton.pref_connection.more_info "Ø§Ø·Ù?Ø§Ø¹Ø§Øª Ø¨Ù?Ø´ØªØ±">
 <!ENTITY torbutton.pref_connection_more_info.title "Ø±Ø§Ù?Ù?Ù?Ø§">
-<!ENTITY torbutton.pref_connection_more_info.text "Ø¯Ú©Ù?Ù? ØªÙ?Ø±Ù?Ù? Ø§Ú©Ù?Ù?Ù? Ù?Ø¹Ø§Ù? Ø´Ø¯.Ø§Ú¯Ø± Ù?Û?Ø®Ù?Ø§Ù?Û?Ø¯ ØªÙ?Ø¸Û?Ù?Ø§Øª Ù¾Ø±Ø§Ú©Ø³Û? ØºÛ?Ø± Ø§Ø² ØªÙ?Ø± Ø®Ù?Ø¯ Ø±Ø§ Ø¹Ù?Ø¶ Ú©Ù?Û?Ø¯Ø? Ù?Ø·Ù?Ø§ Ø¯Ú©Ù?Ù? ØªÙ?Ø± Ø±Ø§ ØºÛ?Ø±Ù?Ø¹Ø§Ù? Ú©Ù?Û?Ø¯ Ù? Ø¯Ù?Ø¨Ø§Ø±Ù? Ø¨Ø§Ø²Ú¯Ø±Ø¯Û?Ø¯. Ø§Ú¯Ø± Ù?Û?Ø®Ù?Ø§Ù?Û?Ø¯ ØªÙ?Ø¸Û?Ù?Ø§Øª ØªÙ?Ø±Ø±Ø§ Ø¹Ù?Ø¶ Ú©Ù?Û?Ø¯Ø? Ø§Ø² Ù¾Ù?Ø¬Ø±Ù? ØªÙ?Ø¸Û?Ù?Ø§Øª Ø¯Ú©Ù?Ù? ØªÙ?Ø± Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ù?Û?Ø¯.">
-<!ENTITY torbutton.context_menu.toggle "Ù?Ø¹Ø§Ù?/ØºÛ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? ØªÙ?Ø±">
+<!ENTITY torbutton.pref_connection_more_info.text "Ø¯Ú©Ù?Ù? ØªÙ?Ø±Ù?Ù? Ø§Ú©Ù?Ù?Ù? Ù?Ø¹Ø§Ù? Ø´Ø¯.Ø§Ú¯Ø± Ù?Ù?Ø®Ù?Ø§Ù?Ù?Ø¯ ØªÙ?Ø¸Ù?Ù?Ø§Øª Ù¾Ø±Ø§Ú©Ø³Û? ØºÙ?Ø± Ø§Ø² ØªÙ?Ø± Ø®Ù?Ø¯ Ø±Ø§ Ø¹Ù?Ø¶ Ú©Ù?Ù?Ø¯Ø? Ù?Ø·Ù?Ø§ Ø¯Ú©Ù?Ù? ØªÙ?Ø± Ø±Ø§ ØºÙ?Ø±Ù?Ø¹Ø§Ù? Ú©Ù?Ù?Ø¯ Ù? Ø¯Ù?Ø¨Ø§Ø±Ù? Ø¨Ø§Ø²Ú¯Ø±Ø¯Ù?Ø¯. Ø§Ú¯Ø± Ù?Ù?Ø®Ù?Ø§Ù?Ù?Ø¯ ØªÙ?Ø¸Ù?Ù?Ø§Øª ØªÙ?Ø± Ø±Ø§ Ø¹Ù?Ø¶ Ú©Ù?Ù?Ø¯Ø? Ø§Ø² Ù¾Ù?Ø¬Ø±Ù? ØªÙ?Ø¸Ù?Ù?Ø§Øª Ø¯Ú©Ù?Ù? ØªÙ?Ø± Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ù?Ù?Ø¯.">
+<!ENTITY torbutton.context_menu.toggle "Ù?Ø¹Ø§Ù?/ØºÙ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? ØªÙ?Ø±">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "ØªÙ?Ø¸Û?Ù?Ø§Øª...">
+<!ENTITY torbutton.context_menu.preferences "ØªÙ?Ø¸Ù?Ù?Ø§Øª...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "Ø¯Ø±Ø¨Ø§Ø±Ù? Ø¯Ú©Ù?Ù? ØªÙ?Ø±...">
+<!ENTITY torbutton.context_menu.about "Ø¯Ø±Ø¨Ø§Ø±Ù? Ù? Ø¯Ú©Ù?Ù? ØªÙ?Ø±...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Ø¯Ú©Ù?Ù? ØªÙ?Ø±">
-<!ENTITY torbutton.button.tooltip "Ø¬Ù?Øª Ø´Ø±Ù?Ø¹ ØªÙ?Ø±Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯">
+<!ENTITY torbutton.button.tooltip "Ø¬Ù?Øª Ø´Ø±Ù?Ø¹ Ø¯Ù?Ù?Ù? ØªÙ?Ø±Ú©Ù?Ù?Ú© Ú©Ù?Ù?Ø¯">
 <!ENTITY torbutton.prefs.sec_settings "ØªÙ?Ø¸Û?Ù?Ø§Øª Ø§Ù?Ù?Û?ØªÛ?">
 <!ENTITY torbutton.prefs.block_thread "Ø¬Ù?Ù?Ú¯Û?Ø±Û? Ø§Ø²Ø®Ù?Ø§Ù?Ø¯Ù? ØªØ§Ø±Û?Ø®Ú?Ù? Ø¯Ø± Ù?Ù?Ú¯Ø§Ù? ØªÙ?Ø± (Ø¨Ø³Û?Ø§Ø± Ù?Ù?Ù?)">
 <!ENTITY torbutton.prefs.block_thwrite "Ø¬Ù?Ù?Ú¯Û?Ø±Û? Ø§Ø² Ù?Ù?Ø´ØªÙ? ØªØ§Ø±Û?Ø®Ú?Ù? Ø¯Ø± Ù?Ù?Ú¯Ø§Ù? ØªÙ?Ø± (ØªÙ?ØµÛ?Ù? Ø´Ø¯Ù?)">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Ø¨Ø§Ø²Ø¯Ø§Ø´ØªÙ? Ù?Ø®Ø²Ù? Ø¯Û?Ø³Ú© ØªÙ?Ø± Ù? Ù¾Ø§Ú© Ú©Ø±Ø¯Ù? Ù?Ø®Ø²Ù? Ø¯Ø± Ø²Ù?Ø§Ù? Ù?Ø¹Ø§Ù?/ØºÛ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? ØªÙ?Ø±">
 <!ENTITY torbutton.prefs.block_cache "Ø¨Ø§Ø²Ø¯Ø§Ø´ØªÙ? Ø¯Ø³ØªØ±Ø³Û? Ø¨Ù? Ù?Ø®Ø²Ù? ØØ§Ù?Ø¸Ù? Ù? Ø¯Û?Ø³Ú© Ø¯Ø± Ù?Ù?Ú¯Ø§Ù? ØªÙ?Ø±">
 <!ENTITY torbutton.prefs.cookie_jars "Ø°Ø®Û?Ø±Ù? Ú©Ø±Ø¯Ù? Ú©Ù?Ú©Û? Ù?Ø§Û? ØºÛ?Ø± ØªÙ?Ø± Ø¯Ø± Û?Ú© Ù?Ø§Û?Ù? ØÙ?Ø§Ø¸Øª Ø´Ø¯Ù? jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "Ù?Ø¯Û?Ø±Û?Øª Ø¯Ø³ØªÛ? Ú©Ù?Ú©Û? Ù?Ø§(Ø®Ø·Ø±Ù?Ø§Ú©)">
 <!ENTITY torbutton.prefs.clear_cookies "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù? Ú©Ù?Ú©Û? Ù?Ø§ Ø¯Ø± Ù?Ù?Ú¯Ø§Ù? Ù?Ø¹Ø§Ù?/ØºÛ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? ØªÙ?Ø±">
 <!ENTITY torbutton.prefs.disable_plugins "ØºÛ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? Ù¾Ù?Ø§Ú¯Û?Ù? Ù?Ø§ Ù?Ù?Ú¯Ø§Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù? ØªÙ?Ø± (Ø¨Ø³Û?Ø§Ø± Ù?Ù?Ù?)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "ØºÛ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? Ø°Ø®Û?Ø±Ù? Ú©Ø±Ø¯Ù? Ù?Ø´Ø³Øª Ù?Ø§ (ØªÙ?ØµÛ?Ù? Ø´Ø¯Ù?)">
 <!ENTITY torbutton.prefs.headers "Ø³Ø±Ø¢Û?Ù?Ø¯Ù?Ø§">
 <!ENTITY torbutton.prefs.spoof_english "Ø¬Ø¹Ù? Ù?Ù?Û?Øª Ø¨Ù? Û?Ú© Ù?Ø±Ù?Ø±Ú¯Ø± Ø¢Ù?Ø±Û?Ú©Ø§Û?Û?">
-<!ENTITY torbutton.prefs.disable_referer " referer Ø±Ø§ Ù?Ù?Ú¯Ø§Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù? ØªÙ?Ø± Ù?Ù?Ø±Ø³Øª (Ù?Ù?Ú©Ù? Ø§Ø³Øª Ø¨Ø±Ø®Û? Ø³Ø§Û?Øª Ù?Ø§ Ø¨Ù? Ø¯Ø±Ø³ØªÛ? Ø¹Ù?Ù? Ù?Ú©Ù?Ù?Ø¯)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "ØºÛ?Ø±ØºØ¹Ø§Ù? Ú©Ø±Ø¯Ù? Ø°Ø®Û?Ø±Ù? Ú¯Ø§Ù? DOM Ù?Ù?Ú¯Ø§Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù? ØªÙ?Ø± (Ø¨Ø³Û?Ø§Ø± Ù?Ù?Ù?)">
 <!ENTITY torbutton.prefs.forms "Ù?Ø±Ù? Ù?Ø§">
 <!ENTITY torbutton.prefs.block_tforms "Ø¨Ø§Ø²Ø¯Ø§Ø´ØªÙ? Ø°Ø®Û?Ø±Ù? Ø§Ø³Ù? Ø±Ù?Ø² + Ù?Ø±Ù? Ù?Ù?Ú¯Ø§Ù? Ù?Ø¹Ø§Ù? Ø¨Ù?Ø¯Ù? ØªÙ?Ø± (ØªÙ?ØµÛ?Ù? Ø´Ø¯Ù?)">
@@ -78,7 +90,7 @@
 <!ENTITY torbutton.prefs.startup_state "Ø¯Ø± Ù?Ù?Ú¯Ø§Ù? Ø´Ø±Ù?Ø¹ Ø¹Ø§Ø¯Û?Ø? Ù?Ø¶Ø¹Û?Øª ØªÙ?Ø± Ø±Ø§ ØªÙ?Ø¸Û?Ù? Ú©Ù? Ø¨Ù?:">
 <!ENTITY torbutton.prefs.shutdown_state "Ù?Ø¶Ø¹Û?Øª Ø¨Ø³ØªÙ?">
 <!ENTITY torbutton.prefs.startup "Ø´Ø±Ù?Ø¹">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
+<!ENTITY torbutton.prefs.block_tor_file_net "Ø¨Ø§Ø²Ø¯Ø§Ø´ØªÙ? Ø¯Ø³ØªØ±Ø³Û? Ø¨Ù? Ø´Ø¨Ú©Ù? Ø§Ø²Ù?Ø´Ø§Ù?Û? Ù?Ø§Û? Ù?Ø¨ file:// Ø¯Ø± ØØ§Ù?Øª ØªÙ?Ø± (ØªÙ?ØµÙ?Ù? Ù?Ù? Ø´Ù?Ø¯)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Ø¨Ø§Ø²Ø¯Ø§Ø´ØªÙ? Ø¯Ø³ØªØ±Ø³Û? Ø¨Ù? Ø´Ø¨Ú©Ù? Ø§Ø²Ù?Ø´Ø§Ù?Û? Ù?Ø§Û? Ù?Ø¨ file:// Ø¯Ø± ØØ§Ù?Øª ØºÛ?Ø±ØªÙ?Ø±">
 <!ENTITY torbutton.prefs.restore_defaults "Ø¨Ø§Ø²Ú¯Ø±Ø¯Ø§Ù?Ø¯Ù? ØªÙ?Ø¸Û?Ù?Ø§Øª Ù¾Û?Ø´Ù?Ø±Ø¶">
 <!ENTITY torbutton.prefs.test_settings "Ø¢Ø²Ù?Ù?Ø¯Ù? ØªÙ?Ø¸Û?Ù?Ø§Øª">
@@ -93,14 +105,33 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCK v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Ø¨Ø¯Ù?Ù? Ù¾Ø±Ø§Ú©Ø³Û? Ø¨Ø±Ø§Û?:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Ø®Ø·Ø±: Ø§Ø² Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ú©Ø±Ø¯Ù? Ø§Ø² hostname Ø¯Ø± Ø¨Ø§Ù?Ø§ Ø¨Ù¾Ø±Ù?Û?Ø²Û?Ø¯">
-<!ENTITY torbutton.prefs.disable_livemarks "Ø§Ø¶Ø§Ù?Ù? Ú©Ø±Ø¯Ù? Ø¨Ù? bookmark Ø±Ø§ Ø¯Ø± ØÛ?Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø§Ø² ØªÙ?Ø± ØºÛ?Ø± Ù?Ø¹Ø§Ù? Ú©Ù?">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
+<!ENTITY torbutton.prefs.disable_livemarks "Ø§Ø¶Ø§Ù?Ù? Ú©Ø±Ø¯Ù? Ø¨Ù? bookmark Ø±Ø§ Ø¯Ø± ØÙ?Ù? Ø§Ø³ØªÙ?Ø§Ø¯Ù? Ø§Ø² ØªÙ?Ø± ØºÙ?Ø± Ù?Ø¹Ø§Ù? Ú©Ù?">
+<!ENTITY torbutton.prefs.dtd_recommended "(ØªÙ?ØµÙ?Ù? Ù?Ù? Ø´Ù?Ø¯)">
+<!ENTITY torbutton.prefs.dtd_optional "(Ø§Ø®ØªÙ?Ø§Ø±Ù?)">
+<!ENTITY torbutton.prefs.dtd_crucial "(Ø¨Ø³Ù?Ø§Ø± Ù?Ù?Ù?)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "ØªØºÙ?Ù?Ø± Ù?Ø³Ù?Ø± Ø¨Ù? Ø±Ù?Ø² Ø±Ø³Ø§Ù?Û?Torbuttin Ø§Ø² Ø·Ø±Ù?Ù? ØªÙ?Ø±">
 <!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties
index 0fba1b2..c0d2c9c 100644
--- a/src/chrome/locale/fa/torbutton.properties
+++ b/src/chrome/locale/fa/torbutton.properties
@@ -1,26 +1,26 @@
 torbutton.button.tooltip.disabled = Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? ØªÙ?Ø±
-torbutton.button.tooltip.enabled = ØºÛ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? ØªÙ?Ø±
-torbutton.panel.tooltip.disabled = Ø¨Ø±Ø§Û? Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? ØªÙ?Ø±Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯
-torbutton.panel.tooltip.enabled = Ø¨Ø±Ø§Û? ØºÛ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? ØªÙ?Ø± Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯
-torbutton.panel.plugins.disabled = Ø¨Ø±Ø§Û? Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? Ù¾Ù?Ø§Ú¯Û?Ù? Ù?Ø§ Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯
-torbutton.panel.plugins.enabled = Ø¨Ø±Ø§Û? ØºÛ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? Ù¾Ù?Ø§Ú¯Û?Ù? Ù?Ø§ Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯
-torbutton.panel.label.disabled = ØªÙ?Ø±ØºÛ?Ø±Ù?Ø¹Ø§Ù? Ø´Ø¯
+torbutton.button.tooltip.enabled = ØºÙ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? ØªÙ?Ø±
+torbutton.panel.tooltip.disabled = Ø¨Ø±Ø§Û? Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? ØªÙ?Ø±Ú©Ù?Ù?Ú© Ú©Ù?Ù?Ø¯
+torbutton.panel.tooltip.enabled = Ø¨Ø±Ø§Û? ØºÙ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? ØªÙ?Ø± Ú©Ù?Ù?Ú© Ú©Ù?Ù?Ø¯
+torbutton.panel.plugins.disabled = Ø¨Ø±Ø§Û? Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? Ù¾Ù?Ø§Ú¯Ù?Ù? Ù?Ø§ Ú©Ù?Ù?Ú© Ú©Ù?Ù?Ø¯
+torbutton.panel.plugins.enabled = Ø¨Ø±Ø§Û? ØºÙ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? Ù¾Ù?Ø§Ú¯Ù?Ù? Ù?Ø§ Ú©Ù?Ù?Ú© Ú©Ù?Ù?Ø¯
+torbutton.panel.label.disabled = ØªÙ?Ø±ØºÙ?Ø±Ù?Ø¹Ø§Ù? Ø´Ø¯
 torbutton.panel.label.enabled = ØªÙ?Ø± Ù?Ø¹Ø§Ù? Ø´Ø¯
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Ø¯Ú©Ù?Ù? ØªÙ?Ø± Ø¨Ù? Ø¢Ø³Ø§Ù?Û? Ø§Ù?Ú©Ø§Ù? Ù?Ø¹Ø§Ù? Ù? ØºÛ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? Ù¾Ø±Ø§Ú©Ø³Û? ØªÙ?Ø± Ø±Ø§ Ø¨Ú©Ù?Ú© Û?Ú© Ø¯Ú©Ù?Ù? Ù?Û? Ø¯Ù?Ø¯
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Ø¯Ú©Ù?Ù? ØªÙ?Ø± Ù?Ø§Ù?Ø¹ Ø§Ø² Ù?ØµØ¨ Ø®Ù?Ø¯Ú©Ø§Ø± Û?Ú© Ù¾Ù?Ø§Ú¯Û?Ù? Ø´Ø¯.\n\nØ¯Ø± Ø¹Ù?Ø¶ Ø°Ø®Û?Ø±Ù? Ø¨Ø§ Ù?Ø§Ù? Ø±Ø§ Ø¨Ú©Ø§Ø± Ø¨Ø¨Ø±Û?Ø¯.\n\n
-torbutton.popup.confirm_ca_certs = Û?Ø§Ø¯Ø¯Ø§Ø´Øª Ø¯Ú©Ù?Ù? ØªÙ?Ø±: Ø¨Ù?Ø¸Ø± Ù?Û?Ø±Ø³Ø¯ Ú©Ù? Ø´Ù?Ø§ Ø¯Ø§Ø±Ø§Û? Ø§Ø³Ù?Ø§Ø¯ Ø³Ù?Ø§Ø±Ø´Û? Ù?Ù?Û? Ø¨Ø§Ø´Û?Ø¯. Ø¨Ø§Ø²Ø±Ø³Û? Ù?Û?Ø³Øª Ø§Ø³Ù?Ø§Ø¯ Ø²Ù?Ø§Ù? Ù?Û? Ø¨Ø±Ø¯ Ù? Ù?Ù?Ø¬Ø¨ Ú©Ù?Ø¯Û? Ø¹Ù?Ù?Ú©Ø±Ø¯ Ø¶Ø§Ù?Ù? ØªÙ?Ø± Ù?Û? Ø´Ù?Ø¯. Ø¢Û?Ø§ Ù?Û? Ø®Ù?Ø§Ù?Û?Ø¯ Ø¬Ø¯Ø§Ø³Ø§Ø²Û? Ø§Ø³Ù?Ø§Ø¯ Ø±Ø§ ØºÛ?Ø±Ù?Ø¹Ø§Ù? Ú©Ù?Û?Ø¯Ø? (Ø§Ú¯Ø± Ù?ØªÙ?Ø¬Ù? Ù?Ø¹Ù?Û? Ù?Ù?Û? Ø´Ù?Û?Ø¯, Ø¨Ù?ØªØ± Ø§Ø³Øª Ø±Ù?Û? Ø¨Ø³Û?Ø§Ø±Ø®Ù?Ø¨ Ù?Ø´Ø§Ø± Ø¯Ù?Û?Ø¯)
-torbutton.popup.ff3.warning = Ù?Ø´Ø¯Ø§Ø±!\n\nØ¯Ú©Ù?Ù? ØªÙ?Ø± Ø¯Ø± Ù?Ø§Û?Ø±Ù?Ø§Ú©Ø³ 3 Ù?ØØ¯Ù?Ø¯Ù? Ø²Ù?Ø§Ù?Û? Ù? Ø¨Ù?Ú© Ù?Ø§Ø±Ú© Ù?Ø§ Ø±Ø§ Ø§Ø² Ø·Ø±Û?Ù? ØªÙ?Ø±Ø§Ù?Ø´Ø§ Ù?Û?Ú©Ù?Ø¯.\n\nØ¢Û?Ø§ Ø¯Ø± Ù?Ø± ØµÙ?Ø±Øª Ù?Ø§Û?Ù? Ø¨Ù? Ø§Ø¯Ø§Ù?Ù? Ù?Ø³ØªÛ?Ø¯Ø?
-torbutton.popup.toggle.warning = Ø´Ù?Ø§ Ø¨Ø§Û?Ø¯ ØªÙ?Ø± Ø±Ø§ Ù?Ø¹Ø§Ù?/ØºÛ?Ø± Ù?Ø¹Ø§Ù? Ù? Û?Ø§ Ù?Ø§Û?Ø±Ù?Ø§Ú©Ø³ Ø±Ø§ Ø¯Ù?Ø¨Ø§Ø±Ù? Ø±Ø§Ù? Ø§Ù?Ø¯Ø§Ø²Û? Ú©Ù?Û?Ø¯ ØªØ§ ØªØºÛ?Û?Ø±Ø§Øª Ø§Ù?Ø¬Ø§Ù? Ø´Ù?Ø¯.
-torbutton.popup.test.success = ØªÙ?Ø±Ø¨Ø§ Ù?Ù?Ù?Ù?Û?Øª Ø¢Ø²Ù?Ø§Û?Ø´ Ø±Ø§ Ø³Ù¾Ø±Û? Ú©Ø±Ø¯!
-torbutton.popup.test.failure = Ø¢Ø²Ù?Ø§Û?Ø´ ØªÙ?Ø± Ù?Ù?Ù?Ù?Û?Øª Ø¢Ù?Û?Ø² Ù?Ø¨Ù?Ø¯! ØªÙ?Ø¸Û?Ù?Ø§Øª Ù¾Ø±Ø§Ú©Ø³Û? Ù? Ù¾Ù?Ù?Û?Ù¾Ù? Ø±Ø§ Ø¨Ø±Ø±Ø³Û? Ú©Ù?Û?Ø¯.
-torbutton.popup.test.confirm_toggle = Ø¢Ø®Û?Ø±Ù? ØªØºÛ?Û?Ø±Ø§Øª Ø§Ù?Ø¬Ø§Ù? Ø´Ø¯Ù? Ø¯Ø± ØªÙ?Ø± Ù¾Ø±Ø§Ú©Ø³Û? Ù?Ù?Ù?Ù?Û?Øª Ø¢Ù?Û?Ø² Ù?Ø¨Ù?Ø¯.\n\nØ¢Û?Ø§ Ù?Ø·Ù?Ø¦Ù? Ù?Ø³ØªÛ?Ø¯ Ú©Ù? Ù?Û?Ø®Ù?Ø§Ù?Û?Ø¯ Ø¯Ø± Ù?Ø± ØµÙ?Ø±Øª Ø¢Ù?Ù?Ø§ Ø±Ø§ Ù?Ø¹Ø§Ù? Ú©Ù?Û?Ø¯Ø?\n\nÙ?Ú©ØªÙ?: Ø§Ú¯Ø±Ù?Ø´Ú©Ù?Ø§Øª Ù?Ù?Ø¬Ù?Ø¯ Ø±Ø§ ØÙ? Ú©Ø±Ø¯Û?Ø¯Ø? Ù?Û?ØªÙ?Ø§Ù?Û?Ø¯ Ø¯Ù?Ø¨Ø§Ø±Ù? Ø¢Ø²Ù?Ù?Ù? Ø¨Ø±Ø±Ø³Û? Ø±Ø§ Ø¯Ø± Ù¾Ù?Ø¬Ø±Ù? ØªÙ?Ø¸Û?Ù?Ø§Øª Ù¾Ø±Ø§Ú©Ø³Û? Ø¯Ú©Ù?Ù? ØªÙ?Ø±Ø§Ù?Ø¬Ø§Ù? Ø¯Ù?Û?Ø¯ ØªØ§ Ø¯Û?Ú¯Ø± Ø§Û?Ù? Ø§Ø®Ø·Ø§Ø± Ø±Ø§ Ø¯Ø±Û?Ø§Ù?Øª Ù?Ú©Ù?Û?Ø¯.
-torbutton.popup.test.ff3_notice = Ø¨Ø± Ø±Ù?Û? OK Ú©Ù?Û?Ú© Ú©Ù?Û?Ø¯ ØªØ§ ØªÙ?Ø¸Û?Ù?Ø§Øª Ù¾Ø±Ø§Ú©Ø³Û? ØªÙ?Ø± Ø¢Ø²Ù?Ø§Û?Ø´ Ø´Ù?Ø¯. Ø§Û?Ù? Ø¢Ø²Ù?Ø§Û?Ø´ Ø¯Ø± Ù¾Ø³ Ø¶Ù?Û?Ù?Ù? Ø§ØªÙ?Ø§Ù? Ù?Û?Ø§Ù?ØªØ¯. Ù?Ø·Ù?Ø§ ØµØ¨Ù?Ø± Ø¨Ø§Ø´Û?Ø¯.
-torbutton.panel.label.verified = ØªÙ?Ø±ØªØ§Û?Û?Ø¯ Ø´Ø¯
-torbutton.popup.test.auto_failed = Ø¢Ø²Ù?Ù?Ù? Ø®Ù?Ø¯Ú©Ø§Ø±Ù¾Ø±Ø§Ú©Ø³Û? ØªÙ?Ø±Ø¨Ø§ Ø§Ø®Ø·Ø§Ø± Ù?Ù?Ø§Ø¬Ù? Ø´Ø¯.\n\nØ¢Û?Ø§ Ù?Ø·Ù?Ø¦Ù? Ù?Ø³ØªÛ?Ø¯ Ú©Ù? Ø¯Ø± Ù?Ø± ØµÙ?Ø±Øª Ù?Û?Ø®Ù?Ø§Ù?Û?Ø¯ Ø¢Ù? Ø±Ø§ Ù?Ø¹Ø§Ù? Ú©Ù?Û?Ø¯Ø?
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Ø¯Ú©Ù?Ù? ØªÙ?Ø± Ø¨Ù? Ø¢Ø³Ø§Ù?Û? Ø§Ù?Ú©Ø§Ù? Ù?Ø¹Ø§Ù? Ù? ØºÙ?Ø±Ù?Ø¹Ø§Ù? Ú©Ø±Ø¯Ù? Ù¾Ø±Ø§Ú©Ø³Û? ØªÙ?Ø± Ø±Ø§ Ø¨Ú©Ù?Ú© Ù?Ú© Ø¯Ú©Ù?Ù? Ù?Û? Ø¯Ù?Ø¯
+torbutton.popup.history.warning = 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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Ø¯Ú©Ù?Ù? ØªÙ?Ø± Ù?Ø§Ù?Ø¹ Ø§Ø² Ù?ØµØ¨ Ø®Ù?Ø¯Ú©Ø§Ø± Ù?Ú© Ù¾Ù?Ø§Ú¯Ù?Ù? Ø´Ø¯.\n\nØ¯Ø± Ø¹Ù?Ø¶ Save-As Ø±Ø§ Ø¨Ú©Ø§Ø± Ø¨Ø¨Ø±Ù?Ø¯.\n\n
+torbutton.popup.confirm_ca_certs = Ù?Ù?ØªÙ? : Ø¨Ù?Ø¸Ø± Ù?Ù? Ø±Ø³Ø¯ Ú©Ù? Ø´Ù?Ø§ Ø¯Ø§Ø±Ø§Û? Ø§Ø³Ù?Ø§Ø¯ Ø³Ù?Ø§Ø±Ø´Û? Ù?Ù?Û? Ø¨Ø§Ø´Ù?Ø¯. Ø¨Ø§Ø²Ø±Ø³Û? Ù?Ù?Ø³Øª Ø§Ø³Ù?Ø§Ø¯ Ø²Ù?Ø§Ù? Ù?Û? Ø¨Ø±Ø¯ Ù? Ù?Ù?Ø¬Ø¨ Ú©Ù?Ø¯Û? Ø¹Ù?Ù?Ú©Ø±Ø¯ Ø¶Ø§Ù?Ù? ØªÙ?Ø± Ù?Û? Ø´Ù?Ø¯. Ø¢Ù?Ø§ Ù?Û? Ø®Ù?Ø§Ù?Ù?Ø¯ Ø¬Ø¯Ø§Ø³Ø§Ø²Û? Ø§Ø³Ù?Ø§Ø¯ Ø±Ø§ ØºÙ?Ø±Ù?Ø¹Ø§Ù? Ú©Ù?Ù?Ø¯Ø? (Ø§Ú¯Ø± Ù?ØªÙ?Ø¬Ù? Ù?Ø¹Ù?Û? Ù?Ù?Û? Ø´Ù?Ù?Ø¯, Ø¨Ù?ØªØ± Ø§Ø³Øª Ø±Ù?Û? Ø¨Ø³Ù?Ø§Ø±Ø®Ù?Ø¨ Ù?Ø´Ø§Ø± Ø¯Ù?Ù?Ø¯)
+torbutton.popup.ff3.warning = Ù?Ø´Ø¯Ø§Ø±!\n\nØ¯Ú©Ù?Ù? ØªÙ?Ø± Ø¯Ø± Ù?Ø§Ù?Ø±Ù?Ø§Ú©Ø³ 3 Ù?ØØ¯Ù?Ø¯Ù? Ø²Ù?Ø§Ù?Û? Ù? Ø¨Ù?Ú© Ù?Ø§Ø±Ú© Ù?Ø§ Ø±Ø§ Ø§Ø² Ø·Ø±Ù?Ù? ØªÙ?Ø±Ø§Ù?Ø´Ø§ Ù?Ù?Ú©Ù?Ø¯.\n\nØ¢Ù?Ø§ Ø¯Ø± Ù?Ø± ØµÙ?Ø±Øª Ù?Ø§Ù?Ù? Ø¨Ù? Ø§Ø¯Ø§Ù?Ù? Ù?Ø³ØªÙ?Ø¯Ø?
+torbutton.popup.toggle.warning = Ø´Ù?Ø§ Ø¨Ø§Ù?Ø¯ ØªÙ?Ø± Ø±Ø§ Ù?Ø¹Ø§Ù?/ØºÙ?Ø± Ù?Ø¹Ø§Ù? Ù?Ù?Ø§ Ù?Ø§Ù?Ø±Ù?Ø§Ú©Ø³ Ø±Ø§ Ø¯Ù?Ø¨Ø§Ø±Ù? Ø±Ø§Ù? Ø§Ù?Ø¯Ø§Ø²Û? Ú©Ù?Ù?Ø¯ ØªØ§ ØªØºÙ?Ù?Ø±Ø§Øª Ø§Ù?Ø¬Ø§Ù? Ø´Ù?Ø¯.
+torbutton.popup.test.success = ØªÙ?Ø±Ø¨Ø§ Ù?Ù?Ù?Ù?Ù?Øª Ø¢Ø²Ù?Ø§Ù?Ø´ Ø±Ø§ Ø³Ù¾Ø±Û? Ú©Ø±Ø¯!
+torbutton.popup.test.failure = Ø¢Ø²Ù?Ø§Ù?Ø´ ØªÙ?Ø± Ù?Ù?Ù?Ù?Ù?Øª Ø¢Ù?Ù?Ø² Ù?Ø¨Ù?Ø¯! ØªÙ?Ø¸Ù?Ù?Ø§Øª Ù¾Ø±Ø§Ú©Ø³Û? Ù? Ù¾Ù?Ù?Ù?Ù¾Ù? Ø±Ø§ Ø¨Ø±Ø±Ø³Û? Ú©Ù?Ù?Ø¯.
+torbutton.popup.test.confirm_toggle = Ø¢Ø®Ù?Ø±Ù? ØªØºÙ?Ù?Ø±Ø§Øª Ø§Ù?Ø¬Ø§Ù? Ø´Ø¯Ù? Ø¯Ø± ØªÙ?Ø± Ù¾Ø±Ø§Ú©Ø³Û? Ù?Ù?Ù?Ù?Ù?Øª Ø¢Ù?Ù?Ø² Ù?Ø¨Ù?Ø¯.\n\nØ¢Ù?Ø§ Ù?Ø·Ù?Ø¦Ù? Ù?Ø³ØªÙ?Ø¯ Ú©Ù? Ù?Ù?Ø®Ù?Ø§Ù?Ù?Ø¯ Ø¯Ø± Ù?Ø± ØµÙ?Ø±Øª Ø¢Ù?Ù?Ø§ Ø±Ø§ Ù?Ø¹Ø§Ù? Ú©Ù?Ù?Ø¯Ø?\n\nÙ?Ú©ØªÙ?: Ø§Ú¯Ø±Ù?Ø´Ú©Ù?Ø§Øª Ù?Ù?Ø¬Ù?Ø¯ Ø±Ø§ ØÙ? Ú©Ø±Ø¯Ù?Ø¯Ø? Ù?Ù?ØªÙ?Ø§Ù?Ù?Ø¯ Ø¯Ù?Ø¨Ø§Ø±Ù? Ø¢Ø²Ù?Ù?Ù? Ø¨Ø±Ø±Ø³Û? Ø±Ø§ Ø¯Ø± Ù¾Ù?Ø¬Ø±Ù? ØªÙ?Ø¸Ù?Ù?Ø§Øª Ù¾Ø±Ø§Ú©Ø³Û? Ø¯Ú©Ù?Ù? ØªÙ?Ø±Ø§Ù?Ø¬Ø§Ù? Ø¯Ù?Ù?Ø¯ ØªØ§ Ø¯Ù?Ú¯Ø± Ø§Ù?Ù? Ø§Ø®Ø·Ø§Ø± Ø±Ø§ Ø¯Ø±Ù?Ø§Ù?Øª Ù?Ú©Ù?Ù?Ø¯.
+torbutton.popup.test.ff3_notice = Ø¨Ø± Ø±Ù?Û? OK Ú©Ù?Ù?Ú© Ú©Ù?Ù?Ø¯ ØªØ§ ØªÙ?Ø¸Ù?Ù?Ø§Øª Ù¾Ø±Ø§Ú©Ø³Û? ØªÙ?Ø± Ø¢Ø²Ù?Ø§Ù?Ø´ Ø´Ù?Ø¯. Ø§Ù?Ù? Ø¢Ø²Ù?Ø§Ù?Ø´ Ø¯Ø± Ù¾Ø³ Ø¶Ù?Ù?Ù?Ù? Ø§ØªÙ?Ø§Ù? Ù?Ù? Ø§Ù?ØªØ¯. Ù?Ø·Ù?Ø§ ØµØ¨Ù?Ø± Ø¨Ø§Ø´Ù?Ø¯.
+torbutton.panel.label.verified = ØªÙ?Ø±ØªØ§Ù?Ù?Ø¯ Ø´Ø¯
+torbutton.popup.test.auto_failed = ØªØ³Øª Ø®Ù?Ø¯Ú©Ø§Ø± Ù¾Ø±Ø§Ú©Ø³Û? ØªÙ?Ø±Ø¨Ø§ Ø§Ø®Ø·Ø§Ø± Ù?Ù?Ø§Ø¬Ù? Ø´Ø¯.\n\nØ¢Ù?Ø§ Ù?Ø·Ù?Ø¦Ù? Ù?Ø³ØªÙ?Ø¯ Ú©Ù? Ø¯Ø± Ù?Ø± ØµÙ?Ø±Øª Ù?Ù? Ø®Ù?Ø§Ù?Ù?Ø¯ Ø¢Ù? Ø±Ø§ Ù?Ø¹Ø§Ù? Ú©Ù?Ù?Ø¯Ø?
 torbutton.prefs.recommended = (ØªÙ?ØµÙ?Ù? Ø´Ø¯Ù?)
-torbutton.prefs.optional = (Ø§Ø®ØªÛ?Ø§Ø±Û?)
-torbutton.prefs.crucial = (Ø¨Ø³Û?Ø§Ø± Ù?Ù?Ù?)
+torbutton.prefs.optional = (Ø§Ø®ØªÙ?Ø§Ø±Û?)
+torbutton.prefs.crucial = (Ø¨Ø³Ù?Ø§Ø± Ù?Ù?Ù?)
 torbutton.popup.external.title = Ù?ØØªÙ?Û?Ø§Øª Ø®Ø§Ø±Ø¬Û? Ø¨Ø§Ø±Ú¯Ø²Ø§Ø±Û? Ø´Ù?Ù?Ø¯Ø?
 torbutton.popup.external.app = Û?Ú© Ø¨Ø±Ù?Ø§Ù?Ù? Ø®Ø§Ø±Ø¬Û? Ø¨Ø§Û?Ø¯ Ù?Ø§Ø±Ø¯ Ø¹Ù?Ù? Ø´Ù?Ø¯:\n\n
 torbutton.popup.external.note = \n\nÙ?Ú©ØªÙ?: Ø¨Ø±Ù?Ø§Ù?Ù? Ù?Ø§Û? Ø®Ø§Ø±Ø¬Û? ØªÙ?Ø³Ø· ØªÙ?Ø± Ø¨Ù? Ø·Ù?Ø± Ù¾Û?Ø´Ù?Ø±Ø¶ Ø§Ù?Ù? Ù?Ø´Ø¯Ù? Ø§Ù?Ø¯ Ù? Ù?Ù?Ú©Ù? Ø§Ø³Øª Ù?Ù?Û?Øª Ø§ØµÙ?Û? Ø´Ù?Ø§ Ø±Ø§ Ø¢Ø´Ú©Ø§Ø± Ú©Ù?Ù?Ø¯!\n
@@ -31,6 +31,6 @@ torbutton.popup.dontask = Ø§Ø² ØØ§Ù?Ø§ Ø¨Ù? Ø¨Ø¹Ø¯ Ù?Ø± Ø¨Ø±Ù?Ø§Ù?Ù? Ø§Û? Ø±Ø§
 torbutton.popup.test.no_http_proxy = Ø¢Ø²Ù?Ù?Ù? Ù¾Ø±Ø§Ú©Ø³Û? ØªÙ?Ø±: Ù¾Ø±Ø§Ú©Ø³Û? HTTP Ù?ØÙ?Û? Ù?Ø§Ø¨Ù? Ø¯Ø³ØªØ±Ø³Û? Ù?Û?Ø³Øª. Ø¢Û?Ø§ Ù¾Ù?Ù?Û?Ù¾Ù? Ø¨Ù? Ø¯Ø±Ø³ØªÛ? Ø§Ø¬Ø±Ø§ Ø´Ø¯Ù? Ø§Ø³ØªØ?
 torbutton.popup.captcha.title = Avoid Google Captchas?
 torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.captcha.always = Ø§Ø² ØØ§Ù?Ø§ Ø¨Ù? Ø¨Ø¹Ø¯ Ù?Ø± Ø¨Ø±Ù?Ø§Ù?Ù? Ø§Û? Ø±Ø§ Ø§Ø¬Ø±Ø§ Ú©Ù?
+torbutton.popup.redirect = ØªØºÙ?Ù?Ø± Ù?Ø³Ù?Ø±....
+torbutton.popup.no_redirect = ØªØºÙ?Ù?Ø± Ù?Ø³Ù?Ø± Ù?Ù?Ù?Ù? Ù?Ù?Ø³Øª
diff --git a/src/chrome/locale/fi/torbutton.dtd b/src/chrome/locale/fi/torbutton.dtd
index 7805bb2..d270c15 100644
--- a/src/chrome/locale/fi/torbutton.dtd
+++ b/src/chrome/locale/fi/torbutton.dtd
@@ -3,11 +3,11 @@
 <!ENTITY torbutton.prefs.display_panel "NÃ¤ytÃ¤ Tor-vÃ¤lityspalvelimen asetukset tilarivillÃ¤">
 <!ENTITY torbutton.prefs.panel_format "Tilapalkin ulkoasu:">
 <!ENTITY torbutton.prefs.panel_text_format "Teksti">
-<!ENTITY torbutton.prefs.panel_icon_format "Kuva">
+<!ENTITY torbutton.prefs.panel_icon_format "Kuvake">
 <!ENTITY torbutton.prefs.tor_settings "VÃ¤lityspalvelin Asetukset">
 <!ENTITY torbutton.prefs.recommended_settings "KÃ¤ytÃ¤ suositeltuja vÃ¤lityspalvelin asetuksia minun Firefox versiolleni.">
 <!ENTITY torbutton.prefs.use_privoxy "KÃ¤ytÃ¤ PrivoxyÃ¤">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
+<!ENTITY torbutton.prefs.use_polipo "KÃ¤ytÃ¤ Polipoa">
 <!ENTITY torbutton.prefs.custom_settings "Aseta vÃ¤lityspalvelinasetukset kÃ¤sin">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP-vÃ¤lityspalvelin:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL-vÃ¤lityspalvelin:">
@@ -16,91 +16,122 @@
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS-palvelin:">
 <!ENTITY torbutton.prefs.proxy.port "Portti:">
 <!ENTITY torbutton.about.title "Tietoja Torbuttonista">
-<!ENTITY torbutton.pref_connection.notice "Poista Torbutton kÃ¤ytÃ¶stÃ¤ muuttaakseen asetukset.">
+<!ENTITY torbutton.pref_connection.notice "Poista Torbutton kÃ¤ytÃ¶stÃ¤ muuttaaksesi asetuksia.">
 <!ENTITY torbutton.pref_connection.more_info "LisÃ¤Ã¤ tietoja">
 <!ENTITY torbutton.pref_connection_more_info.title "Apua">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
+<!ENTITY torbutton.pref_connection_more_info.text "Torbutton on tÃ¤llÃ¤hetkellÃ¤ kÃ¤ytÃ¶ssÃ¤. Jos haluat muuttaa vÃ¤lityspalvelinasetuksia joita kÃ¤ytÃ¤t silloin kun Torbutton ei ole kÃ¤ytÃ¶ssÃ¤, ota ensin Torbutton pois pÃ¤Ã¤ltÃ¤ (Tor Disabled) ja palaa sitten tÃ¤nne. Jos haluat muuttaa Tor asetuksia, kÃ¤ytÃ¤ Torbutton asetukset ikkunaa.">
+<!ENTITY torbutton.context_menu.toggle "Vaihda Tor tilaa">
 <!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Asetukset...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Tietoja Torbuttonista...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Turvallisuus">
+<!ENTITY torbutton.button.tooltip "Klikkaa Torbutton aktiiviseksi">
+<!ENTITY torbutton.prefs.sec_settings "Turvallisuus (asetukset)">
 <!ENTITY torbutton.prefs.block_thread "EstÃ¤ historiatietojen lukeminen Torin ollessa kÃ¤ytÃ¶ssÃ¤. (tÃ¤rkeÃ¤Ã¤)">
 <!ENTITY torbutton.prefs.block_thwrite "EstÃ¤ historiatietojen tallentaminen Torin ollessa kÃ¤ytÃ¶ssÃ¤. (suositeltua)">
 <!ENTITY torbutton.prefs.block_nthread "EstÃ¤ historiatietojen lukeminen Torin ollessa pois kÃ¤ytÃ¶stÃ¤. (valinnaista)">
 <!ENTITY torbutton.prefs.block_nthwrite "EstÃ¤ historiatietojen tallentaminen Torin ollessa pois kÃ¤ytÃ¶stÃ¤. (valinnaista)">
 <!ENTITY torbutton.prefs.clear_history "TyhjennÃ¤ historiatiedot vaihdettaessa Tor-kÃ¤ytÃ¶n tilaa. (valinnaista)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
+<!ENTITY torbutton.prefs.clear_cache "EstÃ¤ Tor vÃ¤limuisti ja tyhjennÃ¤ kaikki vÃ¤limuistissa oleva Tor tilaa vaihdettaessa.">
 <!ENTITY torbutton.prefs.block_cache "EstÃ¤ levyn ja muistin vÃ¤limuistiin pÃ¤Ã¤sy Torin ollessa kÃ¤ytÃ¶ssÃ¤.">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies "Huolehdin evÃ¤steistÃ¤ kÃ¤sin. (vaarallista)">
+<!ENTITY torbutton.prefs.cookie_jars "Talleta ei-Tor kÃ¤ytÃ¶naikaiset evÃ¤steet suojattuun hakemistoon.">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
+<!ENTITY torbutton.prefs.mmm_cookies "Huolehdin evÃ¤steistÃ¤ itse manuaalisesti. (vaarallista)">
 <!ENTITY torbutton.prefs.clear_cookies "Poista evÃ¤steet vaihdettaessa Tor-kÃ¤ytÃ¶n tilaa.">
 <!ENTITY torbutton.prefs.disable_plugins "Poista lisÃ¤osat toiminnasta Torin ollessa kÃ¤ytÃ¶ssÃ¤ (tÃ¤rkeÃ¤Ã¤)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
+<!ENTITY torbutton.prefs.kill_bad_js "EstÃ¤ javascript (tÃ¤rkeÃ¤Ã¤)">
+<!ENTITY torbutton.prefs.isolate_content "EristÃ¤ dynaaminen sisÃ¤ltÃ¶ Tor tilaan (tÃ¤rkeÃ¤Ã¤)">
 <!ENTITY torbutton.prefs.no_updates "EstÃ¤ pÃ¤ivitykset Torin ollessa kÃ¤ytÃ¶ssÃ¤.">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.set_uagent "Aseta ohjelma Tor kÃ¤yttÃ¶Ã¤ varten (tÃ¤rkeÃ¤Ã¤)">
 <!ENTITY torbutton.prefs.dynamic "Dynaaminen SisÃ¤ltÃ¶">
 <!ENTITY torbutton.prefs.cookies "EvÃ¤steet">
 <!ENTITY torbutton.prefs.cache "VÃ¤limuisti">
 <!ENTITY torbutton.prefs.history "Selaushistoria">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
+<!ENTITY torbutton.prefs.no_search "EstÃ¤ selaimen hakuvinkit Tor tilassa (suositeltavaa)">
 <!ENTITY torbutton.prefs.shutdown "Sammuta">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Poista evÃ¤steet selaimen lopettaessa">
+<!ENTITY torbutton.prefs.tor_shutdown "Poista Tor evÃ¤steet kun selain suljetaan Tor tilassa ">
+<!ENTITY torbutton.prefs.all_shutdown "Poista evÃ¤steet kun selain suljetaan olipa selain missÃ¤ tilassa tahansa.">
 <!ENTITY torbutton.prefs.no_shutdown "Ã?lÃ¤ poista evÃ¤steitÃ¤ lopettaessa">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.disable_sessionstore "EstÃ¤ istunnon (Session) tallennus (suositeltavaa)">
 <!ENTITY torbutton.prefs.headers "Tunnistetiedot">
-<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.spoof_english 'NÃ¤ytÃ¤ selaimen asetus ulospÃ¤in "US English"'>
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Poista DOM-sÃ¤ilytys kÃ¤ytÃ¶stÃ¤ kun Tor on kÃ¤ynnissÃ¤ (kriittinen)">
 <!ENTITY torbutton.prefs.forms "Lomakkeet">
-<!ENTITY torbutton.prefs.block_tforms "EstÃ¤ salasana+lomake tallennus kun Tor on kÃ¤ytÃ¶ssÃ¤ (suositeltu)">
+<!ENTITY torbutton.prefs.block_tforms "EstÃ¤ salasana+lomake tallennus Tor kÃ¤ytÃ¶n aikana (suositeltu)">
 <!ENTITY torbutton.prefs.block_ntforms "EstÃ¤ salasana+lomake tallennus kun Tor ei ole kÃ¤ytÃ¶ssÃ¤ (valinnainen)">
 <!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
+<!ENTITY torbutton.prefs.non_tor "Ei-Tor">
+<!ENTITY torbutton.prefs.restore_tor "Palautettaessa kaatunutta istuntoa, aseta Tor tilaksi:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Lataa ja poista evÃ¤steet kun FF kaatuu (suositeltava)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Tallenna sekÃ¤ Tor ettÃ¤ Ei-Tor evÃ¤steet suojattuun hakemistoon(vaarallista)">
+<!ENTITY torbutton.prefs.clear_http_auth "Poista HTTP tunnistetut istunnot (suositeltava)">
+<!ENTITY torbutton.prefs.block_js_history "EristÃ¤ pÃ¤Ã¤sy historia selailuun Tor tilassa (tÃ¤rkeÃ¤Ã¤)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Muuta ikkunoiden kokoa 50px vÃ¤lein Tor kÃ¤ytÃ¶n aikana (suositeltavaa)">
 <!ENTITY torbutton.prefs.close_tor "Sulje kaikki Tor ikkunat ja vÃ¤lilehdet kun Tor poistetaan kÃ¤ytÃ¶stÃ¤ (valinnainen)">
-<!ENTITY torbutton.prefs.close_nontor "Sulje kaikki ikkunat ja vÃ¤lilehdet jotka eivÃ¤t ole Tor ikkunoita tai vÃ¤lilehtiÃ¤ kun Tor otetaan kÃ¤yttÃ¶Ã¶n (valinnainen)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Poista painike ja pikanÃ¤ppÃ¤imet kÃ¤ytÃ¶stÃ¤ estÃ¤Ã¤kseen tahatonta kÃ¤yttÃ¶Ã¶nottoa/kÃ¤ytÃ¶stÃ¤ poistamista">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
+<!ENTITY torbutton.prefs.close_nontor "Sulje kaikki Ei-Tor ikkunat ja vÃ¤lilehdet kun Tor tila vaihdetaan (valinnainen)">
+<!ENTITY torbutton.prefs.block_links "EstÃ¤ linkki klikkaukset ja sivujen uudelleenlataukset eri Tor tilojen vÃ¤lillÃ¤ (suositeltavaa)">
+<!ENTITY torbutton.prefs.jar_certs "Talleta SSL sertifikaatit eri hakemistoihin Tor ja Ei-Tor tiloja varten (suositeltavaa) ">
+<!ENTITY torbutton.prefs.jar_ca_certs "Talleta CA sertifikaatit eri hakemistoihin Tor ja Ei-Tor tiloja varten (suositeltavaa)">
+<!ENTITY torbutton.prefs.locked_mode "EstÃ¤ Tor-button ja pikanÃ¤ppÃ¤imet vÃ¤lttÃ¤Ã¤ksesi Tor-tilan tahatonta vaihtamista">
+<!ENTITY torbutton.prefs.startup_state "Aseta Tor-tilaksi tavallisessa kÃ¤ynnistyksessÃ¤:">
 <!ENTITY torbutton.prefs.shutdown_state "Lopetustila">
 <!ENTITY torbutton.prefs.startup "KÃ¤ynnistys">
-<!ENTITY torbutton.prefs.block_tor_file_net "EstÃ¤ Tor-toiminnan pÃ¤Ã¤sy osoitteisiin file:// (suositellaan)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
+<!ENTITY torbutton.prefs.block_tor_file_net "EstÃ¤ Tor- pÃ¤Ã¤sy nÃ¤ihin verkko-osoitteisiin file:// (suositellaan)">
+<!ENTITY torbutton.prefs.block_nontor_file_net "EstÃ¤ pÃ¤Ã¤sy jos Tori ei ole pÃ¤Ã¤llÃ¤ nÃ¤ihin verkko-osoitteisiin ://">
 <!ENTITY torbutton.prefs.restore_defaults "Palauta Oletukset">
-<!ENTITY torbutton.prefs.test_settings "Koeta Asetuksia">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
+<!ENTITY torbutton.prefs.test_settings "Testaa Asetukset">
+<!ENTITY torbutton.prefs.test_auto "Jokaisen Firefoxin kÃ¤ynnistyksen yhteydessÃ¤ testaa Tor-asetukset kun vaihdan Tor-tilaa ensimmÃ¤isen kerran ">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Ã?lÃ¤ tallenna Tor-evÃ¤steitÃ¤ levylle">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Ã?lÃ¤ tallenna Ei-Tor evÃ¤steitÃ¤ levylle">
+<!ENTITY torbutton.prefs.session_restore "Salli istunnon talletuksen tallettaa ja palauttaa seuraavat vÃ¤lilehdet:">
+<!ENTITY torbutton.prefs.nontor_tabs "Ladatut Ei-Tor vÃ¤lilehdet ">
+<!ENTITY torbutton.prefs.tor_tabs "Ladatut Tor tilan vÃ¤lilehdet">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Ei vÃ¤lityspalvelimia osoitteille:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Varoitus: VÃ¤ltÃ¤ yllÃ¤ olevia osoitteita">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
+<!ENTITY torbutton.prefs.disable_livemarks "EstÃ¤ vÃ¤lilehtipÃ¤ivitykset Torin ollessa kÃ¤ytÃ¶ssÃ¤.">
 <!ENTITY torbutton.prefs.dtd_recommended "(suositeltu)">
 <!ENTITY torbutton.prefs.dtd_optional "(valinnainen)">
 <!ENTITY torbutton.prefs.dtd_crucial "(kriittinen)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Uudelleenohjaa Torbutton pÃ¤ivitykset Tor:in kautta">
+<!ENTITY torbutton.prefs.dodge_google_captcha "KÃ¤ytÃ¤ automaattisesti vaihtoehtoista hakukonetta jos Google kysyy Captcha:a">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
-<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
+<!ENTITY torbutton.prefs.fix_google_srch "Poista yksilÃ¶intitiedot (laitteisto ja kieliasetukset) Google hakuja suoritettaessa ">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/fi/torbutton.properties b/src/chrome/locale/fi/torbutton.properties
index 678bb5a..f274af8 100644
--- a/src/chrome/locale/fi/torbutton.properties
+++ b/src/chrome/locale/fi/torbutton.properties
@@ -6,31 +6,31 @@ torbutton.panel.plugins.disabled = Salli lisÃ¤osat napsauttamalla
 torbutton.panel.plugins.enabled = EstÃ¤ lisÃ¤osat napsauttamalla
 torbutton.panel.label.disabled = Tor pois kÃ¤ytÃ¶stÃ¤.
 torbutton.panel.label.enabled = Tor kÃ¤ytÃ¶ssÃ¤.
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down 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)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbuttonin avulla Firefox saadaan helposti kÃ¤yttÃ¤mÃ¤Ã¤n tai poistamaan kÃ¤ytÃ¶stÃ¤ Tor vÃ¤lityspalvelin 
+torbutton.popup.history.warning = Torbutton esti vÃ¤lilehden lataamisen joka oli avattu eri Tor-tilassa.\n\nKyseessÃ¤ on Firefox Bug 409737 ja 417869.\n\nJos tÃ¤mÃ¤ nÃ¤yttÃ¤Ã¤ tapahtuvan ilman syytÃ¤, jokin vÃ¤lilehdistÃ¤ pyrkii lataamaan itsensÃ¤ taustalla, ja se estettiin.\n\nLadataksesi vÃ¤lilehden tÃ¤ssÃ¤ Tor-tilassa, laita kursori osoite riville (http://...) ja klikkaa 'enter'.\n\n
+torbutton.popup.plugin.warning = Torbutton esti lisÃ¤osan lataamisen Tor-tilassa.\n\nKÃ¤ytÃ¤ Save-As toimintoa.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton huomautus: Vaikuttaa ettÃ¤ sinulla ei ole itsemÃ¤Ã¤riteltyÃ¤ Sertifikaattien Tunnistusta. Sertifikaattien tarkistaminen on hidas prosessi ja hidastaa Tor- tilan vaihtamista. Haluaisitko poistaa tÃ¤mÃ¤n toiminnon kÃ¤ytÃ¶stÃ¤ nopeuttaaksesi toimintaa? (Jos et tiedÃ¤ mistÃ¤ on kyse, voit turvallisesti klikata OK)
+torbutton.popup.ff3.warning = Varoitus!\n\nTorbuttonin kÃ¤yttÃ¶ Firefox 3:ssa saattaa paljastaa aikavyÃ¶hykkeesi ja muita tietoja Torrin kautta.\n\nHaluatko siitÃ¤ huolimatta jatkaa?
+torbutton.popup.toggle.warning = Vaihda Tor tilaa tai kÃ¤ynnistÃ¤ uudestaan jotta muutokset astuvat voimaan.
 torbutton.popup.test.success = Tor-vÃ¤lityspalvelimen testaus onnistui!
 torbutton.popup.test.failure = Tor-vÃ¤lityspalvelimen testaus EPÃ?ONNISTUI! Tarkista vÃ¤lityspalvelimen ja Polipon asetukset.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.popup.test.confirm_toggle = Viimeisin suoritettu Tor vÃ¤lityspalvelintesti epÃ¤onnistui.\n\nHaluatko siitÃ¤ huolimatta kÃ¤Ã¤ntÃ¤Ã¤ Torin pÃ¤Ã¤lle?\n\nHuom: Jos olet korjannut ongelman, voit ajaa testin uudestaan kÃ¤yttÃ¤mÃ¤llÃ¤ Torbutton Proxy Preferences ikkunaa, niin et enÃ¤Ã¤ saa tÃ¤tÃ¤ varoitusta uudestaan.
+torbutton.popup.test.ff3_notice = Klikkaa OK testataksesi Tor vÃ¤lityspalvelinasetukset. Testi tapahtuu taustalla, odota rauhassa, ilmoitus annetaan kuin testi on valmis.
 torbutton.panel.label.verified = Tor varmistettu
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.popup.test.auto_failed = Automaattinen Tor vÃ¤lityspalvelimen testi epÃ¤onnistui kÃ¤yttÃ¤mÃ¤Ã¤n Toria.\nHaluatko aktivoida Torin jokatapauksessa?
 torbutton.prefs.recommended = (suositeltu)
 torbutton.prefs.optional = (valinnainen)
 torbutton.prefs.crucial = (kriittinen)
-torbutton.popup.external.title = Load external content?
-torbutton.popup.external.app = An external application is needed to handle:\n\n
-torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
-torbutton.popup.launch = Launch application
-torbutton.popup.cancel = Cancel
-torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.external.title = Ladataanko ulkopuolinen sisÃ¤ltÃ¶?
+torbutton.popup.external.app = Tarvitaan ulkoinen sovellus:\n\n
+torbutton.popup.external.note = \n\nHUOM: Ulkoiset sovellukset eivÃ¤t ole oletusarvoisesti Tor turvallisia ja saattavat poistaa Tor suojauksesi!\n
+torbutton.popup.external.suggest = \nJos tiedosto ei ole turvallisesta lÃ¤hteestÃ¤, sinun tulisi joko tallettaa se tarkastellaksesi sitÃ¤ offline tilassa, tai VM:ssÃ¤, \ntai harkitse voisitko kÃ¤yttÃ¤Ã¤ lÃ¤pinÃ¤kyvÃ¤Ã¤ Tor vÃ¤lityspalvelinta kuten Amnesia LiveCD, torsocks, tai TorVM.\n
+torbutton.popup.launch = KÃ¤ynnistÃ¤ sovellus
+torbutton.popup.cancel = Peruuta
+torbutton.popup.dontask = KÃ¤ynistÃ¤ sovellus joka kerta tÃ¤stÃ¤ eteenpÃ¤in
+torbutton.popup.test.no_http_proxy = Tor vÃ¤lityspalvelintesti: Paikallista HTTP vÃ¤lityspalvelinta ei lÃ¶ydy. Onko polipo kÃ¤ynnissÃ¤?
+torbutton.popup.captcha.title = VÃ¤ltÃ¤ Google Captchas?
+torbutton.popup.captcha.ask = Torbutton havaitsi Google Captchan. Haluatko ettÃ¤ tÃ¤mÃ¤ kysely uudelleenohjataan toiselle hakukoneelle?
+torbutton.popup.captcha.always = Suorita tÃ¤mÃ¤ toimenpide joka kerta tÃ¤stÃ¤ eteenpÃ¤in
+torbutton.popup.redirect = Uudelleenohjaa
+torbutton.popup.no_redirect = Ã?lÃ¤ Uudelleenohjaa
diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd
index 1783d74..0aa373e 100644
--- a/src/chrome/locale/fr/torbutton.dtd
+++ b/src/chrome/locale/fr/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Ã? propos de Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Cliquez pour lancer Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "ParamÃ¨tres de sÃ©curitÃ©">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Bloquer la mÃ©moire tampon du disque Tor et vider tous les caches Ã  l'activation/dÃ©sactivation de Tor">
 <!ENTITY torbutton.prefs.block_cache "Bloquer la mÃ©moire tampon du disque et l'accÃ¨s Ã  la mÃ©moire tampon pendant l'utilisation de Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Conserver les cookies non-Tor dans une cookie-jar sÃ©curisÃ©e">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "Je gÃ©rerai mes cookies manuellement (dangereux)">
 <!ENTITY torbutton.prefs.clear_cookies "Supprimer les cookies Ã  l'activation/dÃ©sactivation de Tor">
 <!ENTITY torbutton.prefs.disable_plugins "DÃ©sactiver les plugins pendant l'utilisation de Tor (indispensable)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "DÃ©sactiver la fonction de sauvegarde de session (recommandÃ©)">
 <!ENTITY torbutton.prefs.headers "EntÃªtes">
 <!ENTITY torbutton.prefs.spoof_english "Imiter un navigateur anglais US">
-<!ENTITY torbutton.prefs.disable_referer "Ne pas envoyer l'url rÃ©fÃ©rente pendant l'utilisation de Tor (risque de gÃªner la navigation sur certains sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "DÃ©sactiver le stockage DOM pendant l'utilisation de Tor (crucial)">
 <!ENTITY torbutton.prefs.forms "Formulaires">
 <!ENTITY torbutton.prefs.block_tforms "Bloquer la sauvegarde de mot de passe+formulaire pendant l'utilisation de Tor (recommandÃ©)">
@@ -93,14 +105,33 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Pas de Proxy pour: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Attention: Ã?vitez d'utiliser les noms d'hÃ´tes ci-dessus">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "DÃ©sactiver les marques-pages dynamiques durant l'utilisation de Tor">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommandÃ©)">
 <!ENTITY torbutton.prefs.dtd_optional "(optionnel)">
 <!ENTITY torbutton.prefs.dtd_crucial "(essentiel)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Obtenir les mises Ã  jour de Torbutton via Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Utiliser automatiquement un autre moteur de recherche quand un captcha Google est prÃ©sent.">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
-<!ENTITY torbutton.prefs.engine2 "Bing.com">
-<!ENTITY torbutton.prefs.engine3 "Yahoo.com">
+<!ENTITY torbutton.prefs.engine2 "bing.com">
+<!ENTITY torbutton.prefs.engine3 "yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
-<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
+<!ENTITY torbutton.prefs.fix_google_srch "Supprimer les informations relatives Ã  la plateforme et Ã  la langue des champs de recherche Google">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties
index 5e6cf2b..9fa9410 100644
--- a/src/chrome/locale/fr/torbutton.properties
+++ b/src/chrome/locale/fr/torbutton.properties
@@ -7,7 +7,7 @@ torbutton.panel.plugins.enabled = Cliquer pour dÃ©sactiver les plugins
 torbutton.panel.label.disabled = Tor Inactif
 torbutton.panel.label.enabled = Tor Actif
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton fournit un bouton qui permet d'activer et de dÃ©sactiver rapidement le pointage de Firefox vers le proxy de Tor
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.history.warning = Torbutton a bloquÃ© l'activitÃ© provenant d'un onglet ouvert dans un Ã©tat Tor diffÃ©rent.\n\nCeci permet de contourner les bugs Firefox 409737 et 417869.\n\nSi ce message d'erreur semble apparaÃ®tre sans raison, un de vos onglets est en train de se rafraÃ®chir en l'arriÃ¨re-plan, et il a Ã©tÃ© bloquÃ©.\n\nAfin de rafraÃ®chir l'onglet dans l'Ã©tat Tor actuel, cliquer "entrer" dans boite de saisie de l'URL.\n\n
 torbutton.popup.plugin.warning = Torbutton a bloquÃ© le chargement direct par Tor de contenu de plugin.\n\nUtiliser plutÃ´t la fonction Enregistrer sous.\n\n
 torbutton.popup.confirm_ca_certs = Info Torbutton: Vous n'avez pas de Certificat d'AutoritÃ© personnalisÃ©. Examiner la liste des Certificats d'AutoritÃ© est une opÃ©ration lente qui ralentit la bascule vers Tor. Voulez-vous dÃ©sactiver l'isolation des Certificats d'AutoritÃ© ? (Si vous ne comprenez pas, il est bon de rÃ©pondre OK)
 torbutton.popup.ff3.warning = Attention!\n\nTorbutton sur Firefox 3 est connu pour laisser Ã©chapper votre fuseau horaire et vos livemarks par Tor.\n\nVoulez vous continuer malgrÃ© tout?
@@ -24,13 +24,13 @@ torbutton.prefs.crucial = (indispensable)
 torbutton.popup.external.title = Charger un contenu externe ?
 torbutton.popup.external.app = Une application externe est requise pour gÃ©rer:\n\n
 torbutton.popup.external.note = \n\nNOTE: Les applicatiosn externes ne sont pas saines par dÃ©faut pour Tor et peuvent vous dÃ©masquer !\n
-torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
+torbutton.popup.external.suggest = \nSi ce fichier n'est pas fiable, vous devez soit le sauvegarder pour le visionner hors ligne ou avec une machine virtuelle,\nou envisager d'utiliserk un proxy Tor transparent comme Amnesia LiveCD, torsocks, ou TorVM.\n
 torbutton.popup.launch = Lancer l'application
 torbutton.popup.cancel = Annuler
 torbutton.popup.dontask = Toujours lancer les applications Ã  partir de maintenant
 torbutton.popup.test.no_http_proxy = Test du proxy Tor: Le proxy HTTP localLocalest injoignable. Est-ce-que Polipo fonctionne correctement ?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.captcha.title = Eviter les captchas (test permettant de diffÃ©rencier un utilisateur humain d'un ordinateur) de Google ?
+torbutton.popup.captcha.ask = Torbutton a dÃ©tectÃ© un captcha Google. Voulez-vous Ãªtre redirigÃ© vers un autre moteur de recherche ?
+torbutton.popup.captcha.always = Toujours effectuer cette action Ã  partir de maintenant
+torbutton.popup.redirect = Rediriger
+torbutton.popup.no_redirect = Ne pas rediriger
diff --git a/src/chrome/locale/fur/torbutton.dtd b/src/chrome/locale/fur/torbutton.dtd
index 8dcfb2b..7e1fb3b 100644
--- a/src/chrome/locale/fur/torbutton.dtd
+++ b/src/chrome/locale/fur/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "About Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/gl/torbutton.dtd b/src/chrome/locale/gl/torbutton.dtd
index 8dcfb2b..7e1fb3b 100644
--- a/src/chrome/locale/gl/torbutton.dtd
+++ b/src/chrome/locale/gl/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "About Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/gu/torbutton.dtd b/src/chrome/locale/gu/torbutton.dtd
index 8dcfb2b..e2934b8 100644
--- a/src/chrome/locale/gu/torbutton.dtd
+++ b/src/chrome/locale/gu/torbutton.dtd
@@ -1,34 +1,42 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
-<!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
-<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
-<!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
-<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
-<!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
+<!ENTITY torbutton.prefs.title "àª?à«?àª°àª¬àª?àª¨ àªªà«?àª°àª¾àª¥àª®àª¿àª?àª¤àª¾àª?">
+<!ENTITY torbutton.prefs.display_settings "àª¦à«?àª?àª¾àªµ àª?à«?àª àªµàª£à«?àª?">
+<!ENTITY torbutton.prefs.display_panel "àª¸à«?àª¥àª¿àª¤àª¿àªªàª?à«?àª?à«?àª®àª¾àª? àª?à«?àª° àªªà«?àª°à«?àª?à«?àª¸à«? àª?à«?àª àªµàª£à«?àª? àª¦àª°à«?àª¶àª¾àªµà«?">
+<!ENTITY torbutton.prefs.panel_format "àª¸à«?àª¥àª¿àª¤àª¿àªªàª?à«?àª?à«? àª¦à«?àª?àª¾àªµ àª¬àª?àª§àª¾àª°àª£:">
+<!ENTITY torbutton.prefs.panel_text_format "àª²àª?àª¾àª£">
+<!ENTITY torbutton.prefs.panel_icon_format "àª?àª¿àª¹à«?àª¨">
+<!ENTITY torbutton.prefs.tor_settings "àªªà«?àª°à«?àª?à«?àª¸à«? àª?à«?àª àªµàª£à«?àª?">
+<!ENTITY torbutton.prefs.recommended_settings "àª®àª¾àª°à«? àª«àª¾àª¯àª°àª«à«?àª?à«?àª¸ àª?àªµà«?àª¤à«?àª¤àª¿ àª®àª¾àª?à«? àª¸à«?àª?àªµà«?àª² àªªà«?àª°à«?àª?à«?àª¸à«? àª?à«?àª àªµàª£à«?àª? àªµàª¾àªªàª°à«?">
+<!ENTITY torbutton.prefs.use_privoxy "àªªà«?àª°à«?àª?à«?àª¸à«? àªµàª¾àªªàª°à«?">
+<!ENTITY torbutton.prefs.use_polipo "àªªà«?àª²àª¿àªªà«? àªµàª¾àªªàª°à«?">
+<!ENTITY torbutton.prefs.custom_settings "àªªà«?àª¤àª¾àª¨à«? àªªà«?àª°à«?àª?à«?àª¸à«? àª?à«?àª àªµàª£à«?àª? àªµàª¾àªªàª°à«?">
+<!ENTITY torbutton.prefs.proxy.host.http "HTTP àªªà«?àª°à«?àª?à«?àª¸à«?:">
+<!ENTITY torbutton.prefs.proxy.host.https "SSL àªªà«?àª°à«?àª?à«?àª¸à«?:">
+<!ENTITY torbutton.prefs.proxy.host.ftp "FTP àªªà«?àª°à«?àª?à«?àª¸à«?:">
+<!ENTITY torbutton.prefs.proxy.host.gopher "Gopher àªªà«?àª°à«?àª?à«?àª¸à«?:">
+<!ENTITY torbutton.prefs.proxy.host.socks "SOCKS àª¯àª?àª®àª¾àª¨:">
+<!ENTITY torbutton.prefs.proxy.port "àªªà«?àª°à«?àª?:">
+<!ENTITY torbutton.about.title "àª?à«?àª°àª¬àª?àª¨ àªµàª¿àª¶à«?">
+<!ENTITY torbutton.pref_connection.notice "àª? àª?à«?àª àªµàª£à«?àª? àª¬àª¦àª²àªµàª¾ àª®àª¾àª?à«? àª?à«?àª°àª¬àª?àª¨ àª¨àª¿àª·à«?àª?à«?àª°àª¿àª¯ àª?àª°à«?.">
+<!ENTITY torbutton.pref_connection.more_info "àªµàª§à«? àª®àª¾àª¹àª¿àª¤à«?">
+<!ENTITY torbutton.pref_connection_more_info.title "àª®àª¦àª¦">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
+<!ENTITY torbutton.context_menu.toggle "àª?à«?àª° àª¸à«?àª¥àª¿àª¤àª¿ àª¬àª¦àª²à«?">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
+<!ENTITY torbutton.context_menu.preferences "àªªà«?àª°àª¾àª¥àª®àª¿àª?àª¤àª¾àª?...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
+<!ENTITY torbutton.context_menu.about "àª?à«?àª°àª¬àª?àª¨ àªµàª¿àª¶à«?...">
 <!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
+<!ENTITY torbutton.button.label "àª?à«?àª°àª¬àª?àª¨">
+<!ENTITY torbutton.button.tooltip "àª?à«?àª°àª¬àª?àª¨ àª¶àª°à«? àª?àª°àªµàª¾ àª?à«?àª²àª¿àª? àª?àª°à«?">
+<!ENTITY torbutton.prefs.sec_settings "àª¸àª²àª¾àª®àª¤à«? àª?à«?àª àªµàª£à«?àª?">
 <!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
 <!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
 <!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -44,24 +53,27 @@
 <!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
 <!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
 <!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
+<!ENTITY torbutton.prefs.dynamic "àª¬àª¦àª²àª¾àª¤à«? àªµàª¿àª?àª¤à«?">
+<!ENTITY torbutton.prefs.cookies "àª?à«?àª?à«?àª?">
+<!ENTITY torbutton.prefs.cache "àª?à«?àª¶">
+<!ENTITY torbutton.prefs.history "àª?àª¤àª¿àª¹àª¾àª¸">
+<!ENTITY torbutton.prefs.no_search "àª?à«?àª° àªµàª?àª¤à«? àª¶à«?àª§ àª¸à«?àª?àª¨à«? àª¨àª¿àª·à«?àª?à«?àª°àª¿àª¯ àª?àª°à«? (àª¸à«?àª?àªµà«?àª²)">
+<!ENTITY torbutton.prefs.shutdown "àª¬àª?àª§ àª?àª°à«?">
+<!ENTITY torbutton.prefs.tor_shutdown "àª?à«?àª°-àª¸àª?à«?àª°àª¿àª¯ àª¬à«?àª°àª¾àª?àª?àª° àª¬àª?àª§ àª?àª°àª¤à«? àªµàª?àª¤à«? àª?à«?àª?à«?àª? àª¸àª¾àª« àª?àª°à«?">
+<!ENTITY torbutton.prefs.all_shutdown "àª?à«?àª? àªªàª£ àª¬à«?àª°àª¾àª?àª?àª° àª¬àª?àª§ àª?àª°àª¤à«? àªµàª?àª¤à«? àª?à«?àª?à«?àª? àª¸àª¾àª« àª?àª°à«?">
+<!ENTITY torbutton.prefs.no_shutdown "àª¬àª?àª§ àª?àª°àª¤à«? àªµàª?àª¤à«? àª®àª¾àª°à«? àª?à«?àª?à«?àª? àª¸àª¾àª« àª¨ àª?àª°à«?">
+<!ENTITY torbutton.prefs.disable_sessionstore "àª¸àª¤à«?àª°àª¨à«? àª¸àª?àª?à«?àª°àª¹ àª?àª°àªµàª¾àª¨à«?àª? àª¨àª¿àª·à«?àª?à«?àª°àª¿àª¯ àª?àª°à«? (àª¸à«?àª?àªµà«?àª²)">
+<!ENTITY torbutton.prefs.headers "àª¶à«?àª°à«?àª·àª?à«?">
+<!ENTITY torbutton.prefs.spoof_english "àª¯à«?àª?àª¸ àª?àª?àª?à«?àª°à«?àª?à«? àª¬à«?àª°àª¾àª?àª?àª°àª¨à«? àª?à«?àª¤àª°à«?">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.disable_domstorage "àª?à«?àª° àªµàªªàª°àª¾àª¶ àªµàª?àª¤à«? DOM àª¸àª?àª?à«?àª°àª¹ àª¨àª¿àª·à«?àª?à«?àª°àª¿àª¯ àª?àª°à«? (àª?àª°à«?àª°à«?)">
+<!ENTITY torbutton.prefs.forms "àª«à«?àª°à«?àª®à«?àª¸">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
 <!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor">
+<!ENTITY torbutton.prefs.tor "àª?à«?àª°">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
 <!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
@@ -75,13 +87,13 @@
 <!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
 <!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
 <!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.startup_state "àª¸àª¾àª®àª¾àª¨à«?àª¯ àª¶àª°à«?àª?àª¤ àªµàª?àª¤à«?, àª?à«?àª° àª¸à«?àª¥àª¿àª¤àª¿ àª? àªªàª° àª?à«?àª àªµà«?:">
+<!ENTITY torbutton.prefs.shutdown_state "àª¬àª?àª§ àª?àª°àªµàª¾àª¨à«? àª¸à«?àª¥àª¿àª¤àª¿">
+<!ENTITY torbutton.prefs.startup "àª¶àª°à«?àª?àª¤">
 <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
+<!ENTITY torbutton.prefs.restore_defaults "àª®à«?àª³àªà«?àª¤ àªªàª¾àª?à«?àª? àª²àª¾àªµà«?">
+<!ENTITY torbutton.prefs.test_settings "àª?àª?àª¾àª¸àª£à«? àª?à«?àª àªµàª£à«?àª?">
 <!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
@@ -91,16 +103,35 @@
 <!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
+<!ENTITY torbutton.prefs.no_proxies_on "àª? àª®àª¾àª?à«? àªªà«?àª°à«?àª?à«?àª¸à«? àª¨àª¹à«?:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.dtd_recommended "(àª¸à«?àª?àªµà«?àª²)">
+<!ENTITY torbutton.prefs.dtd_optional "(àªµà«?àª?àª²à«?àªªàª¿àª?)">
+<!ENTITY torbutton.prefs.dtd_crucial "(àª?àª°à«?àª°à«?)">
 <!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
 <!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/gu/torbutton.properties b/src/chrome/locale/gu/torbutton.properties
index e2e8754..23d7cd6 100644
--- a/src/chrome/locale/gu/torbutton.properties
+++ b/src/chrome/locale/gu/torbutton.properties
@@ -1,18 +1,18 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
-torbutton.panel.tooltip.disabled = Click to enable Tor
-torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
-torbutton.panel.label.disabled = Tor Disabled
-torbutton.panel.label.enabled = Tor Enabled
+torbutton.button.tooltip.disabled = àª?à«?àª° àª¸àª?à«?àª°àª¿àª¯ àª?àª°à«?
+torbutton.button.tooltip.enabled = àª?à«?àª° àª¨àª¿àª·à«?àª?à«?àª°àª¿àª¯ àª?àª°à«?
+torbutton.panel.tooltip.disabled = àª?à«?àª° àª¸àª?à«?àª°àª¿àª¯ àª?àª°àªµàª¾ àª?à«?àª²àª¿àª? àª?àª°à«?
+torbutton.panel.tooltip.enabled = àª?à«?àª° àª¨àª¿àª·à«?àª?à«?àª°àª¿àª¯ àª?àª°àªµàª¾ àª?à«?àª²àª¿àª? àª?àª°à«?
+torbutton.panel.plugins.disabled = àªªà«?àª²àª?àª?àª¨à«?àª¸ àª¸àª?à«?àª°àª¿àª¯ àª?àª°àªµàª¾ àª?à«?àª²àª¿àª? àª?àª°à«?
+torbutton.panel.plugins.enabled = àªªà«?àª²àª?àª?àª¨à«?àª¸ àª¨àª¿àª·à«?àª?à«?àª°àª¿àª¯ àª?àª°àªµàª¾ àª?à«?àª²àª¿àª? àª?àª°à«?
+torbutton.panel.label.disabled = àª?à«?àª° àª¨àª¿àª·à«?àª?à«?àª°àª¿àª¯
+torbutton.panel.label.enabled = àª?à«?àª° àª¸àª?à«?àª°àª¿àª¯
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down 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)
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
 torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.success = àª?à«?àª° àªªà«?àª°à«?àª?à«?àª¸à«? àª?àª?àª¾àª¸àª£à«? àª¸àª«àª³!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
@@ -25,12 +25,12 @@ torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
 torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
-torbutton.popup.launch = Launch application
-torbutton.popup.cancel = Cancel
-torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.launch = àª?àª¾àª°à«?àª¯àª?à«?àª°àª® àª¶àª°à«? àª?àª°à«?
+torbutton.popup.cancel = àª°àª¦à«? àª?àª°à«?
+torbutton.popup.dontask = àª¹àªµà«? àªªàª?à«? àª¹àª?àª®à«?àª¶àª¾ àª?àª¾àª°à«?àª¯àª?à«?àª°àª® àª¶àª°à«? àª?àª°à«?
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.title = àª?à«?àª?àª² àª?à«?àªªà«?àª?àª¾ àª?àªµàª?àª£àª¶à«??
 torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.captcha.always = àª¹àªµà«? àªªàª?à«? àª¹àª?àª®à«?àª¶àª¾ àª? àª?à«?àª°àª¿àª¯àª¾ àª?àª°àª¶à«?
+torbutton.popup.redirect = àª¬à«?àª?à«? àª®à«?àª?àª²à«?
+torbutton.popup.no_redirect = àª¬à«?àª?à«? àª¨ àª®à«?àª?àª²à«?
diff --git a/src/chrome/locale/he/torbutton.dtd b/src/chrome/locale/he/torbutton.dtd
index 8dcfb2b..7e1fb3b 100644
--- a/src/chrome/locale/he/torbutton.dtd
+++ b/src/chrome/locale/he/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "About Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/hi/torbutton.dtd b/src/chrome/locale/hi/torbutton.dtd
index 51887ae..87fef24 100644
--- a/src/chrome/locale/hi/torbutton.dtd
+++ b/src/chrome/locale/hi/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P/à¤ª">
 <!ENTITY torbutton.context_menu.about "à¤?à¥?à¤° à¤¬à¤?à¤¨ à¤?à¥? à¤¬à¤°à¥? à¤®à¥? ...">
 <!ENTITY torbutton.context_menu.about.key "A/à¤?">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "à¤?à¥?à¤° à¤¬à¤?à¤¨">
 <!ENTITY torbutton.button.tooltip "à¤?à¥?à¤° à¤¬à¤?à¤¨ à¤?à¥? à¤?à¤°à¤?à¤à¤¿à¤¤ à¤?à¤°à¤¨à¥? à¤?à¥? à¤²à¤¿à¤¯à¥? à¤?à¥?à¤²à¤¿à¤? à¤?à¤°à¥?">
 <!ENTITY torbutton.prefs.sec_settings "à¤¸à¥?à¤°à¤?à¥?à¤·à¤¾ à¤¸à¥?à¤?à¤¿à¤?à¤?">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/hr/torbutton.dtd b/src/chrome/locale/hr/torbutton.dtd
index 6d2e256..e8fa98a 100644
--- a/src/chrome/locale/hr/torbutton.dtd
+++ b/src/chrome/locale/hr/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "O Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "O">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Kliknite da biste pokrenuli Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/hu/torbutton.dtd b/src/chrome/locale/hu/torbutton.dtd
index 8dcfb2b..7e1fb3b 100644
--- a/src/chrome/locale/hu/torbutton.dtd
+++ b/src/chrome/locale/hu/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "About Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd
index 8dcfb2b..e0a44be 100644
--- a/src/chrome/locale/id/torbutton.dtd
+++ b/src/chrome/locale/id/torbutton.dtd
@@ -1,106 +1,137 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
-<!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
-<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
+<!ENTITY torbutton.prefs.title "Preferensi Torbutton">
+<!ENTITY torbutton.prefs.display_settings "Pengaturan Tampilan">
+<!ENTITY torbutton.prefs.display_panel "Tampilkan pengaturan proxy Tor pada status bar">
+<!ENTITY torbutton.prefs.panel_format "Susunan tampilan status bar">
+<!ENTITY torbutton.prefs.panel_text_format "Teks">
+<!ENTITY torbutton.prefs.panel_icon_format "Ikon">
+<!ENTITY torbutton.prefs.tor_settings "Pengaturan proxy">
+<!ENTITY torbutton.prefs.recommended_settings "Gunakan pengaturan proxy yang disarankan untuk versi Firefox saya">
+<!ENTITY torbutton.prefs.use_privoxy "Gunakan Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Gunakan Polipo">
+<!ENTITY torbutton.prefs.custom_settings "Gunakan pengaturan proxy yang disesuaikan">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
+<!ENTITY torbutton.about.title "Tentang Torbutton">
+<!ENTITY torbutton.pref_connection.notice "Nonaktifkan Torbutton mengubah pengaturan ini.">
+<!ENTITY torbutton.pref_connection.more_info "Informasi lebih lanjut">
+<!ENTITY torbutton.pref_connection_more_info.title "Bantuan">
+<!ENTITY torbutton.pref_connection_more_info.text "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.">
+<!ENTITY torbutton.context_menu.toggle "Alihkan Status Tor">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
+<!ENTITY torbutton.context_menu.preferences "Preferensi...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
+<!ENTITY torbutton.context_menu.about "Tentang Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
+<!ENTITY torbutton.button.tooltip "Klik untuk mengaktifkan Torbutton">
+<!ENTITY torbutton.prefs.sec_settings "Pengaturan Keamanan">
+<!ENTITY torbutton.prefs.block_thread "Blokir pembacaan riwayat selama sesi Tor (krusial)">
+<!ENTITY torbutton.prefs.block_thwrite "Blokir penulisan riwayat selama sesi Tor (disarankan)">
+<!ENTITY torbutton.prefs.block_nthread "Blokir pembacaan riwayat selama sesi Non-Tor (opsional)">
+<!ENTITY torbutton.prefs.block_nthwrite "Blokir penulisan riwayat selama sesi Non-Tor (opsional)">
+<!ENTITY torbutton.prefs.clear_history "Bersihkan riwayat pada saat peralihan status Tor (opsional)">
+<!ENTITY torbutton.prefs.clear_cache "Blokir disk cache dan bersihkan semua cache pada saat peralihan status Tor">
+<!ENTITY torbutton.prefs.block_cache "Blokir akses cache memori dan disk selama sesi Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Simpan cookie Non-Tor dalam jar terproteksi">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
+<!ENTITY torbutton.prefs.mmm_cookies "Saya akan mengelola cookie saya secara manual (berbahaya)">
+<!ENTITY torbutton.prefs.clear_cookies "Bersihkan cookie pada saat peralihan status Tor">
+<!ENTITY torbutton.prefs.disable_plugins "Nonaktifkan plugin selama menggunakan Tor (krusial)">
+<!ENTITY torbutton.prefs.kill_bad_js "Tahan javascript yang berbahaya (krusial)">
+<!ENTITY torbutton.prefs.isolate_content "Isolasi konten dinamis pada kondisi Tor (krusial)">
+<!ENTITY torbutton.prefs.no_updates "Nonaktifkan update selama penggunaan Tor">
+<!ENTITY torbutton.prefs.set_uagent "Tetapkan agen pengguna untuk penggunaan Tor (krusial)">
+<!ENTITY torbutton.prefs.dynamic "Konten Dinamis">
+<!ENTITY torbutton.prefs.cookies "Cookie">
 <!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.history "Riwayat">
+<!ENTITY torbutton.prefs.no_search "Nonaktifkan saran pencarian selama sesi Tor (disarankan)">
+<!ENTITY torbutton.prefs.shutdown "Matikan">
+<!ENTITY torbutton.prefs.tor_shutdown "Bersihkan cookie Tor saat mematikan browser dengan Tor aktif">
+<!ENTITY torbutton.prefs.all_shutdown "Bersihkan cookie saat mematikan browser dengan kondisi apapun">
+<!ENTITY torbutton.prefs.no_shutdown "Jangan bersihkan cookie saya ketika mematikan browser">
+<!ENTITY torbutton.prefs.disable_sessionstore "Nonaktifkan Penyimpanan Sesi (disarankan)">
+<!ENTITY torbutton.prefs.headers "Header">
+<!ENTITY torbutton.prefs.spoof_english "Aktifkan penyamar untuk browser US-English">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.disable_domstorage "Nonaktifkan penyimpanan DOM selama penggunaan Tor (krusial)">
+<!ENTITY torbutton.prefs.forms "Formulir">
+<!ENTITY torbutton.prefs.block_tforms "Blokir penyimpanan password+formulir selama sesi Tor (disarankan)">
+<!ENTITY torbutton.prefs.block_ntforms "Blokir penyimpanan password+formulir selama sesi Non-Tor (opsional)">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
+<!ENTITY torbutton.prefs.restore_tor "Saat memulai browser dengan sesi dipulihkan, tetapkan kondisi Tor:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Muat ulang cookie jar/bersihkan cookie saat Firefox mengalami kerusakan (disarankan)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Simpan baik cookie Tor maupun Non-Tor dalam jar terproteksi (berbahaya)">
+<!ENTITY torbutton.prefs.clear_http_auth "Bersihkan sesi HTTP terotorisasi (disarankan)">
+<!ENTITY torbutton.prefs.block_js_history "Isolasi akses ke riwayat navigasi pada kondisi Tor (krusial)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Ubah ukuran jendela ke kelipatan 50px selama penggunaan Tor (disarankan)">
+<!ENTITY torbutton.prefs.close_tor "Tutup semua jendela Tor dan Tab pada saat peralihan (opsional)">
+<!ENTITY torbutton.prefs.close_nontor "Tutup semua jendela Non-Tor dan Tab pada saat peralihan (opsional)">
+<!ENTITY torbutton.prefs.block_links "Blokir klik tautan dan pemuatulangan halaman dari kondisi Tor yang berbeda (opsional)">
+<!ENTITY torbutton.prefs.jar_certs "Simpan sertifikat SSL dalam jar terpisah untuk Tor/Non-Tor (disarankan)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Simpan sertifikat CA dalam jar terpisah untuk Tor/Non-Tor (disarankan)">
+<!ENTITY torbutton.prefs.locked_mode "Nonaktifkan tombol pintas untuk mencegah peralihan tak disengaja">
+<!ENTITY torbutton.prefs.startup_state "Pada startup normal, tetapkan status Tor:">
+<!ENTITY torbutton.prefs.shutdown_state "Kondisi mati">
 <!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
+<!ENTITY torbutton.prefs.block_tor_file_net "Blokir akses Tor ke jaringan dari file:// urls (disarankan)">
+<!ENTITY torbutton.prefs.block_nontor_file_net "Blokir akses Non-Tor ke jaringan dari file:// urls (disarankan)">
+<!ENTITY torbutton.prefs.restore_defaults "Kembalikan ke asal">
+<!ENTITY torbutton.prefs.test_settings "Uji pengaturan">
+<!ENTITY torbutton.prefs.test_auto "Uji pengaturan Tor saya setelah saya melakukan peralihan yang pertama setiap kali Firefox dimulai">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
-<!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
-<!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
+<!ENTITY torbutton.prefs.tor_memory_jar "Jangan tulis cookie Tor ke disk">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Jangan tulis cookie Non-Tor ke disk">
+<!ENTITY torbutton.prefs.session_restore "Simpan dan pulihkan tab berikut:">
+<!ENTITY torbutton.prefs.nontor_tabs "Tab dimuat dalam kondisi Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Tab dimuat dalam kondisi Tor">
+<!ENTITY torbutton.prefs.socks_vfour "SOCKS V4">
+<!ENTITY torbutton.prefs.socks_vfive "SOCKS V5">
+<!ENTITY torbutton.prefs.no_proxies_on "Jangan gunakan proxy untuk: ">
+<!ENTITY torbutton.prefs.no_proxy_warning "Peringatan: Hindari penggunaan hostname di atas">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
+<!ENTITY torbutton.prefs.disable_livemarks "Nonaktifkan update Livemark selama penggunaan Tor">
+<!ENTITY torbutton.prefs.dtd_recommended "(disarankan)">
+<!ENTITY torbutton.prefs.dtd_optional "(opsional)">
+<!ENTITY torbutton.prefs.dtd_crucial "(krusial)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Alihkan rute Torbutton melalui Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Gunakan mesin pencari alternatif secara otomatis apabila dihadapkan pada Captcha Google:">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
-<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
+<!ENTITY torbutton.prefs.fix_google_srch "Lepaskan serambi dan bahasa dari Kotak Pencarian Google">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/id/torbutton.properties b/src/chrome/locale/id/torbutton.properties
index e2e8754..d505420 100644
--- a/src/chrome/locale/id/torbutton.properties
+++ b/src/chrome/locale/id/torbutton.properties
@@ -1,36 +1,36 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
-torbutton.panel.tooltip.disabled = Click to enable Tor
-torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
-torbutton.panel.label.disabled = Tor Disabled
-torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down 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)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
-torbutton.popup.external.title = Load external content?
-torbutton.popup.external.app = An external application is needed to handle:\n\n
-torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
-torbutton.popup.launch = Launch application
-torbutton.popup.cancel = Cancel
-torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
+torbutton.button.tooltip.disabled = Aktifkan Tor
+torbutton.button.tooltip.enabled = Nonaktifkan Tor
+torbutton.panel.tooltip.disabled = Klik untuk mengaktifkan Tor
+torbutton.panel.tooltip.enabled = Klik untuk menonaktifkan Tor
+torbutton.panel.plugins.disabled = Klik untuk mengaktifkan plugin
+torbutton.panel.plugins.enabled = Klik untuk menonaktifkan plugin
+torbutton.panel.label.disabled = Tor dinonaktifkan
+torbutton.panel.label.enabled = Tor diaktifkan
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton menyediakan tombol untuk mengaktifkan dan menonaktifkan pengarahan jalur Firefox ke proxy Tor
+torbutton.popup.history.warning = Torbutton memblokir aktivitas dari sebuah tab yang dimuat dalam kondisi Tor yang berbeda.\n\nIni bekerja untuk bug 409737 dan 417869.\n\nApabila popup ini muncul tanpa sebab, salah satu tab Anda mencoba untuk memuat ulang sendiri di latar belakang, dan terblokir.\n\nUntuk memuat ulang tab pada kondisi Tor saat ini, tekan 'enter' pada kotak URL.\n\n
+torbutton.popup.plugin.warning = Torbutton memblokir pemuatan langsung atas konten plugin Tor.\n\nSilahkan Gunakan Save-As saja.\n\n
+torbutton.popup.confirm_ca_certs = Catatan Torbutton: Tampaknya Anda tidak memiliki Certificate Authorities yang disesuaikan. Memeriksa daftar Certificate Authorities merupakan proses yang lambat dan melambatkan peralihan Tor. Apakah Anda berkenan untuk menonaktifkan pengisolasian sertifikat Certificate Authorities? (Apabila Anda tidak paham, adalah aman untuk mengeklik OK)
+torbutton.popup.ff3.warning = Peringatan!\n\nTorbutton pada Firefox 3 diketahui membocorkan zona waktu Anda dan livermarks melalui Tor.\n\nApakah Anda tetap ingin meneruskan?
+torbutton.popup.toggle.warning = Anda perlu mengalihkan Tor atau merestart agar pengaturan Anda dapat dirasakan efeknya.
+torbutton.popup.test.success = Pengujian proxy Tor berhasil!
+torbutton.popup.test.failure = Pengujian proxy Tor GAGAL! Periksa pengaturan proxy dan polipo Anda.
+torbutton.popup.test.confirm_toggle = Pengujian proxy Tor terakhir gagal menggunakan Tor.\n\nApakah Anda yakin untuk tetap mengaktifkannya?\n\nCatatan: Apabila Anda telah memperbaiki masalahnya, Anda dapat melakukan pengujian ulang pada jendela Preferensi Proxy Tor untuk menghapus peringatan ini.
+torbutton.popup.test.ff3_notice = Klik OK untuk menguji pengaturan proxy Tor. Pengujian ini akan berjalan pada latar belakang. Mohon bersabar.
+torbutton.panel.label.verified = Tor Terverifikasi
+torbutton.popup.test.auto_failed = Pengujian proxy Tor otomatis gagal menggunakan Tor.\n\nApakah Anda yakin ingin mengaktifkannya?
+torbutton.prefs.recommended = (disarankan)
+torbutton.prefs.optional = (opsional)
+torbutton.prefs.crucial = (krusial)
+torbutton.popup.external.title = Muat konten eksternal?
+torbutton.popup.external.app = Sebuah aplikasi eksternal butuh untuk ditangani:\n\n
+torbutton.popup.external.note = \n\nCATATAN: secara default, aplikasi eksternal tidaklah aman untuk Tor dan dapat membuka penyamaran Anda!\n
+torbutton.popup.external.suggest = \nApabila berkas ini tidak dapat dipercaya, Anda sebaiknya menyimpannya untuk dilihat secara offline atau dalam sebuah VM,\natau pertimbangkan untuk menggunakan proxy Tor transparan seperti Amnesia LiveCD, torsocks, atau TorVM.\n
+torbutton.popup.launch = Luncurkan aplikasi.
+torbutton.popup.cancel = Batal
+torbutton.popup.dontask = Selalu luncurkan aplikasi mulai dari sekarang
+torbutton.popup.test.no_http_proxy = Pengujian proxy Tor: Proxy HTTP lokal tidak dapat dijangkau. Apakah Polipo berjalan sebagaimana mestinya?
+torbutton.popup.captcha.title = Hindari Captcha Google?
+torbutton.popup.captcha.ask = Torbutton mendeteksi sebuah Captcha Google. Apakah Anda ingin beralih pada mesin pencari lainnya untuk pencarian kali ini?
+torbutton.popup.captcha.always = Selalu lakukan hal ini mulai dari sekarang
+torbutton.popup.redirect = Pemindahan jalur
+torbutton.popup.no_redirect = Jangan Pindahkan jalur
diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd
index 8dcfb2b..7e1fb3b 100644
--- a/src/chrome/locale/is/torbutton.dtd
+++ b/src/chrome/locale/is/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "About Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd
index bdb1282..58f74cf 100644
--- a/src/chrome/locale/it/torbutton.dtd
+++ b/src/chrome/locale/it/torbutton.dtd
@@ -1,4 +1,4 @@
-<!ENTITY torbutton.prefs.title "Opzioni di Torbutton">
+<!ENTITY torbutton.prefs.title "Preferenze di Torbutton">
 <!ENTITY torbutton.prefs.display_settings "Impostazioni di visualizzazione">
 <!ENTITY torbutton.prefs.display_panel "Mostra le impostazioni del proxy Tor nella barra di stato">
 <!ENTITY torbutton.prefs.panel_format "Formato di visualizzazione nella barra di stato:">
@@ -7,8 +7,8 @@
 <!ENTITY torbutton.prefs.tor_settings "Configurazione del proxy">
 <!ENTITY torbutton.prefs.recommended_settings "Usa le impostazioni proxy consigliate per questa versione di Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Usa Privoxy">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Usa delle impostazioni proxy personalizzate">
+<!ENTITY torbutton.prefs.use_polipo "Usa Polipo">
+<!ENTITY torbutton.prefs.custom_settings "Usa le impostazioni proxy personalizzate">
 <!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:">
 <!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:">
 <!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:">
@@ -16,91 +16,122 @@
 <!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "Porta:">
 <!ENTITY torbutton.about.title "Informazioni su Torbutton">
-<!ENTITY torbutton.pref_connection.notice "Disattiva Torbutton per modificare questa impostazione">
+<!ENTITY torbutton.pref_connection.notice "Disattiva Torbutton per modificare queste impostazioni">
 <!ENTITY torbutton.pref_connection.more_info "Ulteriori informazioni">
 <!ENTITY torbutton.pref_connection_more_info.title "Aiuto">
-<!ENTITY torbutton.pref_connection_more_info.text "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.">
+<!ENTITY torbutton.pref_connection_more_info.text "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.">
 <!ENTITY torbutton.context_menu.toggle "Cambia lo stato di Tor">
-<!ENTITY torbutton.context_menu.toggle.key "C">
+<!ENTITY torbutton.context_menu.toggle.key "T">
 <!ENTITY torbutton.context_menu.preferences "Preferenze...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Informazioni su Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "I">
+<!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "Fai clic per avviare Torbutton">
+<!ENTITY torbutton.button.tooltip "Fai clic per inizializzare Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Impostazioni di sicurezza">
 <!ENTITY torbutton.prefs.block_thread "Blocca la lettura della cronologia durante l'uso di Tor (essenziale)">
 <!ENTITY torbutton.prefs.block_thwrite "Blocca la scrittura della cronologia durante l'uso di Tor (consigliato)">
 <!ENTITY torbutton.prefs.block_nthread "Blocca la lettura della cronologia quando non si usa Tor (facoltativo)">
 <!ENTITY torbutton.prefs.block_nthwrite "Blocca la scrittura della cronologia quando non si usa Tor (facoltativo)">
 <!ENTITY torbutton.prefs.clear_history "Cancella la cronologia di navigazione attivando o disattivando Tor (facoltativo)">
-<!ENTITY torbutton.prefs.clear_cache "Blocca l'uso della cache disco durante l'uso di Tor e cancellala attivando o disattivando Tor">
+<!ENTITY torbutton.prefs.clear_cache "Blocca l'uso della cache disco durante l'uso di Tor e cancella tutta la cache attivando o disattivando Tor">
 <!ENTITY torbutton.prefs.block_cache "Blocca l'accesso alla cache sul disco e in memoria durante l'uso di Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Conserva i cookie non-Tor in un deposito protetto">
-<!ENTITY torbutton.prefs.mmm_cookies "Gestisco da me i miei cookie (pericoloso)">
-<!ENTITY torbutton.prefs.clear_cookies "Cancella i cookie attivando o disattivando Tor">
+<!ENTITY torbutton.prefs.cookie_jars "Conserva i cookie non Tor in un archivio protetto">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
+<!ENTITY torbutton.prefs.mmm_cookies "Gestione manuale dei cookies (pericoloso)">
+<!ENTITY torbutton.prefs.clear_cookies "Cancella i cookies attivando o disattivando Tor">
 <!ENTITY torbutton.prefs.disable_plugins "Disabilita i plugin usando Tor (essenziale)">
 <!ENTITY torbutton.prefs.kill_bad_js "Blocca i javascript pericolosi (essenziale)">
-<!ENTITY torbutton.prefs.isolate_content "Confina i contenuti dinamici allo stato di Tor (essenziale)">
+<!ENTITY torbutton.prefs.isolate_content "Disabilita i contenuti dinamici se Tor ha stati diversi da quello attuale (essenziale)">
 <!ENTITY torbutton.prefs.no_updates "Disabilita gli aggiornamenti durante l'uso di Tor">
-<!ENTITY torbutton.prefs.set_uagent "Imposta l'user agent usando Tor (essenziale)">
-<!ENTITY torbutton.prefs.dynamic "Contenuti dinamici">
-<!ENTITY torbutton.prefs.cookies "Cookie">
+<!ENTITY torbutton.prefs.set_uagent "Imposta user agent usando Tor (essenziale)">
+<!ENTITY torbutton.prefs.dynamic "Contenuto dinamico">
+<!ENTITY torbutton.prefs.cookies "Cookies">
 <!ENTITY torbutton.prefs.cache "Cache">
 <!ENTITY torbutton.prefs.history "Cronologia">
-<!ENTITY torbutton.prefs.no_search "Disabilita i suggerimenti di ricerca usando Tor (consigliato)">
+<!ENTITY torbutton.prefs.no_search "Disabilita i suggerimenti di ricerca quando usi Tor (consigliato)">
 <!ENTITY torbutton.prefs.shutdown "Chiusura">
-<!ENTITY torbutton.prefs.tor_shutdown "Cancella i cookie Tor quando si chiude il browser con Tor attivo">
-<!ENTITY torbutton.prefs.all_shutdown "Cancella sempre i cookie chiudendo il browser">
-<!ENTITY torbutton.prefs.no_shutdown "Non cancellare i cookie chiudendo il browser">
+<!ENTITY torbutton.prefs.tor_shutdown "Cancella i cookies Tor quando si chiude il browser con Tor attivo">
+<!ENTITY torbutton.prefs.all_shutdown "Cancella sempre i cookies alla chiusura del browser">
+<!ENTITY torbutton.prefs.no_shutdown "Non cancellare i cookies alla chiusura del browser">
 <!ENTITY torbutton.prefs.disable_sessionstore "Disabilita il salvataggio della sessione (consigliato)">
-<!ENTITY torbutton.prefs.headers "Header">
-<!ENTITY torbutton.prefs.spoof_english "Fingi di essere un browser US English">
-<!ENTITY torbutton.prefs.disable_referer "Non inviare i referer usando Tor (alcuni siti potrebbero non funzionare)">
+<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.spoof_english "Simula di essere un browser US English">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disabilita DOM Storage quando si usa Tor (essenziale)">
 <!ENTITY torbutton.prefs.forms "Moduli">
 <!ENTITY torbutton.prefs.block_tforms "Blocca il salvataggio di password e dei dati nei moduli usando Tor (consigliato)">
 <!ENTITY torbutton.prefs.block_ntforms "Blocca il salvataggio di password e dei dati nei moduli quando non si usa Tor (facoltativo)">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "All'avvio di una sessione ripristinata, imposta lo stato di Tor cosÃ¬:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Ricarica il deposito dei cookie/cancella i cookie a un crash di Firefox (consigliato)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Conserva sia i cookie Tor sia quelli Non-Tor in depositi protetti (pericoloso)">
+<!ENTITY torbutton.prefs.restore_tor "Al ripristino di una sessione, imposta lo stato di Tor a:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Ricarica l'archivio dei cookies/cancella i cookies a un crash di Firefox (consigliato)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Conserva sia i cookie Tor sia quelli Non-Tor in archivi protetti (pericoloso)">
 <!ENTITY torbutton.prefs.clear_http_auth "Cancella le sessioni HTTP autenticate (consigliato)">
-<!ENTITY torbutton.prefs.block_js_history "Confina l'accesso alla cronologia di navigazione nello stato di Tor (essenziale)">
+<!ENTITY torbutton.prefs.block_js_history "Disabilita l'accesso alla cronologia se Tor ha stati diversi da quello attuale (essenziale)">
 <!ENTITY torbutton.prefs.resize_on_toggle "Ridimensiona la finestra a multipli di 50px durante l'uso di Tor (consigliato)">
-<!ENTITY torbutton.prefs.close_tor "Chiudi tutte le finestre e schede Tor quando si disattiva Tor (facoltativo)">
-<!ENTITY torbutton.prefs.close_nontor "Chiudi tutte le finestre e schede Non-Tor quando si attiva Tor (facoltativo)">
+<!ENTITY torbutton.prefs.close_tor "Chiudi tutte le finestre e schede Tor quando avvengono cambi di stato (facoltativo)">
+<!ENTITY torbutton.prefs.close_nontor "Chiudi tutte le finestre e schede Non-Tor quando avvengono cambi di stato (facoltativo)">
 <!ENTITY torbutton.prefs.block_links "Blocca i clic sui link e la ricarica delle pagine da stati Tor differenti (facoltativo)">
-<!ENTITY torbutton.prefs.jar_certs "Conserva i certificati SSL in depositi separati per Tor/Non-Tor (consigliato)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Conserva i certificati delle CA in depositi separati per Tor/Non-Tor (consigliato)">
-<!ENTITY torbutton.prefs.locked_mode "Disabilita il pulsante e le scorciatoie da tastiera per evitare di attivare/disattivare Tor per sbaglio">
+<!ENTITY torbutton.prefs.jar_certs "Conserva i certificati SSL in archivi separati per Tor/Non-Tor (consigliato)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Conserva i certificati delle CA in archivi separati per Tor/Non-Tor (consigliato)">
+<!ENTITY torbutton.prefs.locked_mode "Disabilita il pulsante e le scorciatoie da tastiera per evitare accidentali attivazioni/disattivazioni di Tor">
 <!ENTITY torbutton.prefs.startup_state "All'avvio imposta lo stato di Tor cosÃ¬:">
 <!ENTITY torbutton.prefs.shutdown_state "Stato alla chiusura">
 <!ENTITY torbutton.prefs.startup "Avvio">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
+<!ENTITY torbutton.prefs.block_tor_file_net "Blocca l'accesso Tor alla rete da indirizzi di tipo file://url (consigliato)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Blocca l'accesso non-Tor alla rete da indirizzi di tipo file:// (consigliato)">
 <!ENTITY torbutton.prefs.restore_defaults "Reimposta i valori di default">
 <!ENTITY torbutton.prefs.test_settings "Fai un test delle impostazioni">
-<!ENTITY torbutton.prefs.test_auto "Verifica le mie impostazioni Tor dopo la prima volta che lo attivo o disattivo ad ogni avvio di Firefox">
+<!ENTITY torbutton.prefs.test_auto "Verifica le mie impostazioni Tor dopo la prima volta che lo attivo o disattivo e a ogni avvio di Firefox">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Non scrivere cookie Tor sul disco">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Non scrivere cookie non-Tor sul disco">
-<!ENTITY torbutton.prefs.session_restore "Fai che il session store salvi e ripristini queste schede:">
-<!ENTITY torbutton.prefs.nontor_tabs "Schede caricate in non-Tor">
+<!ENTITY torbutton.prefs.tor_memory_jar "Non scrivere cookies Tor sul disco">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Non scrivere cookies non-Tor sul disco">
+<!ENTITY torbutton.prefs.session_restore "Imposta il session store per salvataggio e ripristino di queste schede:">
+<!ENTITY torbutton.prefs.nontor_tabs "Schede caricate in Non-Tor">
 <!ENTITY torbutton.prefs.tor_tabs "Schede caricate in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.no_proxies_on "Nessun proxy per:">
+<!ENTITY torbutton.prefs.no_proxy_warning "Attenzione: Evitare di usare uno degli hostnames di cui sopra">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disabilita gli aggiornamenti dei livemarks durante l'uso di Tor">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
+<!ENTITY torbutton.prefs.dtd_recommended "(consigliato)">
+<!ENTITY torbutton.prefs.dtd_optional "(facoltativo)">
+<!ENTITY torbutton.prefs.dtd_crucial "(essenziale)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redireziona con Tor gli aggiornamenti di Torbutton">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Utilizza automaticamente un motore di ricerca alternativo quando viene presentato un Google Captcha:">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
-<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
+<!ENTITY torbutton.prefs.fix_google_srch "Estrai sistema e idioma dalle interrogazioni di Google Search Box">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties
index 16b9864..86d131a 100644
--- a/src/chrome/locale/it/torbutton.properties
+++ b/src/chrome/locale/it/torbutton.properties
@@ -6,14 +6,14 @@ torbutton.panel.plugins.disabled = Fai clic per attivare i plugin
 torbutton.panel.plugins.enabled = Fai clic per disattivare i plugin
 torbutton.panel.label.disabled = Tor disattivato
 torbutton.panel.label.enabled = Tor attivato
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = L'estensione Torbutton fornisce un pulsante per attivare e disattivare facilmente l'uso del proxy Tor in Firefox
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = L'estensione Torbutton fornisce un pulsante per attivare e disattivare il proxy Tor per Firefox
+torbutton.popup.history.warning = Torbutton ha bloccato le attivitÃ  in una scheda caricata con un diverso stato Tor.\n\nQuesta operazione evita i Bug 409737 e 417869 di Firefox.\n\nSe questo messaggio popup appare senza motivo, una delle vostre schede Ã¨ stata bloccata perchÃ¨ sta tentando di autoricaricarsi in modo silente.\n\nPer ricaricare la scheda in questo stato Tor, premere 'invio' nella barra degli indirizzi.\n\n
 torbutton.popup.plugin.warning = Torbutton ha bloccato l'attivazione dei plugin durante l'uso di Tor.\n\nUsa Salva Con Nome al suo posto.\n\n
 torbutton.popup.confirm_ca_certs = Avviso di Torbutton: sembra che tu non abbia delle Certification Authority personalizzate. L'esame della lista delle Certification Authority Ã¨ un'operazione lenta e rallenta ancora attivando/disattivando Tor. Vuoi disabilitare l'isolamento dei certificati delle Certification Authority? (Se non capisci questo avviso, puoi tranquillamente fare clic su OK)
 torbutton.popup.ff3.warning = Attenzione!\n\nTorbutton su Firefox 3 divulga il tuo fuso orario ed i tuoi livemark via Tor.\n\nVuoi continuare ugualmente?
-torbutton.popup.toggle.warning = Devi attivare7disattivare Tor o riavviare in modo che le tue impostazioni abbiano effetto.
+torbutton.popup.toggle.warning = Devi attivare e disattivare Tor o riavviare in modo che le impostazioni abbiano effetto.
 torbutton.popup.test.success = Il test del proxy Tor ha avuto successo!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.failure = Il test del proxy Tor Ã¨ FALLITO! Verifica la configurazione del proxy e di Polipo.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Fai clic su OK per testare le impostazioni del proxy Tor. Questo test avverrÃ  in background. Sii paziente.
 torbutton.panel.label.verified = Tor verificato
@@ -21,16 +21,16 @@ torbutton.popup.test.auto_failed = Il test automatico del proxy Tor non Ã¨ riusc
 torbutton.prefs.recommended = (raccomandato)
 torbutton.prefs.optional = (facoltativo)
 torbutton.prefs.crucial = (essenziale)
-torbutton.popup.external.title = Load external content?
+torbutton.popup.external.title = Caricare il contenuto esterno?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
 torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
-torbutton.popup.launch = Launch application
-torbutton.popup.cancel = Cancel
-torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.launch = Lanciare l'applicazione
+torbutton.popup.cancel = Annulla
+torbutton.popup.dontask = Da adesso lanciare sempre le applicazioni
+torbutton.popup.test.no_http_proxy = Test Tor proxy: Proxy HTTP locale non Ã¨ raggiungibile. Polipo Ã¨ in funzione correttamente?
+torbutton.popup.captcha.title = Evitare il Captchas di Google?
+torbutton.popup.captcha.ask = Tornbutton ha rilevato un Captcht di Google. Ti piacerebbe essere reindirizzato a un altro motore di ricerca per questa query?
+torbutton.popup.captcha.always = Da adesso eseguire sempre questa azione
 torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.no_redirect = No redirect
diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd
index 8dcfb2b..ddf1d95 100644
--- a/src/chrome/locale/ja/torbutton.dtd
+++ b/src/chrome/locale/ja/torbutton.dtd
@@ -1,12 +1,12 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
-<!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
-<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.title "Torbuttonè¨å®?">
+<!ENTITY torbutton.prefs.display_settings "è¡¨ç¤ºè¨å®?">
+<!ENTITY torbutton.prefs.display_panel "Torã??ã?ã?¯ã?·è¨å®?ã??ã?¹ã??ã?¼ã?¿ã?¹ã??ã?¼ã?«è¡¨ç¤ºã??ã??">
+<!ENTITY torbutton.prefs.panel_format "ã?¹ã??ã?¼ã?¿ã?¹ã??ã?¼ã?®è¡¨ç¤ºæ?¹æ³?: ">
+<!ENTITY torbutton.prefs.panel_text_format "ã??ã?ã?¹ã??">
+<!ENTITY torbutton.prefs.panel_icon_format "ã?¢ã?¤ã?³ã?³">
+<!ENTITY torbutton.prefs.tor_settings "ã??ã?ã?¯ã?·è¨å®?">
+<!ENTITY torbutton.prefs.recommended_settings "Firefoxã?®ã??ã?ã?¯ã?·è¨å®?ã??ä½¿ã??">
+<!ENTITY torbutton.prefs.use_privoxy "ã??ã?ã?¯ã?·ã??ä½¿ã??">
 <!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
@@ -15,20 +15,28 @@
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
+<!ENTITY torbutton.about.title "Torbuttonã?«ã?¤ã??ã?¦">
 <!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
+<!ENTITY torbutton.pref_connection.more_info "è©³ç´°æ??å ±">
+<!ENTITY torbutton.pref_connection_more_info.title "ã??ã?«ã??">
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
+<!ENTITY torbutton.context_menu.toggle "Torã?®ã?¹ã??ã?¼ã?¿ã?¹ã??å¤?æ?´">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
+<!ENTITY torbutton.context_menu.preferences "è¨å®?...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
+<!ENTITY torbutton.context_menu.about "Torbuttonã?«ã?¤ã??ã?¦...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
+<!ENTITY torbutton.button.tooltip "Torbuttomã??å??æ??ç?¶æ??ã?«æ?»ã??">
+<!ENTITY torbutton.prefs.sec_settings "ã?»ã?ã?¥ã?ªã??ã?£è¨å®?">
 <!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
 <!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
 <!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -44,21 +53,24 @@
 <!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
 <!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
 <!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
+<!ENTITY torbutton.prefs.dynamic "ã?³ã?³ã??ã?³ã??">
+<!ENTITY torbutton.prefs.cookies "ã?¯ã??ã?ã?¼">
+<!ENTITY torbutton.prefs.cache "ã?ã?£ã??ã?·ã?¥">
+<!ENTITY torbutton.prefs.history "å±¥æ´">
 <!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
+<!ENTITY torbutton.prefs.shutdown "å??æ¢">
 <!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
 <!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
 <!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
+<!ENTITY torbutton.prefs.headers "ã??ã??ã??é??ä¿¡">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
+<!ENTITY torbutton.prefs.forms "ã??ã?©ã?¼ã? å?¥å??">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
 <!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
 <!ENTITY torbutton.prefs.tor "Tor">
@@ -75,13 +87,13 @@
 <!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
 <!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
 <!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
+<!ENTITY torbutton.prefs.startup_state "èµ·å??æ??ã?®Torã?®è¨å®?: ">
+<!ENTITY torbutton.prefs.shutdown_state "å??æ¢ç?¶æ??">
+<!ENTITY torbutton.prefs.startup "èµ·å??">
 <!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
 <!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
+<!ENTITY torbutton.prefs.restore_defaults "ã??ã??ã?©ã?«ã??è¨å®?ã?«æ?»ã??">
+<!ENTITY torbutton.prefs.test_settings "è¨å®?ã??ã??ã?¹ã??ã??ã??">
 <!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
@@ -93,14 +105,33 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
+<!ENTITY torbutton.prefs.dtd_recommended "(æ?¨å¥¨)">
+<!ENTITY torbutton.prefs.dtd_optional "(ã?ªã??ã?·ã?§ã?³)">
+<!ENTITY torbutton.prefs.dtd_crucial "(é??è¦?)">
 <!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
 <!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties
index e2e8754..30aa316 100644
--- a/src/chrome/locale/ja/torbutton.properties
+++ b/src/chrome/locale/ja/torbutton.properties
@@ -1,32 +1,32 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
+torbutton.button.tooltip.disabled = Torã??æ??å?¹ã?«ã??ã??
+torbutton.button.tooltip.enabled = Torã??ç?¡å?¹ã?«ã??ã??
 torbutton.panel.tooltip.disabled = Click to enable Tor
 torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.plugins.disabled = ã??ã?©ã?°ã?¤ã?³ã??æ??å?¹ã?«ã??ã??
+torbutton.panel.plugins.enabled = ã??ã?©ã?°ã?¤ã?³ã??ç?¡å?¹ã?«ã??ã??
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbuttonã?¯Firefoxã??ã??ç°¡å??ã?«Torã??ã?ã?¯ã?·ã??æ??å?¹å??ï¼?ç?¡å?¹å??ã?§ã??ã?¾ã??ã??
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down 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)
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
 torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.success = Torã??ã?ã?¯ã?·ã?®ã??ã?¹ã??ã?«æ??å??ã??ã?¾ã??ã??!
+torbutton.popup.test.failure = Torã??ã?ã?¯ã?·ã?®ã??ã?¹ã??ã?«å¤±æ??ã??ã?¾ã??ã??! ã??ã?ã?¯ã?·ã?¨Polipoã?®è¨å®?ã??ç¢ºèª?ã??ã?¦ã??ã? ã??ã??ã??
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.panel.label.verified = Tor Verified
 torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
+torbutton.prefs.recommended = (æ?¨å¥¨)
+torbutton.prefs.optional = (ã?ªã??ã?·ã?§ã?³)
+torbutton.prefs.crucial = (é??è¦?)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
 torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
-torbutton.popup.launch = Launch application
-torbutton.popup.cancel = Cancel
+torbutton.popup.launch = ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³èµ·å??
+torbutton.popup.cancel = ã?ã?£ã?³ã?»ã?«
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
 torbutton.popup.captcha.title = Avoid Google Captchas?
diff --git a/src/chrome/locale/ka/torbutton.dtd b/src/chrome/locale/ka/torbutton.dtd
index 8dcfb2b..7e1fb3b 100644
--- a/src/chrome/locale/ka/torbutton.dtd
+++ b/src/chrome/locale/ka/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "About Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/km/torbutton.dtd b/src/chrome/locale/km/torbutton.dtd
index 8dcfb2b..7e1fb3b 100644
--- a/src/chrome/locale/km/torbutton.dtd
+++ b/src/chrome/locale/km/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "About Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd
index 8dcfb2b..7e1fb3b 100644
--- a/src/chrome/locale/ko/torbutton.dtd
+++ b/src/chrome/locale/ko/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "About Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ku/torbutton.dtd b/src/chrome/locale/ku/torbutton.dtd
index 8dcfb2b..7e1fb3b 100644
--- a/src/chrome/locale/ku/torbutton.dtd
+++ b/src/chrome/locale/ku/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "About Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/mt/torbutton.dtd b/src/chrome/locale/mt/torbutton.dtd
index 8dcfb2b..7e1fb3b 100644
--- a/src/chrome/locale/mt/torbutton.dtd
+++ b/src/chrome/locale/mt/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "About Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd
index e1aea83..17a4bd6 100644
--- a/src/chrome/locale/nb/torbutton.dtd
+++ b/src/chrome/locale/nb/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Om Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klikk for Ã¥ initialisere Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Sikkerhetsinnstillinger">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Blokker Tor disk cache og slett all cache pÃ¥ Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Blokker adgang til disk og minne-cache under Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Lagre ikke-Tor informasjonskapsler i en beskyttet jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "Jeg vil manuelt administrere mine informasjonskapsler (farlig)">
 <!ENTITY torbutton.prefs.clear_cookies "Slett informasjonskapsler pÃ¥ Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Deaktiver tillegg under Tor (avgjÃ¸rende)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Deaktiver lagring av sesjoner (anbefalt)">
 <!ENTITY torbutton.prefs.headers "Topptekst">
 <!ENTITY torbutton.prefs.spoof_english "Parodier US Engelsk nettleser">
-<!ENTITY torbutton.prefs.disable_referer "Ikke sende referer-forespÃ¸rsel under Tor (kan gjÃ¸re at enkelte sider ikke fungerer)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Deaktiver DOM-lagring under Tor (avgjÃ¸rende)">
 <!ENTITY torbutton.prefs.forms "Skjemaer">
 <!ENTITY torbutton.prefs.block_tforms "Blokker lagring av passord + informasjon i skjema under Tor (anbefalt)">
@@ -93,14 +105,33 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Ingen proxyer for:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Advarsel: UnngÃ¥ Ã¥ bruke noen av vertsnavnene ovenfor">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Deaktiver oppdateringer av live-bokmerker under Tor">
 <!ENTITY torbutton.prefs.dtd_recommended "(anbefalt)">
 <!ENTITY torbutton.prefs.dtd_optional "(valgfritt)">
 <!ENTITY torbutton.prefs.dtd_crucial "(kritisk)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Send Torbutton-oppdateringer gjennom Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Bruk automatisk en annen sÃ¸kemotor nÃ¥r du fÃ¥r presentert en Google Captcha:">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
-<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
+<!ENTITY torbutton.prefs.fix_google_srch "Fjern platform og sprÃ¥k fra Google Search Box sÃ¸k.">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/nb/torbutton.properties b/src/chrome/locale/nb/torbutton.properties
index 5969b75..6139c48 100644
--- a/src/chrome/locale/nb/torbutton.properties
+++ b/src/chrome/locale/nb/torbutton.properties
@@ -29,7 +29,7 @@ torbutton.popup.launch = Start program
 torbutton.popup.cancel = Avbryt
 torbutton.popup.dontask = Start alltid programmer fra nÃ¥ av
 torbutton.popup.test.no_http_proxy = Tor-proxy test: Lokal HTTP-proxy kan ikke nÃ¥s. KjÃ¸rer Polipo skikkelig?
-torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.title = UnngÃ¥ Google Captcha-er?
 torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
 torbutton.popup.captcha.always = Always perform this action from now on
 torbutton.popup.redirect = Redirect
diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd
index eff8656..2e15325 100644
--- a/src/chrome/locale/nl/torbutton.dtd
+++ b/src/chrome/locale/nl/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "V">
 <!ENTITY torbutton.context_menu.about "Over Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "O">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klik hier om Torbutton te initialiseren">
 <!ENTITY torbutton.prefs.sec_settings "Beveiligingsinstellingen">
@@ -37,70 +45,93 @@
 <!ENTITY torbutton.prefs.clear_cache "Blokkeer Tor schijf-cache en verwijder alle cachebestanden bij Tor-wissel">
 <!ENTITY torbutton.prefs.block_cache "Blokkeer Tor schijf- en geheugencache">
 <!ENTITY torbutton.prefs.cookie_jars "Sla de niet-Tor cookies op op een beveiligde plaats">
-<!ENTITY torbutton.prefs.mmm_cookies "Ik zal manueel de cookies beheren (gevaarlijk)">
-<!ENTITY torbutton.prefs.clear_cookies "Verwijder de cookies bij Tor-wissel">
-<!ENTITY torbutton.prefs.disable_plugins "Gebruik geen plug-ins bij Tor (cruciaal)">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
+<!ENTITY torbutton.prefs.mmm_cookies "Ik beheer de cookies handmatig (gevaarlijk)">
+<!ENTITY torbutton.prefs.clear_cookies "Verwijder de cookies bij in/uitschakelen van Tor">
+<!ENTITY torbutton.prefs.disable_plugins "Gebruik geen plug-ins tijdens Tor (cruciaal)">
 <!ENTITY torbutton.prefs.kill_bad_js "Pas gevaarlijke javascripts aan (cruciaal)">
 <!ENTITY torbutton.prefs.isolate_content "Isoleer dynamische inhoud binnen de Tor status (cruciaal)">
-<!ENTITY torbutton.prefs.no_updates "Doe geen updates bij Tor">
+<!ENTITY torbutton.prefs.no_updates "Schakel updates uit tijdens gebruik van Tor">
 <!ENTITY torbutton.prefs.set_uagent "Stel de user agent voor Torgebruik in (cruciaal)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
+<!ENTITY torbutton.prefs.dynamic "Dynamische inhoud">
 <!ENTITY torbutton.prefs.cookies "Cookies">
 <!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
+<!ENTITY torbutton.prefs.history "Geschiedenis">
+<!ENTITY torbutton.prefs.no_search "Zoeken uitschakelen tijdens Tor (aanbevolen)">
+<!ENTITY torbutton.prefs.shutdown "Uitschakelen">
+<!ENTITY torbutton.prefs.tor_shutdown "Verwijder Tor cookies na afsluiten van een Tor browsersessie">
+<!ENTITY torbutton.prefs.all_shutdown "Verwijder cookies na afsluiten van elke browsersessie">
+<!ENTITY torbutton.prefs.no_shutdown "Verwijder mijn cookies niet na het afsluiten">
+<!ENTITY torbutton.prefs.disable_sessionstore "Schakel sessie opslaan uit (aanbevolen)">
 <!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
+<!ENTITY torbutton.prefs.spoof_english "Imiteer een US Engelse browser">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.disable_domstorage "Verhinder DOM opslag tijdens Tor gebruik (cruciaal)">
+<!ENTITY torbutton.prefs.forms "Formulieren">
+<!ENTITY torbutton.prefs.block_tforms "Blokkeer het opslaan van het formulierpaswoord tijdens Tor gebruik (aanbevolen)">
+<!ENTITY torbutton.prefs.block_ntforms "Blokkeer het opslaan van het formulierpaswoord buiten het Tor gebruik (optioneel)">
 <!ENTITY torbutton.prefs.tor "Tor">
-<!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
+<!ENTITY torbutton.prefs.non_tor "niet Tor">
+<!ENTITY torbutton.prefs.restore_tor "Bij opstart met sessieherstel, stel de Tor status in als : ">
+<!ENTITY torbutton.prefs.reload_crashed_jar "Herlaad de cookie ruimte/verwijder de cookies bij een Firefox crash (aanbevolen)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "Sla zowel Tor- als niet-Torcookies op in beschermde ruimtes (gevaarlijk)">
+<!ENTITY torbutton.prefs.clear_http_auth "Verwijder HTTP-geauthoriseerde sessies (aanbevolen)">
+<!ENTITY torbutton.prefs.block_js_history "Isoleer toegang tot de navigatiegeschiedenis bij Tor (cruciaal)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Verander de grootte van de schermen tot veelvouden van 50 punten bij Tor gebruik (aanbevolen)">
+<!ENTITY torbutton.prefs.close_tor "Sluit alle Tor schermen en tabs bij wissel (optioneel)">
+<!ENTITY torbutton.prefs.close_nontor "Sluit alle niet-Tor schermen en tabs bij wissel (optioneel)">
+<!ENTITY torbutton.prefs.block_links "Blokkeer links en paginavernieuwingen tussen verschillen Tor toestanden (optioneel)">
+<!ENTITY torbutton.prefs.jar_certs "Sla SSL-certificaten op in afzonderlijke ruimtes voor Tor/niet-Tor (aanbevolen)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Sla CA-certificaten op in afzonderlijke ruimtes voor Tor/niet-Tor (aanbevolen)">
+<!ENTITY torbutton.prefs.locked_mode "Blokkeer knop en sneltoetsen om toevallige wissel te vermijden">
+<!ENTITY torbutton.prefs.startup_state "Zet de toestand bij normale start op :">
+<!ENTITY torbutton.prefs.shutdown_state "Toestand bij afsluiten">
+<!ENTITY torbutton.prefs.startup "Opstarten">
+<!ENTITY torbutton.prefs.block_tor_file_net "Blokkeer Tor-toegang tot file:// urls (aanbevolen)">
+<!ENTITY torbutton.prefs.block_nontor_file_net "Blokkeer niet-Tor-toegang tot file:// urls">
+<!ENTITY torbutton.prefs.restore_defaults "Terugzetten op begintoestand">
+<!ENTITY torbutton.prefs.test_settings "Testen van de instellingen">
+<!ENTITY torbutton.prefs.test_auto "Testen van de Tor-instellingen de eerste wissel na elke Firefoxstart">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
+<!ENTITY torbutton.prefs.tor_memory_jar "Geen Tor cookies op de schijf opslaan">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Geen niet-Tor cookies op de schijf opslaan">
+<!ENTITY torbutton.prefs.session_restore "Volgende tabs door sessiebeheer opslaan en herstellen : ">
+<!ENTITY torbutton.prefs.nontor_tabs "Tabs geladen in niet-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "Tabs geladen in Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
+<!ENTITY torbutton.prefs.no_proxies_on "Geen proxy voor: ">
+<!ENTITY torbutton.prefs.no_proxy_warning "Opgelet: gebruik van bovenstaande hostnamen vermijden">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
+<!ENTITY torbutton.prefs.disable_livemarks "Livemark-updates tijdens Tor verhinderen">
+<!ENTITY torbutton.prefs.dtd_recommended "(aanbevolen)">
+<!ENTITY torbutton.prefs.dtd_optional "(optioneel)">
+<!ENTITY torbutton.prefs.dtd_crucial "(cruciaal)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Torbutton enkel via Tor updaten">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatisch een alternatieve zoekmachine gebruiken bij een Google Captcha:">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
-<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
+<!ENTITY torbutton.prefs.fix_google_srch "Systeem- en taalgegevens verwijderen bij gebruik van de Google zoekbalk">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties
index 98fa7bd..039f8fd 100644
--- a/src/chrome/locale/nl/torbutton.properties
+++ b/src/chrome/locale/nl/torbutton.properties
@@ -1,36 +1,36 @@
 torbutton.button.tooltip.disabled = Tor inschakelen
 torbutton.button.tooltip.enabled = Tor uitschakelen
-torbutton.panel.tooltip.disabled = Klik hier om Tor in te schakelen
-torbutton.panel.tooltip.enabled = Klik hier om Tor uit te schakelen
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.tooltip.disabled = Hier klikken om Tor in te schakelen
+torbutton.panel.tooltip.enabled = Hier klikken om Tor uit te schakelen
+torbutton.panel.plugins.disabled = Hier klikken om plugins in te schakelen
+torbutton.panel.plugins.enabled = Hier klikken om plugins uit te schakelen
 torbutton.panel.label.disabled = Tor uitgeschakeld
 torbutton.panel.label.enabled = Tor ingeschakeld
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton voorziet in een knop om eenvoudig de Tor proxy in- of uit te schakelen
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down 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)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-torbutton.popup.test.success = Tor proxy test successful!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
-torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
-torbutton.popup.external.title = Load external content?
-torbutton.popup.external.app = An external application is needed to handle:\n\n
-torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
-torbutton.popup.launch = Launch application
-torbutton.popup.cancel = Cancel
-torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.history.warning = Torbutton heeft een actie verhinderd uit een tab die geladen werd in een andere Tor toestand.\n\n Dit is een wegens Firefoxfout 409737 en 417869.\n\n Indien deze melding zonder schijnbare reden verschijnt, dan heeft een van uw tabs geprobeerd zichzelf te herladen. Dit werd verhinderd.\n\n Om deze tab in de huidige Tor-toestand te laden, moet 'Enter' gedrukt worden in de adresbalk.\n\n
+torbutton.popup.plugin.warning = Torbutton heeft het rechtstreeks laden van plugin-inhoud verhinderd.\n\nGebruik Opslaan als.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Nota : Er zijn schijnbaar geen aangepaste certificatieauthoriteiten geÃ¯nstalleerd. De certificatieauthoriteitslijst controlleren is een langzame operatie en vertraagt een Tor wissel. Mag het isoleren van de certificatieauthoriteitscertificaten uitgeschakeld worden ? (Indien deze vraag niet verstaanbaar is, mag er op OK geklikt worden)
+torbutton.popup.ff3.warning = Waarschuwing ! \n\n Torbutton op Firefox 3 kan de tijdzone en de livemarks via Tor lekken.\n\nBent U zeker om door te gaan ?
+torbutton.popup.toggle.warning = Het is nodig om Tor te wisselen of om te herstarten om deze instellingen toe te passen.
+torbutton.popup.test.success = Tor proxy test geslaagd!
+torbutton.popup.test.failure = Tor proxy test MISLUKT! Proxy en Polipo instellingen controlleren.
+torbutton.popup.test.confirm_toggle = De laatst uitgevoerde Tor proxy test is mislukt.\n\n Wilt U toch naar Tor wisselen ?\n\n Opmerking: Als het probleem opgelost is, kan de test in het Torbutton Proxy instellingsscherm opnieuw uitgevoerd worden om deze melding te vermijden.
+torbutton.popup.test.ff3_notice = Klik op OK om de Tor proxy instellingen te testen. Deze test gebeurt op de achtergrond. Even geduld aub.
+torbutton.panel.label.verified = Tor vastgesteld
+torbutton.popup.test.auto_failed = De automatische Tor proxy test is mislukt.\n\n Wilt U toch naar Tor wisselen ?
+torbutton.prefs.recommended = (aanbevolen)
+torbutton.prefs.optional = (optioneel)
+torbutton.prefs.crucial = (cruciaal)
+torbutton.popup.external.title = Externe inhoud laden ?
+torbutton.popup.external.app = Een externe toepassing is nodig voor : \n\n
+torbutton.popup.external.note = \n\n Opmerking : Externe toepassingen zijn NIET veilig en kunnen U ontmaskeren.\n
+torbutton.popup.external.suggest = Indien dit bestand niet vertrouwd wordt, zou het beter opgeslaan worden om offline te openen of in een VM,\n of maak gebruik van een transparante Tor proxy zoals Amnesia LiveCD, torsocks of TorVM.\n
+torbutton.popup.launch = Toepassing starten
+torbutton.popup.cancel = Annuleren
+torbutton.popup.dontask = Vanaf nu steeds de toepassing starten
+torbutton.popup.test.no_http_proxy = Tor proxy test : De lokale HTTP proxy is niet bereikbaar. Werkt Polipo zoals het hoort ?
+torbutton.popup.captcha.title = Google Captchas vermijden ?
+torbutton.popup.captcha.ask = Torbutton heeft een Google Captcha ontdekt. Mag deze vraag naar een andere zoekmachine gestuurd worden ?
+torbutton.popup.captcha.always = Vanaf nu steeds deze actie uitvoeren
+torbutton.popup.redirect = Verwijzen
+torbutton.popup.no_redirect = Niet verwijzen
diff --git a/src/chrome/locale/pa/torbutton.dtd b/src/chrome/locale/pa/torbutton.dtd
index 8dcfb2b..7e1fb3b 100644
--- a/src/chrome/locale/pa/torbutton.dtd
+++ b/src/chrome/locale/pa/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "About Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/pl/torbutton.dtd b/src/chrome/locale/pl/torbutton.dtd
index 79aed47..78ccc30 100644
--- a/src/chrome/locale/pl/torbutton.dtd
+++ b/src/chrome/locale/pl/torbutton.dtd
@@ -7,7 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Ustawienia proxy">
 <!ENTITY torbutton.prefs.recommended_settings "UÅ¼yj zalecanych ustawieÅ? proxy dla tej wersji Firefoksa">
 <!ENTITY torbutton.prefs.use_privoxy "UÅ¼yj Privoxy">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
+<!ENTITY torbutton.prefs.use_polipo "UÅ¼ywaj Polipo">
 <!ENTITY torbutton.prefs.custom_settings "UÅ¼yj spersonalizowanych ustawieÅ? proxy.">
 <!ENTITY torbutton.prefs.proxy.host.http "Serwer proxy HTTP:">
 <!ENTITY torbutton.prefs.proxy.host.https "Serwer proxy SSL:">
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "U">
 <!ENTITY torbutton.context_menu.about "O Torbutton">
 <!ENTITY torbutton.context_menu.about.key "T">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Kliknij tutaj, aby uruchomiÄ? Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Ustawienia bezpieczeÅ?stwa">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Blokuj pamiÄ?Ä? podrÄ?cznÄ? Tora i wyczyÅ?Ä? jÄ? przy wÅ?/wyÅ? Tora">
 <!ENTITY torbutton.prefs.block_cache "Blokuj dostÄ?p do pamiÄ?ci podrÄ?cznej (dysk/pamiÄ?Ä?) gdy Tor jest wÅ?Ä?czony">
 <!ENTITY torbutton.prefs.cookie_jars "ZapamiÄ?tuj ciasteczka z trybu zwykÅ?ego w zabezpieczonych magazynach">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "BÄ?dÄ? sam zarzÄ?dzaÅ? ciasteczkami (niebezpieczne)">
 <!ENTITY torbutton.prefs.clear_cookies "CzyÅ?Ä? ciasteczka przy zmianie trybu Tor">
 <!ENTITY torbutton.prefs.disable_plugins "WyÅ?Ä?cz wtyczki podczas uÅ¼ycia Tor (krytyczne)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Blokuj zapisywanie sesji przeglÄ?darki (zalecane)">
 <!ENTITY torbutton.prefs.headers "NagÅ?Ã³wki">
 <!ENTITY torbutton.prefs.spoof_english "Udawaj przeglÄ?darkÄ? z USA">
-<!ENTITY torbutton.prefs.disable_referer "Nie wysyÅ?aj adresu polecajÄ?cego podczas uÅ¼ywania Tora (niektÃ³re strony mogÄ? nie dziaÅ?aÄ?)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Blokuj zapisywanie DOM podczas uÅ¼ywania Tora (krytyczne)">
 <!ENTITY torbutton.prefs.forms "Formularze">
 <!ENTITY torbutton.prefs.block_tforms "Blokuj zapamiÄ?tywanie haseÅ? z formularzy (zalecane)">
@@ -91,16 +103,35 @@
 <!ENTITY torbutton.prefs.tor_tabs "ZakÅ?adki otwarte w trybie Tora">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.disable_livemarks "WyÅ?Ä?cz uaktualnienia livemarks podczas uÅ¼ywania Tora">
+<!ENTITY torbutton.prefs.no_proxies_on "Brak proxy dla: ">
+<!ENTITY torbutton.prefs.no_proxy_warning "Uwaga: Unikaj podawania nazw hostÃ³w powyÅ¼ej">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
+<!ENTITY torbutton.prefs.disable_livemarks "WyÅ?Ä?cz aktualizacje livemarks podczas uÅ¼ywania Tora">
 <!ENTITY torbutton.prefs.dtd_recommended "(zalecane)">
 <!ENTITY torbutton.prefs.dtd_optional "(opcjonalne)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
+<!ENTITY torbutton.prefs.dtd_crucial "(waÅ¼ne)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Przekieruj aktualizajce Torbutton przez Tora">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Automatycznie uÅ¼ywaj alternatywnej wyszukiwarki, gdy natrafisz na Google Captcha:">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
-<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
+<!ENTITY torbutton.prefs.fix_google_srch "UsuÅ? nazwÄ? systemu i jÄ?zyk z zapytaÅ? Google">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties
index fc5af35..1f6dbcd 100644
--- a/src/chrome/locale/pl/torbutton.properties
+++ b/src/chrome/locale/pl/torbutton.properties
@@ -7,30 +7,30 @@ torbutton.panel.plugins.enabled = Kliknij aby wyÅ?Ä?czyÄ? wtyczki
 torbutton.panel.label.disabled = Tor wyÅ?Ä?czony
 torbutton.panel.label.enabled = Tor wÅ?Ä?czony
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Rozszerzenie posiada przycisk do Å?atwego wÅ?Ä?czania/wyÅ?Ä?czania proxy Tor
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.history.warning = Torbutton zablokowaÅ? dziaÅ?alnoÅ?Ä? z karty zaÅ?adowanej w innym stanie Tora.\n\nMa to na celu obejÅ?cie bÅ?Ä?dÃ³w Firefoksa o numerach 409737 i 417869."\nJeÅ?li to okienko pojawiÅ?o siÄ? bez powodu, jedna z kart prÃ³buje przeÅ?adowaÄ? siÄ? w tle, i to zostaÅ?o zablokowane.\n\nAby przeÅ?adowaÄ? tÄ? kartÄ? w tym stanie Tora, wciÅ?nij 'enter' w pasku adresu.\n\n
 torbutton.popup.plugin.warning = Torbutton zablokowaÅ? bezpoÅ?rednie odwoÅ?anie do Sieci przez plugin.\n\nUÅ¼yj Zapisz jako.\n\n
 torbutton.popup.confirm_ca_certs = Informacja Torbutton: WyglÄ?da na to, Å¼e nie posiadasz dodatkowych wpisÃ³w OÅ?rodkÃ³w CertyfikujÄ?cych. Posiadanie takiej listy spowalnia przeÅ?Ä?czanie trybÃ³w Tora. Czy chciaÅ?byÅ? wyÅ?Ä?czyÄ? sprawdzanie OÅ?rodkÃ³w CertyfikujÄ?cych? (jeÅ?li tego nie rozumiesz, moÅ¼esz bezpiecznie kliknÄ?Ä? OK)
 torbutton.popup.ff3.warning = Uwaga!\n\nTorbutton na Firefox-ie 3 ujawnia TwojÄ? strefÄ? czasowÄ? oraz livemarks.\n\nCzy mimo to chcesz kontynuowaÄ??
 torbutton.popup.toggle.warning = Musisz ponownie wÅ?Ä?czyÄ? Tora aby ustawienia odniosÅ?y skutek.
 torbutton.popup.test.success = Test proxy zakoÅ?czony pomyÅ?lnie!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.failure = Test proxy siÄ? NIE POWIÃ?DÅ?! SprawdÅº swoje ustawienia proxy i Polipo.
+torbutton.popup.test.confirm_toggle = Najnowszemu testowi proxy Tor nie udaÅ?o siÄ? skorzystaÄ? z Tora.\n\nNa pewno chcesz wÅ?Ä?czyÄ? mimo tego?\n\nUwaga: JeÅ?li problem zostaÅ? poprawiony, moÅ¼esz ponownie uruchomiÄ? test w oknie Preferencji Proxy Torbuttona, aby wyÅ?Ä?czyÄ? to ostrzeÅ¼enie.
 torbutton.popup.test.ff3_notice = Kliknij OK aby przetestowaÄ? ustawienia proxy. Testowanie odbywa siÄ? w tle. Prosimy o cierpliwoÅ?Ä?.
 torbutton.panel.label.verified = Tor obecny
 torbutton.popup.test.auto_failed = Automatyczny test proxy Tora zakoÅ?czyÅ? siÄ? niepowodzeniem.\n\nCzy mimo to chcesz kontynuowaÄ??
 torbutton.prefs.recommended = (zalecane)
 torbutton.prefs.optional = (opcjonalnie)
 torbutton.prefs.crucial = (wymagane)
-torbutton.popup.external.title = Load external content?
-torbutton.popup.external.app = An external application is needed to handle:\n\n
-torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
+torbutton.popup.external.title = ZaÅ?adowaÄ? zewnÄ?trznÄ? zawartoÅ?Ä??
+torbutton.popup.external.app = ZawnÄ?trzna aplikacja jest wymagana, aby obsÅ?uÅ¼yÄ?:\n\n
+torbutton.popup.external.note = \n\nUWAGA: ZewnÄ?trzne aplikacje NIE sÄ? domyÅ?lnie bezpieczne przy uÅ¼ywaniu Tora i mogÄ? CiÄ? odkryÄ?!\n
+torbutton.popup.external.suggest = \nJesli ten plik jest niezaufany, powinno siÄ? go zachowaÄ? do oglÄ?dania offline lub w maszynie wirtualnej,\nlub rozwaÅ¼yÄ? uÅ¼ywanie przezroczystego proxy Tor, jak Amnesia LiveCD, torsocks lub TorVM.\n
 torbutton.popup.launch = Uruchom aplikacjÄ?
 torbutton.popup.cancel = Anuluj
-torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.dontask = Od teraz zawsze uruchamiaj aplikacje
+torbutton.popup.test.no_http_proxy = Test Tor proxy: Lokalne Proxy HTTP jest nieosiÄ?galne. Czy Polipo dziaÅ?a prawidÅ?owo?
+torbutton.popup.captcha.title = UnikaÄ? Google Captcha?
+torbutton.popup.captcha.ask = Torbutton wykryÅ? Google Captcha. Czy chcesz, aby CiÄ? przekierowaÄ? na innÄ? wyszukiwarkÄ? dla tego zapytania?
+torbutton.popup.captcha.always = Od teraz zawsze wykonuj tÄ? akcjÄ?
+torbutton.popup.redirect = Przekieruj
+torbutton.popup.no_redirect = Nie przekierowywuj
diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd
index ceee440..5a18f56 100644
--- a/src/chrome/locale/pt-BR/torbutton.dtd
+++ b/src/chrome/locale/pt-BR/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Sobre Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Clique para iniciar Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "ConfiguraÃ§Ãµes de SeguranÃ§a">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Bloquear o cache de disco e limpar todos os caches ao alterar o uso do TOR">
 <!ENTITY torbutton.prefs.block_cache "Bloquear cache de memÃ³ria e disco durante o uso do TOR">
 <!ENTITY torbutton.prefs.cookie_jars "Armazenar todos os cookies nÃ£o-Tor num contÃªiner protegido">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I manualmente gerenciarei meus cookies (atenÃ§Ã£o)">
 <!ENTITY torbutton.prefs.clear_cookies "Limpar cookies quando alternar TOR">
 <!ENTITY torbutton.prefs.disable_plugins "Desabilitar plugins durante o uso do TOR (importante)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Desabilitar funÃ§Ã£o de salvar sessÃ£o (recomendado)">
 <!ENTITY torbutton.prefs.headers "CabeÃ§alho">
 <!ENTITY torbutton.prefs.spoof_english "Mimetizar o navegador para InglÃªs US">
-<!ENTITY torbutton.prefs.disable_referer "NÃ£o enviar referer headers durante o uso de Tor (pode truncar alguns sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Desabilitar armazenamento DOM durante o uso do TOR (importante)">
 <!ENTITY torbutton.prefs.forms "FormulÃ¡rios">
 <!ENTITY torbutton.prefs.block_tforms "Bloquear senhas + informaÃ§Ãµes de formulÃ¡rios durante o uso do TOR (recomendado)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Sem Proxy para: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Aviso: evite usar quaisquer dos hosts acima">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recomendado)">
 <!ENTITY torbutton.prefs.dtd_optional "(opcional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd
index d33bd82..e53ee37 100644
--- a/src/chrome/locale/pt/torbutton.dtd
+++ b/src/chrome/locale/pt/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Sobre o Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Clique para iniciar o Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "ConfiguraÃ§Ãµes de SeguranÃ§a">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Bloquear a cÃ³pia local e limpar todos as cÃ³pias ao alterar o uso do Tor">
 <!ENTITY torbutton.prefs.block_cache "Bloquear cache de memÃ³ria e disco durante o uso do Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Armazenar todos os cookies nÃ£o-Tor num local protegido">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "Eu manualmente administrarei os meus cookies (perigoso)">
 <!ENTITY torbutton.prefs.clear_cookies "Limpar cookies quando alterar a utilizaÃ§Ã£o do Tor">
 <!ENTITY torbutton.prefs.disable_plugins "Desactivar plugins durante a utilizaÃ§Ã£o do Tor (importante)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Desactivar a funÃ§Ã£o de salvar sessÃ£o (recomendado)">
 <!ENTITY torbutton.prefs.headers "CabeÃ§alho">
 <!ENTITY torbutton.prefs.spoof_english "Mimetizar o navegador para InglÃªs dos EUA">
-<!ENTITY torbutton.prefs.disable_referer "NÃ£o enviar informaÃ§Ã£o sobre o referente durante a utilizaÃ§Ã£o do Tor (pode bloquear alguns sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Desactivar o armazenamento DOM durante o uso do Tor (crucial)">
 <!ENTITY torbutton.prefs.forms "FormulÃ¡rios">
 <!ENTITY torbutton.prefs.block_tforms "Bloquear senhas + informaÃ§Ãµes de formulÃ¡rios durante o uso do Tor (recomendado)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Nenhum proxy para: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Evite utilizar o nome da mÃ¡quina no campo a cima">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Desactivar actualizaÃ§Ãµes durante a utilizaÃ§Ã£o do Tor">
 <!ENTITY torbutton.prefs.dtd_recommended "(recomendado)">
 <!ENTITY torbutton.prefs.dtd_optional "(opcional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ro/torbutton.dtd b/src/chrome/locale/ro/torbutton.dtd
index 59f8b8e..22a8ed2 100644
--- a/src/chrome/locale/ro/torbutton.dtd
+++ b/src/chrome/locale/ro/torbutton.dtd
@@ -1,7 +1,7 @@
 <!ENTITY torbutton.prefs.title "PreferinÈ?e Torbutton">
 <!ENTITY torbutton.prefs.display_settings "SetÄ?ri de vizualizare">
 <!ENTITY torbutton.prefs.display_panel "AratÄ? setÄ?rile proxy pentru Tor Ã®n bara de statut">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
+<!ENTITY torbutton.prefs.panel_format "Bara de stare,formatul de afiÅ?are:">
 <!ENTITY torbutton.prefs.panel_text_format "Text">
 <!ENTITY torbutton.prefs.panel_icon_format "IconiÈ?Ä?">
 <!ENTITY torbutton.prefs.tor_settings "SetÄ?rile pentru proxy">
@@ -16,91 +16,122 @@
 <!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:">
 <!ENTITY torbutton.prefs.proxy.port "Portul:">
 <!ENTITY torbutton.about.title "Despre Torbutton">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
+<!ENTITY torbutton.pref_connection.notice "DezactivaÅ£i Torbutton pentru a schimba aceste setÄ?ri.">
 <!ENTITY torbutton.pref_connection.more_info "Informatii suplimentare">
 <!ENTITY torbutton.pref_connection_more_info.title "Ajutor">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
+<!ENTITY torbutton.pref_connection_more_info.text "Torbutton este activatÄ? Ã®n acest moment. DacÄ? doriÅ£i sÄ? schimbaÅ£i setÄ?rile non-proxy Tor, dezactivaÅ£i Torbutton Å?i vÄ? rugÄ?m sÄ? reveniÅ£i aici. DacÄ? doriÅ£i sÄ? vÄ? schimbaÅ£i setÄ?rile Tor, vÄ? rugÄ?m sÄ? folosiÅ£i fereastra de preferinÅ£Ä? Torbutton.">
 <!ENTITY torbutton.context_menu.toggle "Comutarea starii Tor">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "PreferinÈ?e">
+<!ENTITY torbutton.context_menu.preferences "PreferinÈ?e...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Despre Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Butonul Tor">
 <!ENTITY torbutton.button.tooltip "ApasÄ? pentru pornirea Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "SetÄ?ri de securitate">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
+<!ENTITY torbutton.prefs.block_thread "BlocheazÄ? citirea istoricului Ã®n timpul Tor (esenÅ£ial)">
+<!ENTITY torbutton.prefs.block_thwrite "BlocheazÄ? scrierea istoriei in timpul Tor (recomandat)">
+<!ENTITY torbutton.prefs.block_nthread "BlocheazÄ? citirea istoricului in timpul non-Tor(opÅ£ional)">
+<!ENTITY torbutton.prefs.block_nthwrite "BlocheazÄ? scrierea istoriei in timpul non-Tor(opÅ£ional)">
+<!ENTITY torbutton.prefs.clear_history "Å?terge istoricul cÃ¢nd comuÅ£ Tor(opÅ£ional)">
+<!ENTITY torbutton.prefs.clear_cache "BlocheazÄ? Tor cache si sterge toate chache-urile cÃ¢nd  comuÅ£ Tor">
+<!ENTITY torbutton.prefs.block_cache "Blocheaza accesarea discului so memoriei cÃ¢nd Tor este pornit">
+<!ENTITY torbutton.prefs.cookie_jars "PÄ?streazÄ? cookie-urile non-Tor Ã®ntr-o cutie protejate">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
+<!ENTITY torbutton.prefs.mmm_cookies "Eu voi gestiona manual cookie-urile mele (periculos)">
+<!ENTITY torbutton.prefs.clear_cookies "Å?terge cookie-urile cÃ¢nd comut Tor">
+<!ENTITY torbutton.prefs.disable_plugins "OpreÅ?te plugin-urile in timpul funcÅ£ionÄ?ri lui Tor(esenÅ£ial)">
+<!ENTITY torbutton.prefs.kill_bad_js "AgÄ?Å£a javascript-urile periculoase (esenÅ£ial)">
+<!ENTITY torbutton.prefs.isolate_content "IzoleazÄ? conÅ£inutul dinamic pentru star lui Tor(esenÅ£ial)">
+<!ENTITY torbutton.prefs.no_updates "OpreÅ?te actualizÄ?rile in timpul funcÅ£ionÄ?ri lui Tor">
+<!ENTITY torbutton.prefs.set_uagent "SeteazÄ? user agentul pentru funcÅ£ionarea lui Tor(esenÅ£ial)">
 <!ENTITY torbutton.prefs.dynamic "ConÅ£inut dinamic ">
 <!ENTITY torbutton.prefs.cookies "Cookies">
 <!ENTITY torbutton.prefs.cache "Cache">
 <!ENTITY torbutton.prefs.history "Istoric">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
+<!ENTITY torbutton.prefs.no_search "OpreÅ?te cÄ?utarea sugestilor in timpul fucÅ£ionÄ?ri lui Tor (recomandat)">
 <!ENTITY torbutton.prefs.shutdown "Inchide">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.tor "Tor-DA">
-<!ENTITY torbutton.prefs.non_tor "Tor-NU">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
+<!ENTITY torbutton.prefs.tor_shutdown "È?terge cookie-urile Tor la Ã®nchiderea browser-ului cu o sesiune Tor activÄ?">
+<!ENTITY torbutton.prefs.all_shutdown "È?terge cookie-urile la oricare Ã®nchidere a browser-ului ">
+<!ENTITY torbutton.prefs.no_shutdown "Nu È?terge cookie-urile mele la Ã®nchidere">
+<!ENTITY torbutton.prefs.disable_sessionstore "DezactivaÈ?i salvarea sesiunilor (recomandat)">
+<!ENTITY torbutton.prefs.headers "Antete">
+<!ENTITY torbutton.prefs.spoof_english "ImiteazÄ? browser-ul Ã®n Limba EnglezÄ?">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.disable_domstorage "OpreÈ?te DOM Storage Ã®n timpul funcÈ?ionÄ?rii Tor (important)">
+<!ENTITY torbutton.prefs.forms "Forme">
+<!ENTITY torbutton.prefs.block_tforms "BlocheazÄ? salvarea parolelor È?i datele pentru completÄ?ri Ã®n timpul utilizÄ?rii Tor (recomandat)">
+<!ENTITY torbutton.prefs.block_ntforms "BlocheazÄ? salvarea parolelor È?i datelor pentru auto-completÄ?ri Ã®n timpul utilizÄ?rii Non-Tor (opÈ?ional)">
+<!ENTITY torbutton.prefs.tor "Tor">
+<!ENTITY torbutton.prefs.non_tor "Non-Tor">
+<!ENTITY torbutton.prefs.restore_tor "La Ã®niÈ?ierea sesiunii restaurate, fixeazÄ? statutul Tor la:">
+<!ENTITY torbutton.prefs.reload_crashed_jar "RestaureazÄ?/È?terge cookie-urile dupÄ? avarierea Firefox">
+<!ENTITY torbutton.prefs.dual_cookie_jars "SalveazÄ? cookie-urile Tor È?i Non-Tor Ã®n fiÈ?iere protejate (periculos)">
+<!ENTITY torbutton.prefs.clear_http_auth "È?terge sesiunile de autentificare HTTP (recomandat)">
+<!ENTITY torbutton.prefs.block_js_history "IzolaÈ?i accesul la istoricul navigÄ?rilor al statutul Tor (important)">
+<!ENTITY torbutton.prefs.resize_on_toggle "RedimensioneazÄ? fereastra de lucru cu multiplul a 50px Ã®n timpul utilizÄ?rii Tor (recomandat)">
+<!ENTITY torbutton.prefs.close_tor "Ã?nchide toate ferestrele È?i filele Tor la pornire/oprire (opÈ?ional)">
+<!ENTITY torbutton.prefs.close_nontor "Ã?nchide toate ferestrele È?i filele Non-Tor la oprire/pornire (opÈ?ional)">
+<!ENTITY torbutton.prefs.block_links "BlocheazÄ? accesarea link-urilor È?i reÃ®ncÄ?rcarea paginilor din diferite statute Tor (opÈ?ional)">
+<!ENTITY torbutton.prefs.jar_certs "PÄ?streazÄ? certificare SSL Ã®n fiÈ?iere jar separate pentru Tor/Non-Tor (recomandat)">
+<!ENTITY torbutton.prefs.jar_ca_certs "PÄ?streazÄ? certificate CA Ã®n fiÈ?iere jar separate pentru Tor/Non-Tor (recomandat)">
+<!ENTITY torbutton.prefs.locked_mode "DezactiveazÄ? Butonul È?i CombinaÈ?iile de Taste pentru a preveni oprirea accidentalÄ?">
+<!ENTITY torbutton.prefs.startup_state "La pornire normalÄ?, stabileÈ?te statutul Tor la:">
+<!ENTITY torbutton.prefs.shutdown_state "Nu porniÈ?i Tor">
+<!ENTITY torbutton.prefs.startup "PorneÈ?te">
+<!ENTITY torbutton.prefs.block_tor_file_net "BlocheazÄ? accesul Tor la reÈ?ea din adrese file:// (recomandat)">
+<!ENTITY torbutton.prefs.block_nontor_file_net "BlocheazÄ? accesul Non-Tor la reÈ?ea din adrese file:// ">
+<!ENTITY torbutton.prefs.restore_defaults "RestaureazÄ? setÄ?rile implicite">
+<!ENTITY torbutton.prefs.test_settings "SetÄ?rile pentru testÄ?ri">
+<!ENTITY torbutton.prefs.test_auto "TesteazÄ? setÄ?rile mele pentru Tor dupÄ? prima pornire/oprire la fiecare demarare Firefox">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
+<!ENTITY torbutton.prefs.tor_memory_jar "Nu scrie cookie-urile Tor pe disc">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Nu scrie cookie-urile Non-Tor pe disc">
+<!ENTITY torbutton.prefs.session_restore "FÄ? ca sesiunea sÄ? salveze È?i sÄ? restaureze urmÄ?toarele file: ">
+<!ENTITY torbutton.prefs.nontor_tabs "File Ã®ncÄ?rcate Ã®n Non-Tor">
+<!ENTITY torbutton.prefs.tor_tabs "File Ã®ncÄ?rcate Ã®n Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
+<!ENTITY torbutton.prefs.no_proxies_on "Nici un proxy pentru:">
+<!ENTITY torbutton.prefs.no_proxy_warning "ATENÈ?IE: EvitaÈ?i sÄ? folosiÈ?i unul din hostname-le de mai sus">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
+<!ENTITY torbutton.prefs.disable_livemarks "OpreÅ?te actualizÄ?rile Livemark Ã®n timpul funcÅ£ionÄ?ri lui Tor">
 <!ENTITY torbutton.prefs.dtd_recommended "(recomandat)">
 <!ENTITY torbutton.prefs.dtd_optional "(opÈ?ional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "RedirecÈ?ioneazÄ? actualizÄ?rile Torbutton prin intermediul Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "FoloseÈ?te automat un alt motor de cÄ?utare cÃ®nd apare Google Captcha:">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
-<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.engine4 "scroogle.com">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
+<!ENTITY torbutton.prefs.fix_google_srch "EliminaÈ?i informaÈ?ii despre platformÄ? È?i limbÄ? din cererile cÃ¢mpurilor de cÄ?utare Google">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ro/torbutton.properties b/src/chrome/locale/ro/torbutton.properties
index 75b51f6..4f4bfe8 100644
--- a/src/chrome/locale/ro/torbutton.properties
+++ b/src/chrome/locale/ro/torbutton.properties
@@ -1,36 +1,36 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
-torbutton.panel.tooltip.disabled = Click to enable Tor
-torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
-torbutton.panel.label.disabled = Tor Disabled
-torbutton.panel.label.enabled = Tor Enabled
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down 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)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-torbutton.popup.test.success = Test proxy Tor cu succes!
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.button.tooltip.disabled = PorneÅ?te Tor
+torbutton.button.tooltip.enabled = OpreÅ?te Tor
+torbutton.panel.tooltip.disabled = Click pentru a porni Tor
+torbutton.panel.tooltip.enabled = Click pentru a opri Tor
+torbutton.panel.plugins.disabled = Click pentru a porni plugin-urile
+torbutton.panel.plugins.enabled = Click pentru a opri plugin-urile
+torbutton.panel.label.disabled = Tor a fost oprit
+torbutton.panel.label.enabled = Tor a fost pornit
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton prevede un buton pentru a activa sau dezactiva cu un click proxy-ul Tor din Firefox
+torbutton.popup.history.warning = Torbutton a blocat activitatea unei file Ã®ncÄ?rcate Ã®ntr-un alt stat Tor.\nAcesta este pentru a lucru cu bug-urile 409737 Å?i 417869 din Firefox.\nDacÄ? acest pop-up pÄ?re sÄ? se aparÄ? fÄ?rÄ? nici un motiv, una dintre filele care Ã®ncercÄ? sa se reÃ®ncarce singurÄ? Ã®n fundal, a fost blocatÄ?.\n\nPentru a reÃ®ncÄ?rca fila Ã®n aceastÄ? stare Tor, apasÄ? "Enter" Ã®n caseta de URL.\n\n
+torbutton.popup.plugin.warning = Torbutton a blocat direct Tor pentru a Ã®ncÄ?rca conÅ£inutul plugin.\n\nUtilizaÅ£i SalvaÅ£i-Ca Ã®n loc.\n\n
+torbutton.popup.confirm_ca_certs = 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)
+torbutton.popup.ff3.warning = AtenÅ£ie!\n\nTorbutton pe Firefox 3 este cunoscut de scurgerea fusului orar Å?i livemarks prin Tor.\n\nDoriÅ£i sÄ? continuaÅ£i oricum?
+torbutton.popup.toggle.warning = Este nevoie pentru a comuta Tor sau sÄ? Ã®l reporniÅ£i pentru ca setÄ?rile sÄ? aibÄ? efect.
+torbutton.popup.test.success = Testul proxy Tor a fost efectuat cu succes!
+torbutton.popup.test.failure = Testul proxy Tor a EÅ?UAT! VerificaÅ£i setÄ?rile proxy Å?i Polipo.
+torbutton.popup.test.confirm_toggle = Cel mai recent test de proxy Tor a eÅ?uat sÄ? foloseasca Tor.\n\nEÅ?ti sigur cÄ? vrei sÄ? Ã®l activezi oricum?\n\nObservatie: DacÄ? aÅ£i fixat problema, puteÅ£i sÄ? rulaÅ£i din nou testul Proxy Torbutton din fereastra Preferences sÄ? elimine acest avertisment.
 torbutton.popup.test.ff3_notice = ApasÄ? OK pentru a testa setÄ?rile proxy Tor. Acest test se va efectua Ã®n spate. VÄ? rugÄ?m sÄ? aveÅ£i rÄ?bdare.
-torbutton.panel.label.verified = Verificat Tor
+torbutton.panel.label.verified = Verificat de Tor
 torbutton.popup.test.auto_failed = Testul automat pentru proxy Tor a eÅ?uat la folosirea Tor.\n\nSunteÅ£i sigur cÄ? vreÅ£i sÄ? permiteÅ£i oricum?
 torbutton.prefs.recommended = (recomandat)
 torbutton.prefs.optional = (opÅ£ional)
 torbutton.prefs.crucial = (critic)
-torbutton.popup.external.title = Load external content?
-torbutton.popup.external.app = An external application is needed to handle:\n\n
-torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
-torbutton.popup.launch = Launch application
-torbutton.popup.cancel = Cancel
-torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.external.title = SÄ? Ã®ncarc conÈ?inutul extern?
+torbutton.popup.external.app = O aplicaÅ£ie externÄ? este necesarÄ? sÄ? se ocupe de:\n\n
+torbutton.popup.external.note = \n\nObservatie: Aplicatiile externe NU sunt sigure cu setÄ?rile implicite Tor, Å?i vÄ? pot demasca!\n
+torbutton.popup.external.suggest = \nDacÄ? acest fiÅ?ier este de Ã®ncredere, ar trebui sÄ? fie salvaÅ£ pentru a putea fi vizualizat offline sau Ã®ntr-o VM,\nsau luaÅ£i Ã®n considerare utilizarea unui mod transparent proxy Tor ca Amnesia LiveCD, torsocks, sau TorVM.\n
+torbutton.popup.launch = PorneÈ?te aplicaÈ?ia
+torbutton.popup.cancel = Anulare
+torbutton.popup.dontask = Ã?ntotdeauna lanseazÄ? aplicaÅ£ii de acum Ã®ncolo
+torbutton.popup.test.no_http_proxy = Testul proxy Tor: Local proxy HTTP este inaccesibil. Este Polipo executat corect?
+torbutton.popup.captcha.title = EvitaÅ£i captcha Google?
+torbutton.popup.captcha.ask = Torbutton a detectat un captcha Google.DoreÅ?ti sa fii redirecÅ£ionat cÄ?tre un alt motor de cÄ?utare pentru aceastÄ? interogare?
+torbutton.popup.captcha.always = Se ca efectua Ã®ntotdeauna aceastÄ? acÅ£iune de acum Ã®ncolo
+torbutton.popup.redirect = RedirecÅ£ioneazÄ?
+torbutton.popup.no_redirect = Nu RedirecÅ£iona
diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd
index 5c93377..b953365 100644
--- a/src/chrome/locale/ru/torbutton.dtd
+++ b/src/chrome/locale/ru/torbutton.dtd
@@ -3,7 +3,7 @@
 <!ENTITY torbutton.prefs.display_panel "Ð?Ñ?Ð¾Ð±Ñ?Ð°Ð¶Ð°Ñ?Ñ? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ? Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ? Ñ? Ñ?ÐµÑ?Ñ?Ñ? Tor">
 <!ENTITY torbutton.prefs.panel_format "Ð?Ð¾ÐºÐ°Ð·Ñ?Ð²Ð°Ñ?Ñ? Ð² Ð¿Ñ?Ð°Ð²Ð¾Ð¼ Ð½Ð¸Ð¶Ð½ÐµÐ¼ Ñ?Ð³Ð»Ñ?:">
 <!ENTITY torbutton.prefs.panel_text_format "Ð¢ÐµÐºÑ?Ñ?">
-<!ENTITY torbutton.prefs.panel_icon_format "Ð?ÐºÐ¾Ð½ÐºÑ?">
+<!ENTITY torbutton.prefs.panel_icon_format "Ð?Ð½Ð°Ñ?Ð¾Ðº">
 <!ENTITY torbutton.prefs.tor_settings "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð¿Ñ?Ð¾ÐºÑ?Ð¸">
 <!ENTITY torbutton.prefs.recommended_settings "Ð?Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ? Ð¿Ñ?Ð¾ÐºÑ?Ð¸, Ñ?ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð½Ñ?Ðµ Ð´Ð»Ñ? Ð´Ð°Ð½Ð½Ð¾Ð¹ Ð²ÐµÑ?Ñ?Ð¸Ð¸ Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Ð?Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Privoxy">
@@ -19,13 +19,21 @@
 <!ENTITY torbutton.pref_connection.notice "Ð?Ð»Ñ? Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾ÐµÐº Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Torbutton.">
 <!ENTITY torbutton.pref_connection.more_info "Ð?Ð¾Ð´Ñ?Ð¾Ð±Ð½Ð¾Ñ?Ñ?Ð¸">
 <!ENTITY torbutton.pref_connection_more_info.title "Ð?Ð¾Ð´Ñ?ÐºÐ°Ð·ÐºÐ°">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton Ð²ÐºÐ»Ñ?Ñ?ÐµÐ½. Ð?Ñ?Ð»Ð¸ Ð±Ñ?Ð´Ñ?Ñ? Ð¸Ð·Ð¼ÐµÐ½Ñ?Ñ?Ñ?Ñ?Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð¿Ñ?Ð¾ÐºÑ?Ð¸, Ð½Ðµ Ñ?Ð²Ð»Ñ?Ñ?Ñ?ÐµÐ³Ð¾Ñ?Ñ? Ñ?Ð°Ñ?Ñ?Ñ?Ñ? Ñ?ÐµÑ?Ð¸ Tor,  Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ñ?Ð½Ð°Ñ?Ð°Ð»Ð° Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Torbutton Ð¸ Ð·Ð°Ñ?ÐµÐ¼ Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?Ð´Ð°. Ð?Ñ?Ð»Ð¸ Ð±Ñ?Ð´Ñ?Ñ? Ð¸Ð·Ð¼ÐµÐ½Ñ?Ñ?Ñ?Ñ?Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Tor, Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Ð¾ÐºÐ½Ð¾ Ð½Ð°Ñ?Ñ?Ñ?Ð¾ÐµÐº Torbutton.">
+<!ENTITY torbutton.pref_connection_more_info.text "Torbutton Ð²ÐºÐ»Ñ?Ñ?ÐµÐ½.  Ð?Ñ?Ð»Ð¸ Ð±Ñ?Ð´Ñ?Ñ? Ð¸Ð·Ð¼ÐµÐ½Ñ?Ñ?Ñ?Ñ?Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð¿Ñ?Ð¾ÐºÑ?Ð¸, Ð½Ðµ Ñ?Ð²Ð»Ñ?Ñ?Ñ?ÐµÐ³Ð¾Ñ?Ñ? Ñ?Ð°Ñ?Ñ?Ñ?Ñ? Ñ?ÐµÑ?Ð¸ Tor, Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ñ?Ð½Ð°Ñ?Ð°Ð»Ð° Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Torbutton Ð¸ Ð·Ð°Ñ?ÐµÐ¼ Ð²ÐµÑ?Ð½Ñ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?Ð´Ð°.  Ð?Ñ?Ð»Ð¸ Ð±Ñ?Ð´Ñ?Ñ? Ð¸Ð·Ð¼ÐµÐ½Ñ?Ñ?Ñ?Ñ?Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Tor, Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Ð¾ÐºÐ½Ð¾ Ð½Ð°Ñ?Ñ?Ñ?Ð¾ÐµÐº Torbutton.">
 <!ENTITY torbutton.context_menu.toggle "Ð?Ð·Ð¼ÐµÐ½Ð¸Ñ?Ñ? Ñ?Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðµ Tor">
 <!ENTITY torbutton.context_menu.toggle.key "Ð?">
 <!ENTITY torbutton.context_menu.preferences "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸...">
 <!ENTITY torbutton.context_menu.preferences.key "Ð?">
-<!ENTITY torbutton.context_menu.about "Ð? Torbutton">
+<!ENTITY torbutton.context_menu.about "Ð? Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "Ð?">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Ð?Ð½Ð¸Ñ?Ð¸Ð°Ð»Ð¸Ð·Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸">
@@ -37,7 +45,8 @@
 <!ENTITY torbutton.prefs.clear_cache "Ð?Ð°Ð¿Ñ?ÐµÑ?Ð°Ñ?Ñ? ÐºÐµÑ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð½Ð° Ð´Ð¸Ñ?Ðº Ð¿Ñ?Ð¸ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Tor Ð¸ Ð¾Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ð²ÐµÑ?Ñ? ÐºÐµÑ? Ð¿Ñ?Ð¸ Ð¿ÐµÑ?ÐµÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ð¸ Ñ?ÐµÐ¶Ð¸Ð¼Ð¾Ð² Tor">
 <!ENTITY torbutton.prefs.block_cache "Ð?Ð¾Ð»Ð½Ð¾Ñ?Ñ?Ñ?Ñ? Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? ÐºÐµÑ? Ð¿Ñ?Ð¸ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Ð¥Ñ?Ð°Ð½Ð¸Ñ?Ñ? cookies Ð² Ñ?ÐµÐ¶Ð¸Ð¼Ðµ Ð½Ðµ-Tor Ð² Ð·Ð°Ñ?Ð¸Ñ?ÐµÐ½Ð½Ð¾Ð¼ Ñ?Ð°Ð¹Ð»Ðµ">
-<!ENTITY torbutton.prefs.mmm_cookies "Ð Ñ?Ñ?Ð½Ð¾Ðµ Ñ?Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ cookies  (Ð¾Ð¿Ð°Ñ?Ð½Ð¾)">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
+<!ENTITY torbutton.prefs.mmm_cookies "Ð Ñ?Ñ?Ð½Ð¾Ðµ Ñ?Ð¿Ñ?Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ cookies (Ð¾Ð¿Ð°Ñ?Ð½Ð¾)">
 <!ENTITY torbutton.prefs.clear_cookies "Ð?Ñ?Ð¸Ñ?Ð°Ñ?Ñ? cookies Ð¿Ñ?Ð¸ Ð¿ÐµÑ?ÐµÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ð¸ Ñ?ÐµÐ¶Ð¸Ð¼Ð¾Ð² Tor">
 <!ENTITY torbutton.prefs.disable_plugins "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð°Ñ?Ñ? Ð¿Ð»Ð°Ð³Ð¸Ð½Ñ? Ð¿Ñ?Ð¸ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Tor (Ð²Ð°Ð¶Ð½Ð¾)">
 <!ENTITY torbutton.prefs.kill_bad_js "Ð?ÐµÑ?ÐµÑ?Ð²Ð°Ñ?Ñ?Ð²Ð°Ñ?Ñ? Ð¾Ð¿Ð°Ñ?Ð½Ñ?Ð¹ ÐºÐ¾Ð´ javascript (Ð²Ð°Ð¶Ð½Ð¾)">
@@ -46,7 +55,7 @@
 <!ENTITY torbutton.prefs.set_uagent "Ð?Ð°Ñ?ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?ÐµÐ»Ñ? Ð¿Ñ?Ð¸ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Tor (Ð²Ð°Ð¶Ð½Ð¾)">
 <!ENTITY torbutton.prefs.dynamic "Ð¡Ð¾Ð´ÐµÑ?Ð¶Ð°Ð½Ð¸Ðµ">
 <!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Ð?ÐµÑ?">
+<!ENTITY torbutton.prefs.cache "Ð?Ñ?Ñ?">
 <!ENTITY torbutton.prefs.history "Ð?Ñ?Ñ?Ð½Ð°Ð»">
 <!ENTITY torbutton.prefs.no_search "Ð?Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¿Ð¾Ð¸Ñ?ÐºÐ¾Ð²Ñ?Ðµ Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ñ? Ð¿Ñ?Ð¸ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Tor (Ð¶ÐµÐ»Ð°Ñ?ÐµÐ»Ñ?Ð½Ð¾)">
 <!ENTITY torbutton.prefs.shutdown "Ð?Ð°ÐºÑ?Ñ?Ñ?Ð¸Ðµ">
@@ -55,8 +64,11 @@
 <!ENTITY torbutton.prefs.no_shutdown "Ð?Ðµ Ð¾Ñ?Ð¸Ñ?Ð°Ñ?Ñ? cookies Ð¿Ñ?Ð¸ Ð·Ð°ÐºÑ?Ñ?Ñ?Ð¸Ð¸ Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð°">
 <!ENTITY torbutton.prefs.disable_sessionstore "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ðµ Ñ?ÐµÑ?Ñ?Ð¸Ð¹ (Ð¶ÐµÐ»Ð°Ñ?ÐµÐ»Ñ?Ð½Ð¾)">
 <!ENTITY torbutton.prefs.headers "Ð?Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¸">
-<!ENTITY torbutton.prefs.spoof_english "Ð?Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¸ ÐºÐ°Ðº Ð² Ð°Ð¼ÐµÑ?Ð¸ÐºÐ°Ð½Ñ?ÐºÐ¾Ð¹ Ð²ÐµÑ?Ñ?Ð¸Ð¸ Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð°">
-<!ENTITY torbutton.prefs.disable_referer "Ð?Ðµ Ð¿Ð¾ÐºÐ°Ð·Ñ?Ð²Ð°Ñ?Ñ? Ð´Ñ?Ñ?Ð³Ð¸Ð¼, Ð¾Ñ?ÐºÑ?Ð´Ð° Ð²Ñ? Ð¿Ñ?Ð¸Ñ?Ð»Ð¸ (Ð¼.Ð±. Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ñ? Ð½Ð° Ð½ÐµÐºÐ¾Ñ?Ð¾Ñ?Ñ?Ñ? Ñ?Ð°Ð¹Ñ?Ð°Ñ?)">
+<!ENTITY torbutton.prefs.spoof_english "Ð?Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¸ ÐºÐ°Ðº Ð² Ð²ÐµÑ?Ñ?Ð¸Ð¸ Ð±Ñ?Ð°Ñ?Ð·ÐµÑ?Ð° US English">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? DOM Storage Ð¿Ñ?Ð¸ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸ Tor (Ð²Ð°Ð¶Ð½Ð¾)">
 <!ENTITY torbutton.prefs.forms "Ð¤Ð¾Ñ?Ð¼Ñ?">
 <!ENTITY torbutton.prefs.block_tforms "Ð?Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ñ?Ð¾Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ðµ Ð¿Ð°Ñ?Ð¾Ð»ÐµÐ¹ Ð¸ Ð´Ð°Ð½Ð½Ñ?Ñ? Ñ?Ð¾Ñ?Ð¼ Ð¿Ñ?Ð¸ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Tor (Ð¶ÐµÐ»Ð°Ñ?ÐµÐ»Ñ?Ð½Ð¾)">
@@ -68,14 +80,14 @@
 <!ENTITY torbutton.prefs.dual_cookie_jars "Ð¥Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð²Ñ?Ðµ cookies Ð² Ð·Ð°Ñ?Ð¸Ñ?ÐµÐ½Ð½Ñ?Ñ? Ñ?Ð°Ð¹Ð»Ð°Ñ? (Ð¾Ð¿Ð°Ñ?Ð½Ð¾)">
 <!ENTITY torbutton.prefs.clear_http_auth "Ð?Ñ?Ð¸Ñ?Ð°Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ð¸ Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ð¸ HTTP (Ð¶ÐµÐ»Ð°Ñ?ÐµÐ»Ñ?Ð½Ð¾)">
 <!ENTITY torbutton.prefs.block_js_history "Ð?Ñ?ÐºÑ?Ñ?Ð²Ð°Ñ?Ñ? Ð²Ñ?Ðµ Ð¿Ñ?ÐµÐ´Ñ?Ð´Ñ?Ñ?Ð¸Ðµ Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ð² Ð½Ñ?Ð½ÐµÑ?Ð½ÐµÐ¼ Ñ?ÐµÐ¶Ð¸Ð¼Ðµ Tor (Ð²Ð°Ð¶Ð½Ð¾)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Ð?Ð°Ñ?Ñ?Ñ?Ð°Ð±Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¾ÐºÐ½Ð° Ñ? Ð¼Ð½Ð¾Ð¶Ð¸Ñ?ÐµÐ»ÐµÐ¼ 40px Ð¿Ñ?Ð¸ Ð¿ÐµÑ?ÐµÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ð¸ Tor (Ð¶ÐµÐ»Ð°Ñ?ÐµÐ»Ñ?Ð½Ð¾)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Ð?Ð°Ñ?Ñ?Ñ?Ð°Ð±Ð¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð¾ÐºÐ½Ð° ÐºÑ?Ð°Ñ?Ð½Ð¾ 50 Ð¿Ð¸ÐºÑ?ÐµÐ»Ð°Ð¼ Ð¿Ñ?Ð¸ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ð¸ Tor (Ð¶ÐµÐ»Ð°Ñ?ÐµÐ»Ñ?Ð½Ð¾)">
 <!ENTITY torbutton.prefs.close_tor "Ð?Ð°ÐºÑ?Ñ?Ð²Ð°Ñ?Ñ? Ð²Ñ?Ðµ Ð¾ÐºÐ½Ð° Ð¸ Ð²ÐºÐ»Ð°Ð´ÐºÐ¸ Tor Ð¿Ñ?Ð¸ Ð¿ÐµÑ?ÐµÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ð¸ Ñ?ÐµÐ¶Ð¸Ð¼Ð¾Ð² (Ð½ÐµÐ¾Ð±Ñ?Ð·.)">
 <!ENTITY torbutton.prefs.close_nontor "Ð?Ð°ÐºÑ?Ñ?Ð²Ð°Ñ?Ñ? Ð²Ñ?Ðµ Ð¾ÐºÐ½Ð° Ð¸ Ð²ÐºÐ»Ð°Ð´ÐºÐ¸ Ð½Ðµ-Tor Ð¿Ñ?Ð¸ Ð¿ÐµÑ?ÐµÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ð¸ Ñ?ÐµÐ¶Ð¸Ð¼Ð¾Ð² (Ð½ÐµÐ¾Ð±Ñ?Ð·.)">
 <!ENTITY torbutton.prefs.block_links "Ð?Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ñ?ÐµÐ»Ñ?ÐºÐ¸ Ð¿Ð¾ Ñ?Ñ?Ñ?Ð»ÐºÐ°Ð¼ Ð¸ Ð¿ÐµÑ?ÐµÐ·Ð°Ð³Ñ?Ñ?Ð·ÐºÑ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ? Ð¸Ð· Ñ?Ð°Ð·Ð½Ñ?Ñ? Ñ?ÐµÐ¶Ð¸Ð¼Ð¾Ð² Tor (Ð½ÐµÐ¾Ð±Ñ?Ð·.)">
 <!ENTITY torbutton.prefs.jar_certs "Ð¥Ñ?Ð°Ð½Ð¸Ñ?Ñ? SSL Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ñ? Ð² Ñ?Ð°Ð·Ð´ÐµÐ»Ñ?Ð½Ñ?Ñ? jar-Ñ?Ð°Ð¹Ð»Ð°Ñ? Ð´Ð»Ñ? Tor/Ð½Ðµ-Tor (Ð¶ÐµÐ»Ð°Ñ?ÐµÐ»Ñ?Ð½Ð¾)">
 <!ENTITY torbutton.prefs.jar_ca_certs "Ð¥Ñ?Ð°Ð½Ð¸Ñ?Ñ? CA Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ñ? Ð² Ñ?Ð°Ð·Ð´ÐµÐ»Ñ?Ð½Ñ?Ñ? jar-Ñ?Ð°Ð¹Ð»Ð°Ñ? Ð´Ð»Ñ? Tor/Ð½Ðµ-Tor (Ð¶ÐµÐ»Ð°Ñ?ÐµÐ»Ñ?Ð½Ð¾)">
-<!ENTITY torbutton.prefs.locked_mode 'Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? "Ð?Ð½Ð¾Ð¿ÐºÑ?" Ð¸ "Ð?Ð¾Ñ?Ñ?Ñ?Ð¸Ðµ Ð?Ð»Ð°Ð²Ð¸Ñ?Ð¸" Ð´Ð»Ñ? Ð¿ÐµÑ?Ð´Ð¾Ñ?Ð²Ñ?Ð°Ñ?ÐµÐ½Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ð¹Ð½Ð¾Ð³Ð¾ Ð¿ÐµÑ?ÐµÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ñ?ÐµÐ¶Ð¸Ð¼Ð°'>
-<!ENTITY torbutton.prefs.startup_state "Ð?Ñ?Ð¸ Ð½Ð¾Ñ?Ð¼Ð°Ð»Ñ?Ð½Ð¾Ð¼ Ð·Ð°Ð¿Ñ?Ñ?ÐºÐµ (Ð±ÐµÐ· Ð²Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ð¸), Ñ?Ñ?Ñ?Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°Ñ?Ñ? Ñ?Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðµ Tor Ð²:">
+<!ENTITY torbutton.prefs.locked_mode 'Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? "Ð?Ð½Ð¾Ð¿ÐºÑ?" Ð¸ "Ð?Ð¾Ñ?Ñ?Ñ?Ð¸Ðµ ÐºÐ»Ð°Ð²Ð¸Ñ?Ð¸" Ð´Ð»Ñ? Ð¿Ñ?ÐµÐ´Ð¾Ñ?Ð²Ñ?Ð°Ñ?ÐµÐ½Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ð¹Ð½Ð¾Ð³Ð¾ Ð¿ÐµÑ?ÐµÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ñ?ÐµÐ¶Ð¸Ð¼Ð°'>
+<!ENTITY torbutton.prefs.startup_state "Ð?Ñ?Ð¸ Ð¾Ð±Ñ?Ñ?Ð½Ð¾Ð¼ Ð·Ð°Ð¿Ñ?Ñ?ÐºÐµ (Ð±ÐµÐ· Ð²Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ð¸), Ñ?Ñ?Ñ?Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°Ñ?Ñ? Ñ?Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðµ Tor Ð²:">
 <!ENTITY torbutton.prefs.shutdown_state "Ð?Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¾Ðµ Ñ?Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ðµ">
 <!ENTITY torbutton.prefs.startup "Ð?Ð°Ð¿Ñ?Ñ?Ðº">
 <!ENTITY torbutton.prefs.block_tor_file_net "Ð?Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿ Ðº Ñ?ÐµÑ?Ð¸ Ð² Ñ?ÐµÐ¶Ð¸Ð¼Ðµ Tor, Ð¾Ñ? Ð°Ð´Ñ?ÐµÑ?Ð¾Ð² Ñ?Ð¸Ð¿Ð° file:// (Ñ?ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ñ?ÐµÑ?Ñ?Ñ?)">
@@ -91,16 +103,35 @@
 <!ENTITY torbutton.prefs.tor_tabs "Ð?ÐºÐ»Ð°Ð´ÐºÐ¸ Ð·Ð°Ð³Ñ?Ñ?Ð¶ÐµÐ½Ñ?Ðµ Ð² Ñ?ÐµÐ¶Ð¸Ð¼Ðµ Tor">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "Ð?ÐµÑ? Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð´Ð»Ñ?">
+<!ENTITY torbutton.prefs.no_proxies_on "Ð?ÐµÑ? Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð´Ð»Ñ?: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Ð?Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ: Ð?Ðµ Ð²Ð½Ð¾Ñ?Ð¸Ñ?Ðµ Ð½Ð¸ÐºÐ°ÐºÐ¸Ñ? Ð¸Ð¼ÐµÐ½ Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð² Ð² Ð¿Ð¾Ð»Ðµ Ð²Ñ?Ñ?Ðµ">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Ð?Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Livemarks Ð²Ð¾ Ð²Ñ?ÐµÐ¼Ñ? Ñ?Ð°Ð±Ð¾Ñ?Ñ? Ð² Tor">
 <!ENTITY torbutton.prefs.dtd_recommended "(Ñ?ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ñ?ÐµÑ?Ñ?Ñ?)">
 <!ENTITY torbutton.prefs.dtd_optional "(Ð¿Ð¾ Ð¶ÐµÐ»Ð°Ð½Ð¸Ñ?)">
 <!ENTITY torbutton.prefs.dtd_crucial "(ÐºÑ?Ð¸Ñ?Ð¸Ñ?Ð½Ð¾)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Ð?ÐµÑ?ÐµÐ½Ð°Ð¿Ñ?Ð°Ð²Ð»Ñ?Ñ?Ñ? Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ? Torbutton Ñ?ÐµÑ?ÐµÐ· Tor">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Ð?Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¸ Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Ð°Ð»Ñ?Ñ?ÐµÑ?Ð½Ð°Ñ?Ð¸Ð²Ð½Ñ?Ñ? Ð¿Ð¾Ð¸Ñ?ÐºÐ¾Ð²Ñ?Ñ? Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ñ? Ð¿Ñ?Ð¸ Ð¿Ð¾ÐºÐ°Ð·Ðµ Google Captcha:">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
-<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
+<!ENTITY torbutton.prefs.fix_google_srch "Ð£Ð´Ð°Ð»Ñ?Ñ?Ñ? Ñ?Ð²ÐµÐ´ÐµÐ½Ð¸Ñ? Ð¾ Ð¿Ð»Ð°Ñ?Ñ?Ð¾Ñ?Ð¼Ðµ Ð¸ Ñ?Ð·Ñ?ÐºÐµ Ð¸Ð· Ð·Ð°Ð¿Ñ?Ð¾Ñ?Ð¾Ð² Ñ?Ñ?Ñ?Ð¾ÐºÐ¸ Ð¿Ð¾Ð¸Ñ?ÐºÐ° Google">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties
index 986e6d3..0dee9ce 100644
--- a/src/chrome/locale/ru/torbutton.properties
+++ b/src/chrome/locale/ru/torbutton.properties
@@ -7,15 +7,15 @@ torbutton.panel.plugins.enabled = Ð?Ð°Ð¶Ð¼Ð¸Ñ?Ðµ, Ñ?Ñ?Ð¾Ð±Ñ? Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ?
 torbutton.panel.label.disabled = Tor Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½
 torbutton.panel.label.enabled = Tor Ð²ÐºÐ»Ñ?Ñ?ÐµÐ½
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Ð?Ð½Ð¾Ð¿ÐºÐ° Ð²ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ?/Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð° Ðº Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?ÐµÑ?ÐµÐ· Ñ?ÐµÑ?Ñ? Tor
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð» Ð¿Ñ?Ñ?Ð¼Ñ?Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¾Ð²ÐºÑ?  Ð¿Ð»Ð°Ð³Ð¸Ð½Ð¾Ð² Ñ?ÐµÑ?ÐµÐ· Tor.\n\nÐ?Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ñ?Ð¹Ñ?Ðµ Ñ?Ð¿Ð¾Ñ?Ð¾Ð± Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? ÐºÐ°Ðº.\n\n
-torbutton.popup.confirm_ca_certs = Ð?Ñ?Ð¸Ð¼ÐµÑ?Ð°ÐµÐ½Ð¸Ðµ: Ð?Ñ?ÐµÐ²Ð¸Ð´Ð½Ð¾ Ñ? Ð²Ð°Ñ? Ð½ÐµÑ? Ð¸Ð½Ð´Ð¸Ð²Ð¸Ð´Ñ?Ð°Ð»Ñ?Ð½Ñ?Ñ? Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ð² Ð?Ð²Ñ?Ð¾Ñ?Ð¸Ð·Ð°Ñ?Ð¸Ð¸. Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ð² Ð?Ð²Ñ?Ð¾Ñ?Ð¸Ð·Ð°Ñ?Ð¸Ð¸ Ð¼ÐµÐ´Ð»ÐµÐ½Ð½Ð°Ñ? Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ? Ð¸ Ð·Ð°Ð¼ÐµÐ´Ð»Ñ?ÐµÑ? Ð¿ÐµÑ?ÐµÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Tor. Ð¥Ð¾Ñ?Ð¸Ñ?Ðµ Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¸Ð·Ð¾Ð»Ñ?Ñ?Ð¸Ñ? Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ð² Ð?Ð²Ñ?Ð¾Ñ?Ð¸Ð·Ð°Ñ?Ð¸Ð¸? (Ð?Ñ?Ð»Ð¸ Ð?Ñ? Ð½Ðµ Ð¿Ð¾Ð½Ð¸Ð¼Ð°ÐµÑ?Ðµ Ð¾ Ñ?ÐµÐ¼ Ñ?ÐµÑ?Ñ?, Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½ÐµÐ¹ Ð½Ð°Ð¶Ð°Ñ?Ñ? OK)
-torbutton.popup.ff3.warning = Ð?Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ!\n\nTorbutton Ð² Firefox 3 ÐºÐ°Ðº Ð¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð¾ Ð¾Ñ?ÐºÑ?Ñ?Ð²Ð°ÐµÑ? Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñ?Ñ?Ñ? Ñ?Ñ?ÐµÑ?ÐºÐ¸ Ð´Ð°Ð½Ð½Ñ?Ñ? Ð¾ Ð²Ð°Ñ?ÐµÐ¹ Ð²Ñ?ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ Ð·Ð¾Ð½Ðµ Ð¸ livemarks Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ñ?Ñ?Ð²Ð¾Ð¼ Tor.\n\nÐ?Ñ?Ðµ ÐµÑ?Ñ? Ñ?Ð¾Ñ?Ð¸Ñ?Ðµ Ð¿Ñ?Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ?Ñ? ?
-torbutton.popup.toggle.warning = Ð?Ð»Ñ? Ñ?Ð¾Ð³Ð¾ Ñ?Ñ?Ð¾Ð±Ñ? Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ? Ð²Ñ?Ñ?Ñ?Ð¿Ð¸Ð»Ð¸ Ð² Ñ?Ð¸Ð»Ñ?. Ð?Ð°Ð¼ Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð¾ Ð²Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¸ Ð¿ÐµÑ?ÐµÐ·Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ñ? Tor.
+torbutton.popup.history.warning = Torbutton Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð» Ð´ÐµÐ¹Ñ?Ñ?Ð²Ð¸Ñ? Ñ? Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ¸, Ð·Ð°Ð³Ñ?Ñ?Ð¶ÐµÐ½Ð½Ð¾Ð¹ Ð¸Ð· Ð´Ñ?Ñ?Ð³Ð¾Ð³Ð¾ Ñ?Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ñ? Tor.\n\nÐÑ?Ð¾ Ñ?Ñ?ÐµÐ±Ñ?ÐµÑ?Ñ?Ñ? Ð´Ð»Ñ? Ð¾Ð±Ñ?Ð¾Ð´Ð° Ð´ÐµÑ?ÐµÐºÑ?Ð¾Ð² Firefox 409737 417869.\n\nÐ?Ñ?Ð»Ð¸ Ñ?Ñ?Ð¾ Ð¿Ñ?ÐµÐ´Ñ?Ñ?ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð²Ð¾Ð·Ð½Ð¸ÐºÐ»Ð¾ Ð±ÐµÐ· Ð¿Ñ?Ð¸Ñ?Ð¸Ð½Ñ?, Ð¾Ð´Ð½Ð° Ð¸Ð· Ð²Ð°Ñ?Ð¸Ñ? Ð·Ð°ÐºÐ»Ð°Ð´Ð¾Ðº Ð¿Ð¾Ð¿Ñ?Ñ?Ð°Ð»Ð°Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ·Ð°Ð³Ñ?Ñ?Ð·Ð¸Ñ?Ñ?Ñ?Ñ? Ð² Ñ?Ð¾Ð½Ð¾Ð²Ð¾Ð¼ Ñ?ÐµÐ¶Ð¸Ð¼Ðµ, Ð¸ Ñ?Ñ?Ð° Ð¿Ð¾Ð¿Ñ?Ñ?ÐºÐ° Ð±Ñ?Ð»Ð° Ð¿Ñ?ÐµÑ?ÐµÑ?ÐµÐ½Ð°.\n\nÐ?Ð»Ñ? Ð¿ÐµÑ?ÐµÐ·Ð°Ð³Ñ?Ñ?Ð·ÐºÐ¸ Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ¸ Ð² Ñ?ÐµÐºÑ?Ñ?ÐµÐ¼ Ñ?Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð¸Ð¸ Tor, Ð½Ð°Ð¶Ð¼Ð¸Ñ?Ðµ 'enter' Ð² Ð°Ð´Ñ?ÐµÑ?Ð½Ð¾Ð¹ Ñ?Ñ?Ñ?Ð¾ÐºÐµ URL.\n\n
+torbutton.popup.plugin.warning = Torbutton Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð» Ð¿Ñ?Ñ?Ð¼Ñ?Ñ? Ð·Ð°Ð³Ñ?Ñ?Ð·ÐºÑ? Ð¿Ð»Ð°Ð³Ð¸Ð½Ð¾Ð² Ñ?ÐµÑ?ÐµÐ· Tor.\n\nÐ?Ð°Ð³Ñ?Ñ?Ð¶Ð°Ð¹Ñ?Ðµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ Ð¡Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? ÐºÐ°Ðº.\n\n
+torbutton.popup.confirm_ca_certs = Ð?Ñ?Ð¸Ð¼ÐµÑ?Ð°Ð½Ð¸Ðµ: Ð?Ñ?ÐµÐ²Ð¸Ð´Ð½Ð¾ Ñ? Ð²Ð°Ñ? Ð½ÐµÑ? Ð¸Ð½Ð´Ð¸Ð²Ð¸Ð´Ñ?Ð°Ð»Ñ?Ð½Ñ?Ñ? Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ð² Ð?Ð²Ñ?Ð¾Ñ?Ð¸Ð·Ð°Ñ?Ð¸Ð¸. Ð?Ñ?Ð¾Ð²ÐµÑ?ÐºÐ° Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ð² Ð?Ð²Ñ?Ð¾Ñ?Ð¸Ð·Ð°Ñ?Ð¸Ð¸ Ð¼ÐµÐ´Ð»ÐµÐ½Ð½Ð°Ñ? Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ? Ð¸ Ð·Ð°Ð¼ÐµÐ´Ð»Ñ?ÐµÑ? Ð¿ÐµÑ?ÐµÐºÐ»Ñ?Ñ?ÐµÐ½Ð¸Ðµ Tor. Ð¥Ð¾Ñ?Ð¸Ñ?Ðµ Ð¾Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¸Ð·Ð¾Ð»Ñ?Ñ?Ð¸Ñ? Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ð² Ð?Ð²Ñ?Ð¾Ñ?Ð¸Ð·Ð°Ñ?Ð¸Ð¸? (Ð?Ñ?Ð»Ð¸ Ð?Ñ? Ð½Ðµ Ð¿Ð¾Ð½Ð¸Ð¼Ð°ÐµÑ?Ðµ Ð¾ Ñ?ÐµÐ¼ Ñ?ÐµÑ?Ñ?, Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½ÐµÐ¹ Ð½Ð°Ð¶Ð°Ñ?Ñ? OK)
+torbutton.popup.ff3.warning = Ð?Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ!\n\nÐ?Ð·Ð²ÐµÑ?Ñ?Ð½Ð¾, Ñ?Ñ?Ð¾ Torbutton Ð² Firefox 3 Ð¾Ñ?ÐºÑ?Ñ?Ð²Ð°ÐµÑ? Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñ?Ñ?Ñ? Ñ?Ñ?ÐµÑ?ÐºÐ¸ Ð´Ð°Ð½Ð½Ñ?Ñ? Ð¾ Ð²Ð°Ñ?ÐµÐ¼ Ñ?Ð°Ñ?Ð¾Ð²Ð¾Ð¼ Ð¿Ð¾Ñ?Ñ?Ðµ Ð¸ livemarks Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ñ?Ñ?Ð²Ð¾Ð¼ Tor.\n\nÐ?Ñ?Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ?Ñ??
+torbutton.popup.toggle.warning = Ð§Ñ?Ð¾Ð±Ñ? Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ? Ð²Ñ?Ñ?Ñ?Ð¿Ð¸Ð»Ð¸ Ð² Ñ?Ð¸Ð»Ñ?, Ð½Ñ?Ð¶Ð½Ð¾ Ð²Ñ?ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¸ Ð¿ÐµÑ?ÐµÐ·Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ñ? Tor.
 torbutton.popup.test.success = Tor proxy Ñ?ÐµÑ?Ñ? Ñ?Ñ?Ð¿ÐµÑ?Ð½Ð¾ Ð¿Ñ?Ð¾Ð¹Ð´ÐµÐ½!
-torbutton.popup.test.failure = Tor proxy Ñ?ÐµÑ?Ñ? Ð·Ð°Ð²ÐµÑ?Ñ?Ð¸Ð»Ñ?Ñ? Ð?Ð?Ð£Ð?Ð?Ð§Ð?Ð?! Ð?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ñ?Ðµ Ð²Ð°Ñ? proxy Ð¸ ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð°Ñ?Ð¸Ñ? Privoxy.
-torbutton.popup.test.confirm_toggle = Ð¡Ð°Ð¼Ð¾Ðµ Ð¿Ð¾Ñ?Ð»ÐµÐ´Ð½ÐµÐµ Ð¸Ñ?Ð¿Ñ?Ñ?Ð°Ð½Ð¸Ðµ Tor Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð½Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Tor.\n\nÐ?Ñ? Ñ?Ð²ÐµÑ?ÐµÐ½Ñ? Ñ?Ñ?Ð¾ Ñ?Ð¾Ñ?Ð¸Ñ?Ðµ Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Tor Ð½Ðµ Ñ?Ð¼Ð¾Ñ?Ñ?Ñ? Ð½Ð° Ð¿Ñ?Ð¾Ð²Ð°Ð» Ñ?ÐµÑ?Ñ?Ð°?\n\nÐ?Ñ?Ð¸Ð¼ÐµÑ?Ð°Ð½Ð¸Ðµ: Ð?Ñ?Ð»Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð° Ñ?ÐµÑ?ÐµÐ½Ð°, Ð¼Ð¾Ð¶Ð½Ð¾ Ð±Ñ?Ð´ÐµÑ? Ð¿Ð¾Ð²Ñ?Ð¾Ñ?Ð½Ñ?Ñ? Ð¸Ñ?Ð¿Ñ?Ñ?Ð°Ð½Ð¸Ð¹ Ð² Ð¾ÐºÐ½Ðµ "Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ° Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Torbutton" Ð´Ð»Ñ? Ñ?Ñ?Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ñ? Ñ?Ñ?Ð¾Ð³Ð¾ Ð¿Ñ?ÐµÐ´Ñ?Ð¿Ñ?ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ?.
-torbutton.popup.test.ff3_notice = Ð?Ð°Ð¶Ð¼Ð¸Ñ?Ðµ OK Ð´Ð»Ñ? Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐºÐ¸ Ð½Ð°Ñ?Ñ?Ñ?Ð¾ÐµÐº Tor. ÐÑ?Ð¾Ñ? Ñ?ÐµÑ?Ñ? Ð²Ñ?Ð¿Ð¾Ð»Ð½Ñ?ÐµÑ?Ñ?Ñ? Ð² Ñ?Ð¾Ð½Ðµ. Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð° Ð±Ñ?Ð´Ñ?Ñ?Ðµ Ñ?ÐµÑ?Ð¿ÐµÐ»Ð¸Ð²Ñ?. Ð?Ð¾Ð¶Ð´Ð¸Ñ?ÐµÑ?Ñ? Ñ?ÐµÐ·Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ð¾Ð².
+torbutton.popup.test.failure = Ð¢ÐµÑ?Ñ? Tor Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð·Ð°Ð²ÐµÑ?Ñ?Ð¸Ð»Ñ?Ñ? Ð?Ð?Ð£Ð?Ð?Ð§Ð?Ð?! Ð?Ñ?Ð¾Ð²ÐµÑ?Ñ?Ñ?Ðµ Ð²Ð°Ñ? Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð¸ ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð°Ñ?Ð¸Ñ? Polipo.
+torbutton.popup.test.confirm_toggle = Ð¡Ð°Ð¼Ð¾Ðµ Ð¿Ð¾Ñ?Ð»ÐµÐ´Ð½ÐµÐµ Ð¸Ñ?Ð¿Ñ?Ñ?Ð°Ð½Ð¸Ðµ Tor Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð½Ðµ Ñ?Ð´Ð°Ð»Ð¾Ñ?Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Tor.\n\nÐ?Ñ? Ñ?Ð²ÐµÑ?ÐµÐ½Ñ? Ñ?Ñ?Ð¾ Ñ?Ð¾Ñ?Ð¸Ñ?Ðµ Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Tor Ð½Ðµ Ñ?Ð¼Ð¾Ñ?Ñ?Ñ? Ð½Ð° Ð¿Ñ?Ð¾Ð²Ð°Ð» Ñ?ÐµÑ?Ñ?Ð°?\n\nÐ?Ñ?Ð¸Ð¼ÐµÑ?Ð°Ð½Ð¸Ðµ: Ð?Ñ?Ð»Ð¸ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð° Ñ?ÐµÑ?ÐµÐ½Ð°, Ð¼Ð¾Ð¶Ð½Ð¾ Ð±Ñ?Ð´ÐµÑ? Ð¿Ð¾Ð²Ñ?Ð¾Ñ?Ð½Ñ?Ñ? Ð¸Ñ?Ð¿Ñ?Ñ?Ð°Ð½Ð¸Ð¹ Ð² Ð¾ÐºÐ½Ðµ 'Ð?Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ° Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Torbutton' Ð´Ð»Ñ? Ñ?Ñ?Ñ?Ñ?Ð°Ð½ÐµÐ½Ð¸Ñ? Ñ?Ñ?Ð¾Ð³Ð¾ Ð¿Ñ?ÐµÐ´Ñ?Ð¿Ñ?ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ?.
+torbutton.popup.test.ff3_notice = Ð?Ð°Ð¶Ð¼Ð¸Ñ?Ðµ OK Ð´Ð»Ñ? Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐºÐ¸ Ð½Ð°Ñ?Ñ?Ñ?Ð¾ÐµÐº Tor. ÐÑ?Ð¾Ñ? Ñ?ÐµÑ?Ñ? Ð²Ñ?Ð¿Ð¾Ð»Ð½Ñ?ÐµÑ?Ñ?Ñ? Ð² Ñ?Ð¾Ð½Ðµ. Ð?Ð¾Ð¶Ð°Ð»Ñ?Ð¹Ñ?Ñ?Ð°, Ð´Ð¾Ð¶Ð´Ð¸Ñ?ÐµÑ?Ñ? Ñ?ÐµÐ·Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ð¾Ð².
 torbutton.panel.label.verified = Tor Ð?Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½
 torbutton.popup.test.auto_failed = Ð?Ð²Ñ?Ð¾Ð¼Ð°Ñ?Ð¸Ñ?ÐµÑ?ÐºÐ¸Ð¹ Ñ?ÐµÑ?Ñ? Tor proxy Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ñ?Ñ? Tor Ñ?ÐµÑ?Ñ?.\n\nÐ?Ñ? Ñ?Ð²ÐµÑ?ÐµÐ½Ñ? Ñ?Ñ?Ð¾ Ñ?Ð¾Ñ?Ð¸Ñ?Ðµ Ð²ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ñ? Tor Ð½Ðµ Ñ?Ð¼Ð¾Ñ?Ñ?Ñ? Ð½Ð° Ð¿Ñ?Ð¾Ð²Ð°Ð» Ñ?ÐµÑ?Ñ?Ð°?
 torbutton.prefs.recommended = (Ñ?ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ñ?ÐµÑ?Ñ?Ñ?)
@@ -23,14 +23,14 @@ torbutton.prefs.optional = (Ð¿Ð¾ Ð¶ÐµÐ»Ð°Ð½Ð¸Ñ?)
 torbutton.prefs.crucial = (ÐºÑ?Ð¸Ñ?Ð¸Ñ?Ð½Ð¾)
 torbutton.popup.external.title = Ð?Ð°Ð³Ñ?Ñ?Ð·Ð¸Ñ?Ñ? Ð²Ð½ÐµÑ?Ð½Ð¸Ðµ Ð´Ð°Ð½Ð½Ñ?Ðµ?
 torbutton.popup.external.app = Ð?Ð½ÐµÑ?Ð½Ñ?Ñ? Ð¿Ñ?Ð¸ÐºÐ»Ð°Ð´Ð½Ð°Ñ? Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¼Ð° Ð½ÐµÐ¾Ð±Ñ?Ð¾Ð´Ð¸Ð¼Ð° Ð´Ð»Ñ? Ð¾Ð±Ñ?Ð°Ð±Ð¾Ñ?ÐºÐ¸:\n\n
-torbutton.popup.external.note = \n\nÐ?Ð Ð?Ð?Ð?Ð§Ð?Ð?Ð?Ð?: Ð?Ð½ÐµÑ?Ð½Ð¸Ðµ Ð¿Ñ?Ð¸ÐºÐ»Ð°Ð´Ð½Ñ?Ðµ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¼Ñ? Ð?Ð? Ð¯Ð?Ð?Ð¯Ð®Ð¢Ð¡Ð¯ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ñ? Ð´Ð»Ñ? Tor Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ? Ð¸ Ð¼Ð¾Ð³Ñ?Ñ? Ñ?Ð°Ð·Ð¾Ð±Ð»Ð°Ñ?Ð¸Ñ?Ñ? Ð²Ð°Ñ?!\n
-torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
+torbutton.popup.external.note = \n\nÐ?Ð Ð?Ð?Ð?Ð§Ð?Ð?Ð?Ð?: Ð?Ð½ÐµÑ?Ð½Ð¸Ðµ Ð¿Ñ?Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ? Ð?Ð? Ð¯Ð?Ð?Ð¯Ð®Ð¢Ð¡Ð¯ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ñ?Ð¼Ð¸ Ð´Ð»Ñ? Tor Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?, Ð¸ Ð¼Ð¾Ð³Ñ?Ñ? Ñ?Ð°Ð·Ð¾Ð±Ð»Ð°Ñ?Ð¸Ñ?Ñ? Ð²Ð°Ñ?!\n
+torbutton.popup.external.suggest = \nÐ?Ñ?Ð»Ð¸ Ð²Ñ? Ð½Ðµ Ð´Ð¾Ð²ÐµÑ?Ñ?ÐµÑ?Ðµ Ñ?Ñ?Ð¾Ð¼Ñ? Ñ?Ð°Ð¹Ð»Ñ?, Ñ?Ð»ÐµÐ´Ñ?ÐµÑ? Ñ?Ð¾Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? ÐµÐ³Ð¾ Ð´Ð»Ñ? Ð¿Ñ?Ð¾Ñ?Ð¼Ð¾Ñ?Ñ?Ð° Ð¿Ñ?Ð¸ Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ð½Ð¾Ð¹ Ñ?ÐµÑ?Ð¸ Ð¸Ð»Ð¸ Ð² Ð²Ð¸Ñ?Ñ?Ñ?Ð°Ð»Ñ?Ð½Ð¾Ð¹ Ð¼Ð°Ñ?Ð¸Ð½Ðµ,\nÐ»Ð¸Ð±Ð¾ Ñ?Ð°Ñ?Ñ?Ð¼Ð¾Ñ?Ñ?ÐµÑ?Ñ? Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñ?Ñ?Ñ? Ð¸Ñ?Ð¿Ð¾Ð»Ñ?Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ? Ð¿Ñ?Ð¾Ð·Ñ?Ð°Ñ?Ð½Ð¾Ð¹ Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Tor Ð½Ð°Ð¿Ð¾Ð´Ð¾Ð±Ð¸Ðµ Amnesia LiveCD, torsocks Ð¸Ð»Ð¸ TorVM.\n
 torbutton.popup.launch = Ð?Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ñ? Ð¿Ñ?Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ
 torbutton.popup.cancel = Ð?Ñ?Ð¼ÐµÐ½Ð¸Ñ?Ñ?
-torbutton.popup.dontask = Ð?Ñ?Ð½Ð°Ð½Ðµ Ð²Ñ?ÐµÐ³Ð´Ð° Ð·Ð°Ð¿Ñ?Ñ?ÐºÐ°Ñ?Ñ? Ð¿Ñ?Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ?
-torbutton.popup.test.no_http_proxy = Tor Ð¿Ñ?Ð¾ÐºÑ?Ð¸-Ñ?ÐµÑ?Ñ?: Ð?ÐµÑ?Ñ?Ð½Ñ?Ðµ HTTP-Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ?. Ð Ð°Ð±Ð¾Ñ?Ð°ÐµÑ?-Ð»Ð¸ Polipo  Ð´Ð¾Ð»Ð¶Ð½Ñ?Ð¼ Ð¾Ð±Ñ?Ð°Ð·Ð¾Ð¼?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.dontask = Ð? Ð±Ñ?Ð´Ñ?Ñ?ÐµÐ¼ Ð²Ñ?ÐµÐ³Ð´Ð° Ð·Ð°Ð¿Ñ?Ñ?ÐºÐ°Ñ?Ñ? Ð¿Ñ?Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ?
+torbutton.popup.test.no_http_proxy = Tor Ð¿Ñ?Ð¾ÐºÑ?Ð¸-Ñ?ÐµÑ?Ñ?: Ð?ÐµÑ?Ñ?Ð½Ñ?Ðµ HTTP-Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ?. Ð Ð°Ð±Ð¾Ñ?Ð°ÐµÑ?-Ð»Ð¸ Polipo Ð´Ð¾Ð»Ð¶Ð½Ñ?Ð¼ Ð¾Ð±Ñ?Ð°Ð·Ð¾Ð¼?
+torbutton.popup.captcha.title = Ð?Ð·Ð±ÐµÐ³Ð°Ñ?Ñ? Google Captcha?
+torbutton.popup.captcha.ask = Torbutton Ð¾Ð±Ð½Ð°Ñ?Ñ?Ð¶Ð¸Ð» Google Captcha. Ð?ÐµÑ?ÐµÐ½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ? Ð·Ð°Ð¿Ñ?Ð¾Ñ? Ð½Ð° Ð´Ñ?Ñ?Ð³Ñ?Ñ? Ð¿Ð¾Ð¸Ñ?ÐºÐ¾Ð²Ñ?Ñ? Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ñ??
+torbutton.popup.captcha.always = Ð? Ð±Ñ?Ð´Ñ?Ñ?ÐµÐ¼ Ð²Ñ?ÐµÐ³Ð´Ð° Ð·Ð°Ð¿Ñ?Ñ?ÐºÐ°Ñ?Ñ? Ð¿Ñ?Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ?
+torbutton.popup.redirect = Ð?ÐµÑ?ÐµÐ½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ñ?
+torbutton.popup.no_redirect = Ð?Ðµ Ð¿ÐµÑ?ÐµÐ½Ð°Ð¿Ñ?Ð°Ð²Ð»Ñ?Ñ?Ñ?
diff --git a/src/chrome/locale/sl/torbutton.dtd b/src/chrome/locale/sl/torbutton.dtd
index 8392ef1..29161ee 100644
--- a/src/chrome/locale/sl/torbutton.dtd
+++ b/src/chrome/locale/sl/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "O razÅ¡iritvi Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klikni za inicializiranje razÅ¡iritve Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Varnostne Nastavitve">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Prepovej zapisovanje medpomnilnika na disk ter brisanje medpomnilnika ob preklopu Tor-a">
 <!ENTITY torbutton.prefs.block_cache "Prepovej zapisovanje (na disk in zaÄ?asni spomin) medpomnilnika med uporabo Tor-a">
 <!ENTITY torbutton.prefs.cookie_jars "Shrani ne-Tor piÅ¡kotke v zaÅ¡Ä?iten predal">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "Samodejno bom upravljal z piÅ¡kotki (nevarno)">
 <!ENTITY torbutton.prefs.clear_cookies "ZbriÅ¡i piÅ¡kotke ob preklopu Tor-a">
 <!ENTITY torbutton.prefs.disable_plugins "OnemogoÄ?i dodatke med uporabo Tor-a (obvezno)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "OnemogoÄ?i shranjevanje sej (proporoÄ?eno)">
 <!ENTITY torbutton.prefs.headers "Headers (informacije na zaÄ?etku paketa - naslavljanje)">
 <!ENTITY torbutton.prefs.spoof_english 'Navidezno "US English" brskalnik'>
-<!ENTITY torbutton.prefs.disable_referer 'Ne poÅ¡iljaj "referer" med uporabo Tor-a (lahko prekine doloÄ?ene strani)'>
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "OnemogoÄ?i DOM shranjevanje med uporabo Tor-a (obvezno)">
 <!ENTITY torbutton.prefs.forms "Obrazci">
 <!ENTITY torbutton.prefs.block_tforms "Prepovej shranjevanje vnosov v obrazce in gesel med uporabo Tor-a (priporoÄ?eno)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "Ne uporabi Proxi za: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Opozorilo: izogibaj se uporabi zgornjih oznak (hostname)">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "OnemogoÄ?i RSS posodobitve med uporaboTor-a ">
 <!ENTITY torbutton.prefs.dtd_recommended "(priporoÄ?eno)">
 <!ENTITY torbutton.prefs.dtd_optional "(neobvezno)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/sq/torbutton.dtd b/src/chrome/locale/sq/torbutton.dtd
index 8dcfb2b..7e1fb3b 100644
--- a/src/chrome/locale/sq/torbutton.dtd
+++ b/src/chrome/locale/sq/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "About Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd
index 786275f..44c666b 100644
--- a/src/chrome/locale/sv/torbutton.dtd
+++ b/src/chrome/locale/sv/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Om Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Klicka fÃ¶r att installera Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "SÃ¤kerhetsinstÃ¤llningar">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Rensa diskcache vid pÃ¥/avslagning av Tor">
 <!ENTITY torbutton.prefs.block_cache "Blockera Ã¥tkomst till disk- och minnescache medan Tor Ã¤r aktiverat">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "Jag skÃ¶ter cookies manuellt (farligt)">
 <!ENTITY torbutton.prefs.clear_cookies "Rensa cookies vid pÃ¥/avaktivering av Tor">
 <!ENTITY torbutton.prefs.disable_plugins "Avaktivera plugins nÃ¤r Tor anvÃ¤nds (kritiskt)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties
index e2e8754..3547a42 100644
--- a/src/chrome/locale/sv/torbutton.properties
+++ b/src/chrome/locale/sv/torbutton.properties
@@ -1,36 +1,36 @@
-torbutton.button.tooltip.disabled = Enable Tor
-torbutton.button.tooltip.enabled = Disable Tor
-torbutton.panel.tooltip.disabled = Click to enable Tor
-torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.plugins.disabled = Click to enable plugins
-torbutton.panel.plugins.enabled = Click to disable plugins
-torbutton.panel.label.disabled = Tor Disabled
-torbutton.panel.label.enabled = Tor Enabled
+torbutton.button.tooltip.disabled = Aktivera Tor
+torbutton.button.tooltip.enabled = Inaktivera Tor
+torbutton.panel.tooltip.disabled = Klicka fÃ¶r att aktivera Tor
+torbutton.panel.tooltip.enabled = Klicka fÃ¶r att inaktivera Tor
+torbutton.panel.plugins.disabled = Klicka fÃ¶r att aktivera plugins
+torbutton.panel.plugins.enabled = Klicka fÃ¶r att inaktivera plugins
+torbutton.panel.label.disabled = Tor inaktiv
+torbutton.panel.label.enabled = Tor aktiv
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbutton provides a button to easily enable or disable pointing Firefox to the Tor proxy
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down 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)
 torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
 torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.success = Tor-proxy testet lyckades!
 torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
 torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-torbutton.panel.label.verified = Tor Verified
+torbutton.panel.label.verified = Tor verifierad
 torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-torbutton.prefs.recommended = (recommended)
-torbutton.prefs.optional = (optional)
-torbutton.prefs.crucial = (crucial)
+torbutton.prefs.recommended = (rekommenderat)
+torbutton.prefs.optional = (valfritt)
+torbutton.prefs.crucial = (kritiskt)
 torbutton.popup.external.title = Load external content?
 torbutton.popup.external.app = An external application is needed to handle:\n\n
 torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
 torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
-torbutton.popup.launch = Launch application
-torbutton.popup.cancel = Cancel
+torbutton.popup.launch = Starta program
+torbutton.popup.cancel = Avbryt
 torbutton.popup.dontask = Always launch applications from now on
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.title = Undvik Google Captchas?
 torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
 torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.redirect = Omdirigera
+torbutton.popup.no_redirect = Omdirigera inte
diff --git a/src/chrome/locale/sw/torbutton.dtd b/src/chrome/locale/sw/torbutton.dtd
index 8dcfb2b..7e1fb3b 100644
--- a/src/chrome/locale/sw/torbutton.dtd
+++ b/src/chrome/locale/sw/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "About Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/th/torbutton.dtd b/src/chrome/locale/th/torbutton.dtd
index 0aa7a46..71a7940 100644
--- a/src/chrome/locale/th/torbutton.dtd
+++ b/src/chrome/locale/th/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "à¹?à¸?à¸µà¹?à¸¢à¸§à¸?à¸±à¸? Torbutton ...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd
index 8dcfb2b..1916073 100644
--- a/src/chrome/locale/tr/torbutton.dtd
+++ b/src/chrome/locale/tr/torbutton.dtd
@@ -1,106 +1,137 @@
-<!ENTITY torbutton.prefs.title "Torbutton Preferences">
-<!ENTITY torbutton.prefs.display_settings "Display Settings">
-<!ENTITY torbutton.prefs.display_panel "Display Tor proxy setting in the status bar">
-<!ENTITY torbutton.prefs.panel_format "Status bar display format:">
-<!ENTITY torbutton.prefs.panel_text_format "Text">
-<!ENTITY torbutton.prefs.panel_icon_format "Icon">
-<!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
-<!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
-<!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
-<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
-<!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
+<!ENTITY torbutton.prefs.title "Ayarlar">
+<!ENTITY torbutton.prefs.display_settings "GÃ¶rÃ¼nÃ¼m">
+<!ENTITY torbutton.prefs.display_panel "Durum Ã§ubuÄ?unda proxy ayarlarÄ±nÄ± gÃ¶ster">
+<!ENTITY torbutton.prefs.panel_format "Durum Ã§ubuÄ?u gÃ¶rÃ¼ntÃ¼leme formatÄ±:">
+<!ENTITY torbutton.prefs.panel_text_format "Metin">
+<!ENTITY torbutton.prefs.panel_icon_format "Ä°kon">
+<!ENTITY torbutton.prefs.tor_settings "Proxy">
+<!ENTITY torbutton.prefs.recommended_settings "Firefoxta varsayÄ±lan proxy ayarlarÄ±mÄ± kullan">
+<!ENTITY torbutton.prefs.use_privoxy "Proxoy'i kullan">
+<!ENTITY torbutton.prefs.use_polipo "Polippo'yu kullan">
+<!ENTITY torbutton.prefs.custom_settings "VarsayÄ±lan proxyi kullan">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.ftp "FTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
-<!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
-<!ENTITY torbutton.pref_connection.more_info "More information">
-<!ENTITY torbutton.pref_connection_more_info.title "Help">
-<!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled.  If you would like to change your non-Tor proxy settings, please disable Torbutton and return here.  If you would like to change your Tor settings, please use the Torbutton preference window.">
-<!ENTITY torbutton.context_menu.toggle "Toggle Tor status">
+<!ENTITY torbutton.about.title "Torbutton HakkÄ±nda">
+<!ENTITY torbutton.pref_connection.notice "AyarlarÄ± uygulumak iÃ§in Torbutonu devredÄ±Å?Ä± bÄ±rak.">
+<!ENTITY torbutton.pref_connection.more_info "Daha fazla bilgi">
+<!ENTITY torbutton.pref_connection_more_info.title "YardÄ±m">
+<!ENTITY torbutton.pref_connection_more_info.text "Torbuton Å?u anda devredÄ±Å?Ä±. Proxy ayarlarÄ±nÄ± deÄ?iÅ?tirmek istiyorsan, Torbutonu tekrar devredÄ±Å?Ä± bÄ±rak. Genel ayarlarÄ± deÄ?iÅ?tirecekten, ayarlar penceresini kullan.">
+<!ENTITY torbutton.context_menu.toggle "Durum">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "Preferences...">
-<!ENTITY torbutton.context_menu.preferences.key "P">
-<!ENTITY torbutton.context_menu.about "About Torbutton...">
-<!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.sec_settings "Security Settings">
-<!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)">
-<!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.block_nthwrite "Block history writes during Non-Tor (optional)">
-<!ENTITY torbutton.prefs.clear_history "Clear history on Tor toggle (optional)">
-<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
-<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
-<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
-<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
-<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
-<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.kill_bad_js "Hook dangerous javascript (crucial)">
-<!ENTITY torbutton.prefs.isolate_content "Isolate dynamic content to Tor state (crucial)">
-<!ENTITY torbutton.prefs.no_updates "Disable updates during Tor usage">
-<!ENTITY torbutton.prefs.set_uagent "Set user agent for Tor usage (crucial)">
-<!ENTITY torbutton.prefs.dynamic "Dynamic Content">
-<!ENTITY torbutton.prefs.cookies "Cookies">
-<!ENTITY torbutton.prefs.cache "Cache">
-<!ENTITY torbutton.prefs.history "History">
-<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
-<!ENTITY torbutton.prefs.shutdown "Shutdown">
-<!ENTITY torbutton.prefs.tor_shutdown "Clear Tor cookies during Tor-enabled browser shutdown">
-<!ENTITY torbutton.prefs.all_shutdown "Clear cookies during any browser shutdown">
-<!ENTITY torbutton.prefs.no_shutdown "Do not clear my cookies at shutdown">
-<!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
-<!ENTITY torbutton.prefs.headers "Headers">
-<!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
-<!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
-<!ENTITY torbutton.prefs.forms "Forms">
-<!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
-<!ENTITY torbutton.prefs.block_ntforms "Block password+form saving during Non-Tor (optional)">
+<!ENTITY torbutton.context_menu.preferences "Ayarlar">
+<!ENTITY torbutton.context_menu.preferences.key "A">
+<!ENTITY torbutton.context_menu.about "HakkÄ±nda">
+<!ENTITY torbutton.context_menu.about.key "H">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
+<!ENTITY torbutton.button.label "Torbuton">
+<!ENTITY torbutton.button.tooltip "BaÅ?lat">
+<!ENTITY torbutton.prefs.sec_settings "GÃ¼venlik AyarlarÄ±">
+<!ENTITY torbutton.prefs.block_thread "Tor Ã§alÄ±Å?Ä±rken geÃ§miÅ?i okumayÄ± durdur(kritik)">
+<!ENTITY torbutton.prefs.block_thwrite "Tor Ã§alÄ±Å?Ä±rken geÃ§miÅ?i oluÅ?turmayÄ± durdur(Ã¶nerilen)">
+<!ENTITY torbutton.prefs.block_nthread "Tor Ã§alÄ±Å?mÄ±yorken geÃ§miÅ?i okumayÄ± durdur (opsiyonel)">
+<!ENTITY torbutton.prefs.block_nthwrite "Tor Ã§alÄ±Å?Ä±rken geÃ§miÅ?i oluÅ?tururken durdur(Ã¶nerilen)">
+<!ENTITY torbutton.prefs.clear_history "Tor baÅ?latÄ±lÄ±rken geÃ§miÅ?i temizle(Ã¶nerilen)">
+<!ENTITY torbutton.prefs.clear_cache "Tor devredeyken tÃ¼m Ã¶nbelleklemeleri temizle">
+<!ENTITY torbutton.prefs.block_cache "Disk ve Ã¶nbellek eriÅ?imini engelle">
+<!ENTITY torbutton.prefs.cookie_jars 'Ã?erezleri korumalÄ± "jar" dosyasÄ±nda tut'>
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
+<!ENTITY torbutton.prefs.mmm_cookies "Ã?erezlerimi kendim yÃ¶netmek istiyorum (tehlikeli)">
+<!ENTITY torbutton.prefs.clear_cookies "Tor Ã§alÄ±Å?Ä±rken tÃ¼m Ã§erezleri temizle">
+<!ENTITY torbutton.prefs.disable_plugins "Tor Ã§alÄ±Å?Ä±rken eklentileri devredÄ±Å?Ä± bÄ±rak(kritik)">
+<!ENTITY torbutton.prefs.kill_bad_js "Tehlikeli javascriptleri yakala(kritik)">
+<!ENTITY torbutton.prefs.isolate_content "Tor Ã§alÄ±Å?Ä±rken dinamik iÃ§eriÄ?i koru(kritik)">
+<!ENTITY torbutton.prefs.no_updates "Tor Ã§alÄ±Å?Ä±rken gÃ¼ncellemeleri devredÄ±Å?Ä± bÄ±rak">
+<!ENTITY torbutton.prefs.set_uagent "Tor kullanÄ±mÄ± iÃ§in arabirim ayarla(kritik)">
+<!ENTITY torbutton.prefs.dynamic "Dinamik iÃ§erik">
+<!ENTITY torbutton.prefs.cookies "Ã?erezler">
+<!ENTITY torbutton.prefs.cache "Ã?nbellek">
+<!ENTITY torbutton.prefs.history "GeÃ§miÅ?">
+<!ENTITY torbutton.prefs.no_search 'Arama yaparken "Ã¶neriler" Ã¶zelliÄ?ini devredÄ±Å?Ä± bÄ±rak(tavsiye edilen)\'>
+<!ENTITY torbutton.prefs.shutdown "Kapat">
+<!ENTITY torbutton.prefs.tor_shutdown "Etkin-DevredÄ±Å?Ä± bÄ±rakÄ±rken tÃ¼m Ã§erezleri temizle">
+<!ENTITY torbutton.prefs.all_shutdown "TarayÄ±cÄ±yÄ± kapattÄ±Ä?Ä±mda tÃ¼m Ã§erezleri temizle">
+<!ENTITY torbutton.prefs.no_shutdown "ProgramÄ± kapatÄ±Ä?Ä±mda Ã§erezlerimi silme">
+<!ENTITY torbutton.prefs.disable_sessionstore "Oturum kaydÄ± devredÄ±Å?Ä±(tavsiye edilen)">
+<!ENTITY torbutton.prefs.headers "BaÅ?lÄ±k Bilgileri">
+<!ENTITY torbutton.prefs.spoof_english "Ä°ngilizce web gezginlerini denetle">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.disable_domstorage "Tor Ã§alÄ±Å?Ä±rken DCOM belleÄ?ini devredÄ±Å?Ä± bÄ±rak(kritik)">
+<!ENTITY torbutton.prefs.forms "Formlar">
+<!ENTITY torbutton.prefs.block_tforms "Tor kullanÄ±lÄ±rken Å?ifreleri kaydetme(Ã¶nerilen)">
+<!ENTITY torbutton.prefs.block_ntforms "Tor Ã§alÄ±Å?mÄ±yorken Å?ifreleri kaydetme(isteÄ?e baÄ?lÄ±)">
 <!ENTITY torbutton.prefs.tor "Tor">
 <!ENTITY torbutton.prefs.non_tor "Non-Tor">
-<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
-<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "Store both Tor and Non-Tor cookies in protected jars (dangerous)">
-<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
-<!ENTITY torbutton.prefs.block_js_history "Isolate access to history navigation to Tor state (crucial)">
-<!ENTITY torbutton.prefs.resize_on_toggle "Resize windows to multiples of 50px during Tor usage (recommended)">
-<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
-<!ENTITY torbutton.prefs.block_links "Block link clicks and page reloads from different Tor states (optional)">
-<!ENTITY torbutton.prefs.jar_certs "Store SSL certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.jar_ca_certs "Store CA certs in seperate jars for Tor/Non-Tor (recommended)">
-<!ENTITY torbutton.prefs.locked_mode "Disable Button and Hotkeys to prevent accidental toggle">
-<!ENTITY torbutton.prefs.startup_state "On normal startup, set Tor state to:">
-<!ENTITY torbutton.prefs.shutdown_state "Shutdown state">
-<!ENTITY torbutton.prefs.startup "Startup">
-<!ENTITY torbutton.prefs.block_tor_file_net "Block Tor access to network from file:// urls (recommended)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "Block Non-Tor access to network from file:// urls">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.prefs.test_settings "Test Settings">
-<!ENTITY torbutton.prefs.test_auto "Test my Tor settings after the first time I toggle on every Firefox start">
+<!ENTITY torbutton.prefs.restore_tor "Oturumunda restore baÅ?langÄ±Ã§, Tor devlet ayarlamak iÃ§in:">
+<!ENTITY torbutton.prefs.reload_crashed_jar 'Firefox Ã§Ã¶ktÃ¼Ä?Ã¼nde, Ã§erezleri "jar" dosyalarÄ±ndan geri yÃ¼kle(Tavsiye edilen)'>
+<!ENTITY torbutton.prefs.dual_cookie_jars "TÃ¼m Ã§erezleri korunan jar dosyalarÄ±nda tut(tehlikeli)">
+<!ENTITY torbutton.prefs.clear_http_auth "HTTP oturum doÄ?rulamalarÄ±nÄ±n tÃ¼mÃ¼nÃ¼ temizle(Ã¶nerilen)">
+<!ENTITY torbutton.prefs.block_js_history "Tor Ã§alÄ±Å?Ä±yorken geÃ§miÅ? bilgisinde gezinmeyi yasakla(kritik)">
+<!ENTITY torbutton.prefs.resize_on_toggle "Tor kullanÄ±rken pencereleri 50px'le Ã¶lÃ§ekle (Ã¶nerilen)">
+<!ENTITY torbutton.prefs.close_tor "Tor aktif olduÄ?unda tÃ¼m pencereleri temizle (Ã¶nerilen)">
+<!ENTITY torbutton.prefs.close_nontor "Kapatmak tÃ¼m Sigara Tor pencereleri ve sekmeleri toggle (isteÄ?e baÄ?lÄ±)">
+<!ENTITY torbutton.prefs.block_links "Blok link tÄ±klama ve farklÄ± Tor devletler (isteÄ?e baÄ?lÄ±), sayfa yeniden yÃ¼kler            ">
+<!ENTITY torbutton.prefs.jar_certs "Tor / Non-Tor iÃ§in ayrÄ± kavanozlarda saklayÄ±n SSL certs (tavsiye)">
+<!ENTITY torbutton.prefs.jar_ca_certs "Tor / Non-Tor iÃ§in ayrÄ± kavanozlarda saklayÄ±n CA certs (Ã¶nerilir)            ">
+<!ENTITY torbutton.prefs.locked_mode "Sakatlar DÃ¼Ä?me ve Hotkeys yanlÄ±Å?lÄ±kla geÃ§iÅ? Ã¶nlemek iÃ§in">
+<!ENTITY torbutton.prefs.startup_state "Normal Ã§alÄ±Å?maya baÅ?layÄ±nca, Tor devlet ayarlamak iÃ§in:">
+<!ENTITY torbutton.prefs.shutdown_state "Kapatma devlet            ">
+<!ENTITY torbutton.prefs.startup "BaÅ?langÄ±Ã§">
+<!ENTITY torbutton.prefs.block_tor_file_net "Dosyadan Tor aÄ? eriÅ?imi file:// url (Ã¶nerilir)">
+<!ENTITY torbutton.prefs.block_nontor_file_net "Dosyadan non-Tor aÄ? eriÅ?imi file:// url (Ã¶nerilir)">
+<!ENTITY torbutton.prefs.restore_defaults "VarsayÄ±lan Ayarlar">
+<!ENTITY torbutton.prefs.test_settings "AyarlarÄ± test et">
+<!ENTITY torbutton.prefs.test_auto "Her ateÅ? baÅ?lar toggle ilk defa sonra Test benim Tor ayarlarÄ±">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "Do not write Tor cookies to disk">
-<!ENTITY torbutton.prefs.nontor_memory_jar "Do not write Non-Tor cookies to disk">
-<!ENTITY torbutton.prefs.session_restore "Have the session store save and restore these tabs:">
-<!ENTITY torbutton.prefs.nontor_tabs "Tabs loaded in Non-Tor">
-<!ENTITY torbutton.prefs.tor_tabs "Tabs loaded in Tor">
+<!ENTITY torbutton.prefs.tor_memory_jar "Diske Tor Ã§erezleri yazmayÄ±n   ">
+<!ENTITY torbutton.prefs.nontor_memory_jar "Diske Non-Tor Ã§erezleri yazmayÄ±n">
+<!ENTITY torbutton.prefs.session_restore "Kurtarmak oturum maÄ?aza var ve bu sekmeleri geri yÃ¼kleme:">
+<!ENTITY torbutton.prefs.nontor_tabs "Sekmeler Non-Tor yÃ¼klendi">
+<!ENTITY torbutton.prefs.tor_tabs "Sekmeler Tor yÃ¼klendi">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
-<!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
-<!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
-<!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
-<!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
-<!ENTITY torbutton.prefs.dtd_optional "(optional)">
-<!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
+<!ENTITY torbutton.prefs.no_proxies_on "No Proxy'leri iÃ§in">
+<!ENTITY torbutton.prefs.no_proxy_warning "UyarÄ±: kaÃ§Ä±nÄ±n Ã¼zerinde herhangi bir sunucu isimleri kullanarak">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
+<!ENTITY torbutton.prefs.disable_livemarks "Tor kullanÄ±mÄ± sÄ±rasÄ±nda devre dÄ±Å?Ä± Livemark gÃ¼ncellemeleri">
+<!ENTITY torbutton.prefs.dtd_recommended "(Ã¶nerilen)">
+<!ENTITY torbutton.prefs.dtd_optional "(isteÄ?e baÄ?lÄ±)">
+<!ENTITY torbutton.prefs.dtd_crucial "(kritik)">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "Tor Ã¼zerinden yÃ¶nlendirme Torbutton gÃ¼ncellemeleri">
+<!ENTITY torbutton.prefs.dodge_google_captcha "Otomatik olarak alternatif bir arama motoru Google Captcha baÅ?vurdu kullanÄ±n:">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
-<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
+<!ENTITY torbutton.prefs.fix_google_srch "KaldÄ±r platform ve Google Arama Kutusu gelen dil sorgular">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties
index 4f268c0..d18d149 100644
--- a/src/chrome/locale/tr/torbutton.properties
+++ b/src/chrome/locale/tr/torbutton.properties
@@ -1,36 +1,36 @@
-torbutton.button.tooltip.disabled = Tor Etkin
-torbutton.button.tooltip.enabled = Tor DevredÄ±Å?Ä±
-torbutton.panel.tooltip.disabled = Tor Etkin
-torbutton.panel.tooltip.enabled = Tor DevredÄ±Å?Ä±
-torbutton.panel.plugins.disabled = Eklentiler etkin
-torbutton.panel.plugins.enabled = Eklentiler DevredÄ±Å?Ä±
+torbutton.button.tooltip.disabled = Tor'u etkinleÅ?tir.
+torbutton.button.tooltip.enabled = Tor'u pasifleÅ?tir
+torbutton.panel.tooltip.disabled = Tor'u aktif etmek iÃ§in tÄ±klayÄ±n
+torbutton.panel.tooltip.enabled = Tor'u pasif hale getirmek iÃ§in tÄ±klayÄ±n
+torbutton.panel.plugins.disabled = Eklentileri etkinleÅ?tirmek iÃ§in tÄ±klayÄ±n
+torbutton.panel.plugins.enabled = Eklentileri pasif hale getirmek iÃ§in tÄ±klayÄ±n
 torbutton.panel.label.disabled = Tor DevredÄ±Å?Ä±
 torbutton.panel.label.enabled = Tor Etkin
-extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = TortuÅ?u firefoxte kolaylÄ±kla Tor proxy etkin veya devredÄ±Å?Ä± bÄ±rakmanÄ±zÄ± saÄ?lar.
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton Torun eklenti iÃ§eriÄ?ini yÃ¼klemesini blokladÄ±.\n
-torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down 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)
-torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-torbutton.popup.test.success = Tor proxy testi bÅ?arÄ±yla gerÃ§ekleÅ?ti
-torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Torbuton, Tor proxy'yi hÄ±zlÄ±ca aktif veya pasif duruma getirebileceÄ?iniz bir dÃ¼Ä?me saÄ?lar.
+torbutton.popup.history.warning = Bu sekmeyi Tor aktifken kullanÄ±rken, Tor'u devre dÄ±Å?Ä± bÄ±rakÄ±p yenileyip ya da kullanmaya devam ederseniz, iÃ§erik otomatik olarak bloklanÄ±r.\n\nBu Firefox 409737 ve 417869 nolu hata raporlarÄ±nÄ± iÃ§in bir Ã§Ã¶zÃ¼mdÃ¼r.\n\nHiÃ§bir sebep yokken bu uyarÄ± aldÄ±ysanÄ±z, muhtelemelen sekme kendini yenilemeye Ã§alÄ±Å?tÄ±Ä?Ä± iÃ§in engellenmiÅ? olabilir.\n\nSekmeyi yenilemek iÃ§in lÃ¼tfen adres Ã§ubuÄ?unu tÄ±klayÄ±p devam etmeyi deneyin.\n\n
+torbutton.popup.plugin.warning = Torbutton Tor'un eklenti iÃ§eriÄ?ini yÃ¼klemesini blokladÄ±.\n\nFarklÄ± Kaydet ile yapmayÄ± deneyin.\n\n
+torbutton.popup.confirm_ca_certs = Torbuton hatÄ±rlatma: AnlaÅ?Ä±lan Ã¶zel sertifakanÄ±z yok. DoÄ?rulama bilgisi her zaman iÅ?lemleri yavaÅ?latÄ±r. Sertifika doÄ?rulamalarÄ±nÄ± devredÄ±Å?Ä± bÄ±rakmak ister misiniz? (AÃ§Ä±klamayÄ± anlamadÄ±ysan, Tamam'a tÄ±kla)\n            
+torbutton.popup.ff3.warning = Dikkat!\n\nFirefox 3'teki Torbuton yerel saatinizi bazÄ± yerel bilgilerinizi gizlice gÃ¶nderebilir?\n\nDevam etmek istiyor musunuz?
+torbutton.popup.toggle.warning = AyarlarÄ±n uygulanmasÄ± iÃ§in Tor'u yeniden baÅ?latmanÄ±z gerekiyor.\n            
+torbutton.popup.test.success = Proxy testi baÅ?arÄ±lÄ±!
+torbutton.popup.test.failure = Proxy testi baÅ?arÄ±sÄ±z oldu!LÃ¼tfen proxyinizi,Polippo ayarlarÄ±nÄ± kontrol ediniz.
+torbutton.popup.test.confirm_toggle = Proxy baÅ?latÄ±lamadÄ±\n\nGenede baÅ?latmak istermisin?\n\nNot: Problem Ã§Ã¶zÃ¼ldÃ¼yse, tekrar proxy testini baÅ?latÄ±p, bu uyarÄ± devredÄ±Å?Ä± bÄ±rakabilirsin.            
 torbutton.popup.test.ff3_notice = Tamama tÄ±klayarak proxy ayarlarÄ±nÄ± test edin. Test arkaplanda gerÃ§ekleÅ?iyor.LÃ¼tfen bekleyin.
-torbutton.panel.label.verified = Tor doÄ?ruladÄ±
-torbutton.popup.test.auto_failed = Otomatik gerÃ§ekleÅ?en proxy testi baÅ?arÄ±z oldu.\n
+torbutton.panel.label.verified = DoÄ?rulandÄ±
+torbutton.popup.test.auto_failed = Otomatik gerÃ§ekleÅ?en proxy testi baÅ?arÄ±z oldu.\n\nDevam etmek ister misiniz?
 torbutton.prefs.recommended = (tavsiye edilir)
 torbutton.prefs.optional = (isteÄ?e baÄ?lÄ±)
-torbutton.prefs.crucial = (Ã§ok Ã¶nemlil)
-torbutton.popup.external.title = Load external content?
-torbutton.popup.external.app = An external application is needed to handle:\n\n
-torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
-torbutton.popup.launch = Launch application
-torbutton.popup.cancel = Cancel
-torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
+torbutton.prefs.crucial =             
+torbutton.popup.external.title =             
+torbutton.popup.external.app = Kullanmak iÃ§in harici bir uygulama seÃ§:\n\n
+torbutton.popup.external.note = \n\nNOT: BaÅ?ka bir uyguluma sizin iÃ§in gÃ¼venli olmayabilir!\n\n
+torbutton.popup.external.suggest = Bu dosya gÃ¼venilmezse, kaydetmeli yada dosyaya Ã§evrimdÄ±Å?Ä± bakmalÄ±sÄ±nÄ±z.\n            
+torbutton.popup.launch = UygulamayÄ± Ã§alÄ±Å?tÄ±r\n            
+torbutton.popup.cancel = Ä°ptal\n            
+torbutton.popup.dontask = Å?u andan itibaren uygulamayÄ± sÃ¼rekli Ã§alÄ±Å?tÄ±r\r\n            
+torbutton.popup.test.no_http_proxy = Proxy test:  Yerel proxy'e ulaÅ?Ä±mÄ±yor. Polippo dÃ¼zgÃ¼n Ã§alÄ±Å?Ä±yormu?\n            
+torbutton.popup.captcha.title = Google Captchas'Ä± atla            
+torbutton.popup.captcha.ask = Google Captcha algÄ±landÄ±. Aramana devam etmek iÃ§in baÅ?ka bir arama moturuna yÃ¶nlendirmek istermisin?            
+torbutton.popup.captcha.always = Bu ayarÄ± Å?u andan itibaren sÃ¼rekli hale getir\n            
+torbutton.popup.redirect = YÃ¶nlendir            
+torbutton.popup.no_redirect = YÃ¶nlendirme  
diff --git a/src/chrome/locale/uk/torbutton.dtd b/src/chrome/locale/uk/torbutton.dtd
index 3f4075e..5a30b3e 100644
--- a/src/chrome/locale/uk/torbutton.dtd
+++ b/src/chrome/locale/uk/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "Ð?Ñ?Ð¾ Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Ð?Ð»Ð°Ñ?Ð½Ñ?Ñ?Ñ? Ð´Ð»Ñ? Ð·Ð°Ð¿Ñ?Ñ?ÐºÑ? Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Ð?Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ? Ð±ÐµÐ·Ð¿ÐµÐºÐ¸">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Ð?Ð»Ð¾ÐºÑ?Ð²Ð°Ñ?Ð¸ Ð´Ð¸Ñ?ÐºÐ¾Ð²Ð¸Ð¹ ÐºÐµÑ? Ñ?Ð° Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð¸ ÐºÐµÑ? Ð¿Ñ?Ð¸ Ð·Ð¼Ñ?Ð½Ñ? Ñ?Ñ?Ð°Ð½Ñ? Tor">
 <!ENTITY torbutton.prefs.block_cache "Ð?Ð»Ð¾ÐºÑ?Ð²Ð°Ñ?Ð¸ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿ Ð´Ð¾ Ð´Ð¸Ñ?ÐºÐ¾Ð²Ð¾Ð³Ð¾ Ñ?Ð° ÐºÐµÑ?Ñ? Ñ? Ð¿Ð°Ð¼â??Ñ?Ñ?Ñ? Ð¿Ñ?Ð¸ Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð°Ð½Ð½Ñ? Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Ð?Ð±ÐµÑ?Ñ?Ð³Ð°Ñ?Ð¸ Ð½Ðµ-Tor ÐºÑ?ÐºÐ¸ Ñ? Ð·Ð°Ñ?Ð¸Ñ?ÐµÐ½Ð¾Ð¼Ñ? Ñ?Ñ?Ð°Ð½Ñ?">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "Ð¯ Ñ?Ð¾Ñ?Ñ? Ñ?Ð°Ð¼ ÐºÐµÑ?Ñ?Ð²Ð°Ñ?Ð¸ Ñ?Ð²Ð¾Ñ?Ð¼Ð¸ ÐºÑ?ÐºÐ°Ð¼Ð¸ (Ð½ÐµÐ±ÐµÐ·Ð¿ÐµÑ?Ð½Ð¾)">
 <!ENTITY torbutton.prefs.clear_cookies "Ð§Ð¸Ñ?Ñ?Ð¸Ñ?Ð¸ ÐºÑ?ÐºÐ¸ Ð¿Ñ?Ð¸ Ð·Ð¼Ñ?Ð½Ñ? Ñ?Ñ?Ð°Ð½Ñ? Tor">
 <!ENTITY torbutton.prefs.disable_plugins "Ð?Ð¸Ð¼Ð¸ÐºÐ°Ñ?Ð¸ Ð¿Ð»Ð°Ð³Ñ?Ð½Ð¸ Ð¿Ñ?Ð¸ Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð°Ð½Ð½Ñ? Tor (ÐºÑ?Ð¸Ñ?Ð¸Ñ?Ð½Ð¾)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Ð?Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»Ñ?Ñ?Ð¸ Ð·Ð±ÐµÑ?ÐµÐ¶ÐµÐ½Ð½Ñ? Ñ?ÐµÑ?Ñ?Ð¹ (Ñ?ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð¾)">
 <!ENTITY torbutton.prefs.headers "Ð?Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¸">
 <!ENTITY torbutton.prefs.spoof_english "Ð?Ñ?Ð¸ÐºÐ¸Ð´Ð°Ñ?Ð¸Ñ?Ñ? Ð¿ÐµÑ?ÐµÐ³Ð»Ñ?Ð´Ð°Ñ?ÐµÐ¼ US English">
-<!ENTITY torbutton.prefs.disable_referer "Ð?Ðµ Ð²Ð¸Ñ?Ð¸Ð»Ð°Ñ?Ð¸ Ñ?ÐµÑ?ÐµÑ?ÐµÐ½Ñ?Ñ?Ð² Ð¿Ñ?Ð¸ Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð°Ð½Ð½Ñ? Tor (Ð¼Ð¾Ð¶Ðµ Ð·Ð°Ð²Ð°Ð´Ð¸Ñ?Ð¸ Ñ?Ð¾Ð±Ð¾Ñ?Ñ? Ð´ÐµÑ?ÐºÐ¸Ñ? Ñ?Ñ?Ð¾Ñ?Ñ?Ð½Ð¾Ðº)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Ð?Ð¸Ð¼ÐºÐ½Ñ?Ñ?Ð¸ Ð·Ð±ÐµÑ?ÐµÐ¶ÐµÐ½Ð½Ñ? DOM Ð¿Ñ?Ð¸ Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð°Ð½Ð½Ñ? Tor (ÐºÑ?Ð¸Ñ?Ð¸Ñ?Ð½Ð¾)">
 <!ENTITY torbutton.prefs.forms "Ð¤Ð¾Ñ?Ð¼Ð¸">
 <!ENTITY torbutton.prefs.block_tforms "Ð?Ð»Ð¾ÐºÑ?Ð²Ð°Ñ?Ð¸ Ð·Ð±ÐµÑ?ÐµÐ¶ÐµÐ½Ð½Ñ? Ð¿Ð°Ñ?Ð¾Ð»Ñ?Ð² Ñ?Ð° Ñ?Ð¾Ñ?Ð¼ Ð¿Ñ?Ð¸ Ð²Ð¸ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð°Ð½Ð½Ñ? Tor (Ñ?ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð¾)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd
index a70b4a8..fa28511 100644
--- a/src/chrome/locale/vi/torbutton.dtd
+++ b/src/chrome/locale/vi/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "y">
 <!ENTITY torbutton.context_menu.about "ThÃ´ng tin vá»? Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "T">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Nháº¥n Ä?á»? nháºn diá»?n Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Thiáº¿t láºp Báº£o máºt">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Cháº·n bá»? Ä?á»?m Ä?Ä©a Tor vÃ  xÃ³a táº¥t cáº£ cÃ¡c táºp tin Ä?á»?m khi báºt táº¯t Tor">
 <!ENTITY torbutton.prefs.block_cache "Cháº·n truy cáºp bá»? Ä?á»?m trÃªn Ä?Ä©a vÃ  bá»? nhá»? trong quÃ¡ trÃ¬nh Tor">
 <!ENTITY torbutton.prefs.cookie_jars "LÆ°u trá»¯ cookie KhÃ´ng-Tor trong má»?t táºp tin jar Ä?Æ°á»£c báº£o vá»?">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "TÃ´i sáº½ tá»± quáº£n lÃ cookie cá»§a tÃ´i (nguy hiá»?m)">
 <!ENTITY torbutton.prefs.clear_cookies "XÃ³a cookie khi báºt táº¯t Tor">
 <!ENTITY torbutton.prefs.disable_plugins "VÃ´ hiá»?u hÃ³a pháº§n bá»? trá»£ trong quÃ¡ trÃ¬nh dÃ¹ng Tor (cáº¥p thiáº¿t)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "VÃ´ hiá»?u hÃ³a LÆ°u PhiÃªn Duyá»?t Web (khuyáº¿n cÃ¡o)">
 <!ENTITY torbutton.prefs.headers "Ä?áº§u Ä?á»?">
 <!ENTITY torbutton.prefs.spoof_english "Báº¯t chÆ°á»?c TrÃ¬nh duyá»?t Tiáº¿ng Anh-Má»¹">
-<!ENTITY torbutton.prefs.disable_referer "KhÃ´ng gá»i referer trong quÃ¡ trÃ¬nh dÃ¹ng Tor (cÃ³ thá»? gÃ¢y lá»?i trÃªn má»?t sá»? trang)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "VÃ´ hiá»?u hÃ³a LÆ°u trá»¯ DOM trong quÃ¡ trÃ¬nh dÃ¹ng Tor (cáº¥p thiáº¿t)">
 <!ENTITY torbutton.prefs.forms "Biá»?u máº«u">
 <!ENTITY torbutton.prefs.block_tforms "Cháº·n viá»?c lÆ°u biá»?u máº«u+máºt kháº©u trong quÃ¡ trÃ¬nh Tor (khuyáº¿n cÃ¡o)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "KhÃ´ng cÃ³ á»¦y nhiá»?m cho:">
 <!ENTITY torbutton.prefs.no_proxy_warning "Cáº£nh bÃ¡o: TrÃ¡nh sá» dá»¥ng báº¥t ká»³ tÃªn mÃ¡y chá»§ á»? trÃªn">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "VÃ´ hiá»?u hÃ³a viá»?c cáºp nháºt Ä?Ã¡nh-dáº¥u-Ä?á»?ng trong quÃ¡ trÃ¬nh dÃ¹ng Tor">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd
index 9331434..860d1f5 100644
--- a/src/chrome/locale/zh-CN/torbutton.dtd
+++ b/src/chrome/locale/zh-CN/torbutton.dtd
@@ -1,4 +1,4 @@
-<!ENTITY torbutton.prefs.title "Torbutton é??é¡¹">
+<!ENTITY torbutton.prefs.title "Torbutton é¦?é??é¡¹">
 <!ENTITY torbutton.prefs.display_settings "æ?¾ç¤ºè®¾ç½®">
 <!ENTITY torbutton.prefs.display_panel "å?¨ç?¶æ??æ ?æ?¾ç¤º Tor ä»£ç??è®¾ç½®">
 <!ENTITY torbutton.prefs.panel_format "ç?¶æ??æ ?æ?¾ç¤ºæ ¼å¼?ï¼?">
@@ -22,10 +22,18 @@
 <!ENTITY torbutton.pref_connection_more_info.text "Torbutton ç?®å??ä½¿ç?¨ä¸ã??å¦?æ??æ?¨æ?³æ?¹å??é?? Tor ä»£ç??è®¾ç½®ï¼?è¯·ç¦?ç?¨ Torbutton å??å??å?°è¿?é??ã??å¦?æ??æ?¨æ?³æ?¹å?? Tor ä»£ç??è®¾ç½®ï¼?è¯·ä½¿ç?¨ Torbutton å??å¥½è®¾ç½®ã??">
 <!ENTITY torbutton.context_menu.toggle "è½¬æ?¢ Tor ç?¶æ??">
 <!ENTITY torbutton.context_menu.toggle.key "T">
-<!ENTITY torbutton.context_menu.preferences "è®¾ç½®...">
+<!ENTITY torbutton.context_menu.preferences "é¦?é??é¡¹...">
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "å?³äº? Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "ç?¹å?»å??å§?å?? Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "å®?å?¨é??é¡¹">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "ä½¿ç?¨ Tor æ?¶ç¦?ç?¨ç¡¬ç??ç¼?å?å¹¶å?¨å??æ?¢æ?¶æ¸?é?¤ç¼?å?">
 <!ENTITY torbutton.prefs.block_cache "ä½¿ç?¨ Tor æ?¶ç¦?æ¢è®¿é?®ç¡¬ç??ç¼?å?å??å??å?ç¼?å?">
 <!ENTITY torbutton.prefs.cookie_jars "å?¨å??ä¿?æ?¤ç??jarä¸ä¿?å?ä¸?ç?¨ Tor æ?¶ç??cookie">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "æ??è¦?è?ªå·±æ??å?¨ç®¡ç?? cookies (å?±é?©)">
 <!ENTITY torbutton.prefs.clear_cookies "å??æ?¢ Tor æ?¶æ¸?é?¤ cookies">
 <!ENTITY torbutton.prefs.disable_plugins "ä½¿ç?¨ Tor æ?¶ç¦?ç?¨æ??ä»¶(é??è¦?)">
@@ -53,54 +62,76 @@
 <!ENTITY torbutton.prefs.tor_shutdown "æ?´ Tor å?³é?æµ?è§?å?¨æ?¶æ¸?é?¤ç?¨ Tor æµ?è§?äº§ç??ç?? Cookies">
 <!ENTITY torbutton.prefs.all_shutdown "ä»»ä½?æ?¶å??å?³é?æµ?è§?å?¨é?½æ¸?é?¤ cookies">
 <!ENTITY torbutton.prefs.no_shutdown "å?³é?æ?¶ä¸?æ¸?é?¤ cookies">
-<!ENTITY torbutton.prefs.disable_sessionstore "ç¦?ç?¨Firefoxç??è¿?ç¨?ä¿?å? (æ?¨è??)">
+<!ENTITY torbutton.prefs.disable_sessionstore "ç¦?ç?¨ Firefox ç??ä¼?è¯?ä¿?å?(æ?¨è??)">
 <!ENTITY torbutton.prefs.headers "Header">
 <!ENTITY torbutton.prefs.spoof_english "ä¼ªè£?æµ?è§?å?¨è¯è¨?ä¸ºç¾?å?½è?±è¯">
-<!ENTITY torbutton.prefs.disable_referer "ä½¿ç?¨ Tor æ?¶ä¸?å??é?? Referer (å?¯è?½å½±å??æ??äº?ç«?ç?¹ç??è®¿é?®)">
-<!ENTITY torbutton.prefs.disable_domstorage "ä½¿ç?¨ Tor æ?¶ç¦?ç?¨æµ?è§?å?¨ç?? DOMå?¨å? (é??è¦?)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.disable_domstorage "ä½¿ç?¨ Tor æ?¶ç¦?ç?¨æµ?è§?å?¨ç?? DOM å?¨å?(é??è¦?)">
 <!ENTITY torbutton.prefs.forms "è¡¨å??">
 <!ENTITY torbutton.prefs.block_tforms "ä½¿ç?¨ Tor æ?¶ç¦?ç?¨å¯?ç ?ä¿?å?ä¸?è¡¨å??è®°å¿?(æ?¨è??)">
 <!ENTITY torbutton.prefs.block_ntforms "ä¸?ç?¨ Tor æ?¶ç¦?ç?¨å¯?ç ?ä¿?å?ä¸?è¡¨å??è®°å¿?(å?¯é??)">
-<!ENTITY torbutton.prefs.tor "ä½¿ç?¨Tor">
-<!ENTITY torbutton.prefs.non_tor "ä¸?ç?¨Tor">
+<!ENTITY torbutton.prefs.tor "ä½¿ç?¨ Tor">
+<!ENTITY torbutton.prefs.non_tor "ä¸?ç?¨ Tor">
 <!ENTITY torbutton.prefs.restore_tor "æµ?è§?å?¨æ?¢å¤?è¿?ç¨?æ?¶ï¼?è®¾ç½® Tor ç??ç?¶æ??ä¸º">
 <!ENTITY torbutton.prefs.reload_crashed_jar "Firefox å´©æº?å??é??è½½ cookie jar/æ¸?é?¤ cookie(æ?¨è??)">
-<!ENTITY torbutton.prefs.dual_cookie_jars "å?¨å??ä¿?æ?¤ç??jaræ??ä»¶ä¸å??æ?¶ä¿?å?ä½¿ç?¨Torå??ä¸?ç?¨Toræ?¶ç?? cookies(å?±é?©)">
+<!ENTITY torbutton.prefs.dual_cookie_jars "å?¨å??ä¿?æ?¤ç?? jar æ??ä»¶ä¸å??æ?¶ä¿?å?ä½¿ç?¨ Tor å??ä¸?ç?¨ Tor æ?¶ç?? cookies(å?±é?©)">
 <!ENTITY torbutton.prefs.clear_http_auth "æ¸?é?¤ HTTP è®¤è¯?è¿?ç¨?(æ?¨è??)">
 <!ENTITY torbutton.prefs.block_js_history "Tor ç?¶æ??å??å??å??é??å?¶å?¨å??å??ç?¶æ??ä¸?å·²æµ?è§?ç??ç½?é¡µé?´è¿?è¡?è·³è½¬ (é??è¦?)">
-<!ENTITY torbutton.prefs.resize_on_toggle "ä½¿ç?¨ Tor æ?¶è°?æ?´çª?å?£å¤§å°?ä¸º50å??ç´ ç??å??æ?°(æ?¨è??)">
+<!ENTITY torbutton.prefs.resize_on_toggle "ä½¿ç?¨ Tor æ?¶è°?æ?´çª?å?£å¤§å°?ä¸º 50 å??ç´ ç??å??æ?°(æ?¨è??)">
 <!ENTITY torbutton.prefs.close_tor "å??æ?¢æ?¶å?³é?æ??æ??ä½¿ç?¨ Tor ç??çª?å?£å??æ ?ç¾(å?¯é??)">
 <!ENTITY torbutton.prefs.close_nontor "å??æ?¢æ?¶å?³é?æ??æ??ä¸?ç?¨ Tor ç??çª?å?£å??æ ?ç¾(å?¯é??)">
 <!ENTITY torbutton.prefs.block_links "Tor ç?¶æ??å??ç??æ?¹å??ç??é¡µé?¢ä¸æ?¦æ?ªé?¾æ?¥ç?¹å?»å??é¡µé?¢å?·æ?°(å?¯é??)">
-<!ENTITY torbutton.prefs.jar_certs "å°?ä½¿ç?¨Tor/ä¸?ç?¨Toræ?¶ç??SSLè¯?ä¹¦å??å¼?å?æ?¾(æ?¨è??)">
-<!ENTITY torbutton.prefs.jar_ca_certs "å°?ä½¿ç?¨Tor/ä¸?ç?¨Toræ?¶ç??CAè¯?ä¹¦å??å¼?å?æ?¾(æ?¨è??)">
+<!ENTITY torbutton.prefs.jar_certs "å°?ä½¿ç?¨ Tor/ä¸?ç?¨ Tor æ?¶ç?? SSL è¯?ä¹¦å??å¼?å?æ?¾(æ?¨è??)">
+<!ENTITY torbutton.prefs.jar_ca_certs "å°?ä½¿ç?¨ Tor/ä¸?ç?¨ Tor æ?¶ç?? CA è¯?ä¹¦å??å¼?å?æ?¾(æ?¨è??)">
 <!ENTITY torbutton.prefs.locked_mode "ç¦?ç?¨å·¥å?·æ ?æ??é?®ä¸?é?®ç??å¿«æ?·é?®é?²æ¢è¯¯å??æ?¢">
-<!ENTITY torbutton.prefs.startup_state "æ£å¸¸å?¯å?¨æ?¶ï¼?è®¾ç½®Torç??ç?¶æ??ä¸ºï¼?">
-<!ENTITY torbutton.prefs.shutdown_state "ä¸?ä¸?æ¬¡å?³é?æ?¶ä¸?è?´">
+<!ENTITY torbutton.prefs.startup_state "æ£å¸¸å?¯å?¨æ?¶ï¼?è®¾ç½® Tor ç??ç?¶æ??ä¸ºï¼?">
+<!ENTITY torbutton.prefs.shutdown_state "å?³é?ç?¶æ??">
 <!ENTITY torbutton.prefs.startup "å?¯å?¨">
-<!ENTITY torbutton.prefs.block_tor_file_net "ç¦?æ¢æ?¬å?°é?¾æ?¥(file://)ä½¿ç?¨Torè®¿é?®ç½?ç»?(æ?¨è??)">
-<!ENTITY torbutton.prefs.block_nontor_file_net "ç¦?æ¢æ?¬å?°é?¾æ?¥(file://)æ?ªç»?Torè®¿é?®ç½?ç»?">
+<!ENTITY torbutton.prefs.block_tor_file_net "ç¦?æ¢æ?¬å?°é?¾æ?¥(file://)ä½¿ç?¨ Tor è®¿é?®ç½?ç»?(æ?¨è??)">
+<!ENTITY torbutton.prefs.block_nontor_file_net "ç¦?æ¢æ?¬å?°é?¾æ?¥(file://)æ?ªç»? Tor è®¿é?®ç½?ç»?">
 <!ENTITY torbutton.prefs.restore_defaults "æ?¢å¤?é»?è®¤è®¾ç½®">
 <!ENTITY torbutton.prefs.test_settings "æµ?è¯?ä»£ç??è®¾ç½®">
-<!ENTITY torbutton.prefs.test_auto "æ¯?æ¬¡å?¯å?¨Firefoxå??å?¨ç¬¬ä¸?æ¬¡å??æ?¢ Tor æ?¶è?ªå?¨éª?è¯? Tor è®¾ç½®">
+<!ENTITY torbutton.prefs.test_auto "æ¯?æ¬¡å?¯å?¨ Firefox å??å?¨ç¬¬ä¸?æ¬¡å??æ?¢ Tor æ?¶è?ªå?¨éª?è¯? Tor è®¾ç½®">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
-<!ENTITY torbutton.prefs.tor_memory_jar "ä½¿ç?¨Toræµ?è§?æ?¶ä¸?è¦?å°?Cookieå?å?¥ç£?ç??">
-<!ENTITY torbutton.prefs.nontor_memory_jar "ä¸?ç?¨Toræµ?è§?æ?¶ä¸?è¦?å°?Cookieå?å?¥ç£?ç??">
-<!ENTITY torbutton.prefs.session_restore "è®©Firefoxè¿?ç¨?ä¿?å?å??è?½ä¿?å?å¹¶æ?¢å¤?å¦?ä¸?æ ?ç¾é¡µï¼?">
-<!ENTITY torbutton.prefs.nontor_tabs "ä¸?ç?¨Torç??æ ?ç¾é¡µ">
-<!ENTITY torbutton.prefs.tor_tabs "ä½¿ç?¨Torç??æ ?ç¾é¡µ">
+<!ENTITY torbutton.prefs.tor_memory_jar "ä½¿ç?¨ Tor æµ?è§?æ?¶ä¸?è¦?å°? Cookie å?å?¥ç£?ç??">
+<!ENTITY torbutton.prefs.nontor_memory_jar "ä¸?ç?¨ Tor æµ?è§?æ?¶ä¸?è¦?å°? Cookie å?å?¥ç£?ç??">
+<!ENTITY torbutton.prefs.session_restore "è®© Firefox ä¼?è¯?ä¿?å?å??è?½ä¿?å?å¹¶æ?¢å¤?å¦?ä¸?æ ?ç¾é¡µï¼?">
+<!ENTITY torbutton.prefs.nontor_tabs "ä¸?ç?¨ Tor ç??æ ?ç¾é¡µ">
+<!ENTITY torbutton.prefs.tor_tabs "ä½¿ç?¨ Tor ç??æ ?ç¾é¡µ">
 <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4">
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "ä¸?ä½¿ç?¨ä»£ç??ç??å?°å??:">
 <!ENTITY torbutton.prefs.no_proxy_warning "è¦å??ï¼?è¯·ä¸?è¦?ä½¿ç?¨ä¸?è¿°ä»»ä½?ä¸»æ?ºå??ã??">
-<!ENTITY torbutton.prefs.disable_livemarks "ä½¿ç?¨Toræ?¶ç¦?ç?¨Livemarkæ?´æ?°(RSSä¹¦ç¾)">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
+<!ENTITY torbutton.prefs.disable_livemarks "ä½¿ç?¨ Tor æ?¶ç¦?ç?¨ Livemark æ?´æ?°(RSSä¹¦ç¾)">
 <!ENTITY torbutton.prefs.dtd_recommended "(æ?¨è??)">
 <!ENTITY torbutton.prefs.dtd_optional "(å?¯é??)">
 <!ENTITY torbutton.prefs.dtd_crucial "(é??è¦?)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "Redirect Torbutton updates through Tor">
-<!ENTITY torbutton.prefs.dodge_google_captcha "Automatically use an alternate search engine when presented with a Google Captcha:">
+<!ENTITY torbutton.prefs.update_torbutton_via_tor "é??è¿? Tor é??å®?å?? Torbutton ç??æ?´æ?°">
+<!ENTITY torbutton.prefs.dodge_google_captcha "å½?æ?¾ç¤º Google Captcha æ?¶ï¼?è?ªå?¨è°?ç?¨å??é??æ??ç´¢å¼?æ??">
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
-<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
+<!ENTITY torbutton.prefs.fix_google_srch "å?¨ Google æ??ç´¢æ ?æ??ç´¢æ?¶å??å?²å¹³å?°å??è¯è¨?ä¿¡æ?¯ã??">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties
index 085139f..4ea34a0 100644
--- a/src/chrome/locale/zh-CN/torbutton.properties
+++ b/src/chrome/locale/zh-CN/torbutton.properties
@@ -7,14 +7,14 @@ torbutton.panel.plugins.enabled = ç?¹å?»ç¦?ç?¨æ??ä»¶
 torbutton.panel.label.disabled = Tor å·²ç¦?ç?¨
 torbutton.panel.label.enabled = Tor å·²å?¯ç?¨
 extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = é??è¿? Torbutton æ??é?®å?¯ä»¥æ?¹ä¾¿å?°è®© Firefoxå??ç?¨æ??ä½¿ç?¨ Tor ä½?ä¸ºä»£ç??ã??
-torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\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\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-torbutton.popup.plugin.warning = Torbutton é?»æ¢äº?æµ?è§?å?¨æ?´ Tor æ?¶ç?´æ?¥å? è½½é??è¦?æ??ä»¶æ?¯æ??ç??å??å®¹ã??\n\nè¯·ä½¿ç?¨â??å?¦å?ä¸ºâ??ï¼?ä¿?å?å??æµ?è§?ï¼?ã??\n\n
+torbutton.popup.history.warning = Torbutton å±?è?½äº?å?¨å?¶ä»? Tor ç?¶æ??ä¸?å? è½½ç??æ ?ç¾ç??æ´»å?¨ã??\n\nè¿?æ?¯ç?¨äº?æ??æ?¶è§£å?³ Firefox Bug 409737 å?? 417869ã??\nå¦?æ??è¿?ä¸ªå¼¹å?ºçª?å?£å?¨æ?¨ä¸?ç?¥æ??ç??æ??å?µä¸?å¼¹å?ºï¼?å??æ?¨ç??æ ?ç¾ä¹?ä¸?æ£è¯?å?¾å?¨å??å?°é??æ?°è½½å?¥è?ªå·±ï¼?ç?¶è??è¿?æ ·ç??è¡?ä¸ºæ?¯è¢«å±?è?½ç??ã??\n\nè¦?å?·æ?°å½?å?? Tor ç?¶æ??ä¸?ç??æ ?ç¾ï¼?å°?ç?¦ç?¹ç½®äº?å?¨å?°å??æ ?å¹¶æ??å??è½¦é?®ã??\n\n
+torbutton.popup.plugin.warning = Torbutton é?»æ¢äº?æµ?è§?å?¨æ?´ Tor æ?¶ç?´æ?¥å? è½½é??è¦?æ??ä»¶æ?¯æ??ç??å??å®¹ã??\n\nè¯·ä½¿ç?¨â??å?¦å?ä¸ºâ??(ä¿?å?å??æµ?è§?)ã??\n\n
 torbutton.popup.confirm_ca_certs = Torbutton æ³¨æ??ï¼?æµ?è§?å?¨ä¼¼ä¹?ç¼ºå°?è?ªå®?ä¹?ç??CA(è¯?ä¹¦é¢?å??æ?ºæ??)ã??æ£?æ?¥CAå??è¡¨æ?¯ä¸?é¡¹è??æ?¶ç??æ??ä½?ï¼?é??ç¢?Torç??å??æ?¢ã??æ?¨æ?¯å?¦å¸?æ??ç¦?ç?¨å¯¹CAè¯?ä¹¦ç??é??ç¦»ï¼?)å¦?æ??æ?¨ä¸?æ??ï¼?å?¯ä»¥é??æ?©â??ç¡®å®?â??)
-torbutton.popup.ff3.warning = è¦å??ï¼?\n\nFirefox 3 ä¼?é??è¿? Tor æ³?é?²æ?¨ç??æ?¶å?ºå??Livemarkï¼?ä¹¦ç¾æ ?ç??RSSé?¾æ?¥ï¼?ï¼?Torbutton å¯¹æ¤æ? è?½ä¸ºå??ã??\n\næ?¨æ?¯å?¦è¦?ç»§ç»ï¼?
+torbutton.popup.ff3.warning = è¦å??ï¼?\n\nFirefox 3 ä¼?é??è¿? Tor æ³?é?²æ?¨ç??æ?¶å?ºå?? Livemark (ä¹¦ç¾æ ?ç??RSSé?¾æ?¥)ï¼?Torbutton å¯¹æ¤æ? è?½ä¸ºå??ã??\n\næ?¨æ?¯å?¦è¦?ç»§ç»ï¼?
 torbutton.popup.toggle.warning = æ?¨é??è¦?å??æ?¢ Tor æ??é??æ?°å?¯å?¨æ?¨ç??è®¾ç½®æ??ä¼?ç??æ??ã??
 torbutton.popup.test.success = Tor ä»£ç??æµ?è¯?æ??å??ï¼?
-torbutton.popup.test.failure = Tor ä»£ç??æµ?è¯?å¤±è´¥ï¼?è¯·æ£?æ?¥æ?¨ç??ä»£ç??å??Polipo è®¾ç½®ã??
-torbutton.popup.test.confirm_toggle = ä¸?ä¸?æ¬¡Torä»£ç??æµ?è¯?å¤±è´¥ã??\n\næ?¨è¿?è¦?å?¯ç?¨ä»£ç??å??ï¼?\n\næ³¨æ??ï¼?å¦?æ??æ?¨å·²ç»?è§£å?³äº?ä»£ç??é?®é¢?ï¼?è¯·æ??å¼?Torbuttonä»£ç??è®¾ç½®çª?å?£ï¼?æ¶?é?¤æ¤è¦å??ã??
+torbutton.popup.test.failure = Tor ä»£ç??æµ?è¯?å¤±è´¥ï¼?è¯·æ£?æ?¥æ?¨ç??ä»£ç??å?? Polipo è®¾ç½®ã??
+torbutton.popup.test.confirm_toggle = ä¸?ä¸?æ¬¡ Tor ä»£ç??æµ?è¯?å¤±è´¥ã??\n\næ?¨è¿?è¦?å?¯ç?¨ä»£ç??å??ï¼?\n\næ³¨æ??ï¼?å¦?æ??æ?¨å·²ç»?è§£å?³äº?ä»£ç??é?®é¢?ï¼?è¯·æ??å¼? Torbutton ä»£ç??è®¾ç½®çª?å?£ï¼?æ¶?é?¤æ¤è¦å??ã??
 torbutton.popup.test.ff3_notice = å??å?» ç¡®å®? æµ?è¯? Tor ç??ä»£ç??è®¾ç½®ã??æµ?è¯?å°?å?¨å??å?°è¿?è¡?ã??è¯·è??å¿?ç?å¾?ã??
 torbutton.panel.label.verified = Tor éª?è¯?é??è¿?
 torbutton.popup.test.auto_failed = Tor æ?ªé??è¿?è?ªå?¨ä»£ç??æµ?è¯?ã??\n\næ?¨ç¡®å®?è¦?ç»§ç»å?¯ç?¨å??ï¼?
@@ -23,14 +23,14 @@ torbutton.prefs.optional = (å?¯é??)
 torbutton.prefs.crucial = (é??è¦?)
 torbutton.popup.external.title = è½½å?¥å¤?é?¨å??å®¹ï¼?
 torbutton.popup.external.app = é??è¦?å¤?é?¨ç¨?åº?æ?¥å¤?ç??:\n\n
-torbutton.popup.external.note = \n\næ³¨æ??ï¼?å¤?é?¨ç¨?åº?ä½¿ç?¨Torå¹¶ä¸?å®?å?¨å?¯è?½æ³?é?²æ?¨ç??èº«ä»½ï¼?\n
-torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Amnesia LiveCD, torsocks, or TorVM.\n
+torbutton.popup.external.note = \n\næ³¨æ??ï¼?Tor ä¸?è?½ä½¿å¤?é?¨ç¨?åº?ç??è®¿é?®å®?å?¨ï¼?å?¯è?½æ³?é?²æ?¨ç??èº«ä»½ï¼?\n
+torbutton.popup.external.suggest = \nå¦?æ??è¿?ä¸ªæ??ä»¶ä¸?å?¯ä¿¡ï¼?æ?¨åº?è¯¥å°?å?¶ä¿?å?å??ç¦»çº¿å¯?ç??æ??ç½®äº?è??æ??æ?ºä¸å¯?ç??ï¼?\næ??è??ä½¿ç?¨è¯¸å¦? Amnesia LiveCDã??torsocks æ?? TorVM ç??é??æ?? Tor ä»£ç??ã??\n
 torbutton.popup.launch = å?¯å?¨ç¨?åº?
 torbutton.popup.cancel = å??æ¶?
 torbutton.popup.dontask = æ¤å??æ?»æ?¯å?¯å?¨ç¨?åº?
-torbutton.popup.test.no_http_proxy = Torä»£ç??æµ?è¯?ï¼?æ?¬å?°HTTPä»£ç??ä¸?å?¯è¾¾ï¼?æ?¨ç??Polipoæ£å¸¸å?¯å?¨äº?å??ï¼?
-torbutton.popup.captcha.title = Avoid Google Captchas?
-torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-torbutton.popup.captcha.always = Always perform this action from now on
-torbutton.popup.redirect = Redirect
-torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.test.no_http_proxy = Tor ä»£ç??æµ?è¯?ï¼?æ?¬å?° HTTP ä»£ç??ä¸?å?¯è¾¾ï¼?æ?¨ç?? Polipo æ£å¸¸å?¯å?¨äº?å??ï¼?
+torbutton.popup.captcha.title = é?¿å?? Google Captchasï¼?
+torbutton.popup.captcha.ask = Torbutton æ£?æµ?å?°äº?ä¸?ä¸ª Google Captchaï¼?æ?¨æ?¯å?¦æ?¿æ??æ??æ?¬æ¬¡æ??ç´¢é??å®?å??å?°ä½¿ç?¨å?¶ä»?æ??ç´¢å¼?æ??ï¼?
+torbutton.popup.captcha.always = æ¤å??æ?»æ?¯ä½¿ç?¨æ¤æ??ä½?
+torbutton.popup.redirect = é??å®?å??
+torbutton.popup.no_redirect = ä¸?è¦?é??å®?å??
diff --git a/src/chrome/locale/zh-HK/torbutton.dtd b/src/chrome/locale/zh-HK/torbutton.dtd
index 8dcfb2b..7e1fb3b 100644
--- a/src/chrome/locale/zh-HK/torbutton.dtd
+++ b/src/chrome/locale/zh-HK/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "About Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
 <!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
 <!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd
index d71db4c..de588e3 100644
--- a/src/chrome/locale/zh-TW/torbutton.dtd
+++ b/src/chrome/locale/zh-TW/torbutton.dtd
@@ -26,6 +26,14 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "é??æ?¼Torbutton...(A)">
 <!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
 <!ENTITY torbutton.button.tooltip "é»?æ??ä»¥å??å§? Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -37,6 +45,7 @@
 <!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
 <!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
 <!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
 <!ENTITY torbutton.prefs.mmm_cookies "æ??å°?æ??å??ç®¡ç??æ??ç??cookies (å?±é?ª)">
 <!ENTITY torbutton.prefs.clear_cookies "æ¸?é?¤Tor toggleä¸?ç??cookies">
 <!ENTITY torbutton.prefs.disable_plugins "ä½¿ç?¨Toræ??æ?«å??pluginså??å?? (å?´æ ¼ç??)">
@@ -56,7 +65,10 @@
 <!ENTITY torbutton.prefs.disable_sessionstore "Disable Session Saving (recommended)">
 <!ENTITY torbutton.prefs.headers "Headers">
 <!ENTITY torbutton.prefs.spoof_english "Spoof US English Browser">
-<!ENTITY torbutton.prefs.disable_referer "Don't send referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.refererspoofing "Referer spoofing">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.prefs.smartspoof "Smart referer spoof during Tor usage (spoofs cross domain referers)">
+<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!ENTITY torbutton.prefs.disable_domstorage "Disable DOM Storage during Tor usage (crucial)">
 <!ENTITY torbutton.prefs.forms "Forms">
 <!ENTITY torbutton.prefs.block_tforms "Block password+form saving during Tor (recommended)">
@@ -93,6 +105,23 @@
 <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5">
 <!ENTITY torbutton.prefs.no_proxies_on "No Proxies for: ">
 <!ENTITY torbutton.prefs.no_proxy_warning "Warning: Avoid using any hostnames above">
+<!ENTITY torbutton.prefs.spoofreresh "Spoof Refresh">
+<!ENTITY torbutton.prefs.refereroptions "Referer Spoofing Options">
+<!ENTITY torbutton.prefs.nospoof "Do not spoof referer">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.disable_livemarks "Disable Livemark updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
@@ -103,4 +132,6 @@
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
 <!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
+<!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
-- 
1.7.1
Prev by Author: [or-cvs] [torbutton/master 4/4] Bump version.
Next by Author: [or-cvs] [torbutton/master 2/4] Add update URL for alpha series.
Previous by thread: [or-cvs] [torbutton/master 4/4] Bump version.
Next by thread: [or-cvs] [torbutton/master 2/4] Add update URL for alpha series.
Index(es):
- Author
- Thread