Author: jsuchome Date: Wed Nov 16 12:32:06 2011 New Revision: 66824 URL: http://svn.opensuse.org/viewcvs/yast?rev=66824&view=rev Log: - merged texts from proofreading - 2.22.0 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp trunk/ldap-client/src/LdapPopup.ycp trunk/ldap-client/src/ui.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=66824&r1=66823&r2=66824&view=diff ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Wed Nov 16 12:32:06 2011 @@ -1 +1 @@ -2.21.11 +2.22.0 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-client.changes?rev=66824&r1=66823&r2=66824&view=diff ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Wed Nov 16 12:32:06 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 16 12:31:32 CET 2011 - jsuchome@suse.cz + +- merged texts from proofreading +- 2.22.0 + +------------------------------------------------------------------- Thu Sep 29 12:41:38 CEST 2011 - visnov@suse.cz - set dialog title Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=66824&r1=66823&r2=66824&view=diff ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Wed Nov 16 12:32:06 2011 @@ -1005,11 +1005,11 @@ // error message, more specific description follows "read": _("A problem occurred while reading data from the LDAP server."), // error message, more specific description follows - "users": _("There was a problem with writing LDAP users."), + "users": _("A problem occurred while writing LDAP users."), // error message, more specific description follows - "groups": _("There was a problem with writing LDAP groups."), + "groups": _("A problem occurred while writing LDAP groups."), // error message, more specific description follows - "write": _("There was a problem with writing data to the LDAP server."), + "write": _("A problem occurred while writing data to the LDAP server."), // error message, more specific description follows "schema": _("A problem occurred while reading schema from the LDAP server."), ]; Modified: trunk/ldap-client/src/LdapPopup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/LdapPopup.ycp?rev=66824&r1=66823&r2=66824&view=diff ============================================================================== --- trunk/ldap-client/src/LdapPopup.ycp (original) +++ trunk/ldap-client/src/LdapPopup.ycp Wed Nov 16 12:32:06 2011 @@ -574,7 +574,7 @@ `pwchange : _("<p>Specify the <b>Maximum Number of Passwords Stored in History</b> to set how many previously used passwords should be saved. Saved passwords may not be used.</p>") + // help text for pwdMustChange attribute - _("<p>Check <b>User Must Change Password after Reset</b> to force users to change their passwords after the the password is reset or changed by an administrator.</p>") + + _("<p>Check <b>User Must Change Password after Reset</b> to force users to change their passwords after the password is reset or changed by an administrator.</p>") + // help text for pwdAllowUserChange attribute _("<p>Check <b>User Can Change Password</b> to allow users to change their passwords.</p>") + @@ -583,7 +583,7 @@ _("<p>If the existing password must be provided along with the new password, check <b>Old Password Required for Password Change</b>.</p>") + // help text for pwdCheckQuality attribute - _("<p>Select whether the password quality should be verified while passwords are modified or added. Select <b>No Checking</b> if passwords should not be checked at all. With <b>Accept Uncheckable Passwords</b>, passwords are accepted even if the check cannot be performed, for example, if the user has provided an encrypted password. With <b>Only Accept Checked Passwords</b> passwords are refused if the quality test fails or the password cannot be checked.</p>") + + _("<p>Select whether the password quality should be verified while passwords are modified or added. Select <b>No Checking</b> if passwords should not be evaluated. With <b>Accept Uncheckable Passwords</b>, passwords are accepted even if the check cannot be performed, for example, if the user provides an encrypted password. With <b>Only Accept Checked Passwords</b> passwords are refused if the quality test fails or the password cannot be checked.</p>") + // help text for pwdMinLength attribute _("Set the minimum number of characters that must be used in a password in <b>Minimum Password Length</b>.</p>"), @@ -595,7 +595,7 @@ _("<p><b>Maximum Password Age</b> sets how long after modification a password expires.</p>") + // help text for pwdExpireWarning attribute - _("<p>In <b>Time before Password Expiration to Issue Warning</b> set how long before a password is due to expire that an expiration warning messages should be given to an authenticating user.</p>") + + _("<p>In <b>Time before Password Expiration to Issue Warning</b> specify how long\nbefore expiration an authenticating user should be warned.</p>") + // help text for pwdGraceAuthNLimit attribute _("<p>Set the number of times an expired password can be used to authenticate in <b>Allowed Uses of an Expired Password</b>.</p>"), @@ -607,10 +607,10 @@ _("<p>Set the number of consecutive failed bind attempts after which the password may not be used to authenticate in <b>Bind Failures to Lock the Password</b>.</p>") + // help text for pwdLockoutDuration attribute - _("<p>Set how long the password cannot be used in <b>Password Lock Duration</b>.</p>") + + _("<p>Set for how long the password cannot be used in <b>Password Lock Duration</b>.</p>") + // help text for pwdFailureCountInterval attribute - _("<p><b>Bind Failures Cache Duration</b> sets how long before password failures are purged from the failure counter even though no successful authentication has occurred.</p>"), + _("<p><b>Bind Failures Cache Duration</b> specifies the time after which password failures are purged from the failure counter even if no successful authentication has occurred.</p>"), ]; // map of attribute names for each tab @@ -764,7 +764,7 @@ `VSpacing (0.2), `IntField (`id ("pwdGraceAuthNLimit"), // IntField label - _("Allowed Uses of an Expired Password"), 0, max, + _("Allowed Use of an Expired Password"), 0, max, tointeger (ppolicy["pwdGraceAuthNLimit"]:"0") ) ), `HSpacing (0.5))); Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=66824&r1=66823&r2=66824&view=diff ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Wed Nov 16 12:32:06 2011 @@ -165,8 +165,7 @@ define symbol LdapDialog () { // help text 1/9 - string help_text = _("<p>Here, your machine can be set up as an -LDAP client.</p> + string help_text = _("<p>Set up your machine as an LDAP client.</p> ") + // help text 2/9 @@ -197,20 +196,19 @@ // help text 6/9 _("<p>Some LDAP servers support StartTLS (RFC2830). If your server supports it and it is configured, activate <b>LDAP TLS/SSL</b> -to encrypt your communication with the LDAP server. You may download CA certificate file in PEM format from given URL.</p> +to encrypt your communication with the LDAP server. You may download a CA +certificate file in PEM format from a given URL.</p> ") + // help text 8/9 - _("<p>For configuration of advanced LDAP settings, click + _("<p>To configure advanced LDAP settings, click <b>Advanced Configuration</b>.</p> "); // help text 9/9 (additional) - string autofs_help_text = _("<p><b>Automounter</b> is a daemon that automatically mounts directories, -such as users' home directories. -It is assumed that its configuration files (auto.*) already exist -locally or over LDAP. -If it is not installed and you want to use it, it is installed -automatically.</p> + string autofs_help_text = _("<p><b>Automounter</b> is a daemon that automatically mounts directories, such +as users' home directories. Its configuration files (auto.*) should already +exist locally or over LDAP. If the automounter is not installed yet but you +want to use it, it will be installed automatically.</p> "); @@ -460,7 +458,8 @@ '%1' -was copied to '%2' directory"), name, dir)); +has been copied to '%2' directory. +"), name, dir)); Ldap::tls_cacertdir = dir; Ldap::modified = true; @@ -672,7 +671,7 @@ ")) + // help text 2/3 - _("<p><b>Password Change Protocol</b> refers to the pam_password attribute of the <tt>/etc/ldap.conf</tt> file. See <tt>man pam_ldap</tt> for the meaning of its values.</p>") + + _("<p><b>Password Change Protocol</b> refers to the pam_password attribute of the\n<tt>/etc/ldap.conf</tt> file. See <tt>man pam_ldap</tt> for an explanation of its values.</p>") + // help text 3/3, %1 is attribute name sformat (_("<p>Set the type of LDAP groups to use. @@ -680,7 +679,7 @@ "), "member") + - _("<p>If secure connection requires certificate checking, you may specify where is your certificate file located. It is possible to enter either directory with certificates, or the explicit path to one certificate file.</p>") + + _("<p>If secure connection requires certificate checking, specify where your\ncertificate file is located. Enter either a directory containing certificates\nor the explicit path to one certificate file.</p>") + // help text 7/9 _("<p>Normally, the LDAP version 3 protocol is used. If you have @@ -695,14 +694,14 @@ // help text 1/4 _("<p>First, set <b>Configuration Base DN</b>. -It is the base for storing your configuration data, which is saved on the LDAP +This is the base for storing your configuration data on the LDAP server.</p> ") + // help text 2/4 _("<p>To access the data stored on the server, enter the <b>Administrator DN</b>. -You can enter the full DN (for example, cn=Administrator,dc=mydomain,dc=com) or just +You can enter the full DN (for example, cn=Administrator,dc=mydomain,dc=com) or the relative DN (for example, cn=Administrator). The LDAP base DN is appended automatically if the appropriate option is checked.</p> ") + @@ -723,7 +722,7 @@ // help text 1/1 _("<p>If home directories of users should be stored on this machine, check the appropriate option. Changing this value does not cause any direct -action. It is only information for the YaST users module, which can manage +action. It is only information for the YaST users module, which manages user home directories.</p> ") + @@ -731,7 +730,9 @@ _("<p><b>Password Policy</b></p>") + // password policy help - _("<p>Configure the selected password policy with <b>Edit</b>. Use <b>Add</b> to add a new password policy. The configuration is only possible,\n if the password policies are already enabled on the LDAP server.</p>") + _("<p>Configure the selected password policy with <b>Edit</b>. Use <b>Add</b> to +add a new password policy. Password policies must be enabled on the LDAP server.</p> +") ]; string bind_dn = Ldap::bind_dn; @@ -1482,8 +1483,8 @@ define map<string,any> TemplateConfigurationDialog (map templ) { // help text 1/3 - string help_text = _("<p>Here, configure the template used for -creating new objects (like users or groups).</p> + string help_text = _("<p>Configure the template used for creating +new objects (like users or groups).</p> ") + // help text 2/3 @@ -1492,8 +1493,8 @@ ") + // help text 3/3 - _("<p>The second table contains a list of <b>default values</b>, used -for new objects. Modify the list by adding new values and editing or + _("<p>The second table contains a list of <b>default values</b> used +for new objects. Modify the list by adding new values, editing or removing current ones.</p> "); @@ -1709,7 +1710,7 @@ define symbol ModuleConfigurationDialog () ``{ // helptext 1/4 - string help_text = _("<p>Here, manage the configuration stored in LDAP directory.</p>") + + string help_text = _("<p>Manage the configuration stored in the LDAP directory.</p>") + // helptext 2/4 _("<p>Each configuration set is called a \"configuration module.\" If there @@ -1929,8 +1930,9 @@ if (available == []) { // message - Popup::Message (_("You currently have configuration modules -of each type, so you cannot add a new one.")); + Popup::Message (_("You currently have a configuration module of each +type, therefore you cannot add a new one. +")); continue; } // get new name and class -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org