[or-cvs] [torbutton/master] - Localized unlocalized strings - Fixed an error that made cookies not populate right after installing extension (I think this is the error mikeperry was experiencing)
mikeperry at seul.org
mikeperry at seul.org
Wed Sep 23 23:49:11 UTC 2009
Author: Kory Kork <kory at korykirk.com>
Date: Wed, 26 Aug 2009 20:38:50 +0000
Subject: - Localized unlocalized strings
Commit: 034b46ed1ede7a6be38c2fb6949ee489a04c6225
svn:r20375
---
src/chrome/content/popup.xul | 4 ++--
src/chrome/content/preferences.xul | 2 +-
src/chrome/content/torbutton.xul | 12 ++++++------
src/chrome/content/torcookie.js | 3 ++-
src/chrome/content/torcookiedialog.xul | 22 +++++++++++-----------
src/chrome/locale/en/torbutton.dtd | 29 +++++++++++++++++++++++++++++
6 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul
index 685bb32..13853f7 100644
--- a/src/chrome/content/popup.xul
+++ b/src/chrome/content/popup.xul
@@ -24,8 +24,8 @@
insertafter="context-stop"
oncommand="torbutton_open_prefs_dialog()"/>
<menuitem id="torbutton-cookie-protector"
- label="Cookie Protections"
- accesskey="C"
+ label="&torbutton.context_menu.cookieProtections;"
+ accesskey="&torbutton.context_menu.cookieProtections.key;"
insertafter="context-stop"
oncommand="torbutton_open_cookie_dialog()"/>
<menuitem id="torbutton-about"
diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul
index 38e4c09..0db6ac6 100644
--- a/src/chrome/content/preferences.xul
+++ b/src/chrome/content/preferences.xul
@@ -240,7 +240,7 @@
label="&torbutton.prefs.dual_cookie_jars;"
oncommand="torbutton_prefs_set_field_attributes(document)"/>
<radio id="torbutton_cookieProtections"
- label="Use the Cookie Protections dialog to choose which cookies are protected"
+ label="&torbutton.prefs.cookie_protection;"
oncommand="torbutton_prefs_set_field_attributes(document)"/>
<radio id="torbutton_mmmCookies"
label="&torbutton.prefs.mmm_cookies;"
diff --git a/src/chrome/content/torbutton.xul b/src/chrome/content/torbutton.xul
index 6917d1d..db0079d 100644
--- a/src/chrome/content/torbutton.xul
+++ b/src/chrome/content/torbutton.xul
@@ -48,20 +48,20 @@
<popup id="contentAreaContextMenu">
<menuitem
id="torcontext-copyurl"
- label="Copy Tor URL"
- accesskey="t"
+ label="&torbutton.context_menu.copyTor;"
+ accesskey="&torbutton.context_menu.copyTor.key;"
insertafter="context-copylink"
oncommand="torbutton_copy_link();"/>
<menuitem
id="torcontext-opentortab"
- label="Open Tor URL in New Tab"
- accesskey="r"
+ label="&torbutton.context_menu.openTorTab;"
+ accesskey="&torbutton.context_menu.openTorTab.key;"
insertafter="context-openlinkintab"
oncommand="torbutton_open_link_as_tor(true);"/>
<menuitem
id="torcontext-opentorwin"
- label="Open Tor URL in New Window"
- accesskey="d"
+ label="&torbutton.context_menu.openTorWindow;"
+ accesskey="&torbutton.context_menu.openTorWindow.key;"
insertafter="context-openlinkintab"
oncommand="torbutton_open_link_as_tor(false);"/>
diff --git a/src/chrome/content/torcookie.js b/src/chrome/content/torcookie.js
index 5bdef57..4a017fd 100644
--- a/src/chrome/content/torcookie.js
+++ b/src/chrome/content/torcookie.js
@@ -167,7 +167,8 @@ function getProtectedCookies()
{
var tor_enabled = prefs.getBoolPref("extensions.torbutton.tor_enabled");
var cookiesAsXml = selector.getProtectedCookies(tor_enabled? "tor" : "nontor");
-
+ if (cookiesAsXml == null)
+ return;
for (var i = 0; i < cookiesAsXml.cookie.length(); i++) {
var xml = cookiesAsXml.cookie[i];
var value = xml.toString();
diff --git a/src/chrome/content/torcookiedialog.xul b/src/chrome/content/torcookiedialog.xul
index 64ccc99..68a7caf 100644
--- a/src/chrome/content/torcookiedialog.xul
+++ b/src/chrome/content/torcookiedialog.xul
@@ -6,7 +6,7 @@
<dialog id="TorCookieDialog"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
- title="Manage Cookies"
+ title="&torbutton.cookiedialog.title;"
buttons="accept,cancel"
style="width: 30em;"
onload="initDialog();"
@@ -26,15 +26,15 @@
onselect="itemSelected();"
hidecolumnpicker="true">
<treecols>
- <treecol id="lockCol" label="Protected" flex="1"
+ <treecol id="lockCol" label="&torbutton.cookiedialog.lockCol;" flex="1"
onclick="CookieColumnSort('isProtected', true);" persist="width"/>
<splitter class="tree-splitter"/>
- <treecol id="domainCol" label="Host" flex="2"
+ <treecol id="domainCol" label="&torbutton.cookiedialog.domainCol;" flex="2"
onclick="CookieColumnSort('rawHost', true);" persist="width"/>
<splitter class="tree-splitter"/>
- <treecol id="nameCol" label="Name" flex="1"
+ <treecol id="nameCol" label="&torbutton.cookiedialog.nameCol;" flex="1"
onclick="CookieColumnSort('name', true);" persist="width"/>
- <treecol id="pathCol" label="Path" flex="1"
+ <treecol id="pathCol" label="&torbutton.cookiedialog.pathCol;" flex="1"
onclick="CookieColumnSort('path', true);" persist="width"/>
</treecols>
@@ -45,25 +45,25 @@
<hbox>
<vbox>
<button id="protectCookie" disabled="true"
- label="Protect Cookie"
+ label="&torbutton.cookiedialog.protectCookie;"
oncommand="protectCookie();"/>
<button id="removeCookie" disabled="true"
- label="Remove Cookie"
+ label="&torbutton.cookiedialog.removeCookie;"
oncommand="DeleteCookie();"/>
</vbox>
<vbox>
<button id="unprotectCookie" disabled="true"
- label="Unprotect Cookie"
+ label="&torbutton.cookiedialog.unprotectCookie;"
oncommand="unprotectCookie();"/>
<button id="removeAllCookies"
- label="Remove All But Protected"
+ label="&torbutton.cookiedialog.removeAllBut;"
oncommand="DeleteAllCookies();"/>
</vbox>
</hbox>
<hbox>
<radiogroup id="defaultCookieGroup">
- <radio id="saveAllCookies" label="Protect All New Cookies" />
- <radio id="donnotsaveCookies" label="Do Not Protect New Cookies" />
+ <radio id="saveAllCookies" label="&torbutton.cookiedialog.saveAllCookies;" />
+ <radio id="donnotsaveCookies" label="&torbutton.cookiedialog.doNotSaveAllCookies;" />
</radiogroup>
</hbox>
</groupbox>
diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd
index de6f487..a194656 100644
--- a/src/chrome/locale/en/torbutton.dtd
+++ b/src/chrome/locale/en/torbutton.dtd
@@ -25,6 +25,14 @@
<!ENTITY torbutton.context_menu.preferences.key "P">
<!ENTITY torbutton.context_menu.about "About Torbutton...">
<!ENTITY torbutton.context_menu.about.key "A">
+<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections.key "C">
+<!ENTITY torbutton.context_menu.copyTor "Copy Tor URL">
+<!ENTITY torbutton.context_menu.copyTor.key "p">
+<!ENTITY torbutton.context_menu.openTorTab "Open Tor URL in new Tab">
+<!ENTITY torbutton.context_menu.openTorTab.key "r">
+<!ENTITY torbutton.context_menu.openTorWindow "Open Tor URL in new Window">
+<!ENTITY torbutton.context_menu.openTorWindow.key "d">
<!ENTITY torbutton.button.label "Torbutton">
<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
<!ENTITY torbutton.prefs.sec_settings "Security Settings">
@@ -36,6 +44,7 @@
<!ENTITY torbutton.prefs.clear_cache "Block Tor disk cache and clear all cache on Tor toggle">
<!ENTITY torbutton.prefs.block_cache "Block disk and memory cache access during Tor">
<!ENTITY torbutton.prefs.cookie_jars "Store Non-Tor cookies in a protected jar">
+<!ENTITY torbutton.prefs.cookie_protection "Use the Cookie Protections Dialog to choose">
<!ENTITY torbutton.prefs.mmm_cookies "I will manually manage my cookies (dangerous)">
<!ENTITY torbutton.prefs.clear_cookies "Clear cookies on Tor toggle">
<!ENTITY torbutton.prefs.disable_plugins "Disable plugins during Tor usage (crucial)">
@@ -98,3 +107,23 @@
<!ENTITY torbutton.prefs.spoofroot "Spoof the containing folder of the page">
<!ENTITY torbutton.prefs.spoofdomain "Spoof the domain as referer">
<!ENTITY torbutton.prefs.spoofblank "Make referer blank">
+<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
+<!ENTITY torbutton.cookiedialog.lockCol "Protected">
+<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.cookiedialog.nameCol "Name">
+<!ENTITY torbutton.cookiedialog.pathCol "Path">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
+<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
+
+
+
+
+
+
+
+
+
--
1.5.6.5
More information about the tor-commits
mailing list