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

[tor-commits] [translation/torbutton-torbuttonproperties] Second half of #9144 fix

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/torbutton-torbuttonproperties] Second half of #9144 fix
From: translation@xxxxxxxxxxxxxx
Date: Thu, 20 Mar 2014 23:42:46 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Thu, 20 Mar 2014 19:43:17 -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 16ca4c0f9182a28a684a795aeca5c4e420febd84
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Thu Mar 20 23:42:11 2014 +0000

    Second half of #9144 fix
---
 ach/torbutton.properties         |  104 +++++++++++++++++++-------------------
 ady/torbutton.properties         |  104 +++++++++++++++++++-------------------
 af_ZA/torbutton.properties       |  104 +++++++++++++++++++-------------------
 bg_BG/torbutton.properties       |  104 +++++++++++++++++++-------------------
 bn_BD/torbutton.properties       |  104 +++++++++++++++++++-------------------
 cs_CZ/torbutton.properties       |  104 +++++++++++++++++++-------------------
 el_GR/torbutton.properties       |  104 +++++++++++++++++++-------------------
 en/torbutton.properties          |    2 +-
 en_GB/torbutton.properties       |  102 ++++++++++++++++++-------------------
 es_AR/torbutton.properties       |  102 ++++++++++++++++++-------------------
 es_CO/torbutton.properties       |  104 +++++++++++++++++++-------------------
 es_MX/torbutton.properties       |   50 +++++++++---------
 es_NI/torbutton.properties       |  104 +++++++++++++++++++-------------------
 gu_IN/torbutton.properties       |  102 ++++++++++++++++++-------------------
 hr_HR/torbutton.properties       |   82 +++++++++++++++---------------
 hy_AM/torbutton.properties       |  102 ++++++++++++++++++-------------------
 ia/torbutton.properties          |  102 ++++++++++++++++++-------------------
 kk/torbutton.properties          |  104 +++++++++++++++++++-------------------
 ko_KR/torbutton.properties       |  100 ++++++++++++++++++------------------
 lg/torbutton.properties          |   32 ++++++------
 ms_MY/torbutton.properties       |   24 ++++-----
 nds/torbutton.properties         |  104 +++++++++++++++++++-------------------
 nl_BE/torbutton.properties       |  104 +++++++++++++++++++-------------------
 ru@petr1708/torbutton.properties |  104 +++++++++++++++++++-------------------
 si/torbutton.properties          |  104 +++++++++++++++++++-------------------
 si_LK/torbutton.properties       |    2 +-
 sk_SK/torbutton.properties       |   82 +++++++++++++++---------------
 sl_SI/torbutton.properties       |  104 +++++++++++++++++++-------------------
 sn/torbutton.properties          |  104 +++++++++++++++++++-------------------
 sr@latin/torbutton.properties    |   62 +++++++++++------------
 szl/torbutton.properties         |  104 +++++++++++++++++++-------------------
 te_IN/torbutton.properties       |  104 +++++++++++++++++++-------------------
 ur_PK/torbutton.properties       |  102 ++++++++++++++++++-------------------
 uz/torbutton.properties          |  100 ++++++++++++++++++------------------
 34 files changed, 1510 insertions(+), 1510 deletions(-)

