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

[tor-commits] [translation/torbutton-torbuttondtd] Partial fix for #9144

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/torbutton-torbuttondtd] Partial fix for #9144
From: translation@xxxxxxxxxxxxxx
Date: Mon, 10 Mar 2014 21:27:56 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Mon, 10 Mar 2014 17:28:23 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 765368cfe93cff382718db3a3022a69a41a11a15
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Mon Mar 10 21:27:38 2014 +0000

    Partial fix for #9144
---
 bg_BG/torbutton.dtd    |  298 +++++++++++++++++++++++------------------------
 el_GR/torbutton.dtd    |  300 ++++++++++++++++++++++++------------------------
 en/torbutton.dtd       |    6 +-
 es_AR/torbutton.dtd    |  298 +++++++++++++++++++++++------------------------
 es_CO/torbutton.dtd    |  300 ++++++++++++++++++++++++------------------------
 gu_IN/torbutton.dtd    |  280 ++++++++++++++++++++++----------------------
 hr_HR/torbutton.dtd    |  272 +++++++++++++++++++++----------------------
 ia/torbutton.dtd       |  290 +++++++++++++++++++++++-----------------------
 lg/torbutton.dtd       |   34 +++---
 ms_MY/torbutton.dtd    |  152 ++++++++++++------------
 nds/torbutton.dtd      |  300 ++++++++++++++++++++++++------------------------
 si/torbutton.dtd       |  300 ++++++++++++++++++++++++------------------------
 sk_SK/torbutton.dtd    |  198 ++++++++++++++++----------------
 sl_SI/torbutton.dtd    |  300 ++++++++++++++++++++++++------------------------
 sn/torbutton.dtd       |  298 +++++++++++++++++++++++------------------------
 sr@latin/torbutton.dtd |  294 +++++++++++++++++++++++------------------------
 szl/torbutton.dtd      |  300 ++++++++++++++++++++++++------------------------
 te_IN/torbutton.dtd    |  300 ++++++++++++++++++++++++------------------------
 ur_PK/torbutton.dtd    |  294 +++++++++++++++++++++++------------------------
 uz/torbutton.dtd       |  274 +++++++++++++++++++++----------------------
 20 files changed, 2544 insertions(+), 2544 deletions(-)

diff --git a/bg_BG/torbutton.dtd b/bg_BG/torbutton.dtd
index 8c51955..dd23008 100644
--- a/bg_BG/torbutton.dtd
+++ b/bg_BG/torbutton.dtd
@@ -1,150 +1,150 @@
 <!ENTITY torbutton.prefs.title "Ð?Ñ?ÐµÐ´Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð¸Ñ? Ð½Ð° Ð¢Ð¾Ñ?-Ð±Ñ?Ñ?Ð¾Ð½Ð°">
-<!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 "">
-<!ENTITY torbutton.prefs.proxy.host.https "">
-<!ENTITY torbutton.prefs.proxy.host.ftp "">
-<!ENTITY torbutton.prefs.proxy.host.gopher "">
-<!ENTITY torbutton.prefs.proxy.host.socks "">
-<!ENTITY torbutton.prefs.proxy.port "">
-<!ENTITY torbutton.about.title "">
-<!ENTITY torbutton.about.version "">
-<!ENTITY torbutton.about.summary "">
-<!ENTITY torbutton.about.code "">
-<!ENTITY torbutton.about.maintainer "">
-<!ENTITY torbutton.about.security_review "">
-<!ENTITY torbutton.about.donate "">
-<!ENTITY torbutton.about.make_donation "">
-<!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.new_identity "">
-<!ENTITY torbutton.context_menu.new_identity_key "">
-<!ENTITY torbutton.context_menu.toggle "">
-<!ENTITY torbutton.context_menu.toggle.key "">
-<!ENTITY torbutton.context_menu.preferences "">
-<!ENTITY torbutton.context_menu.preferences.key "">
-<!ENTITY torbutton.context_menu.about "">
-<!ENTITY torbutton.context_menu.about.key "">
-<!ENTITY torbutton.context_menu.networksettings "">
-<!ENTITY torbutton.context_menu.networksettings.key "">
-<!ENTITY torbutton.context_menu.downloadUpdate "">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "">
-<!ENTITY torbutton.context_menu.cookieProtections "">
-<!ENTITY torbutton.context_menu.cookieProtections.key "">
-<!ENTITY torbutton.context_menu.copyTor "">
-<!ENTITY torbutton.context_menu.copyTor.key "">
-<!ENTITY torbutton.context_menu.openTorTab "">
-<!ENTITY torbutton.context_menu.openTorTab.key "">
-<!ENTITY torbutton.context_menu.openTorWindow "">
-<!ENTITY torbutton.context_menu.openTorWindow.key "">
-<!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_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.cookie_protection "">
-<!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.headers "">
-<!ENTITY torbutton.prefs.spoof_english "">
-<!ENTITY torbutton.prefs.refererspoofing "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.prefs.smartspoof "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.disable_domstorage "">
-<!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.startup_tor "">
-<!ENTITY torbutton.prefs.reload_crashed_jar "">
-<!ENTITY torbutton.prefs.dual_cookie_jars "">
-<!ENTITY torbutton.prefs.clear_http_auth "">
-<!ENTITY torbutton.prefs.block_js_history "">
-<!ENTITY torbutton.prefs.resize_on_toggle "">
-<!ENTITY torbutton.prefs.close_tor "">
-<!ENTITY torbutton.prefs.close_nontor "">
-<!ENTITY torbutton.prefs.block_links "">
-<!ENTITY torbutton.prefs.jar_certs "">
-<!ENTITY torbutton.prefs.jar_ca_certs "">
-<!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 "">
-<!ENTITY torbutton.prefs.block_nontor_file_net "">
-<!ENTITY torbutton.prefs.restore_defaults "">
-<!ENTITY torbutton.prefs.test_settings "">
-<!ENTITY torbutton.prefs.test_auto "">
-<!ENTITY torbutton.prefs.disable_livemarks "">
-<!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 "">
-<!ENTITY torbutton.prefs.socks_vfive "">
-<!ENTITY torbutton.prefs.no_proxies_on "">
-<!ENTITY torbutton.prefs.no_proxy_warning "">
-<!ENTITY torbutton.prefs.spoofreresh "">
-<!ENTITY torbutton.prefs.refereroptions "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.spoofroot "">
-<!ENTITY torbutton.prefs.spoofdomain "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.cookiedialog.title "">
-<!ENTITY torbutton.cookiedialog.lockCol "">
-<!ENTITY torbutton.cookiedialog.domainCol "">
-<!ENTITY torbutton.cookiedialog.nameCol "">
-<!ENTITY torbutton.cookiedialog.pathCol "">
-<!ENTITY torbutton.cookiedialog.protectCookie "">
-<!ENTITY torbutton.cookiedialog.removeCookie "">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "">
-<!ENTITY torbutton.cookiedialog.removeAllBut "">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "">
-<!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 "">
-<!ENTITY torbutton.prefs.dodge_google_captcha "">
-<!ENTITY torbutton.prefs.engine1 "">
-<!ENTITY torbutton.prefs.engine2 "">
-<!ENTITY torbutton.prefs.engine3 "">
-<!ENTITY torbutton.prefs.engine4 "">
-<!ENTITY torbutton.prefs.engine5 "">
-<!ENTITY torbutton.prefs.fix_google_srch "">
-<!ENTITY torbutton.prefs.transparentTor "">
-<!ENTITY torbutton.prefs.block_disk "">
-<!ENTITY torbutton.prefs.restrict_thirdparty "">
-<!ENTITY torbutton.prefs.block_plugins "">
-<!ENTITY torbutton.prefs.resist_fingerprinting "">
+<!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.about.version "Version:">
+<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
+<!ENTITY torbutton.about.code "Code Contributors:">
+<!ENTITY torbutton.about.maintainer "Maintainer:">
+<!ENTITY torbutton.about.security_review "Security Review:">
+<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
+<!ENTITY torbutton.about.make_donation "making a donation.">
+<!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.new_identity "New Identity">
+<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!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.networksettings "Open Network Settingsâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
+<!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.startup_tor "On browser 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 "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!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 livemarks 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 "startpage.com">
+<!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/el_GR/torbutton.dtd b/el_GR/torbutton.dtd
index 2bc5bac..680b561 100644
--- a/el_GR/torbutton.dtd
+++ b/el_GR/torbutton.dtd
@@ -1,150 +1,150 @@
-<!ENTITY torbutton.prefs.title "">
-<!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 "">
-<!ENTITY torbutton.prefs.proxy.host.https "">
-<!ENTITY torbutton.prefs.proxy.host.ftp "">
-<!ENTITY torbutton.prefs.proxy.host.gopher "">
-<!ENTITY torbutton.prefs.proxy.host.socks "">
-<!ENTITY torbutton.prefs.proxy.port "">
-<!ENTITY torbutton.about.title "">
-<!ENTITY torbutton.about.version "">
-<!ENTITY torbutton.about.summary "">
-<!ENTITY torbutton.about.code "">
-<!ENTITY torbutton.about.maintainer "">
-<!ENTITY torbutton.about.security_review "">
-<!ENTITY torbutton.about.donate "">
-<!ENTITY torbutton.about.make_donation "">
-<!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.new_identity "">
-<!ENTITY torbutton.context_menu.new_identity_key "">
-<!ENTITY torbutton.context_menu.toggle "">
-<!ENTITY torbutton.context_menu.toggle.key "">
-<!ENTITY torbutton.context_menu.preferences "">
-<!ENTITY torbutton.context_menu.preferences.key "">
-<!ENTITY torbutton.context_menu.about "">
-<!ENTITY torbutton.context_menu.about.key "">
-<!ENTITY torbutton.context_menu.networksettings "">
-<!ENTITY torbutton.context_menu.networksettings.key "">
-<!ENTITY torbutton.context_menu.downloadUpdate "">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "">
-<!ENTITY torbutton.context_menu.cookieProtections "">
-<!ENTITY torbutton.context_menu.cookieProtections.key "">
-<!ENTITY torbutton.context_menu.copyTor "">
-<!ENTITY torbutton.context_menu.copyTor.key "">
-<!ENTITY torbutton.context_menu.openTorTab "">
-<!ENTITY torbutton.context_menu.openTorTab.key "">
-<!ENTITY torbutton.context_menu.openTorWindow "">
-<!ENTITY torbutton.context_menu.openTorWindow.key "">
-<!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_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.cookie_protection "">
-<!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.headers "">
-<!ENTITY torbutton.prefs.spoof_english "">
-<!ENTITY torbutton.prefs.refererspoofing "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.prefs.smartspoof "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.disable_domstorage "">
-<!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.startup_tor "">
-<!ENTITY torbutton.prefs.reload_crashed_jar "">
-<!ENTITY torbutton.prefs.dual_cookie_jars "">
-<!ENTITY torbutton.prefs.clear_http_auth "">
-<!ENTITY torbutton.prefs.block_js_history "">
-<!ENTITY torbutton.prefs.resize_on_toggle "">
-<!ENTITY torbutton.prefs.close_tor "">
-<!ENTITY torbutton.prefs.close_nontor "">
-<!ENTITY torbutton.prefs.block_links "">
-<!ENTITY torbutton.prefs.jar_certs "">
-<!ENTITY torbutton.prefs.jar_ca_certs "">
-<!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 "">
-<!ENTITY torbutton.prefs.block_nontor_file_net "">
-<!ENTITY torbutton.prefs.restore_defaults "">
-<!ENTITY torbutton.prefs.test_settings "">
-<!ENTITY torbutton.prefs.test_auto "">
-<!ENTITY torbutton.prefs.disable_livemarks "">
-<!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 "">
-<!ENTITY torbutton.prefs.socks_vfive "">
-<!ENTITY torbutton.prefs.no_proxies_on "">
-<!ENTITY torbutton.prefs.no_proxy_warning "">
-<!ENTITY torbutton.prefs.spoofreresh "">
-<!ENTITY torbutton.prefs.refereroptions "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.spoofroot "">
-<!ENTITY torbutton.prefs.spoofdomain "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.cookiedialog.title "">
-<!ENTITY torbutton.cookiedialog.lockCol "">
-<!ENTITY torbutton.cookiedialog.domainCol "">
-<!ENTITY torbutton.cookiedialog.nameCol "">
-<!ENTITY torbutton.cookiedialog.pathCol "">
-<!ENTITY torbutton.cookiedialog.protectCookie "">
-<!ENTITY torbutton.cookiedialog.removeCookie "">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "">
-<!ENTITY torbutton.cookiedialog.removeAllBut "">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "">
-<!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 "">
-<!ENTITY torbutton.prefs.dodge_google_captcha "">
-<!ENTITY torbutton.prefs.engine1 "">
-<!ENTITY torbutton.prefs.engine2 "">
-<!ENTITY torbutton.prefs.engine3 "">
-<!ENTITY torbutton.prefs.engine4 "">
-<!ENTITY torbutton.prefs.engine5 "">
-<!ENTITY torbutton.prefs.fix_google_srch "">
-<!ENTITY torbutton.prefs.transparentTor "">
-<!ENTITY torbutton.prefs.block_disk "">
-<!ENTITY torbutton.prefs.restrict_thirdparty "">
-<!ENTITY torbutton.prefs.block_plugins "">
-<!ENTITY torbutton.prefs.resist_fingerprinting "">
+<!ENTITY torbutton.prefs.title "Torbutton Preferences">
+<!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.about.version "Version:">
+<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
+<!ENTITY torbutton.about.code "Code Contributors:">
+<!ENTITY torbutton.about.maintainer "Maintainer:">
+<!ENTITY torbutton.about.security_review "Security Review:">
+<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
+<!ENTITY torbutton.about.make_donation "making a donation.">
+<!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.new_identity "New Identity">
+<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!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.networksettings "Open Network Settingsâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
+<!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.startup_tor "On browser 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 "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!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 livemarks 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 "startpage.com">
+<!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/en/torbutton.dtd b/en/torbutton.dtd
index 1457b20..680b561 100644
--- a/en/torbutton.dtd
+++ b/en/torbutton.dtd
@@ -116,10 +116,10 @@
 <!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.nospoof "No referer spoof during Tor usage (sends referers as normal)">
 <!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.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -131,7 +131,7 @@
 <!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.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(recommended)">
 <!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(crucial)">
