--- rpms/e-smith-base/sme7/e-smith-base-4.18.1-add2general.patch 2008/04/28 17:52:40 1.4 +++ rpms/e-smith-base/sme7/e-smith-base-4.18.1-add2general.patch 2008/07/05 17:57:46 1.7 @@ -242,8 +242,7 @@ diff -Nur -x '*.orig' -x '*.rej' e-smith + . $fm->localise("GROUP_ADD") . "
")); -- if ( $numGroups == 0 ) { -+ if ( $numGroups == 0 ) { + if ( $numGroups == 0 ) { print $q->Tr($q->td( - '' . $fm->localise("NO_GROUPS") . '
')); + '' . $fm->localise("ACCOUNT_GROUP_NONE") . '
')); @@ -264,7 +263,7 @@ diff -Nur -x '*.orig' -x '*.rej' e-smith off => $self->localise('NO_ACCESS'), ); -@@ -306,14 +306,14 @@ +@@ -306,8 +306,8 @@ return '' unless $db->get('ftp'); my %options = ( @@ -275,14 +274,6 @@ diff -Nur -x '*.orig' -x '*.rej' e-smith 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 ) @@ -522,3 +513,14 @@ diff -Nur -x '*.orig' -x '*.rej' e-smith