Author: mvidner Date: Wed Apr 16 10:53:46 2008 New Revision: 46699 URL: http://svn.opensuse.org/viewcvs/yast?rev=46699&view=rev Log: Merged proofread texts. Modified: trunk/nfs-server/package/yast2-nfs-server.changes trunk/nfs-server/src/NfsServer.ycp trunk/nfs-server/src/nfs_server.ycp trunk/nfs-server/src/ui.ycp Modified: trunk/nfs-server/package/yast2-nfs-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/package/yast2-nfs-server.changes?rev=46699&r1=46698&r2=46699&view=diff ============================================================================== --- trunk/nfs-server/package/yast2-nfs-server.changes (original) +++ trunk/nfs-server/package/yast2-nfs-server.changes Wed Apr 16 10:53:46 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Apr 16 10:53:41 CEST 2008 - mvidner@suse.cz + +- Merged proofread texts. + +------------------------------------------------------------------- Mon Mar 17 12:43:32 CET 2008 - jsrain@suse.cz - added 'StartupNotify=true' to the desktop file (bnc #304964) Modified: trunk/nfs-server/src/NfsServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/NfsServer.ycp?rev=46699&r1=46698&r2=46699&view=diff ============================================================================== --- trunk/nfs-server/src/NfsServer.ycp (original) +++ trunk/nfs-server/src/NfsServer.ycp Wed Apr 16 10:53:46 2008 @@ -447,7 +447,7 @@ if (enable_nfsv4) { summary = Summary::AddLine (summary, "NFSv4 support is enabled."); summary = Summary::AddLine (summary, - sformat(_("And the NFSv4 domain for idmapping is %1."),domain)); + sformat(_("The NFSv4 domain for idmapping is %1."),domain)); } else summary = Summary::AddLine (summary, "NFSv4 support is disabled."); Modified: trunk/nfs-server/src/nfs_server.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/nfs_server.ycp?rev=46699&r1=46698&r2=46699&view=diff ============================================================================== --- trunk/nfs-server/src/nfs_server.ycp (original) +++ trunk/nfs-server/src/nfs_server.ycp Wed Apr 16 10:53:46 2008 @@ -254,14 +254,14 @@ if (v4domain != "") { if (!NfsServer::enable_nfsv4) { - CommandLine::Print(_("Domain can not be set without enabling NFSv4. Please use 'set enablev4' command.")); + CommandLine::Print(_("Domain cannot be set without enabling NFSv4. Please use the 'set enablev4' command.")); return false; } NfsServer::domain = v4domain; } if (nfs_sec == "" && enablev4 == "" && v4domain == "") { - CommandLine::Print(_("Command set must be used as in 'set option=value'. Please use 'set help' to know the options.")); + CommandLine::Print(_("Command set must be used as in 'set option=value'. Please use 'set help' to get information about the options.")); return false; } @@ -300,7 +300,7 @@ ], "set" : $[ "handler" : NfsServerSetOptionHandler, - "help" : _("Set parameters - domain, security and enablev4"), + "help" : _("Set the parameters for domain, security and enablev4"), ] ], "options" : $[ Modified: trunk/nfs-server/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/ui.ycp?rev=46699&r1=46698&r2=46699&view=diff ============================================================================== --- trunk/nfs-server/src/ui.ycp (original) +++ trunk/nfs-server/src/ui.ycp Wed Apr 16 10:53:46 2008 @@ -85,7 +85,7 @@ { if (mountpoint == nil || mountpoint == "") { - Popup::Message(_("Please enter a non-empty export path. Eg: /exports")); + Popup::Message(_("Enter a non-empty export path. For example, /exports.")); ret = nil; } else @@ -301,7 +301,7 @@ string domain = (string) SCR::Read(.etc.idmapd_conf,"Domain"); if (domain == nil) { - Popup::Message(_("Unable to read /etc/idmapd.conf file. Defaulting the domain to 'localdomain'")); + Popup::Message(_("Unable to read the /etc/idmapd.conf file. Setting the default setting for the domain to 'localdomain'.")); domain = "localdomain"; } @@ -330,14 +330,16 @@ help_text = help_text + fw_cwm_widget["help"]:""; help_text = help_text + -_("<P>If the server needs to handle NFSv4 clients, enable the option <B>Enable NFSv4</B>, -and fillin the NFSv4 domain name in the text entry, for id mapping daemon to use. Please leave -it as localdomain or refer to man page for idmapd and idmapd.conf if you are not sure.</P>"); +_("<P>If the server needs to handle NFSv4 clients, check <B>Enable NFSv4</B>, +and fill in the NFSv4 domain name you want the id mapping daemon to use. Leave +it as localdomain or refer to the man page for idmapd and idmapd.conf if you are not sure.</P> +"); help_text = help_text + // FIXME: use %1 as nfs-utils.src.rpm produces nfs-kernel-server.rpm _("<P>If the server and client must authenticate using GSS library, please enable the <B>Enable GSS Security</B> -checkbox. For being able to use GSS API, currently you need to have kerberos and gssapi (nfs-utils > 1.0.7) on your system</P>"); +checkbox. For being able to use GSS API, currently you need to have Kerberos and gssapi (nfs-utils > 1.0.7) on your system</P> +"); /* The end of the definitions */ @@ -505,9 +507,9 @@ if (NfsServer::enable_nfsv4) { // Help, part 4 of 5, caution about fsid=0 in case NFSv4 is enabled. - help_text = help_text + _("<p>The NFSv4 option is enabled in the previous page. Make sure that only one exported filesystem is marked with fsid=0 option for a particular client.</p>"); + help_text = help_text + _("<p>The NFSv4 option is enabled in the previous page. Make sure that only one exported filesystem is marked with the fsid=0 option for a particular client.</p>"); - help_text = help_text + _("<p>In case of multiple exports to a NFSv4 client, there is a need to bind the exported paths (not with fsid=0) to the one with fsid=0. To do this, simply add another export option, bind=/target/path where /target/path amounts to some directory existing below the fsid=0 - exported tree.</p>"); + help_text = help_text + _("<p>In case of multiple exports to a NFSv4 client, you need to bind the exported paths with no fsid=0 to the one with fsid=0. To do this, add another export option (bind=/target/path), where /target/path amounts to some directory existing below the fsid=0 exported tree.</p>"); } // Help, part 5 of 5 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org