Author: jsuchome Date: Mon Dec 3 15:35:56 2007 New Revision: 42609 URL: http://svn.opensuse.org/viewcvs/yast?rev=42609&view=rev Log: - merged texts from proofread Modified: trunk/users/package/yast2-users.changes trunk/users/src/UsersPluginLDAPPasswordPolicy.pm trunk/users/src/UsersPluginLDAPShadowAccount.pm trunk/users/src/helps.ycp trunk/users/src/users_plugin_quota.ycp Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes... ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Mon Dec 3 15:35:56 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Dec 3 15:35:41 CET 2007 - jsuchome@suse.cz + +- merged texts from proofread + +------------------------------------------------------------------- Mon Dec 3 11:48:24 CET 2007 - jsuchome@suse.cz - ask for CurrentButton property of RadioButtonGroup (#345490) Modified: trunk/users/src/UsersPluginLDAPPasswordPolicy.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersPluginLDAPPassword... ============================================================================== --- trunk/users/src/UsersPluginLDAPPasswordPolicy.pm (original) +++ trunk/users/src/UsersPluginLDAPPasswordPolicy.pm Mon Dec 3 15:35:56 2007 @@ -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 plugin 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 plugin for Shadow Account attributes is in use. +"); return undef; } return $data; Modified: trunk/users/src/UsersPluginLDAPShadowAccount.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersPluginLDAPShadowAc... ============================================================================== --- trunk/users/src/UsersPluginLDAPShadowAccount.pm (original) +++ trunk/users/src/UsersPluginLDAPShadowAccount.pm Mon Dec 3 15:35:56 2007 @@ -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; Modified: trunk/users/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/helps.ycp?rev=42609&r1=... ============================================================================== --- trunk/users/src/helps.ycp (original) +++ trunk/users/src/helps.ycp Mon Dec 3 15:35:56 2007 @@ -111,7 +111,8 @@ // Help text 4.5/6 _("<p><b>Umask for Home Directory</b><br> -Umask which is used by for creating new home directories.</p>") + +Umask which is used for creating new home directories.</p> +") + // Help text 5/6: // Don't reorder letters YYYY-MM-DD, date must be set in this format @@ -372,7 +373,7 @@ if (what == "add_user") { // help text for user's home directory mode - helptext = helptext + _("<p>Optionally, set the <b>Home Directory Permission Mode</b> for this user's home directory differenty from the default.</p>"); + helptext = helptext + _("<p>Optionally, set the <b>Home Directory Permission Mode</b> for this user's home directory different from the default.</p>"); map defaults = Users::GetLoginDefaults (); helptext = helptext + Modified: trunk/users/src/users_plugin_quota.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/users_plugin_quota.ycp?... ============================================================================== --- trunk/users/src/users_plugin_quota.ycp (original) +++ trunk/users/src/users_plugin_quota.ycp Mon Dec 3 15:35:56 2007 @@ -118,11 +118,12 @@ string help_text = _("<p>Here, configure quota settings of the user on selected file systems.</p>") + // helptext for quota, cont. - _("<p>Define a Size Limit by specifying the number of 1 kB blocks the -user may have on this file system. Additionally, you can define an inode limit specifying the number of inodes the user may have on the file system.</p>") + + _("<p>Define a size limit by specifying the number of 1 kB blocks the +user may have on this file system. Additionally, you can define an inode limit specifying the number of inodes the user may have on the file system.</p> +") + // helptext for quota, cont. - _("<p>You can specify both Soft and Hard Limits for size and number of inodes. The soft limits define a warning level at which users are informed they are nearing their limit, whereas the hard limits define the limit at which write requests are denied.</p>") + + _("<p>You can specify both soft and hard limits for size and number of inodes. The soft limits define a warning level at which users are informed they are nearing their limit, whereas the hard limits define the limit at which write requests are denied.</p>") + // helptext for quota, cont. _("<p>As soon as the user has reached the soft limit, the input fields for the grace interval are activated. Specify the time period for which the user is allowed to exceed the soft limits set above. The countdown of the grace interval starts immediately.</p>"); @@ -133,11 +134,12 @@ help_text = _("<p>Here, configure quota settings of the group on selected file systems.</p>") + // helptext for quota, cont. - _("<p>Define a Size Limit by specifying the number of 1 kB blocks the -group may have on this file system. Additionally, you can define an inode limit specifying the number of inodes the group may have on the file system.</p>") + + _("<p>Define a size simit by specifying the number of 1 kB blocks the +group may have on this file system. Additionally, you can define an inode limit specifying the number of inodes the group may have on the file system.</p> +") + // helptext for quota, cont. - _("<p>You can specify both Soft and Hard Limits for size and number of inodes. The soft limits define a warning level at which groups are informed they are nearing their limit, whereas the hard limits define the limit at which write requests are denied.</p>") + + _("<p>You can specify both soft and hard limits for size and number of inodes. The soft limits define a warning level at which groups are informed they are nearing their limit, whereas the hard limits define the limit at which write requests are denied.</p>") + // helptext for quota, cont. _("<p>As soon as the group has reached the soft limit, the input fields for the grace interval are activated. Specify the time period for which the group is allowed to exceed the soft limits set above. The countdown of the grace interval starts immediately.</p>"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org