Author: jsrain Date: Tue Jan 15 10:41:25 2008 New Revision: 43593 URL: http://svn.opensuse.org/viewcvs/yast?rev=43593&view=rev Log: merged texts from proofread Modified: branches/SuSE-SLE-10-SP2-Branch/users/package/yast2-users.changes branches/SuSE-SLE-10-SP2-Branch/users/src/UsersPluginLDAPPasswordPolicy.pm branches/SuSE-SLE-10-SP2-Branch/users/src/UsersPluginLDAPShadowAccount.pm Modified: branches/SuSE-SLE-10-SP2-Branch/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/users/package/yast2-users.changes?rev=43593&r1=43592&r2=43593&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/users/package/yast2-users.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/users/package/yast2-users.changes Tue Jan 15 10:41:25 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 15 10:41:06 CET 2008 - jsrain@suse.cz + +- merged texts from proofread + +------------------------------------------------------------------- Fri May 11 12:08:13 CEST 2007 - jsuchome@suse.cz - during autoinstallation, do not touch already created directories Modified: branches/SuSE-SLE-10-SP2-Branch/users/src/UsersPluginLDAPPasswordPolicy.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/users/src/UsersPluginLDAPPasswordPolicy.pm?rev=43593&r1=43592&r2=43593&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/users/src/UsersPluginLDAPPasswordPolicy.pm (original) +++ branches/SuSE-SLE-10-SP2-Branch/users/src/UsersPluginLDAPPasswordPolicy.pm Tue Jan 15 10:41:25 2008 @@ -278,8 +278,9 @@ if (!contains ($data->{'plugins_to_remove'}, $name, 1) && contains ($data->{'plugins'}, $shadow_plugin, 1)) { # error popup - $error = __("It is not possible to add this plugin when -the plugin for Shadow Account attributes is in use."); + $error = __("It is not possible to add this plug-in when +the plug-in for Shadow Account attributes is in use. +"); return undef; } return $data; @@ -318,8 +319,9 @@ if (!contains ($data->{'plugins_to_remove'}, $name, 1) && contains ($data->{'plugins'}, $shadow_plugin, 1)) { # error popup - $error = __("It is not possible to add this plugin when -the plugin for Shadow Account attributes is in use."); + $error = __("It is not possible to add this plug-in when +the plug-in for Shadow Account attributes is in use. +"); return undef; } return $data; Modified: branches/SuSE-SLE-10-SP2-Branch/users/src/UsersPluginLDAPShadowAccount.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/users/src/UsersPluginLDAPShadowAccount.pm?rev=43593&r1=43592&r2=43593&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/users/src/UsersPluginLDAPShadowAccount.pm (original) +++ branches/SuSE-SLE-10-SP2-Branch/users/src/UsersPluginLDAPShadowAccount.pm Tue Jan 15 10:41:25 2008 @@ -323,8 +323,9 @@ contains ($data->{'plugins'}, $pwdpolicy_plugin, 1)) { # error popup - $error = __("It is not possible to add this plugin when -the plugin for Password Policy is in use."); + $error = __("It is not possible to add this plug-in when +the plug-in for Password Policy is in use. +"); return undef; } return $data; @@ -368,8 +369,9 @@ contains ($data->{'plugins'}, $pwdpolicy_plugin, 1)) { # error popup - $error = __("It is not possible to add this plugin when -the plugin for Password Policy is in use."); + $error = __("It is not possible to add this plug-in when +the plug-in for Password Policy is in use. +"); return undef; } return $data; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org