adding disclaimer message with ad-hoc wrap, see bug 27732

extensions/wallet/src/wallet.cpp

@@ -880,6 +880,15 @@ Wallet_CheckConfirmYN(PRUnichar * szMessage, PRUnichar * szCheckMessage, PRBool*
 nsresult
 wallet_GetString(nsAutoString& result, PRUnichar * szMessage, PRUnichar * szMessage1)
 {
+  /* doing wrap manually because of bug 27732 */
+  PRInt32 i=0;
+  while (szMessage[i] != '\0') {
+    if (szMessage[i] == '#') {
+      szMessage[i] = '\n';
+    }
+  i++;
+  }
+
   nsAutoString password;
   nsresult res;  
   NS_WITH_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, &res);
@@ -930,6 +939,15 @@ wallet_GetString(nsAutoString& result, PRUnichar * szMessage, PRUnichar * szMess
 nsresult
 wallet_GetDoubleString(nsAutoString& result, PRUnichar * szMessage, PRUnichar * szMessage1, PRUnichar * szMessage2, PRBool& matched)
 {
+  /* doing wrap manually because of bug 27732 */
+  PRInt32 i=0;
+  while (szMessage[i] != '\0') {
+    if (szMessage[i] == '#') {
+      szMessage[i] = '\n';
+    }
+  i++;
+  }
+
   nsAutoString password, password2;
   nsresult res;  
   NS_WITH_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, &res);
@@ -1713,12 +1731,6 @@ Wallet_SetKey(PRBool isNewkey) {
 
   if (Wallet_KeySize() < 0) { /* no key has yet been established */
 
-// following lines are temporary for the beta1 release
-PRUnichar * message0 = Wallet_Localize("disclaimer");
-res = Wallet_Confirm(message0);
-if (res) {
-// end of temporary lines
-
     PRUnichar * message = Wallet_Localize("firstPassword");
     PRUnichar * message1 = Wallet_Localize("enterPassword");
     PRUnichar * message2 = Wallet_Localize("confirmPassword");
@@ -1744,14 +1756,6 @@ if (res) {
     Recycle(message1);
     PR_FREEIF(message2);
 
-// following lines are temporary for the beta1 release
-} else {
-Recycle(message0);
-return FALSE;
-}
-Recycle(message0);
-// end of temporary lines
-
   } else { /* key has previously been established */
     PRUnichar * message;
     PRUnichar * message1 = Wallet_Localize("enterPassword");

extensions/wallet/src/wallet.properties

@@ -17,16 +17,17 @@
 #
 # Contributor(s): 
 #
-disclaimer = A master password will be used to protect sensitive single-signon information stored on your hard drive.  Future releases will strongly encrypt this data for maximum protection.
 IncorrectKey_TryAgain? = Master password incorrect. Do you want to try again?
 WantToCaptureForm? = Do you want to put the values on this form into your wallet?
 WantToSavePassword? = Do you want to save the user name and password for this form?
-firstPassword = Select a master password.  (Leave fields blank if you don't want to use a master password).
+#translator's note: # in following line will be converted to linefeed by program
+firstPassword = A master password will be used to protect sensitive single-signon#information stored on your hard drive.  Future releases will#strongly encrypt this data for maximum protection.##Select a master password.#(Leave fields blank if you don't want to use a master password).#
 password = Enter your master password.
-newPassword = Select a new master password. (Leave fields blank if you don't want to use a master password).
+#translator's note: # in following line will be converted to linefeed by program
+newPassword = Select a new master password.#(Leave fields blank if you don't want to use a master password).#
 enterPassword = Enter a master password
 confirmPassword = Retype the master password
-confirmFailed_TryAgain? = The two master passwords were not identical. Please enter the same master password in both fields.
+confirmFailed_TryAgain? = The two master passwords were not identical.  Please enter the same master password in both fields.
 noPasswordToChange = There is no master password to change.
 SelectUser = Select a username to be entered on this form.
 SelectUserWhosePasswordIsBeingChanged = Select the user whose password is being changed.