diff --git a/es_AR/torbutton.dtd b/es_AR/torbutton.dtd
index 1ce0e76..a7a8996 100644
--- a/es_AR/torbutton.dtd
+++ b/es_AR/torbutton.dtd
@@ -1,150 +1,150 @@
-<!ENTITY torbutton.prefs.title "">
-<!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 "">
-<!ENTITY torbutton.prefs.proxy.host.https "">
-<!ENTITY torbutton.prefs.proxy.host.ftp "">
-<!ENTITY torbutton.prefs.proxy.host.gopher "">
-<!ENTITY torbutton.prefs.proxy.host.socks "">
-<!ENTITY torbutton.prefs.proxy.port "">
-<!ENTITY torbutton.about.title "">
-<!ENTITY torbutton.about.version "">
-<!ENTITY torbutton.about.summary "">
-<!ENTITY torbutton.about.code "">
-<!ENTITY torbutton.about.maintainer "">
-<!ENTITY torbutton.about.security_review "">
-<!ENTITY torbutton.about.donate "">
-<!ENTITY torbutton.about.make_donation "">
-<!ENTITY torbutton.pref_connection.notice "">
-<!ENTITY torbutton.pref_connection.more_info "">
+<!ENTITY torbutton.prefs.title "Torbutton Preferences">
+<!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.about.version "Version:">
+<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
+<!ENTITY torbutton.about.code "Code Contributors:">
+<!ENTITY torbutton.about.maintainer "Maintainer:">
+<!ENTITY torbutton.about.security_review "Security Review:">
+<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
+<!ENTITY torbutton.about.make_donation "making a donation.">
+<!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 "Ayuda">
-<!ENTITY torbutton.pref_connection_more_info.text "">
-<!ENTITY torbutton.context_menu.new_identity "">
-<!ENTITY torbutton.context_menu.new_identity_key "">
-<!ENTITY torbutton.context_menu.toggle "">
-<!ENTITY torbutton.context_menu.toggle.key "">
-<!ENTITY torbutton.context_menu.preferences "">
-<!ENTITY torbutton.context_menu.preferences.key "">
-<!ENTITY torbutton.context_menu.about "">
-<!ENTITY torbutton.context_menu.about.key "">
-<!ENTITY torbutton.context_menu.networksettings "">
-<!ENTITY torbutton.context_menu.networksettings.key "">
-<!ENTITY torbutton.context_menu.downloadUpdate "">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "">
-<!ENTITY torbutton.context_menu.cookieProtections "">
-<!ENTITY torbutton.context_menu.cookieProtections.key "">
-<!ENTITY torbutton.context_menu.copyTor "">
-<!ENTITY torbutton.context_menu.copyTor.key "">
-<!ENTITY torbutton.context_menu.openTorTab "">
-<!ENTITY torbutton.context_menu.openTorTab.key "">
-<!ENTITY torbutton.context_menu.openTorWindow "">
-<!ENTITY torbutton.context_menu.openTorWindow.key "">
-<!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_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.cookie_protection "">
-<!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.headers "">
-<!ENTITY torbutton.prefs.spoof_english "">
-<!ENTITY torbutton.prefs.refererspoofing "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.prefs.smartspoof "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.disable_domstorage "">
-<!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.startup_tor "">
-<!ENTITY torbutton.prefs.reload_crashed_jar "">
-<!ENTITY torbutton.prefs.dual_cookie_jars "">
-<!ENTITY torbutton.prefs.clear_http_auth "">
-<!ENTITY torbutton.prefs.block_js_history "">
-<!ENTITY torbutton.prefs.resize_on_toggle "">
-<!ENTITY torbutton.prefs.close_tor "">
-<!ENTITY torbutton.prefs.close_nontor "">
-<!ENTITY torbutton.prefs.block_links "">
-<!ENTITY torbutton.prefs.jar_certs "">
-<!ENTITY torbutton.prefs.jar_ca_certs "">
-<!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 "">
-<!ENTITY torbutton.prefs.block_nontor_file_net "">
-<!ENTITY torbutton.prefs.restore_defaults "">
-<!ENTITY torbutton.prefs.test_settings "">
-<!ENTITY torbutton.prefs.test_auto "">
-<!ENTITY torbutton.prefs.disable_livemarks "">
-<!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 "">
-<!ENTITY torbutton.prefs.socks_vfive "">
-<!ENTITY torbutton.prefs.no_proxies_on "">
-<!ENTITY torbutton.prefs.no_proxy_warning "">
-<!ENTITY torbutton.prefs.spoofreresh "">
-<!ENTITY torbutton.prefs.refereroptions "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.spoofroot "">
-<!ENTITY torbutton.prefs.spoofdomain "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.cookiedialog.title "">
-<!ENTITY torbutton.cookiedialog.lockCol "">
-<!ENTITY torbutton.cookiedialog.domainCol "">
-<!ENTITY torbutton.cookiedialog.nameCol "">
-<!ENTITY torbutton.cookiedialog.pathCol "">
-<!ENTITY torbutton.cookiedialog.protectCookie "">
-<!ENTITY torbutton.cookiedialog.removeCookie "">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "">
-<!ENTITY torbutton.cookiedialog.removeAllBut "">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "">
-<!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 "">
-<!ENTITY torbutton.prefs.dodge_google_captcha "">
-<!ENTITY torbutton.prefs.engine1 "">
-<!ENTITY torbutton.prefs.engine2 "">
-<!ENTITY torbutton.prefs.engine3 "">
-<!ENTITY torbutton.prefs.engine4 "">
-<!ENTITY torbutton.prefs.engine5 "">
-<!ENTITY torbutton.prefs.fix_google_srch "">
-<!ENTITY torbutton.prefs.transparentTor "">
-<!ENTITY torbutton.prefs.block_disk "">
-<!ENTITY torbutton.prefs.restrict_thirdparty "">
-<!ENTITY torbutton.prefs.block_plugins "">
-<!ENTITY torbutton.prefs.resist_fingerprinting "">
+<!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.new_identity "New Identity">
+<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!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.networksettings "Open Network Settingsâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
+<!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.startup_tor "On browser 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 "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!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 livemarks 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 "startpage.com">
+<!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/es_CO/torbutton.dtd b/es_CO/torbutton.dtd
index 2bc5bac..680b561 100644
--- a/es_CO/torbutton.dtd
+++ b/es_CO/torbutton.dtd
@@ -1,150 +1,150 @@
-<!ENTITY torbutton.prefs.title "">
-<!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 "">
-<!ENTITY torbutton.prefs.proxy.host.https "">
-<!ENTITY torbutton.prefs.proxy.host.ftp "">
-<!ENTITY torbutton.prefs.proxy.host.gopher "">
-<!ENTITY torbutton.prefs.proxy.host.socks "">
-<!ENTITY torbutton.prefs.proxy.port "">
-<!ENTITY torbutton.about.title "">
-<!ENTITY torbutton.about.version "">
-<!ENTITY torbutton.about.summary "">
-<!ENTITY torbutton.about.code "">
-<!ENTITY torbutton.about.maintainer "">
-<!ENTITY torbutton.about.security_review "">
-<!ENTITY torbutton.about.donate "">
-<!ENTITY torbutton.about.make_donation "">
-<!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.new_identity "">
-<!ENTITY torbutton.context_menu.new_identity_key "">
-<!ENTITY torbutton.context_menu.toggle "">
-<!ENTITY torbutton.context_menu.toggle.key "">
-<!ENTITY torbutton.context_menu.preferences "">
-<!ENTITY torbutton.context_menu.preferences.key "">
-<!ENTITY torbutton.context_menu.about "">
-<!ENTITY torbutton.context_menu.about.key "">
-<!ENTITY torbutton.context_menu.networksettings "">
-<!ENTITY torbutton.context_menu.networksettings.key "">
-<!ENTITY torbutton.context_menu.downloadUpdate "">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "">
-<!ENTITY torbutton.context_menu.cookieProtections "">
-<!ENTITY torbutton.context_menu.cookieProtections.key "">
-<!ENTITY torbutton.context_menu.copyTor "">
-<!ENTITY torbutton.context_menu.copyTor.key "">
-<!ENTITY torbutton.context_menu.openTorTab "">
-<!ENTITY torbutton.context_menu.openTorTab.key "">
-<!ENTITY torbutton.context_menu.openTorWindow "">
-<!ENTITY torbutton.context_menu.openTorWindow.key "">
-<!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_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.cookie_protection "">
-<!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.headers "">
-<!ENTITY torbutton.prefs.spoof_english "">
-<!ENTITY torbutton.prefs.refererspoofing "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.prefs.smartspoof "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.disable_domstorage "">
-<!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.startup_tor "">
-<!ENTITY torbutton.prefs.reload_crashed_jar "">
-<!ENTITY torbutton.prefs.dual_cookie_jars "">
-<!ENTITY torbutton.prefs.clear_http_auth "">
-<!ENTITY torbutton.prefs.block_js_history "">
-<!ENTITY torbutton.prefs.resize_on_toggle "">
-<!ENTITY torbutton.prefs.close_tor "">
-<!ENTITY torbutton.prefs.close_nontor "">
-<!ENTITY torbutton.prefs.block_links "">
-<!ENTITY torbutton.prefs.jar_certs "">
-<!ENTITY torbutton.prefs.jar_ca_certs "">
-<!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 "">
-<!ENTITY torbutton.prefs.block_nontor_file_net "">
-<!ENTITY torbutton.prefs.restore_defaults "">
-<!ENTITY torbutton.prefs.test_settings "">
-<!ENTITY torbutton.prefs.test_auto "">
-<!ENTITY torbutton.prefs.disable_livemarks "">
-<!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 "">
-<!ENTITY torbutton.prefs.socks_vfive "">
-<!ENTITY torbutton.prefs.no_proxies_on "">
-<!ENTITY torbutton.prefs.no_proxy_warning "">
-<!ENTITY torbutton.prefs.spoofreresh "">
-<!ENTITY torbutton.prefs.refereroptions "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.spoofroot "">
-<!ENTITY torbutton.prefs.spoofdomain "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.cookiedialog.title "">
-<!ENTITY torbutton.cookiedialog.lockCol "">
-<!ENTITY torbutton.cookiedialog.domainCol "">
-<!ENTITY torbutton.cookiedialog.nameCol "">
-<!ENTITY torbutton.cookiedialog.pathCol "">
-<!ENTITY torbutton.cookiedialog.protectCookie "">
-<!ENTITY torbutton.cookiedialog.removeCookie "">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "">
-<!ENTITY torbutton.cookiedialog.removeAllBut "">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "">
-<!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 "">
-<!ENTITY torbutton.prefs.dodge_google_captcha "">
-<!ENTITY torbutton.prefs.engine1 "">
-<!ENTITY torbutton.prefs.engine2 "">
-<!ENTITY torbutton.prefs.engine3 "">
-<!ENTITY torbutton.prefs.engine4 "">
-<!ENTITY torbutton.prefs.engine5 "">
-<!ENTITY torbutton.prefs.fix_google_srch "">
-<!ENTITY torbutton.prefs.transparentTor "">
-<!ENTITY torbutton.prefs.block_disk "">
-<!ENTITY torbutton.prefs.restrict_thirdparty "">
-<!ENTITY torbutton.prefs.block_plugins "">
-<!ENTITY torbutton.prefs.resist_fingerprinting "">
+<!ENTITY torbutton.prefs.title "Torbutton Preferences">
+<!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.about.version "Version:">
+<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
+<!ENTITY torbutton.about.code "Code Contributors:">
+<!ENTITY torbutton.about.maintainer "Maintainer:">
+<!ENTITY torbutton.about.security_review "Security Review:">
+<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
+<!ENTITY torbutton.about.make_donation "making a donation.">
+<!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.new_identity "New Identity">
+<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!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.networksettings "Open Network Settingsâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
+<!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.startup_tor "On browser 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 "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!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 livemarks 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 "startpage.com">
+<!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/gu_IN/torbutton.dtd b/gu_IN/torbutton.dtd
index b4f90e8..99f74ae 100644
--- a/gu_IN/torbutton.dtd
+++ b/gu_IN/torbutton.dtd
@@ -1,150 +1,150 @@
-<!ENTITY torbutton.prefs.title "">
+<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "àªªà«?àª°à«?àª?à«?àª¸à«? àª?à«?àª àªµàª£à«?àª?">
-<!ENTITY torbutton.prefs.recommended_settings "">
-<!ENTITY torbutton.prefs.use_privoxy "">
-<!ENTITY torbutton.prefs.use_polipo "">
+<!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 "àªªà«?àª¤àª¾àª¨à«? àªªà«?àª°à«?àª?à«?àª¸à«? àª?à«?àª àªµàª£à«?àª? àªµàª¾àªªàª°à«?">
-<!ENTITY torbutton.prefs.proxy.host.http "">
-<!ENTITY torbutton.prefs.proxy.host.https "">
-<!ENTITY torbutton.prefs.proxy.host.ftp "">
-<!ENTITY torbutton.prefs.proxy.host.gopher "">
-<!ENTITY torbutton.prefs.proxy.host.socks "">
-<!ENTITY torbutton.prefs.proxy.port "">
-<!ENTITY torbutton.about.title "">
-<!ENTITY torbutton.about.version "">
-<!ENTITY torbutton.about.summary "">
-<!ENTITY torbutton.about.code "">
-<!ENTITY torbutton.about.maintainer "">
-<!ENTITY torbutton.about.security_review "">
-<!ENTITY torbutton.about.donate "">
-<!ENTITY torbutton.about.make_donation "">
-<!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.new_identity "">
+<!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.about.version "Version:">
+<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
+<!ENTITY torbutton.about.code "Code Contributors:">
+<!ENTITY torbutton.about.maintainer "Maintainer:">
+<!ENTITY torbutton.about.security_review "Security Review:">
+<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
+<!ENTITY torbutton.about.make_donation "making a donation.">
+<!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.new_identity "New Identity">
 <!ENTITY torbutton.context_menu.new_identity_key "S">