diff --git a/ach/torbutton.properties b/ach/torbutton.properties
index e2767c8..da6981f 100644
--- a/ach/torbutton.properties
+++ b/ach/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
-# torbutton.popup.cancel = Cancel
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
+torbutton.popup.cancel = Cancel
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/ady/torbutton.properties b/ady/torbutton.properties
index e2767c8..da6981f 100644
--- a/ady/torbutton.properties
+++ b/ady/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
-# torbutton.popup.cancel = Cancel
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
+torbutton.popup.cancel = Cancel
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/af_ZA/torbutton.properties b/af_ZA/torbutton.properties
index e2767c8..da6981f 100644
--- a/af_ZA/torbutton.properties
+++ b/af_ZA/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
-# torbutton.popup.cancel = Cancel
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
+torbutton.popup.cancel = Cancel
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/bg_BG/torbutton.properties b/bg_BG/torbutton.properties
index e2767c8..da6981f 100644
--- a/bg_BG/torbutton.properties
+++ b/bg_BG/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
-# torbutton.popup.cancel = Cancel
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
+torbutton.popup.cancel = Cancel
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/bn_BD/torbutton.properties b/bn_BD/torbutton.properties
index e2767c8..da6981f 100644
--- a/bn_BD/torbutton.properties
+++ b/bn_BD/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
-# torbutton.popup.cancel = Cancel
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
+torbutton.popup.cancel = Cancel
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/cs_CZ/torbutton.properties b/cs_CZ/torbutton.properties
index e2767c8..da6981f 100644
--- a/cs_CZ/torbutton.properties
+++ b/cs_CZ/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
-# torbutton.popup.cancel = Cancel
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
+torbutton.popup.cancel = Cancel
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/el_GR/torbutton.properties b/el_GR/torbutton.properties
index e2767c8..da6981f 100644
--- a/el_GR/torbutton.properties
+++ b/el_GR/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
-# torbutton.popup.cancel = Cancel
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
+torbutton.popup.cancel = Cancel
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/en/torbutton.properties b/en/torbutton.properties
index dc6684c..da6981f 100644
--- a/en/torbutton.properties
+++ b/en/torbutton.properties
@@ -36,7 +36,7 @@ torbutton.popup.redirect = Redirect
 torbutton.popup.no_redirect = Don't Redirect
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL: 
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
 torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
 torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
 torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
diff --git a/en_GB/torbutton.properties b/en_GB/torbutton.properties
index 9a427a0..da6981f 100644
--- a/en_GB/torbutton.properties
+++ b/en_GB/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancel
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/es_AR/torbutton.properties b/es_AR/torbutton.properties
index dcd6872..68d4258 100644
--- a/es_AR/torbutton.properties
+++ b/es_AR/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancelar
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/es_CO/torbutton.properties b/es_CO/torbutton.properties
index e2767c8..da6981f 100644
--- a/es_CO/torbutton.properties
+++ b/es_CO/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
-# torbutton.popup.cancel = Cancel
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
+torbutton.popup.cancel = Cancel
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/es_MX/torbutton.properties b/es_MX/torbutton.properties
index 895e423..65fea8c 100644
--- a/es_MX/torbutton.properties
+++ b/es_MX/torbutton.properties
@@ -7,24 +7,24 @@ torbutton.panel.plugins.enabled = Click para deshabilitar complementos(plugins)
 torbutton.panel.label.disabled = Tor deshabilitado
 torbutton.panel.label.enabled = Tor habilitado
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provee un botÃ³n para configurar las preferencias de Tor y limpiar rÃ¡pida y fÃ¡cilmente datos privados de navegaciÃ³n 
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Â¡Prueba del proxy Tor exitosa!
 torbutton.popup.test.failure = Â¡La prueba del proxy Tor fallÃ³! Revisa tu proxy y las preferencias de Polipo.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
 torbutton.popup.test.ff3_notice = Haz Click en OK para probar las preferencias del proxy Tor. Esta prueba se llevarÃ¡ acabo en segundo plano. Porfavor sÃ© paciente.
 torbutton.panel.label.verified = Tor Verificado
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
 torbutton.prefs.recommended = (recomendado)
 torbutton.prefs.optional = (opcional)
 torbutton.prefs.crucial = (crucial)
 torbutton.popup.external.title = Â¿Cargar contenido externo?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
 torbutton.popup.launch = Iniciar aplicaciÃ³n 
 torbutton.popup.cancel = Cancelar
 torbutton.popup.dontask = Siempre iniciar las aplicaciones a partir de ahora
