Use the token name instead of the slot name when formatting the string

name.

security/manager/ssl/src/nsNSSCallbacks.cpp

@@ -92,7 +92,7 @@ char* PK11PasswordPrompt(PK11SlotInfo* slot, PRBool retry, void* arg) {
   if (NS_FAILED(rv))
     return nsnull; 
 
-  const PRUnichar* formatStrings[1] = { ToNewUnicode(nsLiteralCString(PK11_GetSlotName(slot))) };
+  const PRUnichar* formatStrings[1] = { ToNewUnicode(nsLiteralCString(PK11_GetTokenName(slot))) };
   rv = nssComponent->PIPBundleFormatStringFromName(NS_LITERAL_STRING("CertPassPrompt").get(),
                                       formatStrings, 1,
                                       getter_Copies(promptString));