-<!ENTITY torbutton.context_menu.toggle "">
-<!ENTITY torbutton.context_menu.toggle.key "">
-<!ENTITY torbutton.context_menu.preferences "">
+<!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 "">
-<!ENTITY torbutton.context_menu.about.key "">
-<!ENTITY torbutton.context_menu.networksettings "">
+<!ENTITY torbutton.context_menu.about "About Torbutton...">
+<!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
-<!ENTITY torbutton.context_menu.downloadUpdate "">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "">
-<!ENTITY torbutton.context_menu.cookieProtections "">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
 <!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
 <!ENTITY torbutton.context_menu.openTorTab.key "p">
-<!ENTITY torbutton.context_menu.openTorWindow "">
-<!ENTITY torbutton.context_menu.openTorWindow.key "">
-<!ENTITY torbutton.button.label "">
-<!ENTITY torbutton.button.tooltip "">
+<!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 "">
-<!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.cookie_protection "">
-<!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.headers "">
-<!ENTITY torbutton.prefs.spoof_english "">
-<!ENTITY torbutton.prefs.refererspoofing "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.prefs.smartspoof "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.disable_domstorage "">
-<!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.startup_tor "">
-<!ENTITY torbutton.prefs.reload_crashed_jar "">
-<!ENTITY torbutton.prefs.dual_cookie_jars "">
-<!ENTITY torbutton.prefs.clear_http_auth "">
-<!ENTITY torbutton.prefs.block_js_history "">
-<!ENTITY torbutton.prefs.resize_on_toggle "">
-<!ENTITY torbutton.prefs.close_tor "">
-<!ENTITY torbutton.prefs.close_nontor "">
-<!ENTITY torbutton.prefs.block_links "">
-<!ENTITY torbutton.prefs.jar_certs "">
-<!ENTITY torbutton.prefs.jar_ca_certs "">
-<!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 "">
-<!ENTITY torbutton.prefs.block_nontor_file_net "">
-<!ENTITY torbutton.prefs.restore_defaults "">
+<!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.startup_tor "On browser 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 "àª?àª?àª¾àª¸àª£à«? àª?à«?àª àªµàª£à«?àª?">
-<!ENTITY torbutton.prefs.test_auto "">
-<!ENTITY torbutton.prefs.disable_livemarks "">
-<!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 "">
-<!ENTITY torbutton.prefs.socks_vfive "">
-<!ENTITY torbutton.prefs.no_proxies_on "">
-<!ENTITY torbutton.prefs.no_proxy_warning "">
-<!ENTITY torbutton.prefs.spoofreresh "">
-<!ENTITY torbutton.prefs.refereroptions "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.spoofroot "">
-<!ENTITY torbutton.prefs.spoofdomain "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.cookiedialog.title "">
-<!ENTITY torbutton.cookiedialog.lockCol "">
-<!ENTITY torbutton.cookiedialog.domainCol "">
-<!ENTITY torbutton.cookiedialog.nameCol "">
-<!ENTITY torbutton.cookiedialog.pathCol "">
-<!ENTITY torbutton.cookiedialog.protectCookie "">
-<!ENTITY torbutton.cookiedialog.removeCookie "">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "">
-<!ENTITY torbutton.cookiedialog.removeAllBut "">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "">
-<!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 "">
-<!ENTITY torbutton.prefs.dodge_google_captcha "">
-<!ENTITY torbutton.prefs.engine1 "">
-<!ENTITY torbutton.prefs.engine2 "">
-<!ENTITY torbutton.prefs.engine3 "">
-<!ENTITY torbutton.prefs.engine4 "">
-<!ENTITY torbutton.prefs.engine5 "">
-<!ENTITY torbutton.prefs.fix_google_srch "">
-<!ENTITY torbutton.prefs.transparentTor "">
-<!ENTITY torbutton.prefs.block_disk "">
-<!ENTITY torbutton.prefs.restrict_thirdparty "">
-<!ENTITY torbutton.prefs.block_plugins "">
-<!ENTITY torbutton.prefs.resist_fingerprinting "">
+<!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 "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!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 livemarks 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 "startpage.com">
+<!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/hr_HR/torbutton.dtd b/hr_HR/torbutton.dtd
index c8af710..c3b7732 100644
--- a/hr_HR/torbutton.dtd
+++ b/hr_HR/torbutton.dtd
@@ -1,150 +1,150 @@
-<!ENTITY torbutton.prefs.title "">
+<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Postavke Proxya">
-<!ENTITY torbutton.prefs.recommended_settings "">
-<!ENTITY torbutton.prefs.use_privoxy "">
-<!ENTITY torbutton.prefs.use_polipo "">
+<!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 "Koristi standardne proksi postavke">
-<!ENTITY torbutton.prefs.proxy.host.http "">
-<!ENTITY torbutton.prefs.proxy.host.https "">
-<!ENTITY torbutton.prefs.proxy.host.ftp "">
-<!ENTITY torbutton.prefs.proxy.host.gopher "">
-<!ENTITY torbutton.prefs.proxy.host.socks "">
+<!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 "">
-<!ENTITY torbutton.about.version "">
-<!ENTITY torbutton.about.summary "">
-<!ENTITY torbutton.about.code "">
-<!ENTITY torbutton.about.maintainer "">
-<!ENTITY torbutton.about.security_review "">
-<!ENTITY torbutton.about.donate "">
-<!ENTITY torbutton.about.make_donation "">
-<!ENTITY torbutton.pref_connection.notice "">
-<!ENTITY torbutton.pref_connection.more_info "">
+<!ENTITY torbutton.about.title "About Torbutton">
+<!ENTITY torbutton.about.version "Version:">
+<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
+<!ENTITY torbutton.about.code "Code Contributors:">
+<!ENTITY torbutton.about.maintainer "Maintainer:">
+<!ENTITY torbutton.about.security_review "Security Review:">
+<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
+<!ENTITY torbutton.about.make_donation "making a donation.">
+<!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 "PomoÄ?">
-<!ENTITY torbutton.pref_connection_more_info.text "">
+<!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.new_identity "Novi Identitet">
-<!ENTITY torbutton.context_menu.new_identity_key "">
-<!ENTITY torbutton.context_menu.toggle "">
-<!ENTITY torbutton.context_menu.toggle.key "">
-<!ENTITY torbutton.context_menu.preferences "">
-<!ENTITY torbutton.context_menu.preferences.key "">
-<!ENTITY torbutton.context_menu.about "">
-<!ENTITY torbutton.context_menu.about.key "">
-<!ENTITY torbutton.context_menu.networksettings "">
+<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!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.networksettings "Open Network Settingsâ?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
-<!ENTITY torbutton.context_menu.downloadUpdate "">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "">
-<!ENTITY torbutton.context_menu.cookieProtections "">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.context_menu.copyTor "">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
 <!ENTITY torbutton.context_menu.copyTor.key "p">
-<!ENTITY torbutton.context_menu.openTorTab "">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
 <!ENTITY torbutton.context_menu.openTorTab.key "r">
-<!ENTITY torbutton.context_menu.openTorWindow "">
+<!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.label "Torbutton">
+<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "Postavke sigurnosti">
-<!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.cookie_protection "">
-<!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.headers "">
-<!ENTITY torbutton.prefs.spoof_english "">
-<!ENTITY torbutton.prefs.refererspoofing "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.prefs.smartspoof "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.disable_domstorage "">
-<!ENTITY torbutton.prefs.forms "">
-<!ENTITY torbutton.prefs.block_tforms "">
-<!ENTITY torbutton.prefs.block_ntforms "">
+<!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 "">
-<!ENTITY torbutton.prefs.restore_tor "">
-<!ENTITY torbutton.prefs.startup_tor "">
-<!ENTITY torbutton.prefs.reload_crashed_jar "">
-<!ENTITY torbutton.prefs.dual_cookie_jars "">
-<!ENTITY torbutton.prefs.clear_http_auth "">
-<!ENTITY torbutton.prefs.block_js_history "">
-<!ENTITY torbutton.prefs.resize_on_toggle "">
-<!ENTITY torbutton.prefs.close_tor "">
-<!ENTITY torbutton.prefs.close_nontor "">
-<!ENTITY torbutton.prefs.block_links "">
-<!ENTITY torbutton.prefs.jar_certs "">
-<!ENTITY torbutton.prefs.jar_ca_certs "">
-<!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 "">
-<!ENTITY torbutton.prefs.block_nontor_file_net "">
+<!ENTITY torbutton.prefs.non_tor "Non-Tor">
+<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser 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 "Vrati uobiÄ?ajeno">
-<!ENTITY torbutton.prefs.test_settings "">
-<!ENTITY torbutton.prefs.test_auto "">
-<!ENTITY torbutton.prefs.disable_livemarks "">
-<!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 "">
-<!ENTITY torbutton.prefs.socks_vfive "">
-<!ENTITY torbutton.prefs.no_proxies_on "">
-<!ENTITY torbutton.prefs.no_proxy_warning "">
-<!ENTITY torbutton.prefs.spoofreresh "">
-<!ENTITY torbutton.prefs.refereroptions "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.spoofroot "">
-<!ENTITY torbutton.prefs.spoofdomain "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.cookiedialog.title "">
-<!ENTITY torbutton.cookiedialog.lockCol "">
-<!ENTITY torbutton.cookiedialog.domainCol "">
+<!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 "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
 <!ENTITY torbutton.cookiedialog.nameCol "Naziv">
-<!ENTITY torbutton.cookiedialog.pathCol "">
-<!ENTITY torbutton.cookiedialog.protectCookie "">
-<!ENTITY torbutton.cookiedialog.removeCookie "">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "">
-<!ENTITY torbutton.cookiedialog.removeAllBut "">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "">
-<!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 "">
-<!ENTITY torbutton.prefs.dodge_google_captcha "">
-<!ENTITY torbutton.prefs.engine1 "">
-<!ENTITY torbutton.prefs.engine2 "">
-<!ENTITY torbutton.prefs.engine3 "">
-<!ENTITY torbutton.prefs.engine4 "">
-<!ENTITY torbutton.prefs.engine5 "">
-<!ENTITY torbutton.prefs.fix_google_srch "">
-<!ENTITY torbutton.prefs.transparentTor "">
-<!ENTITY torbutton.prefs.block_disk "">
-<!ENTITY torbutton.prefs.restrict_thirdparty "">
-<!ENTITY torbutton.prefs.block_plugins "">
-<!ENTITY torbutton.prefs.resist_fingerprinting "">
+<!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 livemarks 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 "startpage.com">
+<!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/ia/torbutton.dtd b/ia/torbutton.dtd
index 38ba826..668a0dd 100644
--- a/ia/torbutton.dtd
+++ b/ia/torbutton.dtd
@@ -1,150 +1,150 @@
-<!ENTITY torbutton.prefs.title "">
+<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Configurationes de proxy:">
-<!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 "">
-<!ENTITY torbutton.prefs.proxy.host.https "">
-<!ENTITY torbutton.prefs.proxy.host.ftp "">
-<!ENTITY torbutton.prefs.proxy.host.gopher "">
-<!ENTITY torbutton.prefs.proxy.host.socks "">
+<!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 "Porto:">
-<!ENTITY torbutton.about.title "">
-<!ENTITY torbutton.about.version "">
-<!ENTITY torbutton.about.summary "">
-<!ENTITY torbutton.about.code "">
-<!ENTITY torbutton.about.maintainer "">
-<!ENTITY torbutton.about.security_review "">
-<!ENTITY torbutton.about.donate "">
-<!ENTITY torbutton.about.make_donation "">
-<!ENTITY torbutton.pref_connection.notice "">
-<!ENTITY torbutton.pref_connection.more_info "">
+<!ENTITY torbutton.about.title "About Torbutton">
+<!ENTITY torbutton.about.version "Version:">
+<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
+<!ENTITY torbutton.about.code "Code Contributors:">
+<!ENTITY torbutton.about.maintainer "Maintainer:">
+<!ENTITY torbutton.about.security_review "Security Review:">
+<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
+<!ENTITY torbutton.about.make_donation "making a donation.">
+<!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 "Adjuta">
-<!ENTITY torbutton.pref_connection_more_info.text "">
+<!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.new_identity "Nove identitate">
-<!ENTITY torbutton.context_menu.new_identity_key "">
-<!ENTITY torbutton.context_menu.toggle "">
-<!ENTITY torbutton.context_menu.toggle.key "">
-<!ENTITY torbutton.context_menu.preferences "">
-<!ENTITY torbutton.context_menu.preferences.key "">
-<!ENTITY torbutton.context_menu.about "">
-<!ENTITY torbutton.context_menu.about.key "">
-<!ENTITY torbutton.context_menu.networksettings "">
-<!ENTITY torbutton.context_menu.networksettings.key "">
-<!ENTITY torbutton.context_menu.downloadUpdate "">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "">
-<!ENTITY torbutton.context_menu.cookieProtections "">
-<!ENTITY torbutton.context_menu.cookieProtections.key "">
-<!ENTITY torbutton.context_menu.copyTor "">
-<!ENTITY torbutton.context_menu.copyTor.key "">
-<!ENTITY torbutton.context_menu.openTorTab "">
-<!ENTITY torbutton.context_menu.openTorTab.key "">
-<!ENTITY torbutton.context_menu.openTorWindow "">
-<!ENTITY torbutton.context_menu.openTorWindow.key "">
-<!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_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.cookie_protection "">
-<!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.headers "">
-<!ENTITY torbutton.prefs.spoof_english "">
-<!ENTITY torbutton.prefs.refererspoofing "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.prefs.smartspoof "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.disable_domstorage "">
-<!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.startup_tor "">
-<!ENTITY torbutton.prefs.reload_crashed_jar "">
-<!ENTITY torbutton.prefs.dual_cookie_jars "">
-<!ENTITY torbutton.prefs.clear_http_auth "">
-<!ENTITY torbutton.prefs.block_js_history "">
-<!ENTITY torbutton.prefs.resize_on_toggle "">
-<!ENTITY torbutton.prefs.close_tor "">
-<!ENTITY torbutton.prefs.close_nontor "">
-<!ENTITY torbutton.prefs.block_links "">
-<!ENTITY torbutton.prefs.jar_certs "">
-<!ENTITY torbutton.prefs.jar_ca_certs "">
-<!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 "">
-<!ENTITY torbutton.prefs.block_nontor_file_net "">
-<!ENTITY torbutton.prefs.restore_defaults "">
-<!ENTITY torbutton.prefs.test_settings "">
-<!ENTITY torbutton.prefs.test_auto "">
-<!ENTITY torbutton.prefs.disable_livemarks "">
-<!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 "">
-<!ENTITY torbutton.prefs.socks_vfive "">
-<!ENTITY torbutton.prefs.no_proxies_on "">
-<!ENTITY torbutton.prefs.no_proxy_warning "">
-<!ENTITY torbutton.prefs.spoofreresh "">
-<!ENTITY torbutton.prefs.refereroptions "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.spoofroot "">
-<!ENTITY torbutton.prefs.spoofdomain "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.cookiedialog.title "">
-<!ENTITY torbutton.cookiedialog.lockCol "">
-<!ENTITY torbutton.cookiedialog.domainCol "">
+<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!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.networksettings "Open Network Settingsâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
+<!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.startup_tor "On browser 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 "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
 <!ENTITY torbutton.cookiedialog.nameCol "Nomine">
