Index: mozilla/security/manager/pki/resources/content/password.js
===================================================================
RCS file: /cvsroot/mozilla/security/manager/pki/resources/content/password.js,v
retrieving revision 1.23
diff -u -p -r1.23 password.js
--- mozilla/security/manager/pki/resources/content/password.js	2 Feb 2007 22:53:48 -0000	1.23
+++ mozilla/security/manager/pki/resources/content/password.js	11 Jul 2008 15:35:32 -0000
@@ -168,6 +168,9 @@ function setPassword()
 {
   var pk11db = Components.classes[nsPK11TokenDB].getService(nsIPK11TokenDB);
   var token = pk11db.findTokenByName(tokenName);
+  var device = (tokenName == "Builtin Object Token")
+    ? ""
+    : "device_";
 
   var oldpwbox = document.getElementById("oldpw");
   var initpw = oldpwbox.getAttribute("inited");
@@ -203,11 +206,11 @@ function setPassword()
           if (passok) {
             token.changePassword(oldpw, pw1.value);
             if (pw1.value == "") {
-              alert(bundle.GetStringFromName("pw_erased_ok")
+              alert(bundle.GetStringFromName(device+"pw_erased_ok")
                     + " "
-                    + bundle.GetStringFromName("pw_empty_warning"));
+                    + bundle.GetStringFromName(device+"pw_empty_warning"));
             } else {
-              alert(bundle.GetStringFromName("pw_change_ok")); 
+              alert(bundle.GetStringFromName(device+"pw_change_ok")); 
             }
             success = true;
           }
@@ -218,14 +221,14 @@ function setPassword()
         alert(bundle.GetStringFromName("incorrect_pw")); 
       }
     } catch (e) {
-      alert(bundle.GetStringFromName("failed_pw_change")); 
+      alert(bundle.GetStringFromName(device+"failed_pw_change")); 
     }
   } else {
     token.initPassword(pw1.value);
     if (pw1.value == "") {
-      alert(bundle.GetStringFromName("pw_not_wanted")
+      alert(bundle.GetStringFromName(device+"pw_not_wanted")
             + " " 
-            + bundle.GetStringFromName("pw_empty_warning"));
+            + bundle.GetStringFromName(device+"pw_empty_warning"));
     }
     success = true;
   }
Index: mozilla/security/manager/locales/en-US/chrome/pippki/pippki.properties
===================================================================
RCS file: /cvsroot/mozilla/security/manager/locales/en-US/chrome/pippki/pippki.properties,v
retrieving revision 1.19
diff -u -p -r1.19 pippki.properties
--- mozilla/security/manager/locales/en-US/chrome/pippki/pippki.properties	20 Apr 2008 18:14:30 -0000	1.19
+++ mozilla/security/manager/locales/en-US/chrome/pippki/pippki.properties	11 Jul 2008 15:35:32 -0000
@@ -131,6 +131,10 @@ pw_erased_ok=Warning! You have deleted y
 pw_not_wanted=Warning! You have decided not to use a Master Password.
 pw_empty_warning=Your stored web and email passwords, form data, and private keys will not be protected.
 pw_change2empty_in_fips_mode=You are currently in FIPS mode. FIPS requires a non-empty Master Password.
+device_pw_change_ok=Successfully changed your device's Master Password.
+device_pw_erased_ok=Warning! You have deleted your device's Master Password.
+device_pw_not_wanted=Warning! You have decided not to use a Master Password for your device.
+device_pw_empty_warning=Keys stored on your device will not be protected.
 login_failed=Failed to Login
 loadPK11TokenDialog=Choose a PKCS#11 device to load
 devinfo_modname=Module