diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/groups mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/groups --- e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/groups 2008-03-26 17:49:00.000000000 +0100 +++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/groups 2008-04-27 12:11:51.000000000 +0200 @@ -6,18 +6,6 @@ Create, modify, or remove user groups - CREATE_TITLE - Create user group - - - MODIFY_TITLE - Modify user group - - - REMOVE_TITLE - Remove user group - - GROUP_TOO_LONG Error: group name is too long.The maximum is {$maxLength} characters. @@ -81,10 +69,6 @@ Error: That is not an existing group account. - GROUP_NAME - Group Name - - GROUP_DESC Brief Description/Windows Group Alias @@ -109,37 +93,13 @@ ]]> - USERNAME - User Name - - - CLICK_TO_CREATE - Add group - - - NO_GROUPS - There are no user groups in the system. - - CURRENT_LIST Current list of User Groups

]]> - GROUP_MEMBERS - Group Members - - - DESCRIPTION - Description - - DELETE_DESCRIPTION {$group}." ]]> - - Groups - Groups - diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteaccess mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteaccess --- e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteaccess 2008-03-26 17:49:00.000000000 +0100 +++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/remoteaccess 2008-04-27 12:19:22.000000000 +0200 @@ -20,14 +20,6 @@ The new remote access settings have been saved. - ERROR_UPDATING - Error occurred while updating system configuration. - - - OFF - Off - - NO_ACCESS No Access @@ -40,14 +32,6 @@ Accept passwords from anywhere - PUBLIC - Allow public access (entire Internet) - - - PRIVATE - Allow access only from local networks - - LABEL_TELNET_ACCESS Telnet access diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts --- e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts 2008-04-27 12:20:21.000000000 +0200 +++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/useraccounts 2008-04-27 12:16:36.000000000 +0200 @@ -155,22 +155,6 @@ Group memberships - USER_NAME - User name - - - PASSWORD1 - New password - - - PASSWORD2 - New password (verify) - - - PASSWORD_VERIFY_ERROR - The passwords you entered did not match. - - RESET_DESC You are about to change the password for the user account @@ -209,10 +193,6 @@ initials to this field. - RESET_PASSWORD - Reset password - - LOCK_ACCOUNT Lock account @@ -268,10 +248,6 @@ There are no user accounts on this system. - ACCOUNT_IS_LOCKED - Account is locked - - Users Users @@ -313,10 +289,6 @@ Member? - DESCRIPTION - Description - - VPN_CLIENT_ACCESS VPN Client Access @@ -368,10 +340,6 @@ Download digital certificate to IPSec client - BUTTON_IPSECRW_DOWNLOAD - Download - - ERR_OCCURRED_DELETING An error occurred while trying to delete the user. diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/web/functions/groups mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/web/functions/groups --- e-smith-base-4.18.1/root/etc/e-smith/web/functions/groups 2008-03-26 17:49:00.000000000 +0100 +++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/web/functions/groups 2008-04-27 12:09:25.000000000 +0200 @@ -3,7 +3,7 @@ # vim: ft=xml ts=4 sw=4 et: #---------------------------------------------------------------------- # heading : Collaboration -# description : Groups +# description : GROUPS # navigation : 2000 2200 #---------------------------------------------------------------------- #---------------------------------------------------------------------- @@ -112,7 +112,7 @@ - CREATE_TITLE + CREATE_GROUP GROUP_NAMING @@ -127,7 +127,7 @@ - REMOVE_TITLE + REMOVE_USER_GROUP @@ -135,7 +135,7 @@ - MODIFY_TITLE + MODIFY_USER_GROUP diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/web/functions/useraccounts mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/web/functions/useraccounts --- e-smith-base-4.18.1/root/etc/e-smith/web/functions/useraccounts 2008-04-27 12:20:21.000000000 +0200 +++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/web/functions/useraccounts 2008-04-27 12:14:39.000000000 +0200 @@ -257,13 +257,13 @@ - RESET_PASSWORD_TITLE + PASSWORD_RESET_TITLE - + - + diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/groups.pm mezzanine_patched_e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/groups.pm --- e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/groups.pm 2008-03-26 17:49:00.000000000 +0100 +++ mezzanine_patched_e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/groups.pm 2008-04-27 12:08:04.000000000 +0200 @@ -161,12 +161,12 @@ print $q->Tr($q->td( "