-<!ENTITY torbutton.cookiedialog.pathCol "">
-<!ENTITY torbutton.cookiedialog.protectCookie "">
-<!ENTITY torbutton.cookiedialog.removeCookie "">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "">
-<!ENTITY torbutton.cookiedialog.removeAllBut "">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "">
-<!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 "">
-<!ENTITY torbutton.prefs.dodge_google_captcha "">
-<!ENTITY torbutton.prefs.engine1 "">
-<!ENTITY torbutton.prefs.engine2 "">
-<!ENTITY torbutton.prefs.engine3 "">
-<!ENTITY torbutton.prefs.engine4 "">
-<!ENTITY torbutton.prefs.engine5 "">
-<!ENTITY torbutton.prefs.fix_google_srch "">
-<!ENTITY torbutton.prefs.transparentTor "">
-<!ENTITY torbutton.prefs.block_disk "">
-<!ENTITY torbutton.prefs.restrict_thirdparty "">
-<!ENTITY torbutton.prefs.block_plugins "">
-<!ENTITY torbutton.prefs.resist_fingerprinting "">
+<!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 livemarks 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 "startpage.com">
+<!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/lg/torbutton.dtd b/lg/torbutton.dtd
index edc3227..37973bc 100644
--- a/lg/torbutton.dtd
+++ b/lg/torbutton.dtd
@@ -11,29 +11,29 @@
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host:">
 <!ENTITY torbutton.prefs.proxy.port "Port:">
 <!ENTITY torbutton.about.title "About Torbutton">
-<!ENTITY torbutton.about.version "">
-<!ENTITY torbutton.about.summary "">
-<!ENTITY torbutton.about.code "">
-<!ENTITY torbutton.about.maintainer "">
-<!ENTITY torbutton.about.security_review "">
-<!ENTITY torbutton.about.donate "">
-<!ENTITY torbutton.about.make_donation "">
+<!ENTITY torbutton.about.version "Version:">
+<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
+<!ENTITY torbutton.about.code "Code Contributors:">
+<!ENTITY torbutton.about.maintainer "Maintainer:">
+<!ENTITY torbutton.about.security_review "Security Review:">
+<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
+<!ENTITY torbutton.about.make_donation "making a donation.">
 <!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.new_identity "">
-<!ENTITY torbutton.context_menu.new_identity_key "">
+<!ENTITY torbutton.context_menu.new_identity "New Identity">
+<!ENTITY torbutton.context_menu.new_identity_key "I">
 <!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.networksettings "">
-<!ENTITY torbutton.context_menu.networksettings.key "">
-<!ENTITY torbutton.context_menu.downloadUpdate "">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "">
+<!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
@@ -144,7 +144,7 @@
 <!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)">
-<!ENTITY torbutton.prefs.block_disk "">
-<!ENTITY torbutton.prefs.restrict_thirdparty "">
-<!ENTITY torbutton.prefs.block_plugins "">
-<!ENTITY torbutton.prefs.resist_fingerprinting "">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/ms_MY/torbutton.dtd b/ms_MY/torbutton.dtd
index 8cc71b2..943c40d 100644
--- a/ms_MY/torbutton.dtd
+++ b/ms_MY/torbutton.dtd
@@ -48,103 +48,103 @@
 <!ENTITY torbutton.prefs.block_thread "Sekat history daripada dibaca ketika Tor berjalan (penting)">
 <!ENTITY torbutton.prefs.block_thwrite "Sekat history daripada ditulis ketika Tor berjalan (digalakkan)">
 <!ENTITY torbutton.prefs.block_nthread "Sekat history daripada dibaca ketika Tor tidak berjalan (optional)">
-<!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.cookie_protection "">
-<!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.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 "Kandungan Dinamik">
-<!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 "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.prefs.smartspoof "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.disable_domstorage "">
-<!ENTITY torbutton.prefs.forms "">
-<!ENTITY torbutton.prefs.block_tforms "">
-<!ENTITY torbutton.prefs.block_ntforms "">
+<!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 "Bukan-Tor">
-<!ENTITY torbutton.prefs.restore_tor "">
-<!ENTITY torbutton.prefs.startup_tor "">
-<!ENTITY torbutton.prefs.reload_crashed_jar "">
-<!ENTITY torbutton.prefs.dual_cookie_jars "">
-<!ENTITY torbutton.prefs.clear_http_auth "">
-<!ENTITY torbutton.prefs.block_js_history "">
-<!ENTITY torbutton.prefs.resize_on_toggle "">
-<!ENTITY torbutton.prefs.close_tor "">
-<!ENTITY torbutton.prefs.close_nontor "">
-<!ENTITY torbutton.prefs.block_links "">
-<!ENTITY torbutton.prefs.jar_certs "">
-<!ENTITY torbutton.prefs.jar_ca_certs "">
-<!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 "">
-<!ENTITY torbutton.prefs.block_nontor_file_net "">
+<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser 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 "Kembalikan tetapan asal">
-<!ENTITY torbutton.prefs.test_settings "">
-<!ENTITY torbutton.prefs.test_auto "">
-<!ENTITY torbutton.prefs.disable_livemarks "">
-<!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.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 "Tiada proksi untuk:">
-<!ENTITY torbutton.prefs.no_proxy_warning "">
-<!ENTITY torbutton.prefs.spoofreresh "">
-<!ENTITY torbutton.prefs.refereroptions "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.spoofroot "">
-<!ENTITY torbutton.prefs.spoofdomain "">
-<!ENTITY torbutton.prefs.spoofblank "">
+<!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 "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
 <!ENTITY torbutton.cookiedialog.title "Mengurus Perlindungan Cookie">
-<!ENTITY torbutton.cookiedialog.lockCol "">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Hos">
 <!ENTITY torbutton.cookiedialog.nameCol "Nama">
-<!ENTITY torbutton.cookiedialog.pathCol "">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
 <!ENTITY torbutton.cookiedialog.protectCookie "Lindung Cookie">
 <!ENTITY torbutton.cookiedialog.removeCookie "Buang Cookie">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
 <!ENTITY torbutton.cookiedialog.removeAllBut "Buang Semua Kecuali Yang Dilindungi">
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Lindungi Cookies Baru">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Jangan Melindungi Cookies Baru">
-<!ENTITY torbutton.prefs.disable_livemarks "">
+<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(digalakkan)">
-<!ENTITY torbutton.prefs.dtd_optional "">
+<!ENTITY torbutton.prefs.dtd_optional "(optional)">
 <!ENTITY torbutton.prefs.dtd_crucial "(penting)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "">
-<!ENTITY torbutton.prefs.dodge_google_captcha "">
+<!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 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
-<!ENTITY torbutton.prefs.fix_google_srch "">
-<!ENTITY torbutton.prefs.transparentTor "">
-<!ENTITY torbutton.prefs.block_disk "">
-<!ENTITY torbutton.prefs.restrict_thirdparty "">
+<!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
 <!ENTITY torbutton.prefs.block_plugins "Matikan pelayar plugin (seperti Flash)">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Ubah butir-butir yang membezakan anda daripada pengguna lain Pelayar Tor">