@@ -35,21 +35,21 @@ torbutton.popup.captcha.always = Realizar siempre la misma acciÃ³n a partir de a
 torbutton.popup.redirect = Redirigir
 torbutton.popup.no_redirect = No redirigir
 torbutton.popup.prompted_language = Para darte mayor privacidad, Torbutton puede solicitar la versiÃ³n en inglÃ©s de los sitios web. Esto podrÃa causar que las pÃ¡ginas que prefieres leer en tu idioma nativo se muestren en inglÃ©s en su lugar. \n\nÂ¿Deseas solicitar pÃ¡ginas web en idioma inglÃ©s para mayor privacidad?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/es_NI/torbutton.properties b/es_NI/torbutton.properties
index e2767c8..da6981f 100644
--- a/es_NI/torbutton.properties
+++ b/es_NI/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
-# torbutton.popup.cancel = Cancel
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
+torbutton.popup.cancel = Cancel
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/gu_IN/torbutton.properties b/gu_IN/torbutton.properties
index 4ac3f09..997a552 100644
--- a/gu_IN/torbutton.properties
+++ b/gu_IN/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
 torbutton.popup.cancel = àª°àª¦ àª?àª°à«?
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/hr_HR/torbutton.properties b/hr_HR/torbutton.properties
index b29e7cd..cffbef8 100644
--- a/hr_HR/torbutton.properties
+++ b/hr_HR/torbutton.properties
@@ -7,49 +7,49 @@ torbutton.panel.plugins.enabled = Klik za onemoguÄ?enje pluginova
 torbutton.panel.label.disabled = Tor OnemoguÄ?en
 torbutton.panel.label.enabled = Tor OmoguÄ?en
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton omoguÄ?uje gumb za konfiguraciju postavki Tora i brzo i lako brisanje privatnih podataka o surfanju.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
 torbutton.prefs.recommended = (preporuÄ?eno)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Odustani
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/hy_AM/torbutton.properties b/hy_AM/torbutton.properties
index cb0fe6a..152e1f8 100644
--- a/hy_AM/torbutton.properties
+++ b/hy_AM/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Õ¥Õ²Õ¡Ö?Õ¯Õ¥Õ¬
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/ia/torbutton.properties b/ia/torbutton.properties
index 71fb6a1..4816936 100644
--- a/ia/torbutton.properties
+++ b/ia/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Cancellar
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/kk/torbutton.properties b/kk/torbutton.properties
index e2767c8..da6981f 100644
--- a/kk/torbutton.properties
+++ b/kk/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
-# torbutton.popup.cancel = Cancel
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
+torbutton.popup.cancel = Cancel
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/ko_KR/torbutton.properties b/ko_KR/torbutton.properties
index 86a306c..538de4d 100644
--- a/ko_KR/torbutton.properties
+++ b/ko_KR/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
 torbutton.popup.cancel = ì·¨ì??
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
 canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/lg/torbutton.properties b/lg/torbutton.properties
index 56f29e1..da6981f 100644
--- a/lg/torbutton.properties
+++ b/lg/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.panel.plugins.disabled = Click to enable plugins
 torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor Disabled
 torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
 torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
 torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
@@ -34,22 +34,22 @@ torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you lik
 torbutton.popup.captcha.always = Always perform this action from now on
 torbutton.popup.redirect = Redirect
 torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
 canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/ms_MY/torbutton.properties b/ms_MY/torbutton.properties
index 9e064ab..cc734e1 100644
--- a/ms_MY/torbutton.properties
+++ b/ms_MY/torbutton.properties
@@ -7,11 +7,11 @@ torbutton.panel.plugins.enabled = Klik untuk nyah-aktifkan plugin
 torbutton.panel.label.disabled = Tor dinyah-aktifkan
 torbutton.panel.label.enabled = Tor diaktifkan
 extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton menyediakan butang bagi mengkonfigurasi tetapan Tor dengan pantas dan mudah untuk membersihkan data peribada anda.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Ujian Tor proksi berjaya!
 torbutton.popup.test.failure = Ujian Tor proksi GAGAL! Semak semula proksi dan tetapan Polipo.
 torbutton.popup.test.confirm_toggle = Cubaan Tor proksi yang terbaru gagal untuk menggunakan Tor.\n\nAdakah anda pasti mahu aktifkan juga?\n\nNota: Jika anda telah selesaikan masalah ini, anda boleh jalankan cubaan itu semula di dalam tetingkap Tetapan Torbutton Proksi untuk membuang amaran ini.