" - . $fm->localise("CLICK_TO_CREATE") + . $fm->localise("GROUP_ADD") . "

")); if ( $numGroups == 0 ) { print $q->Tr($q->td( - '

' . $fm->localise("NO_GROUPS") . '

')); + '

' . $fm->localise("ACCOUNT_GROUP_NONE") . '

')); } else { diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/remoteaccess.pm mezzanine_patched_e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/remoteaccess.pm --- e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/remoteaccess.pm 2008-03-26 17:49:00.000000000 +0100 +++ mezzanine_patched_e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/remoteaccess.pm 2008-04-27 12:17:51.000000000 +0200 @@ -268,8 +268,8 @@ return '' if $mode eq 'off'; my %options = ( - public => $self->localise('PUBLIC'), - private => $self->localise('PRIVATE'), + public => $self->localise('NETWORKS_ALLOW_PUBLIC'), + private => $self->localise('NETWORKS_ALLOW_LOCAL'), off => $self->localise('NO_ACCESS'), ); @@ -306,14 +306,14 @@ return '' unless $db->get('ftp'); my %options = ( - normal => $self->localise('PUBLIC'), - private => $self->localise('PRIVATE'), + normal => $self->localise('NETWORKS_ALLOW_PUBLIC'), + private => $self->localise('NETWORKS_ALLOW_LOCAL'), off => $self->localise('NO_ACCESS'), ); my %loginOptions = ( - private => $self->localise('PASSWORD_LOGIN_PRIVATE'), - public => $self->localise('PASSWORD_LOGIN_PUBLIC'), + private => $self->localise('PASSWORD_LOGIN_NETWORKS_ALLOW_LOCAL'), + public => $self->localise('PASSWORD_LOGIN_NETWORKS_ALLOW_PUBLIC'), ); print $q->Tr( @@ -721,7 +721,7 @@ unless ( system( "/sbin/e-smith/signal-event", "remoteaccess-update" ) == 0 ) { - $self->error('ERROR_UPDATING'); + $self->error('ERROR_UPDATING_CONFIGURATION'); return undef; } diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm mezzanine_patched_e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm --- e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm 2008-04-27 12:20:21.000000000 +0200 +++ mezzanine_patched_e-smith-base-4.18.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/useraccounts.pm 2008-04-27 12:13:38.000000000 +0200 @@ -142,9 +142,9 @@ my $acctName = $self->localise('USER_NAME'); my $modify = $self->localise('MODIFY'); - my $resetpw = $self->localise('RESET_PASSWORD'); + my $resetpw = $self->localise('PASSWORD_RESET'); my $lock = $self->localise('LOCK_ACCOUNT'); - my $account_locked = $self->localise('ACCOUNT_IS_LOCKED'); + my $account_locked = $self->localise('ACCOUNT_LOCKED'); my $remove = $self->localise('REMOVE'); my @users = $accountdb->get('admin'); @@ -605,7 +605,7 @@ my $pass1 = $self->{cgi}->param('password1'); unless ($pass1 eq $pass2) { $self->{cgi}->param( -name => 'wherenext', -value => 'Password' ); - return "PASSWORD_VERIFY_ERROR"; + return "PASSWORD_NO_MATCH"; } return "OK"; } @@ -1140,7 +1140,7 @@ my $pass1 = $self->{cgi}->param('pass'); unless ($pass1 eq $pass2) { $self->{cgi}->param( -name => 'wherenext', -value => 'Password' ); - return "SYSTEM_PASSWORD_VERIFY_ERROR"; + return "SYSTEM_PASSWORD_NO_MATCH"; } return "OK"; } @@ -1261,7 +1261,7 @@ $q->td({-class=>'sme-noborders-content'}, $q->a({-class=>'button-like', -href=>"?action=getCert&user=$acct"}, - $self->localise('BUTTON_IPSECRW_DOWNLOAD')))); + $self->localise('DOWNLOAD')))); } } return ''; diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/reboot mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/reboot --- e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/reboot 2008-03-26 17:49:00.000000000 +0100 +++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/reboot 2008-04-27 17:49:48.000000000 +0200 @@ -2,18 +2,10 @@ --> - PERFORM - Perform - - FORM_TITLE Shutdown or reboot - SHUTDOWN - Shutdown - - REBOOT Reboot @@ -26,10 +18,6 @@ Your server has initiated the reboot process. - RECONFIGURE - Reconfigure - - RECONFIGURE_SUCCEEDED Reconfiguration request initiated successfully. diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/panels/password/cgi-bin/userpassword mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/panels/password/cgi-bin/userpassword --- e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/panels/password/cgi-bin/userpassword 2005-11-21 05:28:05.000000000 +0100 +++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/panels/password/cgi-bin/userpassword 2008-04-27 18:49:34.000000000 +0200 @@ -1,11 +1,6 @@ - FORM_TITLE - Change account password - - - DESCRIPTION - ACCOUNT_NAME - Your account: - - - - OLD_SYSTEM_PASSWORD - Old password: - - - - NEW_SYSTEM_PASSWORD - New password: - - - - NEW_SYSTEM_PASSWORD_VERIFY - New password (verify): - - - - CHANGE_PASSWORD - Change Password - - - - PASSWORD_VERIFY_ERROR - The passwords you entered did not match. - - - - PASSWORD_CHANGE_FAILURE - An error occurred while attempting to change your password. Please make sure that the old password entered is correct. - - - - PASSWORD_CHANGED - Your password has been successfully changed. - - - - TAINED_OLDPASS - The old password you entered contained invalid characters. - - - - TAINED_PASS - The password you entered contained invalid characters. - - - - TAINED_ACCOUNT - The account name you entered contained invalid characters. - - - - NO_SUCH_USER - The account name entered is invalid. - diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword --- e-smith-base-4.18.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword 2005-11-21 05:28:10.000000000 +0100 +++ mezzanine_patched_e-smith-base-4.18.1/root/etc/e-smith/web/panels/password/cgi-bin/userpassword 2008-04-27 18:51:05.000000000 +0200 @@ -66,13 +66,13 @@ my $acct; unless ($acct = $accountdb->get($acctName)) { - $q->param(-name => 'status_message', -value => 'NO_SUCH_USER'); + $q->param(-name => 'status_message', -value => 'YOUR_ACCOUNT_INVALID'); return; } unless ($acct->prop('type') eq 'user') { - $q->param(-name=>'status_message', -value=>"NO_SUCH_USER"); + $q->param(-name=>'status_message', -value=>"YOUR_ACCOUNT_INVALID"); return; } @@ -82,7 +82,7 @@ $pass)) { $q->param(-name => 'status_message', - -value => 'PASSWORD_CHANGE_FAILURE'); + -value => 'ERROR_PASSWORD_CHANGE'); return; } $acct->set_prop("PasswordSet", "yes"); @@ -92,7 +92,7 @@ or die ("Error occurred while modifying password for $acctName.\n"); $accountdb = esmith::AccountsDB->open(); - $q->param(-name => 'status_message', -value => 'PASSWORD_CHANGED'); + $q->param(-name => 'status_message', -value => 'PASSWORD_CHANGE_SUCCESS'); return; } @@ -103,7 +103,7 @@ my $pass1 = $fm->{cgi}->param('pass'); unless ($pass1 eq $pass2) { $fm->{cgi}->param( -name => 'wherenext', -value => 'Password' ); - return "PASSWORD_VERIFY_ERROR"; + return "PASSWORD_NO_MATCH"; } return "OK"; } @@ -128,23 +128,23 @@ } __DATA__ -
+ DESCRIPTION - + - + - + - + - +