diff --git a/nds/torbutton.dtd b/nds/torbutton.dtd
index 2bc5bac..680b561 100644
--- a/nds/torbutton.dtd
+++ b/nds/torbutton.dtd
@@ -1,150 +1,150 @@
-<!ENTITY torbutton.prefs.title "">
-<!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 "">
-<!ENTITY torbutton.prefs.proxy.host.https "">
-<!ENTITY torbutton.prefs.proxy.host.ftp "">
-<!ENTITY torbutton.prefs.proxy.host.gopher "">
-<!ENTITY torbutton.prefs.proxy.host.socks "">
-<!ENTITY torbutton.prefs.proxy.port "">
-<!ENTITY torbutton.about.title "">
-<!ENTITY torbutton.about.version "">
-<!ENTITY torbutton.about.summary "">
-<!ENTITY torbutton.about.code "">
-<!ENTITY torbutton.about.maintainer "">
-<!ENTITY torbutton.about.security_review "">
-<!ENTITY torbutton.about.donate "">
-<!ENTITY torbutton.about.make_donation "">
-<!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.new_identity "">
-<!ENTITY torbutton.context_menu.new_identity_key "">
-<!ENTITY torbutton.context_menu.toggle "">
-<!ENTITY torbutton.context_menu.toggle.key "">
-<!ENTITY torbutton.context_menu.preferences "">
-<!ENTITY torbutton.context_menu.preferences.key "">
-<!ENTITY torbutton.context_menu.about "">
-<!ENTITY torbutton.context_menu.about.key "">
-<!ENTITY torbutton.context_menu.networksettings "">
-<!ENTITY torbutton.context_menu.networksettings.key "">
-<!ENTITY torbutton.context_menu.downloadUpdate "">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "">
-<!ENTITY torbutton.context_menu.cookieProtections "">
-<!ENTITY torbutton.context_menu.cookieProtections.key "">
-<!ENTITY torbutton.context_menu.copyTor "">
-<!ENTITY torbutton.context_menu.copyTor.key "">
-<!ENTITY torbutton.context_menu.openTorTab "">
-<!ENTITY torbutton.context_menu.openTorTab.key "">
-<!ENTITY torbutton.context_menu.openTorWindow "">
-<!ENTITY torbutton.context_menu.openTorWindow.key "">
-<!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_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.cookie_protection "">
-<!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.headers "">
-<!ENTITY torbutton.prefs.spoof_english "">
-<!ENTITY torbutton.prefs.refererspoofing "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.prefs.smartspoof "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.disable_domstorage "">
-<!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.startup_tor "">
-<!ENTITY torbutton.prefs.reload_crashed_jar "">
-<!ENTITY torbutton.prefs.dual_cookie_jars "">
-<!ENTITY torbutton.prefs.clear_http_auth "">
-<!ENTITY torbutton.prefs.block_js_history "">
-<!ENTITY torbutton.prefs.resize_on_toggle "">
-<!ENTITY torbutton.prefs.close_tor "">
-<!ENTITY torbutton.prefs.close_nontor "">
-<!ENTITY torbutton.prefs.block_links "">
-<!ENTITY torbutton.prefs.jar_certs "">
-<!ENTITY torbutton.prefs.jar_ca_certs "">
-<!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 "">
-<!ENTITY torbutton.prefs.block_nontor_file_net "">
-<!ENTITY torbutton.prefs.restore_defaults "">
-<!ENTITY torbutton.prefs.test_settings "">
-<!ENTITY torbutton.prefs.test_auto "">
-<!ENTITY torbutton.prefs.disable_livemarks "">
-<!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 "">
-<!ENTITY torbutton.prefs.socks_vfive "">
-<!ENTITY torbutton.prefs.no_proxies_on "">
-<!ENTITY torbutton.prefs.no_proxy_warning "">
-<!ENTITY torbutton.prefs.spoofreresh "">
-<!ENTITY torbutton.prefs.refereroptions "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.spoofroot "">
-<!ENTITY torbutton.prefs.spoofdomain "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.cookiedialog.title "">
-<!ENTITY torbutton.cookiedialog.lockCol "">
-<!ENTITY torbutton.cookiedialog.domainCol "">
-<!ENTITY torbutton.cookiedialog.nameCol "">
-<!ENTITY torbutton.cookiedialog.pathCol "">
-<!ENTITY torbutton.cookiedialog.protectCookie "">
-<!ENTITY torbutton.cookiedialog.removeCookie "">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "">
-<!ENTITY torbutton.cookiedialog.removeAllBut "">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "">
-<!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 "">
-<!ENTITY torbutton.prefs.dodge_google_captcha "">
-<!ENTITY torbutton.prefs.engine1 "">
-<!ENTITY torbutton.prefs.engine2 "">
-<!ENTITY torbutton.prefs.engine3 "">
-<!ENTITY torbutton.prefs.engine4 "">
-<!ENTITY torbutton.prefs.engine5 "">
-<!ENTITY torbutton.prefs.fix_google_srch "">
-<!ENTITY torbutton.prefs.transparentTor "">
-<!ENTITY torbutton.prefs.block_disk "">
-<!ENTITY torbutton.prefs.restrict_thirdparty "">
-<!ENTITY torbutton.prefs.block_plugins "">
-<!ENTITY torbutton.prefs.resist_fingerprinting "">
+<!ENTITY torbutton.prefs.title "Torbutton Preferences">
+<!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.about.version "Version:">
+<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
+<!ENTITY torbutton.about.code "Code Contributors:">
+<!ENTITY torbutton.about.maintainer "Maintainer:">
+<!ENTITY torbutton.about.security_review "Security Review:">
+<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
+<!ENTITY torbutton.about.make_donation "making a donation.">
+<!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.new_identity "New Identity">
+<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!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.networksettings "Open Network Settingsâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
+<!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.startup_tor "On browser 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 "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!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 livemarks 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 "startpage.com">
+<!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/si/torbutton.dtd b/si/torbutton.dtd
index 2bc5bac..680b561 100644
--- a/si/torbutton.dtd
+++ b/si/torbutton.dtd
@@ -1,150 +1,150 @@
-<!ENTITY torbutton.prefs.title "">
-<!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 "">
-<!ENTITY torbutton.prefs.proxy.host.https "">
-<!ENTITY torbutton.prefs.proxy.host.ftp "">
-<!ENTITY torbutton.prefs.proxy.host.gopher "">
-<!ENTITY torbutton.prefs.proxy.host.socks "">
-<!ENTITY torbutton.prefs.proxy.port "">
-<!ENTITY torbutton.about.title "">
-<!ENTITY torbutton.about.version "">
-<!ENTITY torbutton.about.summary "">
-<!ENTITY torbutton.about.code "">
-<!ENTITY torbutton.about.maintainer "">
-<!ENTITY torbutton.about.security_review "">
-<!ENTITY torbutton.about.donate "">
-<!ENTITY torbutton.about.make_donation "">
-<!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.new_identity "">
-<!ENTITY torbutton.context_menu.new_identity_key "">
-<!ENTITY torbutton.context_menu.toggle "">
-<!ENTITY torbutton.context_menu.toggle.key "">
-<!ENTITY torbutton.context_menu.preferences "">
-<!ENTITY torbutton.context_menu.preferences.key "">
-<!ENTITY torbutton.context_menu.about "">
-<!ENTITY torbutton.context_menu.about.key "">
-<!ENTITY torbutton.context_menu.networksettings "">
-<!ENTITY torbutton.context_menu.networksettings.key "">
-<!ENTITY torbutton.context_menu.downloadUpdate "">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "">
-<!ENTITY torbutton.context_menu.cookieProtections "">
-<!ENTITY torbutton.context_menu.cookieProtections.key "">
-<!ENTITY torbutton.context_menu.copyTor "">
-<!ENTITY torbutton.context_menu.copyTor.key "">
-<!ENTITY torbutton.context_menu.openTorTab "">
-<!ENTITY torbutton.context_menu.openTorTab.key "">
-<!ENTITY torbutton.context_menu.openTorWindow "">
-<!ENTITY torbutton.context_menu.openTorWindow.key "">
-<!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_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.cookie_protection "">
-<!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.headers "">
-<!ENTITY torbutton.prefs.spoof_english "">
-<!ENTITY torbutton.prefs.refererspoofing "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.prefs.smartspoof "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.disable_domstorage "">
-<!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.startup_tor "">
-<!ENTITY torbutton.prefs.reload_crashed_jar "">
-<!ENTITY torbutton.prefs.dual_cookie_jars "">
-<!ENTITY torbutton.prefs.clear_http_auth "">
-<!ENTITY torbutton.prefs.block_js_history "">
-<!ENTITY torbutton.prefs.resize_on_toggle "">
-<!ENTITY torbutton.prefs.close_tor "">
-<!ENTITY torbutton.prefs.close_nontor "">
-<!ENTITY torbutton.prefs.block_links "">
-<!ENTITY torbutton.prefs.jar_certs "">
-<!ENTITY torbutton.prefs.jar_ca_certs "">
-<!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 "">
-<!ENTITY torbutton.prefs.block_nontor_file_net "">
-<!ENTITY torbutton.prefs.restore_defaults "">
-<!ENTITY torbutton.prefs.test_settings "">
-<!ENTITY torbutton.prefs.test_auto "">
-<!ENTITY torbutton.prefs.disable_livemarks "">
-<!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 "">
-<!ENTITY torbutton.prefs.socks_vfive "">
-<!ENTITY torbutton.prefs.no_proxies_on "">
-<!ENTITY torbutton.prefs.no_proxy_warning "">
-<!ENTITY torbutton.prefs.spoofreresh "">
-<!ENTITY torbutton.prefs.refereroptions "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.spoofroot "">
-<!ENTITY torbutton.prefs.spoofdomain "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.cookiedialog.title "">
-<!ENTITY torbutton.cookiedialog.lockCol "">
-<!ENTITY torbutton.cookiedialog.domainCol "">
-<!ENTITY torbutton.cookiedialog.nameCol "">
-<!ENTITY torbutton.cookiedialog.pathCol "">
-<!ENTITY torbutton.cookiedialog.protectCookie "">
-<!ENTITY torbutton.cookiedialog.removeCookie "">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "">
-<!ENTITY torbutton.cookiedialog.removeAllBut "">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "">
-<!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 "">
-<!ENTITY torbutton.prefs.dodge_google_captcha "">
-<!ENTITY torbutton.prefs.engine1 "">
-<!ENTITY torbutton.prefs.engine2 "">
-<!ENTITY torbutton.prefs.engine3 "">
-<!ENTITY torbutton.prefs.engine4 "">
-<!ENTITY torbutton.prefs.engine5 "">
-<!ENTITY torbutton.prefs.fix_google_srch "">
-<!ENTITY torbutton.prefs.transparentTor "">
-<!ENTITY torbutton.prefs.block_disk "">
-<!ENTITY torbutton.prefs.restrict_thirdparty "">
-<!ENTITY torbutton.prefs.block_plugins "">
-<!ENTITY torbutton.prefs.resist_fingerprinting "">
+<!ENTITY torbutton.prefs.title "Torbutton Preferences">
+<!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.about.version "Version:">
+<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
+<!ENTITY torbutton.about.code "Code Contributors:">
+<!ENTITY torbutton.about.maintainer "Maintainer:">
+<!ENTITY torbutton.about.security_review "Security Review:">
+<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
+<!ENTITY torbutton.about.make_donation "making a donation.">
+<!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.new_identity "New Identity">
+<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!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.networksettings "Open Network Settingsâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
+<!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.startup_tor "On browser 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 "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!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 livemarks 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 "startpage.com">
+<!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/sk_SK/torbutton.dtd b/sk_SK/torbutton.dtd
index 8e7e8e7..bbf33d4 100644
--- a/sk_SK/torbutton.dtd
+++ b/sk_SK/torbutton.dtd
@@ -11,17 +11,17 @@
 <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Host">
 <!ENTITY torbutton.prefs.proxy.port "Port">
 <!ENTITY torbutton.about.title "O Torbutton">
-<!ENTITY torbutton.about.version "">
-<!ENTITY torbutton.about.summary "">
-<!ENTITY torbutton.about.code "">
+<!ENTITY torbutton.about.version "Version:">
+<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
+<!ENTITY torbutton.about.code "Code Contributors:">
 <!ENTITY torbutton.about.maintainer "SprÃ¡vca:">
-<!ENTITY torbutton.about.security_review "">
-<!ENTITY torbutton.about.donate "">
-<!ENTITY torbutton.about.make_donation "">
-<!ENTITY torbutton.pref_connection.notice "">
+<!ENTITY torbutton.about.security_review "Security Review:">
+<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
+<!ENTITY torbutton.about.make_donation "making a donation.">
+<!ENTITY torbutton.pref_connection.notice "Disable Torbutton to change these settings.">
 <!ENTITY torbutton.pref_connection.more_info "Ä?aÄ¾Å¡ie informÃ¡cie">
 <!ENTITY torbutton.pref_connection_more_info.title "PomocnÃk">
-<!ENTITY torbutton.pref_connection_more_info.text "">
+<!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.new_identity "NovÃ¡ Identita">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
 <!ENTITY torbutton.context_menu.toggle "PrepnÃºÅ¥ stav Toru">
@@ -30,9 +30,9 @@
 <!ENTITY torbutton.context_menu.preferences.key "P">
 <!ENTITY torbutton.context_menu.about "O Torbutton...">
 <!ENTITY torbutton.context_menu.about.key "A">
-<!ENTITY torbutton.context_menu.networksettings "">
+<!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
 <!ENTITY torbutton.context_menu.networksettings.key "S">
-<!ENTITY torbutton.context_menu.downloadUpdate "">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
 <!ENTITY torbutton.context_menu.cookieProtections "Ochrana Cookies">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
@@ -43,108 +43,108 @@
 <!ENTITY torbutton.context_menu.openTorWindow "OtvoriÅ¥ Tor URL v novom Okne">
 <!ENTITY torbutton.context_menu.openTorWindow.key "d">
 <!ENTITY torbutton.button.label "Torbutton">
-<!ENTITY torbutton.button.tooltip "">
+<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
 <!ENTITY torbutton.prefs.sec_settings "BezpeÄ?nostnÃ© nastavenia">
-<!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.cookie_protection "">
-<!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.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 "">
+<!ENTITY torbutton.prefs.cache "Cache">
 <!ENTITY torbutton.prefs.history "HistÃ³ria">
-<!ENTITY torbutton.prefs.no_search "">
+<!ENTITY torbutton.prefs.no_search "Disable search suggestions during Tor (recommended)">
 <!ENTITY torbutton.prefs.shutdown "Vypnutie">
-<!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 "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.prefs.smartspoof "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.disable_domstorage "">
-<!ENTITY torbutton.prefs.forms "">
-<!ENTITY torbutton.prefs.block_tforms "">
-<!ENTITY torbutton.prefs.block_ntforms "">
+<!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 "">
-<!ENTITY torbutton.prefs.restore_tor "">
-<!ENTITY torbutton.prefs.startup_tor "">
-<!ENTITY torbutton.prefs.reload_crashed_jar "">
-<!ENTITY torbutton.prefs.dual_cookie_jars "">
-<!ENTITY torbutton.prefs.clear_http_auth "">
-<!ENTITY torbutton.prefs.block_js_history "">
-<!ENTITY torbutton.prefs.resize_on_toggle "">
-<!ENTITY torbutton.prefs.close_tor "">
-<!ENTITY torbutton.prefs.close_nontor "">
-<!ENTITY torbutton.prefs.block_links "">
-<!ENTITY torbutton.prefs.jar_certs "">
-<!ENTITY torbutton.prefs.jar_ca_certs "">
-<!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 "">
-<!ENTITY torbutton.prefs.block_nontor_file_net "">
-<!ENTITY torbutton.prefs.restore_defaults "">
+<!ENTITY torbutton.prefs.non_tor "Non-Tor">
+<!ENTITY torbutton.prefs.restore_tor "On session restored startup, set Tor state to:">
+<!ENTITY torbutton.prefs.startup_tor "On browser 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 "SkontrolovaÅ¥ nastavenia">
-<!ENTITY torbutton.prefs.test_auto "">
-<!ENTITY torbutton.prefs.disable_livemarks "">
-<!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 "">
-<!ENTITY torbutton.prefs.socks_vfive "">
-<!ENTITY torbutton.prefs.no_proxies_on "">
-<!ENTITY torbutton.prefs.no_proxy_warning "">
-<!ENTITY torbutton.prefs.spoofreresh "">
-<!ENTITY torbutton.prefs.refereroptions "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.spoofroot "">
-<!ENTITY torbutton.prefs.spoofdomain "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.cookiedialog.title "">
-<!ENTITY torbutton.cookiedialog.lockCol "">
-<!ENTITY torbutton.cookiedialog.domainCol "">
+<!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 "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
 <!ENTITY torbutton.cookiedialog.nameCol "Meno">
 <!ENTITY torbutton.cookiedialog.pathCol "Cesta">
-<!ENTITY torbutton.cookiedialog.protectCookie "">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
 <!ENTITY torbutton.cookiedialog.removeCookie "OdstrÃ¡niÅ¥ Cookies">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "">
-<!ENTITY torbutton.cookiedialog.removeAllBut "">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "">
-<!ENTITY torbutton.prefs.disable_livemarks "">
+<!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 livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(odporÃºÄ?anÃ©)">
 <!ENTITY torbutton.prefs.dtd_optional "(voliteÄ¾nÃ©)">
 <!ENTITY torbutton.prefs.dtd_crucial "(kritickÃ©)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "">