@@ -19,11 +19,11 @@ torbutton.popup.test.ff3_notice = Klik OK untuk memulakan ujian tetapan Tor prok
 torbutton.panel.label.verified = Tor Disahkan
 torbutton.popup.test.auto_failed = Cubaan automatik Tor proksi gagal untuk menggunakan Tor.\n\nAnda pasti mahu aktifkan juga?
 torbutton.prefs.recommended = (digalakkan)
-# torbutton.prefs.optional = (optional)
+torbutton.prefs.optional = (optional)
 torbutton.prefs.crucial = (penting)
 torbutton.popup.external.title = Memuatkan kandungan luaran?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
 torbutton.popup.external.suggest = \nJika fail ini tidak dipercayai, anda patut simpan dalam melihat kandungannya secara luar talian atau di dalam VM,\natau mempertimbangkan untuk menggunakan Tor proksi sepertiTails LiveCD atau torsocks.\n
 torbutton.popup.launch = Mulakan aplikasi
 torbutton.popup.cancel = Batal
@@ -35,21 +35,21 @@ torbutton.popup.captcha.always = Sentiasa melakukan tindakan ini mulai sekarang
 torbutton.popup.redirect = Ubah Hala
 torbutton.popup.no_redirect = Jangan Ubah Hala
 torbutton.popup.prompted_language = Untuk memberikan anda lebih privasi, Torbutton boleh meminta versi Bahasa Inggeris dari laman web. Ini membolehkan laman web yang menggunakan bahasa ibunda anda untuk memaparkan dalam Bahasa Inggeris.\n\nAdakah anda ingin meminta halaman web bahasa Inggeris untuk privasi yang lebih baik?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
 torbutton.popup.use_tbb = Nampaknya bahawa anda menggunakan Torbutton dengan Firefox, yang tidak lagi konfigurasi yang disyorkan selamat.\n\nSebaliknya, kami mencadangkan anda untuk mendapatkan Tor Browser Bundle yang terbaru dengan menghantar e-mel kepada gettor@xxxxxxxxxxxxxx atau muat turun pada URL berikut:
 torbutton.popup.pref_error = Torbutton tidak boleh mengemas kini tetapan dalam direktori profil Pelayar Tor.
 torbutton.popup.permission_denied = Sila tetapkan semula keizinan (permission) direktori Pelayar Tor atau menyalinnya ke lokasi baru.
 torbutton.popup.device_full = Cakera anda sudah kelihatan hampir penuh. Sila berikan ruang cakera lebih atau gerakkan Pelayar Tor kepada peranti baru.
 torbutton.title.prompt_torbrowser = Maklumat penting Torbutton
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
 torbutton.popup.short_torbrowser = Maklumat Penting Torbutton! \nâ??\nTorbutton kini sentiasa aktif. \n\nKlik pada Torbutton untuk maklumat lanjut.
 
 torbutton.popup.confirm_plugins = Plugin seperti Flash boleh menggangu privasi dan anonimiti anda.\n\nMereka juga boleh memintas Tor untuk mendedahkan lokasi semasa anda dan alamat IP.\n\nAdakah anda pasti anda mahu mengaktifkan plugin?\n
 torbutton.popup.never_ask_again = Jangan bertanya saya lagi
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
 canvas.allowAccessKey=A
 canvas.never=Tidak untuk Laman ini
 canvas.neverAccessKey=e
