[or-cvs] [torbutton/maint-1.2] Update strings to reference polipo and not privoxy.

[mikeperry@xxxxxxxx]

Author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Date: Sun, 29 Nov 2009 15:11:49 -0800
Subject: Update strings to reference polipo and not privoxy.
Commit: 7ea88c40d0aac7a3ebe7db16493add5d87955d55

Also add translation string for local proxy failure case.
---
 src/chrome/content/preferences.js         |    4 ++--
 src/chrome/content/preferences.xul        |    2 +-
 src/chrome/locale/en/torbutton.dtd        |    1 +
 src/chrome/locale/en/torbutton.properties |    3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js
index 4ca563d..b87d5eb 100644
--- a/src/chrome/content/preferences.js
+++ b/src/chrome/content/preferences.js
@@ -467,7 +467,6 @@ function torbutton_prefs_test_settings() {
         return;
     }
 
-    // XXX: Localize these.
     switch(ret) {
         case 0:
             window.alert("Tor proxy test: Internal error");
@@ -496,7 +495,8 @@ function torbutton_prefs_test_settings() {
             window.alert("Tor proxy test: check.torproject.org returned bad result");
             break;
         case 8:
-            window.alert("Tor proxy test: HTTP Proxy is unreachable. Is Polipo running properly?");
+            var warning = strings.GetStringFromName("torbutton.popup.test.no_http_proxy");
+            window.alert(warning);
             break;
     }
 }
diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul
index cdba07a..840a534 100644
--- a/src/chrome/content/preferences.xul
+++ b/src/chrome/content/preferences.xul
@@ -30,7 +30,7 @@
                    label="&torbutton.prefs.recommended_settings;"
                    oncommand="torbutton_prefs_set_field_attributes(document)"/>
                 <checkbox class="indent" id="torbutton_usePrivoxy"
-                   label="&torbutton.prefs.use_privoxy;"
+                   label="&torbutton.prefs.use_polipo;"
                    oncommand="torbutton_prefs_set_field_attributes(document)"/>
             <radio value="custom" id="torbutton_useCustomSettings"
                    label="&torbutton.prefs.custom_settings;"
diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd
index cd4b386..9b18387 100644
--- a/src/chrome/locale/en/torbutton.dtd
+++ b/src/chrome/locale/en/torbutton.dtd
@@ -7,6 +7,7 @@
 <!ENTITY torbutton.prefs.tor_settings "Proxy Settings">
 <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox">
 <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy">
+<!ENTITY torbutton.prefs.use_polipo "Use Polipo">
 <!ENTITY torbutton.prefs.custom_settings "Use custom proxy settings">
 <!ENTITY torbutton.prefs.proxy.host.http "HTTP Proxy:">
 <!ENTITY torbutton.prefs.proxy.host.https "SSL Proxy:">
diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties
index b273440..ef6c42a 100644
--- a/src/chrome/locale/en/torbutton.properties
+++ b/src/chrome/locale/en/torbutton.properties
@@ -13,7 +13,7 @@ torbutton.popup.confirm_ca_certs = Torbutton Note: It appears you have no custom
 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 Privoxy settings.
+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
@@ -27,3 +27,4 @@ torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe
 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?
-- 
1.5.6.5