Author: jsuchome Date: Thu Mar 29 15:30:10 2012 New Revision: 67790 URL: http://svn.opensuse.org/viewcvs/yast?rev=67790&view=rev Log: - merged proofread texts Modified: trunk/nis-client/VERSION trunk/nis-client/package/yast2-nis-client.changes trunk/nis-client/src/ui.ycp Modified: trunk/nis-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/VERSION?rev=67790&r1=67789&r2=67790&view=diff ============================================================================== --- trunk/nis-client/VERSION (original) +++ trunk/nis-client/VERSION Thu Mar 29 15:30:10 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 Modified: trunk/nis-client/package/yast2-nis-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/package/yast2-nis-client.changes?rev=67790&r1=67789&r2=67790&view=diff ============================================================================== --- trunk/nis-client/package/yast2-nis-client.changes (original) +++ trunk/nis-client/package/yast2-nis-client.changes Thu Mar 29 15:30:10 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 29 15:29:20 CEST 2012 - jsuchome@suse.cz + +- merged proofread texts +- 2.22.2 + +------------------------------------------------------------------- Mon Mar 26 10:53:57 CEST 2012 - jsuchome@suse.cz - testsuite adapted to changes in FileUtils.ycp Modified: trunk/nis-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/src/ui.ycp?rev=67790&r1=67789&r2=67790&view=diff ============================================================================== --- trunk/nis-client/src/ui.ycp (original) +++ trunk/nis-client/src/ui.ycp Thu Mar 29 15:30:10 2012 @@ -218,8 +218,17 @@ ") + // help text for netconfig part - _("<p>Select the way how NIS configuration will be modified. Normally, it is handled by netconfig script which merges the data statically defined here with those obtained dynamically (e.g. from DHCP client, NetworkManager etc.). This is the default, Default Policy option and it is sufficient for most of the configurations. -By choosing Only Manual Changes option, netconfig will no longer be allowed to modify configuration. You can however edit the file manually. By choosing Custom Policy option, you may specify a custom policy string, which consists of space-separated list of interface names, including wildcards, with STATIC/STATIC_FALLBACK as predefined special values. For more information, see netconfig manual page.</p>"); + _("<p>Select the way how the NIS configuration will be modified. Normally, it is +handled by the netconfig script, which merges the data statically defined here +with dynamically obtained data (e.g. from DHCP client, NetworkManager +etc.). This is the Default Policy and sufficient for most configurations. +By choosing Only Manual Changes, netconfig will no longer be allowed to modify +the configuration. You can, however, edit the file manually. By choosing +Custom Policy, you can specify a custom policy string, which consists of a +space-separated list of interface names, including wildcards, with +STATIC/STATIC_FALLBACK as predefined special values. For more information, see +the netconfig manual page.</p> +"); // help text help_text = help_text + _("<p>Specify multiple servers -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org