diff --git a/nds/torbutton.properties b/nds/torbutton.properties
index e2767c8..da6981f 100644
--- a/nds/torbutton.properties
+++ b/nds/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
-# torbutton.popup.cancel = Cancel
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
+torbutton.popup.cancel = Cancel
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/nl_BE/torbutton.properties b/nl_BE/torbutton.properties
index e2767c8..da6981f 100644
--- a/nl_BE/torbutton.properties
+++ b/nl_BE/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
-# torbutton.popup.cancel = Cancel
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
+torbutton.popup.cancel = Cancel
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/ru@petr1708/torbutton.properties b/ru@petr1708/torbutton.properties
index e2767c8..da6981f 100644
--- a/ru@petr1708/torbutton.properties
+++ b/ru@petr1708/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
-# torbutton.popup.cancel = Cancel
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
+torbutton.popup.cancel = Cancel
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/si/torbutton.properties b/si/torbutton.properties
index e2767c8..da6981f 100644
--- a/si/torbutton.properties
+++ b/si/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
-# torbutton.popup.cancel = Cancel
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
+torbutton.popup.cancel = Cancel
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/si_LK/torbutton.properties b/si_LK/torbutton.properties
index 6b7a05d..06ea377 100644
--- a/si_LK/torbutton.properties
+++ b/si_LK/torbutton.properties
@@ -36,7 +36,7 @@ torbutton.popup.redirect = à¶±à·?à·?à¶ à¶ºà·?à¶¸à·? à¶?à¶»à¶±à·?à¶±
 torbutton.popup.no_redirect = à¶±à·?à·?à¶ à¶ºà·?à¶¸à·? à¶±à·?à¶?à¶»à¶±à·?à¶± 
 torbutton.popup.prompted_language = à¶?à¶¶à¶§ à·?à·?à¶©à·? à¶´à·?à¶¯à·?à¶?à¶½à·?à¶?à¶à·?à·?à¶ºà¶?à·? à¶½à¶¶à·?à¶¯à·?à¶¸ à·?à¶¯à·?à·?, Torbutton à¶§ à·?à·?à¶¶à·? à¶´à·?à¶§à·?à·?à¶½ à¶?à¶?à¶?à·?â??à¶»à·?à·?à·? à·?à¶?à·?à·?à¶?à¶»à¶« à¶?à¶½à·?à¶½à·? à·?à·?à¶§à·?à¶º à·?à·?à¶?. à¶¸à·?à¶¸à¶?à·?à¶±à·? à¶?à¶¶ à¶?à¶?à¶?à·?â??à¶»à·?à·?à·? à·?à¶½à·?à¶±à·? à¶?à¶?à¶¸à·?à¶à·?, à¶?à¶¶à¶?à·? à¶¸à·?à·? à¶·à·?à·?à·?à·?à·?à¶±à·? à¶?à·?à¶ºà·?à·?à¶¸à¶§ à¶?à·?à¶¸à¶à·? à·?à·?à¶¶à·? à¶´à·?à¶§à·? à¶?à¶¸ à¶·à·?à·?à·?à·?à¶±à·? à¶½à¶¶à·?à¶¯à·?à¶±à·? à¶?à¶.\n\nà·?à¶©à·? à·?à·?à¶©à·? à¶´à·?à¶¯à·?à¶?à¶½à·?à¶?à¶à·?à·?à¶ºà¶?à·? à¶½à¶¶à·?à¶?à·?à¶±à·?à¶¸à¶§ à¶?à¶?à¶?à·?â??à¶»à·?à·?à·? à¶·à·?à·?à·?à·?à·?à¶±à·? à·?à·?à¶¶à·? à¶´à·?à¶§à·? à¶½à¶¶à·? à¶?à·?à¶±à·?à¶¸à¶§ à¶?à·?à¶¸à¶à·?à¶¯?
 torbutton.popup.no_newnym = Torbutton à¶?à¶¶à¶§ à¶?à¶»à¶?à·?â??à·?à·?à¶ à¶±à·? à·?à·?à¶¯à·?à¶±à·?à¶¸à·?à¶´à¶à¶?à·? à¶¯à·?à¶º à¶±à·?à·?à·?à¶?. à¶?à¶ºà¶§ Tor à¶´à·?à¶½à¶? à¶´à·?à¶»à·?à¶§à¶ºà¶§ à¶´à·?â??à¶»à·?à·?à·?à·?à¶§ à·?à·?à¶¸à¶§ à¶±à·?à·?à·?à¶?.\n\nà¶?à¶¶ à¶?à·?â??à¶»à·?à¶ºà·?à¶à·?à¶¸à¶? à¶?à¶»à¶±à·?à¶±à·? Tor à¶¶à·?â??à¶»à·?à·?à·?à¶»à·? à¶?à¶§à·?à¶§à¶½à¶ºà¶¯?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
 torbutton.popup.pref_error = Tor à¶¶à·?â??à¶»à·?à·?à·?à¶» à¶´à·?à¶à·?à¶?à¶© à¶±à·?à¶¸à·?à·?à¶½à·?à¶ºà·? à¶¸à¶±à·?à¶´ Torbutton à¶§ à¶ºà·?à·?à¶à·? à¶?à·?à¶½à·?à¶± à¶?à¶½ à¶±à·?à·?à·?à¶?.
 torbutton.popup.permission_denied = à¶?à¶»à·?à¶«à·?à¶?à¶» Tor à¶¶à·?â??à¶»à·?à·?à·?à¶»à¶ºà·? à¶?à·?à·?à¶» à¶±à·?à·?à¶ à¶´à·?â??à¶»à¶à·?à·?à·?à¶®à·?à¶´à¶±à¶º à¶?à¶»à¶±à·?à¶± à·?à·? à·?à·?à¶±à¶à·? à·?à·?à¶®à·?à¶±à¶ºà¶?à¶§ à¶´à·?à¶§à¶´à¶à·? à¶?à¶»à¶±à·?à¶±.
 torbutton.popup.device_full = à¶°à·?à·?à¶?à¶º à·?à¶¸à·?à¶´à·?à¶»à¶«à¶ºà·?à¶±à·? à¶´à·?à¶»à·? à¶?à¶. à¶ºà¶¸à·? à¶?à·?à¶?à·?à·?à¶ºà¶?à·? à¶±à·?à¶¯à·?à·?à·? à¶?à·?à¶»à·?à¶¸ à·?à·? Tor à¶¶à·?â??à¶»à·?à·?à·?à¶»à¶º à·?à·?à¶±à¶à·? à¶?à¶´à·?à¶?à¶?à¶ºà¶?à¶§ à¶?à·?à¶± à¶ºà¶±à·?à¶±.