-<!ENTITY torbutton.prefs.dodge_google_captcha "">
+<!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 "">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
-<!ENTITY torbutton.prefs.fix_google_srch "">
-<!ENTITY torbutton.prefs.transparentTor "">
-<!ENTITY torbutton.prefs.block_disk "">
-<!ENTITY torbutton.prefs.restrict_thirdparty "">
-<!ENTITY torbutton.prefs.block_plugins "">
-<!ENTITY torbutton.prefs.resist_fingerprinting "">
+<!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/sl_SI/torbutton.dtd b/sl_SI/torbutton.dtd
index 2bc5bac..680b561 100644
--- a/sl_SI/torbutton.dtd
+++ b/sl_SI/torbutton.dtd
@@ -1,150 +1,150 @@
-<!ENTITY torbutton.prefs.title "">
-<!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 "">
-<!ENTITY torbutton.prefs.proxy.host.https "">
-<!ENTITY torbutton.prefs.proxy.host.ftp "">
-<!ENTITY torbutton.prefs.proxy.host.gopher "">
-<!ENTITY torbutton.prefs.proxy.host.socks "">
-<!ENTITY torbutton.prefs.proxy.port "">
-<!ENTITY torbutton.about.title "">
-<!ENTITY torbutton.about.version "">
-<!ENTITY torbutton.about.summary "">
-<!ENTITY torbutton.about.code "">
-<!ENTITY torbutton.about.maintainer "">
-<!ENTITY torbutton.about.security_review "">
-<!ENTITY torbutton.about.donate "">
-<!ENTITY torbutton.about.make_donation "">
-<!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.new_identity "">
-<!ENTITY torbutton.context_menu.new_identity_key "">
-<!ENTITY torbutton.context_menu.toggle "">
-<!ENTITY torbutton.context_menu.toggle.key "">
-<!ENTITY torbutton.context_menu.preferences "">
-<!ENTITY torbutton.context_menu.preferences.key "">
-<!ENTITY torbutton.context_menu.about "">
-<!ENTITY torbutton.context_menu.about.key "">
-<!ENTITY torbutton.context_menu.networksettings "">
-<!ENTITY torbutton.context_menu.networksettings.key "">
-<!ENTITY torbutton.context_menu.downloadUpdate "">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "">
-<!ENTITY torbutton.context_menu.cookieProtections "">
-<!ENTITY torbutton.context_menu.cookieProtections.key "">
-<!ENTITY torbutton.context_menu.copyTor "">
-<!ENTITY torbutton.context_menu.copyTor.key "">
-<!ENTITY torbutton.context_menu.openTorTab "">
-<!ENTITY torbutton.context_menu.openTorTab.key "">
-<!ENTITY torbutton.context_menu.openTorWindow "">
-<!ENTITY torbutton.context_menu.openTorWindow.key "">
-<!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_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.cookie_protection "">
-<!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.headers "">
-<!ENTITY torbutton.prefs.spoof_english "">
-<!ENTITY torbutton.prefs.refererspoofing "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.prefs.smartspoof "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.disable_domstorage "">
-<!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.startup_tor "">
-<!ENTITY torbutton.prefs.reload_crashed_jar "">
-<!ENTITY torbutton.prefs.dual_cookie_jars "">
-<!ENTITY torbutton.prefs.clear_http_auth "">
-<!ENTITY torbutton.prefs.block_js_history "">
-<!ENTITY torbutton.prefs.resize_on_toggle "">
-<!ENTITY torbutton.prefs.close_tor "">
-<!ENTITY torbutton.prefs.close_nontor "">
-<!ENTITY torbutton.prefs.block_links "">
-<!ENTITY torbutton.prefs.jar_certs "">
-<!ENTITY torbutton.prefs.jar_ca_certs "">
-<!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 "">
-<!ENTITY torbutton.prefs.block_nontor_file_net "">
-<!ENTITY torbutton.prefs.restore_defaults "">
-<!ENTITY torbutton.prefs.test_settings "">
-<!ENTITY torbutton.prefs.test_auto "">
-<!ENTITY torbutton.prefs.disable_livemarks "">
-<!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 "">
-<!ENTITY torbutton.prefs.socks_vfive "">
-<!ENTITY torbutton.prefs.no_proxies_on "">
-<!ENTITY torbutton.prefs.no_proxy_warning "">
-<!ENTITY torbutton.prefs.spoofreresh "">
-<!ENTITY torbutton.prefs.refereroptions "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.spoofroot "">
-<!ENTITY torbutton.prefs.spoofdomain "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.cookiedialog.title "">
-<!ENTITY torbutton.cookiedialog.lockCol "">
-<!ENTITY torbutton.cookiedialog.domainCol "">
-<!ENTITY torbutton.cookiedialog.nameCol "">
-<!ENTITY torbutton.cookiedialog.pathCol "">
-<!ENTITY torbutton.cookiedialog.protectCookie "">
-<!ENTITY torbutton.cookiedialog.removeCookie "">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "">
-<!ENTITY torbutton.cookiedialog.removeAllBut "">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "">
-<!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 "">
-<!ENTITY torbutton.prefs.dodge_google_captcha "">
-<!ENTITY torbutton.prefs.engine1 "">
-<!ENTITY torbutton.prefs.engine2 "">
-<!ENTITY torbutton.prefs.engine3 "">
-<!ENTITY torbutton.prefs.engine4 "">
-<!ENTITY torbutton.prefs.engine5 "">
-<!ENTITY torbutton.prefs.fix_google_srch "">
-<!ENTITY torbutton.prefs.transparentTor "">
-<!ENTITY torbutton.prefs.block_disk "">
-<!ENTITY torbutton.prefs.restrict_thirdparty "">
-<!ENTITY torbutton.prefs.block_plugins "">
-<!ENTITY torbutton.prefs.resist_fingerprinting "">
+<!ENTITY torbutton.prefs.title "Torbutton Preferences">
+<!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.about.version "Version:">
+<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
+<!ENTITY torbutton.about.code "Code Contributors:">
+<!ENTITY torbutton.about.maintainer "Maintainer:">
+<!ENTITY torbutton.about.security_review "Security Review:">
+<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
+<!ENTITY torbutton.about.make_donation "making a donation.">
+<!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.new_identity "New Identity">
+<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!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.networksettings "Open Network Settingsâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
+<!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.startup_tor "On browser 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 "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!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 livemarks 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 "startpage.com">
+<!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/sn/torbutton.dtd b/sn/torbutton.dtd
index 69b4843..7e3f864 100644
--- a/sn/torbutton.dtd
+++ b/sn/torbutton.dtd
@@ -1,150 +1,150 @@
-<!ENTITY torbutton.prefs.title "">
+<!ENTITY torbutton.prefs.title "Torbutton Preferences">
 <!ENTITY torbutton.prefs.tor_settings "Proxy Zvamada">
-<!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 "">
-<!ENTITY torbutton.prefs.proxy.host.https "">
-<!ENTITY torbutton.prefs.proxy.host.ftp "">
-<!ENTITY torbutton.prefs.proxy.host.gopher "">
-<!ENTITY torbutton.prefs.proxy.host.socks "">
-<!ENTITY torbutton.prefs.proxy.port "">
-<!ENTITY torbutton.about.title "">
-<!ENTITY torbutton.about.version "">
-<!ENTITY torbutton.about.summary "">
-<!ENTITY torbutton.about.code "">
-<!ENTITY torbutton.about.maintainer "">
-<!ENTITY torbutton.about.security_review "">
-<!ENTITY torbutton.about.donate "">
-<!ENTITY torbutton.about.make_donation "">
-<!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.new_identity "">
-<!ENTITY torbutton.context_menu.new_identity_key "">
-<!ENTITY torbutton.context_menu.toggle "">
-<!ENTITY torbutton.context_menu.toggle.key "">
-<!ENTITY torbutton.context_menu.preferences "">
-<!ENTITY torbutton.context_menu.preferences.key "">
-<!ENTITY torbutton.context_menu.about "">
-<!ENTITY torbutton.context_menu.about.key "">
-<!ENTITY torbutton.context_menu.networksettings "">
-<!ENTITY torbutton.context_menu.networksettings.key "">
-<!ENTITY torbutton.context_menu.downloadUpdate "">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "">
-<!ENTITY torbutton.context_menu.cookieProtections "">
-<!ENTITY torbutton.context_menu.cookieProtections.key "">
-<!ENTITY torbutton.context_menu.copyTor "">
-<!ENTITY torbutton.context_menu.copyTor.key "">
-<!ENTITY torbutton.context_menu.openTorTab "">
-<!ENTITY torbutton.context_menu.openTorTab.key "">
-<!ENTITY torbutton.context_menu.openTorWindow "">
-<!ENTITY torbutton.context_menu.openTorWindow.key "">
-<!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_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.cookie_protection "">
-<!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.headers "">
-<!ENTITY torbutton.prefs.spoof_english "">
-<!ENTITY torbutton.prefs.refererspoofing "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.prefs.smartspoof "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.disable_domstorage "">
-<!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.startup_tor "">
-<!ENTITY torbutton.prefs.reload_crashed_jar "">
-<!ENTITY torbutton.prefs.dual_cookie_jars "">
-<!ENTITY torbutton.prefs.clear_http_auth "">
-<!ENTITY torbutton.prefs.block_js_history "">
-<!ENTITY torbutton.prefs.resize_on_toggle "">
-<!ENTITY torbutton.prefs.close_tor "">
-<!ENTITY torbutton.prefs.close_nontor "">
-<!ENTITY torbutton.prefs.block_links "">
-<!ENTITY torbutton.prefs.jar_certs "">
-<!ENTITY torbutton.prefs.jar_ca_certs "">
-<!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 "">
-<!ENTITY torbutton.prefs.block_nontor_file_net "">
-<!ENTITY torbutton.prefs.restore_defaults "">
-<!ENTITY torbutton.prefs.test_settings "">
-<!ENTITY torbutton.prefs.test_auto "">
-<!ENTITY torbutton.prefs.disable_livemarks "">
-<!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 "">
-<!ENTITY torbutton.prefs.socks_vfive "">
-<!ENTITY torbutton.prefs.no_proxies_on "">
-<!ENTITY torbutton.prefs.no_proxy_warning "">
-<!ENTITY torbutton.prefs.spoofreresh "">
-<!ENTITY torbutton.prefs.refereroptions "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.spoofroot "">
-<!ENTITY torbutton.prefs.spoofdomain "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.cookiedialog.title "">
-<!ENTITY torbutton.cookiedialog.lockCol "">
-<!ENTITY torbutton.cookiedialog.domainCol "">
-<!ENTITY torbutton.cookiedialog.nameCol "">
-<!ENTITY torbutton.cookiedialog.pathCol "">
-<!ENTITY torbutton.cookiedialog.protectCookie "">
-<!ENTITY torbutton.cookiedialog.removeCookie "">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "">
-<!ENTITY torbutton.cookiedialog.removeAllBut "">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "">
-<!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 "">
-<!ENTITY torbutton.prefs.dodge_google_captcha "">
-<!ENTITY torbutton.prefs.engine1 "">
-<!ENTITY torbutton.prefs.engine2 "">
-<!ENTITY torbutton.prefs.engine3 "">
-<!ENTITY torbutton.prefs.engine4 "">
-<!ENTITY torbutton.prefs.engine5 "">
-<!ENTITY torbutton.prefs.fix_google_srch "">
-<!ENTITY torbutton.prefs.transparentTor "">
-<!ENTITY torbutton.prefs.block_disk "">
-<!ENTITY torbutton.prefs.restrict_thirdparty "">
-<!ENTITY torbutton.prefs.block_plugins "">
-<!ENTITY torbutton.prefs.resist_fingerprinting "">
+<!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.about.version "Version:">
+<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
+<!ENTITY torbutton.about.code "Code Contributors:">
+<!ENTITY torbutton.about.maintainer "Maintainer:">
+<!ENTITY torbutton.about.security_review "Security Review:">
+<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
+<!ENTITY torbutton.about.make_donation "making a donation.">
+<!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.new_identity "New Identity">
+<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!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.networksettings "Open Network Settingsâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
+<!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.startup_tor "On browser 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 "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!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 livemarks 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 "startpage.com">
+<!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/sr@latin/torbutton.dtd b/sr@latin/torbutton.dtd
index 88b44b3..1b538e8 100644
--- a/sr@latin/torbutton.dtd
+++ b/sr@latin/torbutton.dtd
@@ -1,150 +1,150 @@
-<!ENTITY torbutton.prefs.title "">
-<!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 "">
-<!ENTITY torbutton.prefs.proxy.host.https "">
-<!ENTITY torbutton.prefs.proxy.host.ftp "">
-<!ENTITY torbutton.prefs.proxy.host.gopher "">
-<!ENTITY torbutton.prefs.proxy.host.socks "">
-<!ENTITY torbutton.prefs.proxy.port "">
-<!ENTITY torbutton.about.title "">
-<!ENTITY torbutton.about.version "">
-<!ENTITY torbutton.about.summary "">
-<!ENTITY torbutton.about.code "">
-<!ENTITY torbutton.about.maintainer "">
-<!ENTITY torbutton.about.security_review "">
-<!ENTITY torbutton.about.donate "">
-<!ENTITY torbutton.about.make_donation "">
-<!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.new_identity "">
-<!ENTITY torbutton.context_menu.new_identity_key "">
-<!ENTITY torbutton.context_menu.toggle "">
-<!ENTITY torbutton.context_menu.toggle.key "">
-<!ENTITY torbutton.context_menu.preferences "">
-<!ENTITY torbutton.context_menu.preferences.key "">
-<!ENTITY torbutton.context_menu.about "">
-<!ENTITY torbutton.context_menu.about.key "">
-<!ENTITY torbutton.context_menu.networksettings "">
-<!ENTITY torbutton.context_menu.networksettings.key "">
-<!ENTITY torbutton.context_menu.downloadUpdate "">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "">
-<!ENTITY torbutton.context_menu.cookieProtections "">
-<!ENTITY torbutton.context_menu.cookieProtections.key "">
-<!ENTITY torbutton.context_menu.copyTor "">
-<!ENTITY torbutton.context_menu.copyTor.key "">
-<!ENTITY torbutton.context_menu.openTorTab "">
-<!ENTITY torbutton.context_menu.openTorTab.key "">
-<!ENTITY torbutton.context_menu.openTorWindow "">
-<!ENTITY torbutton.context_menu.openTorWindow.key "">
-<!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_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.cookie_protection "">
-<!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.headers "">
-<!ENTITY torbutton.prefs.spoof_english "">
-<!ENTITY torbutton.prefs.refererspoofing "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.prefs.smartspoof "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.disable_domstorage "">
-<!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.startup_tor "">
-<!ENTITY torbutton.prefs.reload_crashed_jar "">
-<!ENTITY torbutton.prefs.dual_cookie_jars "">
-<!ENTITY torbutton.prefs.clear_http_auth "">
-<!ENTITY torbutton.prefs.block_js_history "">
-<!ENTITY torbutton.prefs.resize_on_toggle "">
-<!ENTITY torbutton.prefs.close_tor "">
-<!ENTITY torbutton.prefs.close_nontor "">
-<!ENTITY torbutton.prefs.block_links "">
-<!ENTITY torbutton.prefs.jar_certs "">
-<!ENTITY torbutton.prefs.jar_ca_certs "">
-<!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 "">
-<!ENTITY torbutton.prefs.block_nontor_file_net "">
-<!ENTITY torbutton.prefs.restore_defaults "">
-<!ENTITY torbutton.prefs.test_settings "">
-<!ENTITY torbutton.prefs.test_auto "">
-<!ENTITY torbutton.prefs.disable_livemarks "">
-<!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 "">
-<!ENTITY torbutton.prefs.socks_vfive "">
-<!ENTITY torbutton.prefs.no_proxies_on "">
-<!ENTITY torbutton.prefs.no_proxy_warning "">
-<!ENTITY torbutton.prefs.spoofreresh "">
-<!ENTITY torbutton.prefs.refereroptions "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.spoofroot "">
-<!ENTITY torbutton.prefs.spoofdomain "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.cookiedialog.title "">
-<!ENTITY torbutton.cookiedialog.lockCol "">
-<!ENTITY torbutton.cookiedialog.domainCol "">
-<!ENTITY torbutton.cookiedialog.nameCol "">
-<!ENTITY torbutton.cookiedialog.pathCol "">
-<!ENTITY torbutton.cookiedialog.protectCookie "">
-<!ENTITY torbutton.cookiedialog.removeCookie "">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "">
-<!ENTITY torbutton.cookiedialog.removeAllBut "">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "">
-<!ENTITY torbutton.prefs.disable_livemarks "">
+<!ENTITY torbutton.prefs.title "Torbutton Preferences">
+<!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.about.version "Version:">
+<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
+<!ENTITY torbutton.about.code "Code Contributors:">
+<!ENTITY torbutton.about.maintainer "Maintainer:">
+<!ENTITY torbutton.about.security_review "Security Review:">
+<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
+<!ENTITY torbutton.about.make_donation "making a donation.">
+<!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.new_identity "New Identity">
+<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!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.networksettings "Open Network Settingsâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
+<!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.startup_tor "On browser 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 "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!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 livemarks updates during Tor usage">
 <!ENTITY torbutton.prefs.dtd_recommended "(preporuÄ?eno)">
 <!ENTITY torbutton.prefs.dtd_optional "(proizvoljno)">
 <!ENTITY torbutton.prefs.dtd_crucial "(krucijalno)">
