diff -Nur -x '*.orig' -x '*.rej' e-smith-formmagick-1.4.0/root/etc/e-smith/locale/en-us/FormMagick/general mezzanine_patched_e-smith-formmagick-1.4.0/root/etc/e-smith/locale/en-us/FormMagick/general
--- e-smith-formmagick-1.4.0/root/etc/e-smith/locale/en-us/FormMagick/general 2008-08-05 19:11:37.000000000 +0200
+++ mezzanine_patched_e-smith-formmagick-1.4.0/root/etc/e-smith/locale/en-us/FormMagick/general 2008-08-05 19:09:55.000000000 +0200
@@ -159,7 +159,7 @@
- PASSWORD_CHANGE_ERROR
+ ERROR_PASSWORD_CHANGE
An error occurred while attempting to change your password. Please make sure that the old password entered is correct.
@@ -417,7 +417,7 @@
- PASSWORD_VERIFY_ERROR
+ PASSWORD_NO_MATCH
The passwords you entered did not match.
@@ -429,7 +429,7 @@
- NO_GROUPS
+ ACCOUNT_GROUP_NONE
There are no user groups in the system.