diff --git a/sk_SK/torbutton.properties b/sk_SK/torbutton.properties
index 851b28a..f2e013b 100644
--- a/sk_SK/torbutton.properties
+++ b/sk_SK/torbutton.properties
@@ -2,54 +2,54 @@ torbutton.button.tooltip.disabled = AktivovaÅ¥ Tor
 torbutton.button.tooltip.enabled = DeaktivovaÅ¥ Tor
 torbutton.panel.tooltip.disabled = KliknutÃm aktivujete Tor
 torbutton.panel.tooltip.enabled = KliknutÃm deaktivujete Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
 torbutton.panel.label.disabled = Tor deaktivovanÃ½
 torbutton.panel.label.enabled = Tor aktivovanÃ½
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
 torbutton.prefs.recommended = (odporÃºÄ?anÃ©)
 torbutton.prefs.optional = (voliteÄ¾nÃ©)
 torbutton.prefs.crucial = (kritickÃ©)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
 torbutton.popup.cancel = ZruÅ¡iÅ¥
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
 canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/sl_SI/torbutton.properties b/sl_SI/torbutton.properties
index e2767c8..da6981f 100644
--- a/sl_SI/torbutton.properties
+++ b/sl_SI/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
-# torbutton.popup.cancel = Cancel
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
+torbutton.popup.cancel = Cancel
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/sn/torbutton.properties b/sn/torbutton.properties
index e2767c8..da6981f 100644
--- a/sn/torbutton.properties
+++ b/sn/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
-# torbutton.popup.cancel = Cancel
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
+torbutton.popup.cancel = Cancel
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/sr@latin/torbutton.properties b/sr@latin/torbutton.properties
index 412156d..d5adf00 100644
--- a/sr@latin/torbutton.properties
+++ b/sr@latin/torbutton.properties
@@ -6,50 +6,50 @@ torbutton.panel.plugins.disabled = Klikni da omoguÄ?iÅ¡ plugin-ove
 torbutton.panel.plugins.enabled = Klikni da onemoguÄ?iÅ¡ plugin-ove
 torbutton.panel.label.disabled = Tor onemoguÄ?en
 torbutton.panel.label.enabled = Tor omoguÄ?en
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
 torbutton.popup.test.success = Test Tor proksija uspeÅ¡an!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
 torbutton.panel.label.verified = Tor verifikovan
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
 torbutton.prefs.recommended = (preporuÄ?eno)
 torbutton.prefs.optional = (proizvoljno)
 torbutton.prefs.crucial = (krucijalno)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
 torbutton.popup.launch = Lansiraj aplikaciju
 torbutton.popup.cancel = OtkaÅ¾i
 torbutton.popup.dontask = UbuduÄ?e uvek lansiraj aplikacije
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
 torbutton.popup.redirect = Preusmeri
 torbutton.popup.no_redirect = Ne preusmeravaj
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
 torbutton.popup.never_ask_again = Nikad me ne pitaj ponovo
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
 canvas.allow=UbuduÄ?e dopuÅ¡taj