-<!ENTITY torbutton.prefs.update_torbutton_via_tor "">
-<!ENTITY torbutton.prefs.dodge_google_captcha "">
-<!ENTITY torbutton.prefs.engine1 "">
-<!ENTITY torbutton.prefs.engine2 "">
-<!ENTITY torbutton.prefs.engine3 "">
-<!ENTITY torbutton.prefs.engine4 "">
-<!ENTITY torbutton.prefs.engine5 "">
-<!ENTITY torbutton.prefs.fix_google_srch "">
-<!ENTITY torbutton.prefs.transparentTor "">
-<!ENTITY torbutton.prefs.block_disk "">
-<!ENTITY torbutton.prefs.restrict_thirdparty "">
-<!ENTITY torbutton.prefs.block_plugins "">
-<!ENTITY torbutton.prefs.resist_fingerprinting "">
+<!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 "startpage.com">
+<!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/szl/torbutton.dtd b/szl/torbutton.dtd
index 2bc5bac..680b561 100644
--- a/szl/torbutton.dtd
+++ b/szl/torbutton.dtd
@@ -1,150 +1,150 @@
-<!ENTITY torbutton.prefs.title "">
-<!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 "">
-<!ENTITY torbutton.prefs.proxy.host.https "">
-<!ENTITY torbutton.prefs.proxy.host.ftp "">
-<!ENTITY torbutton.prefs.proxy.host.gopher "">
-<!ENTITY torbutton.prefs.proxy.host.socks "">
-<!ENTITY torbutton.prefs.proxy.port "">
-<!ENTITY torbutton.about.title "">
-<!ENTITY torbutton.about.version "">
-<!ENTITY torbutton.about.summary "">
-<!ENTITY torbutton.about.code "">
-<!ENTITY torbutton.about.maintainer "">
-<!ENTITY torbutton.about.security_review "">
-<!ENTITY torbutton.about.donate "">
-<!ENTITY torbutton.about.make_donation "">
-<!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.new_identity "">
-<!ENTITY torbutton.context_menu.new_identity_key "">
-<!ENTITY torbutton.context_menu.toggle "">
-<!ENTITY torbutton.context_menu.toggle.key "">
-<!ENTITY torbutton.context_menu.preferences "">
-<!ENTITY torbutton.context_menu.preferences.key "">
-<!ENTITY torbutton.context_menu.about "">
-<!ENTITY torbutton.context_menu.about.key "">
-<!ENTITY torbutton.context_menu.networksettings "">
-<!ENTITY torbutton.context_menu.networksettings.key "">
-<!ENTITY torbutton.context_menu.downloadUpdate "">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "">
-<!ENTITY torbutton.context_menu.cookieProtections "">
-<!ENTITY torbutton.context_menu.cookieProtections.key "">
-<!ENTITY torbutton.context_menu.copyTor "">
-<!ENTITY torbutton.context_menu.copyTor.key "">
-<!ENTITY torbutton.context_menu.openTorTab "">
-<!ENTITY torbutton.context_menu.openTorTab.key "">
-<!ENTITY torbutton.context_menu.openTorWindow "">
-<!ENTITY torbutton.context_menu.openTorWindow.key "">
-<!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_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.cookie_protection "">
-<!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.headers "">
-<!ENTITY torbutton.prefs.spoof_english "">
-<!ENTITY torbutton.prefs.refererspoofing "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.prefs.smartspoof "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.disable_domstorage "">
-<!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.startup_tor "">
-<!ENTITY torbutton.prefs.reload_crashed_jar "">
-<!ENTITY torbutton.prefs.dual_cookie_jars "">
-<!ENTITY torbutton.prefs.clear_http_auth "">
-<!ENTITY torbutton.prefs.block_js_history "">
-<!ENTITY torbutton.prefs.resize_on_toggle "">
-<!ENTITY torbutton.prefs.close_tor "">
-<!ENTITY torbutton.prefs.close_nontor "">
-<!ENTITY torbutton.prefs.block_links "">
-<!ENTITY torbutton.prefs.jar_certs "">
-<!ENTITY torbutton.prefs.jar_ca_certs "">
-<!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 "">
-<!ENTITY torbutton.prefs.block_nontor_file_net "">
-<!ENTITY torbutton.prefs.restore_defaults "">
-<!ENTITY torbutton.prefs.test_settings "">
-<!ENTITY torbutton.prefs.test_auto "">
-<!ENTITY torbutton.prefs.disable_livemarks "">
-<!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 "">
-<!ENTITY torbutton.prefs.socks_vfive "">
-<!ENTITY torbutton.prefs.no_proxies_on "">
-<!ENTITY torbutton.prefs.no_proxy_warning "">
-<!ENTITY torbutton.prefs.spoofreresh "">
-<!ENTITY torbutton.prefs.refereroptions "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.spoofroot "">
-<!ENTITY torbutton.prefs.spoofdomain "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.cookiedialog.title "">
-<!ENTITY torbutton.cookiedialog.lockCol "">
-<!ENTITY torbutton.cookiedialog.domainCol "">
-<!ENTITY torbutton.cookiedialog.nameCol "">
-<!ENTITY torbutton.cookiedialog.pathCol "">
-<!ENTITY torbutton.cookiedialog.protectCookie "">
-<!ENTITY torbutton.cookiedialog.removeCookie "">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "">
-<!ENTITY torbutton.cookiedialog.removeAllBut "">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "">
-<!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 "">
-<!ENTITY torbutton.prefs.dodge_google_captcha "">
-<!ENTITY torbutton.prefs.engine1 "">
-<!ENTITY torbutton.prefs.engine2 "">
-<!ENTITY torbutton.prefs.engine3 "">
-<!ENTITY torbutton.prefs.engine4 "">
-<!ENTITY torbutton.prefs.engine5 "">
-<!ENTITY torbutton.prefs.fix_google_srch "">
-<!ENTITY torbutton.prefs.transparentTor "">
-<!ENTITY torbutton.prefs.block_disk "">
-<!ENTITY torbutton.prefs.restrict_thirdparty "">
-<!ENTITY torbutton.prefs.block_plugins "">
-<!ENTITY torbutton.prefs.resist_fingerprinting "">
+<!ENTITY torbutton.prefs.title "Torbutton Preferences">
+<!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.about.version "Version:">
+<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
+<!ENTITY torbutton.about.code "Code Contributors:">
+<!ENTITY torbutton.about.maintainer "Maintainer:">
+<!ENTITY torbutton.about.security_review "Security Review:">
+<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
+<!ENTITY torbutton.about.make_donation "making a donation.">
+<!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.new_identity "New Identity">
+<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!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.networksettings "Open Network Settingsâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
+<!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.startup_tor "On browser 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 "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!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 livemarks 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 "startpage.com">
+<!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/te_IN/torbutton.dtd b/te_IN/torbutton.dtd
index 2bc5bac..680b561 100644
--- a/te_IN/torbutton.dtd
+++ b/te_IN/torbutton.dtd
@@ -1,150 +1,150 @@
-<!ENTITY torbutton.prefs.title "">
-<!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 "">
-<!ENTITY torbutton.prefs.proxy.host.https "">
-<!ENTITY torbutton.prefs.proxy.host.ftp "">
-<!ENTITY torbutton.prefs.proxy.host.gopher "">
-<!ENTITY torbutton.prefs.proxy.host.socks "">
-<!ENTITY torbutton.prefs.proxy.port "">
-<!ENTITY torbutton.about.title "">
-<!ENTITY torbutton.about.version "">
-<!ENTITY torbutton.about.summary "">
-<!ENTITY torbutton.about.code "">
-<!ENTITY torbutton.about.maintainer "">
-<!ENTITY torbutton.about.security_review "">
-<!ENTITY torbutton.about.donate "">
-<!ENTITY torbutton.about.make_donation "">
-<!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.new_identity "">
-<!ENTITY torbutton.context_menu.new_identity_key "">
-<!ENTITY torbutton.context_menu.toggle "">
-<!ENTITY torbutton.context_menu.toggle.key "">
-<!ENTITY torbutton.context_menu.preferences "">
-<!ENTITY torbutton.context_menu.preferences.key "">
-<!ENTITY torbutton.context_menu.about "">
-<!ENTITY torbutton.context_menu.about.key "">
-<!ENTITY torbutton.context_menu.networksettings "">
-<!ENTITY torbutton.context_menu.networksettings.key "">
-<!ENTITY torbutton.context_menu.downloadUpdate "">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "">
-<!ENTITY torbutton.context_menu.cookieProtections "">
-<!ENTITY torbutton.context_menu.cookieProtections.key "">
-<!ENTITY torbutton.context_menu.copyTor "">
-<!ENTITY torbutton.context_menu.copyTor.key "">
-<!ENTITY torbutton.context_menu.openTorTab "">
-<!ENTITY torbutton.context_menu.openTorTab.key "">
-<!ENTITY torbutton.context_menu.openTorWindow "">
-<!ENTITY torbutton.context_menu.openTorWindow.key "">
-<!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_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.cookie_protection "">
-<!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.headers "">
-<!ENTITY torbutton.prefs.spoof_english "">
-<!ENTITY torbutton.prefs.refererspoofing "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.prefs.smartspoof "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.disable_domstorage "">
-<!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.startup_tor "">
-<!ENTITY torbutton.prefs.reload_crashed_jar "">
-<!ENTITY torbutton.prefs.dual_cookie_jars "">
-<!ENTITY torbutton.prefs.clear_http_auth "">
-<!ENTITY torbutton.prefs.block_js_history "">
-<!ENTITY torbutton.prefs.resize_on_toggle "">
-<!ENTITY torbutton.prefs.close_tor "">
-<!ENTITY torbutton.prefs.close_nontor "">
-<!ENTITY torbutton.prefs.block_links "">
-<!ENTITY torbutton.prefs.jar_certs "">
-<!ENTITY torbutton.prefs.jar_ca_certs "">
-<!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 "">
-<!ENTITY torbutton.prefs.block_nontor_file_net "">
-<!ENTITY torbutton.prefs.restore_defaults "">
-<!ENTITY torbutton.prefs.test_settings "">
-<!ENTITY torbutton.prefs.test_auto "">
-<!ENTITY torbutton.prefs.disable_livemarks "">
-<!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 "">
-<!ENTITY torbutton.prefs.socks_vfive "">
-<!ENTITY torbutton.prefs.no_proxies_on "">
-<!ENTITY torbutton.prefs.no_proxy_warning "">
-<!ENTITY torbutton.prefs.spoofreresh "">
-<!ENTITY torbutton.prefs.refereroptions "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.spoofroot "">
-<!ENTITY torbutton.prefs.spoofdomain "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.cookiedialog.title "">
-<!ENTITY torbutton.cookiedialog.lockCol "">
-<!ENTITY torbutton.cookiedialog.domainCol "">
-<!ENTITY torbutton.cookiedialog.nameCol "">
-<!ENTITY torbutton.cookiedialog.pathCol "">
-<!ENTITY torbutton.cookiedialog.protectCookie "">
-<!ENTITY torbutton.cookiedialog.removeCookie "">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "">
-<!ENTITY torbutton.cookiedialog.removeAllBut "">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "">
-<!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 "">
-<!ENTITY torbutton.prefs.dodge_google_captcha "">
-<!ENTITY torbutton.prefs.engine1 "">
-<!ENTITY torbutton.prefs.engine2 "">
-<!ENTITY torbutton.prefs.engine3 "">
-<!ENTITY torbutton.prefs.engine4 "">
-<!ENTITY torbutton.prefs.engine5 "">
-<!ENTITY torbutton.prefs.fix_google_srch "">
-<!ENTITY torbutton.prefs.transparentTor "">
-<!ENTITY torbutton.prefs.block_disk "">
-<!ENTITY torbutton.prefs.restrict_thirdparty "">
-<!ENTITY torbutton.prefs.block_plugins "">
-<!ENTITY torbutton.prefs.resist_fingerprinting "">
+<!ENTITY torbutton.prefs.title "Torbutton Preferences">
+<!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.about.version "Version:">
+<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
+<!ENTITY torbutton.about.code "Code Contributors:">
+<!ENTITY torbutton.about.maintainer "Maintainer:">
+<!ENTITY torbutton.about.security_review "Security Review:">
+<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
+<!ENTITY torbutton.about.make_donation "making a donation.">
+<!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.new_identity "New Identity">
+<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!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.networksettings "Open Network Settingsâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
+<!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.startup_tor "On browser 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 "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!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 livemarks 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 "startpage.com">
+<!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/ur_PK/torbutton.dtd b/ur_PK/torbutton.dtd
index 3312991..af355fc 100644
--- a/ur_PK/torbutton.dtd
+++ b/ur_PK/torbutton.dtd
@@ -1,150 +1,150 @@
-<!ENTITY torbutton.prefs.title "">
-<!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 "">
-<!ENTITY torbutton.prefs.proxy.host.https "">
-<!ENTITY torbutton.prefs.proxy.host.ftp "">
-<!ENTITY torbutton.prefs.proxy.host.gopher "">
-<!ENTITY torbutton.prefs.proxy.host.socks "">
-<!ENTITY torbutton.prefs.proxy.port "">
-<!ENTITY torbutton.about.title "">
-<!ENTITY torbutton.about.version "">
-<!ENTITY torbutton.about.summary "">
-<!ENTITY torbutton.about.code "">
-<!ENTITY torbutton.about.maintainer "">
-<!ENTITY torbutton.about.security_review "">
-<!ENTITY torbutton.about.donate "">
-<!ENTITY torbutton.about.make_donation "">
-<!ENTITY torbutton.pref_connection.notice "">
-<!ENTITY torbutton.pref_connection.more_info "">
+<!ENTITY torbutton.prefs.title "Torbutton Preferences">
+<!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.about.version "Version:">
+<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
+<!ENTITY torbutton.about.code "Code Contributors:">
+<!ENTITY torbutton.about.maintainer "Maintainer:">
+<!ENTITY torbutton.about.security_review "Security Review:">
+<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
+<!ENTITY torbutton.about.make_donation "making a donation.">
+<!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 "Ù?Ø¯Ø¯">
-<!ENTITY torbutton.pref_connection_more_info.text "">
-<!ENTITY torbutton.context_menu.new_identity "">
-<!ENTITY torbutton.context_menu.new_identity_key "">
-<!ENTITY torbutton.context_menu.toggle "">
-<!ENTITY torbutton.context_menu.toggle.key "">
-<!ENTITY torbutton.context_menu.preferences "">
-<!ENTITY torbutton.context_menu.preferences.key "">
-<!ENTITY torbutton.context_menu.about "">
-<!ENTITY torbutton.context_menu.about.key "">
-<!ENTITY torbutton.context_menu.networksettings "">
-<!ENTITY torbutton.context_menu.networksettings.key "">
-<!ENTITY torbutton.context_menu.downloadUpdate "">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "">
-<!ENTITY torbutton.context_menu.cookieProtections "">
-<!ENTITY torbutton.context_menu.cookieProtections.key "">
-<!ENTITY torbutton.context_menu.copyTor "">
-<!ENTITY torbutton.context_menu.copyTor.key "">
-<!ENTITY torbutton.context_menu.openTorTab "">
-<!ENTITY torbutton.context_menu.openTorTab.key "">
-<!ENTITY torbutton.context_menu.openTorWindow "">
-<!ENTITY torbutton.context_menu.openTorWindow.key "">
-<!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_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.cookie_protection "">
-<!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.headers "">
-<!ENTITY torbutton.prefs.spoof_english "">
-<!ENTITY torbutton.prefs.refererspoofing "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.prefs.smartspoof "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.disable_domstorage "">
-<!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.startup_tor "">
-<!ENTITY torbutton.prefs.reload_crashed_jar "">
-<!ENTITY torbutton.prefs.dual_cookie_jars "">
-<!ENTITY torbutton.prefs.clear_http_auth "">
-<!ENTITY torbutton.prefs.block_js_history "">
-<!ENTITY torbutton.prefs.resize_on_toggle "">
-<!ENTITY torbutton.prefs.close_tor "">
-<!ENTITY torbutton.prefs.close_nontor "">
-<!ENTITY torbutton.prefs.block_links "">
-<!ENTITY torbutton.prefs.jar_certs "">
-<!ENTITY torbutton.prefs.jar_ca_certs "">
-<!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 "">
-<!ENTITY torbutton.prefs.block_nontor_file_net "">
+<!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.new_identity "New Identity">
+<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!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.networksettings "Open Network Settingsâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
+<!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.startup_tor "On browser 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 "Ú?Û?Ù?Ø§Ù?Ù¹Ø³ Ù¾Ø± Ù?Ø§Ù¾Ø³ Ø¬Ø§Ø¦Û?Û?">
-<!ENTITY torbutton.prefs.test_settings "">
-<!ENTITY torbutton.prefs.test_auto "">
-<!ENTITY torbutton.prefs.disable_livemarks "">
-<!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 "">
-<!ENTITY torbutton.prefs.socks_vfive "">
-<!ENTITY torbutton.prefs.no_proxies_on "">
-<!ENTITY torbutton.prefs.no_proxy_warning "">
-<!ENTITY torbutton.prefs.spoofreresh "">
-<!ENTITY torbutton.prefs.refereroptions "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.spoofroot "">
-<!ENTITY torbutton.prefs.spoofdomain "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.cookiedialog.title "">
-<!ENTITY torbutton.cookiedialog.lockCol "">
-<!ENTITY torbutton.cookiedialog.domainCol "">
+<!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 "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
 <!ENTITY torbutton.cookiedialog.nameCol "Ù?Ø§Ù?">
