merge backout

This commit is contained in:
Mike Connor 2009-10-23 01:11:07 -04:00
commit 258c4dcb9a
2 changed files with 38 additions and 0 deletions

View File

@ -0,0 +1,33 @@
noPassword.alert = You must enter a password.
noPassphrase.alert = You must enter a passphrase.
passwordNoMatch.alert = Your passwords do not match. Try again!
passphraseNoMatch.alert = Your passphrases do not match. Try again!
incorrectPassword.alert = Your current password is incorrect!
incorrectPassphrase.alert = Your current passphrase is incorrect!
change.password.title = Change your Password
change.password.status.active = Changing your password...
change.password.status.success = Your password has been changed.
change.password.status.error = There was an error changing your password.
change.password.status.passwordSameAsPassphrase = The password cannot be the same as the passphrase.
change.password.status.passwordSameAsUsername = The password cannot be the same as the username.
change.password.status.passwordsDoNotMatch = The passwords you entered do not match.
change.password.status.badOldPassword = Your current password is incorrect.
change.passphrase.title = Change your Passphrase
change.passphrase.label = Changing passphrase, please wait...
change.passphrase.error = There was an error while changing your passphrase!
change.passphrase.success = Your passphrase was successfully changed!
reset.passphrase.title = Reset your Passphrase
reset.passphrase.label = Resetting passphrase, please wait...
reset.passphrase.error = There was an error while resetting your passphrase!
reset.passphrase.success = Your passphrase was successfully reset!
new.passphrase.old = Enter your current passphrase
new.passphrase.label = Enter your new passphrase
new.passphrase.confirm = Confirm your new passphrase
new.password.old = Enter your current password
new.password.label = Enter your new password
new.password.confirm = Confirm your new password

View File

@ -719,6 +719,11 @@ let Utils = {
options || "centerscreen,chrome,dialog,modal,resizable=no", args);
},
openGenericDialog: function Utils_openGenericDialog(type) {
this._genericDialogType = type;
this.openDialog("ChangeSomething", "generic-change.xul");
},
openLog: function Utils_openLog() {
Utils._openChromeWindow("Log", "log.xul");
},