-# canvas.allowAccessKey=A
+canvas.allowAccessKey=A
 canvas.never=Novije za ovaj sajt
-# canvas.neverAccessKey=e
+canvas.neverAccessKey=e
diff --git a/szl/torbutton.properties b/szl/torbutton.properties
index e2767c8..da6981f 100644
--- a/szl/torbutton.properties
+++ b/szl/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
-# torbutton.popup.cancel = Cancel
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
+torbutton.popup.cancel = Cancel
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/te_IN/torbutton.properties b/te_IN/torbutton.properties
index e2767c8..da6981f 100644
--- a/te_IN/torbutton.properties
+++ b/te_IN/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
-# torbutton.popup.cancel = Cancel
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
+torbutton.popup.cancel = Cancel
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/ur_PK/torbutton.properties b/ur_PK/torbutton.properties
index 42032b2..21c4a88 100644
--- a/ur_PK/torbutton.properties
+++ b/ur_PK/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
 torbutton.popup.cancel = ØªÙ?Ø³Û?Ø® Ú©Û?Ø¬Û?Û?
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
-# canvas.never=Never for This Site
-# canvas.neverAccessKey=e
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
+canvas.never=Never for This Site
+canvas.neverAccessKey=e
diff --git a/uz/torbutton.properties b/uz/torbutton.properties
index 4e291ac..667bff0 100644
--- a/uz/torbutton.properties
+++ b/uz/torbutton.properties
@@ -1,55 +1,55 @@
-# torbutton.button.tooltip.disabled = Enable Tor
-# torbutton.button.tooltip.enabled = Disable Tor
-# torbutton.panel.tooltip.disabled = Click to enable Tor
-# torbutton.panel.tooltip.enabled = Click to disable Tor
-# torbutton.panel.plugins.disabled = Click to enable plugins
-# torbutton.panel.plugins.enabled = Click to disable plugins
-# torbutton.panel.label.disabled = Tor Disabled
-# torbutton.panel.label.enabled = Tor Enabled
-# extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-# torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
-# torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
-# torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
-# torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
-# torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
-# torbutton.popup.test.success = Tor proxy test successful!
-# torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
-# torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
-# torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
-# torbutton.panel.label.verified = Tor Verified
-# torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
-# torbutton.prefs.recommended = (recommended)
-# torbutton.prefs.optional = (optional)
-# torbutton.prefs.crucial = (crucial)
-# torbutton.popup.external.title = Load external content?
-# torbutton.popup.external.app = An external application is needed to handle:\n\n
-# torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-# torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-# torbutton.popup.launch = Launch application
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
+torbutton.panel.tooltip.disabled = Click to enable Tor
+torbutton.panel.tooltip.enabled = Click to disable Tor
+torbutton.panel.plugins.disabled = Click to enable plugins
+torbutton.panel.plugins.enabled = Click to disable plugins
+torbutton.panel.label.disabled = Tor Disabled
+torbutton.panel.label.enabled = Tor Enabled
+extensions.torbutton@xxxxxxxxxxxxxxxxxxxxxxxxxx = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
+torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n
+torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n
+torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom Certificate Authorities. Examining the Certificate Authority list is a slow operation and slows down Tor toggle. Would you like to disable the isolation of Certificate Authority certificates? (If you don't understand this, it is safe to click OK)
+torbutton.popup.ff3.warning = Warning!\n\nTorbutton on Firefox 3 is known to leak your timezone and livemarks via Tor.\n\nDo you wish to continue anyway?
+torbutton.popup.toggle.warning = You need to toggle Tor or restart for your settings to take effect.
+torbutton.popup.test.success = Tor proxy test successful!
+torbutton.popup.test.failure = Tor proxy test FAILED! Check your proxy and Polipo settings.
+torbutton.popup.test.confirm_toggle = The most recent Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?\n\nNote: If you have fixed the problem, you can rerun the test in the Torbutton Proxy Preferences window to eliminate this warning.
+torbutton.popup.test.ff3_notice = Click OK to test Tor proxy settings. This test will happen in the background. Please be patient.
+torbutton.panel.label.verified = Tor Verified
+torbutton.popup.test.auto_failed = The automatic Tor proxy test failed to use Tor.\n\nAre you sure you want to enable anyway?
+torbutton.prefs.recommended = (recommended)
+torbutton.prefs.optional = (optional)
+torbutton.prefs.crucial = (crucial)
+torbutton.popup.external.title = Load external content?
+torbutton.popup.external.app = An external application is needed to handle:\n\n
+torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
+torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
+torbutton.popup.launch = Launch application
 torbutton.popup.cancel = Bekor qilish
-# torbutton.popup.dontask = Always launch applications from now on
-# torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
-# torbutton.popup.captcha.title = Avoid Google Captchas?
-# torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
-# torbutton.popup.captcha.always = Always perform this action from now on
-# torbutton.popup.redirect = Redirect
-# torbutton.popup.no_redirect = Don't Redirect
-# torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-# torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-# torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
-# torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
-# torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
-# torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
-# torbutton.title.prompt_torbrowser = Important Torbutton Information
-# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-# torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly?
+torbutton.popup.captcha.title = Avoid Google Captchas?
+torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query?
+torbutton.popup.captcha.always = Always perform this action from now on
+torbutton.popup.redirect = Redirect
+torbutton.popup.no_redirect = Don't Redirect
+torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
+torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
+torbutton.popup.use_tbb = It appears that you are using Torbutton with Firefox, which is no longer a recommended safe configuration.\n\nInstead, we recommend that you obtain the latest Tor Browser Bundle by sending email to gettor@xxxxxxxxxxxxxx or by downloading it at the following URL:
+torbutton.popup.pref_error = Torbutton cannot update preferences in the Tor Browser profile directory.
+torbutton.popup.permission_denied = Please either reset the permissions of the Tor Browser directory or copy it to a new location.
+torbutton.popup.device_full = The disk appears to be full. Please free up space or move Tor Browser to a new device.
+torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
+torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
-# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-# torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.never_ask_again = Never ask me again
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-# canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-# canvas.allow=Allow in the Future
-# canvas.allowAccessKey=A
+canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
+canvas.allow=Allow in the Future
+canvas.allowAccessKey=A
 canvas.never=Ushbu sahifa uchun hech qachon
-# canvas.neverAccessKey=e
+canvas.neverAccessKey=e

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

Prev by Author: [tor-commits] [translation/torbutton-browserproperties] Second half of #9144 fix
Next by Author: [tor-commits] [translation/tor-launcher-properties] Second half of #9144 fix
Previous by thread: [tor-commits] [translation/torbutton-browserproperties] Second half of #9144 fix
Next by thread: [tor-commits] [translation/tor-launcher-properties] Second half of #9144 fix
Index(es):
- Author
- Thread