-<!ENTITY torbutton.cookiedialog.pathCol "">
-<!ENTITY torbutton.cookiedialog.protectCookie "">
-<!ENTITY torbutton.cookiedialog.removeCookie "">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "">
-<!ENTITY torbutton.cookiedialog.removeAllBut "">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "">
-<!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 "">
-<!ENTITY torbutton.prefs.dodge_google_captcha "">
-<!ENTITY torbutton.prefs.engine1 "">
-<!ENTITY torbutton.prefs.engine2 "">
-<!ENTITY torbutton.prefs.engine3 "">
-<!ENTITY torbutton.prefs.engine4 "">
-<!ENTITY torbutton.prefs.engine5 "">
-<!ENTITY torbutton.prefs.fix_google_srch "">
-<!ENTITY torbutton.prefs.transparentTor "">
-<!ENTITY torbutton.prefs.block_disk "">
-<!ENTITY torbutton.prefs.restrict_thirdparty "">
-<!ENTITY torbutton.prefs.block_plugins "">
-<!ENTITY torbutton.prefs.resist_fingerprinting "">
+<!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 livemarks 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 "startpage.com">
+<!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
diff --git a/uz/torbutton.dtd b/uz/torbutton.dtd
index 7b06a07..0eb9e74 100644
--- a/uz/torbutton.dtd
+++ b/uz/torbutton.dtd
@@ -1,150 +1,150 @@
-<!ENTITY torbutton.prefs.title "">
-<!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 "">
-<!ENTITY torbutton.prefs.proxy.host.https "">
-<!ENTITY torbutton.prefs.proxy.host.ftp "">
-<!ENTITY torbutton.prefs.proxy.host.gopher "">
-<!ENTITY torbutton.prefs.proxy.host.socks "">
+<!ENTITY torbutton.prefs.title "Torbutton Preferences">
+<!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 "">
-<!ENTITY torbutton.about.version "">
-<!ENTITY torbutton.about.summary "">
-<!ENTITY torbutton.about.code "">
-<!ENTITY torbutton.about.maintainer "">
-<!ENTITY torbutton.about.security_review "">
-<!ENTITY torbutton.about.donate "">
-<!ENTITY torbutton.about.make_donation "">
-<!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.new_identity "">
-<!ENTITY torbutton.context_menu.new_identity_key "">
-<!ENTITY torbutton.context_menu.toggle "">
-<!ENTITY torbutton.context_menu.toggle.key "">
-<!ENTITY torbutton.context_menu.preferences "">
-<!ENTITY torbutton.context_menu.preferences.key "">
-<!ENTITY torbutton.context_menu.about "">
-<!ENTITY torbutton.context_menu.about.key "">
-<!ENTITY torbutton.context_menu.networksettings "">
-<!ENTITY torbutton.context_menu.networksettings.key "">
-<!ENTITY torbutton.context_menu.downloadUpdate "">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "">
-<!ENTITY torbutton.context_menu.cookieProtections "">
-<!ENTITY torbutton.context_menu.cookieProtections.key "">
-<!ENTITY torbutton.context_menu.copyTor "">
-<!ENTITY torbutton.context_menu.copyTor.key "">
-<!ENTITY torbutton.context_menu.openTorTab "">
-<!ENTITY torbutton.context_menu.openTorTab.key "">
-<!ENTITY torbutton.context_menu.openTorWindow "">
-<!ENTITY torbutton.context_menu.openTorWindow.key "">
-<!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_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.cookie_protection "">
-<!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.headers "">
-<!ENTITY torbutton.prefs.spoof_english "">
-<!ENTITY torbutton.prefs.refererspoofing "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.prefs.smartspoof "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.disable_domstorage "">
-<!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.startup_tor "">
-<!ENTITY torbutton.prefs.reload_crashed_jar "">
-<!ENTITY torbutton.prefs.dual_cookie_jars "">
-<!ENTITY torbutton.prefs.clear_http_auth "">
-<!ENTITY torbutton.prefs.block_js_history "">
-<!ENTITY torbutton.prefs.resize_on_toggle "">
-<!ENTITY torbutton.prefs.close_tor "">
-<!ENTITY torbutton.prefs.close_nontor "">
-<!ENTITY torbutton.prefs.block_links "">
-<!ENTITY torbutton.prefs.jar_certs "">
-<!ENTITY torbutton.prefs.jar_ca_certs "">
-<!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 "">
-<!ENTITY torbutton.prefs.block_nontor_file_net "">
+<!ENTITY torbutton.about.title "About Torbutton">
+<!ENTITY torbutton.about.version "Version:">
+<!ENTITY torbutton.about.summary "Protects the privacy of your Tor browsing.">
+<!ENTITY torbutton.about.code "Code Contributors:">
+<!ENTITY torbutton.about.maintainer "Maintainer:">
+<!ENTITY torbutton.about.security_review "Security Review:">
+<!ENTITY torbutton.about.donate "If you like using Tor, you might consider">
+<!ENTITY torbutton.about.make_donation "making a donation.">
+<!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.new_identity "New Identity">
+<!ENTITY torbutton.context_menu.new_identity_key "I">
+<!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.networksettings "Open Network Settingsâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "S">
+<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
+<!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.startup_tor "On browser 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 "Andozalarni tiklash">
-<!ENTITY torbutton.prefs.test_settings "">
-<!ENTITY torbutton.prefs.test_auto "">
-<!ENTITY torbutton.prefs.disable_livemarks "">
-<!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.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 "">
-<!ENTITY torbutton.prefs.no_proxy_warning "">
-<!ENTITY torbutton.prefs.spoofreresh "">
-<!ENTITY torbutton.prefs.refereroptions "">
-<!ENTITY torbutton.prefs.nospoof "">
-<!ENTITY torbutton.prefs.spoofroot "">
-<!ENTITY torbutton.prefs.spoofdomain "">
-<!ENTITY torbutton.prefs.spoofblank "">
-<!ENTITY torbutton.cookiedialog.title "">
+<!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 "No referer spoof during Tor usage (sends referers as normal)">
+<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
+<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
+<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Himoyalangan">
 <!ENTITY torbutton.cookiedialog.domainCol "Xost">
 <!ENTITY torbutton.cookiedialog.nameCol "Nomi">
 <!ENTITY torbutton.cookiedialog.pathCol "Yo'li">
-<!ENTITY torbutton.cookiedialog.protectCookie "">
-<!ENTITY torbutton.cookiedialog.removeCookie "">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "">
-<!ENTITY torbutton.cookiedialog.removeAllBut "">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "">
-<!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 "">
-<!ENTITY torbutton.prefs.dodge_google_captcha "">
+<!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 livemarks 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 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
-<!ENTITY torbutton.prefs.fix_google_srch "">
-<!ENTITY torbutton.prefs.transparentTor "">
-<!ENTITY torbutton.prefs.block_disk "">
-<!ENTITY torbutton.prefs.restrict_thirdparty "">
-<!ENTITY torbutton.prefs.block_plugins "">
-<!ENTITY torbutton.prefs.resist_fingerprinting "">
+<!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)">
+<!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
+<!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [translation/torbutton-branddtd] Partial fix for #9144
Next by Author: [tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
Previous by thread: [tor-commits] [translation/torbutton-branddtd] Partial fix for #9144
Next by thread: [tor-commits] [tor-launcher/master] Bug 10418: Improve layout and strings
Index(es):
- Author
- Thread