fix bug 17945, string concatenation in localizable strings, r=erik

extensions/wallet/src/singsign.cpp

@@ -1903,17 +1903,14 @@ si_OkToSave(char *URLName, char *userName) {
   }
 
   if (!si_RememberSignons && !si_GetNotificationPref()) {
-    PRUnichar * notification1 = Wallet_Localize("PasswordNotification1");
-    PRUnichar * notification2 = Wallet_Localize("PasswordNotification2");
-    nsString s = nsString(notification1) + nsString(notification2);
-    PRUnichar * message = (PRUnichar*)(s.GetUnicode());
-    Recycle(notification1);
-    Recycle(notification2);
+    PRUnichar * notification = Wallet_Localize("PasswordNotification");
     si_SetNotificationPref(PR_TRUE);
-    if (!si_ConfirmYN(message)) {
+    if (!si_ConfirmYN(notification)) {
+      Recycle(notification);
       SI_SetBoolPref(pref_rememberSignons, PR_FALSE);
       return PR_FALSE;
     }
+    Recycle(notification);
     SI_SetBoolPref(pref_rememberSignons, PR_TRUE);
   }
 

extensions/wallet/src/wallet.cpp

@@ -3112,14 +3112,10 @@ WLLT_OnSubmit(nsIContent* formNode) {
       if ((count>=3) && !wallet_GetWalletNotificationPref()) {
 
         /* conditions all met, now give notification */
-        PRUnichar * notification1 = Wallet_Localize("WalletNotification1");
-        PRUnichar * notification2 = Wallet_Localize("WalletNotification2");
-        nsString s = nsString(notification1) + nsString(notification2);
-        PRUnichar * message = (PRUnichar*)(s.GetUnicode());
+        PRUnichar * notification = Wallet_Localize("WalletNotification");
         wallet_SetWalletNotificationPref(PR_TRUE);
-        Wallet_Alert(message);
-        Recycle(notification1);
-        Recycle(notification2);
+        Wallet_Alert(notification);
+        Recycle(notification);
       }
 #else
       /* save form if it meets all necessary conditions */

extensions/wallet/src/wallet.properties

@@ -27,15 +27,7 @@ confirmPassword = Confirm your key by entering it again
 confirmFailed_TryAgain? = Keys did not match.  Do you want to try again?
 SelectUser = Select a username to be entered on this form
 SelectUserWhosePasswordIsBeingChanged = Select the user whose password is being changed.
-
-# LOCALIZATION NOTE: PasswordNotification1 and PasswordNotification2 are concatenated. The size of each is limited to 256 bytes
-
-PasswordNotification1 = For your convenience, the browser can remember your user names and passwords so you won't have to re-type them in the future.  Y
-PasswordNotification2 = our passwords will be obscured before being saved on your hard drive.  Do you want this feature enabled?
-
-# LOCALIZATION NOTE: WalletNotification1 and WalletNotification2 are concatenated. The size of each is limited to 256 bytes
-
-WalletNotification1 = You can save information that you enter on forms and later automatically prefill that information on other forms.  T
-WalletNotification2 = o save such information, select edit/wallet/capture from the menu while viewing the form.
+PasswordNotification = For your convenience, the browser can remember your user names and passwords so you won't have to re-type them in the future.  Your passwords will be obscured before being saved on your hard drive.  Do you want this feature enabled?
+WalletNotification = You can save information that you enter on forms and later automatically prefill that information on other forms.  To save such information, select edit/wallet/capture from the menu while viewing the form.
 NeverSave = Never save this form
 noPrefills = There are no fields that can be prefilled.