Author: jsrain Date: Thu Sep 11 08:01:20 2008 New Revision: 50998 URL: http://svn.opensuse.org/viewcvs/yast?rev=50998&view=rev Log: merged texts from proofread Modified: trunk/autofs/package/yast2-autofs.changes trunk/autofs/src/Autofs.pm trunk/autofs/src/helps.ycp Modified: trunk/autofs/package/yast2-autofs.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autofs/package/yast2-autofs.changes?rev=50998&r1=50997&r2=50998&view=diff ============================================================================== --- trunk/autofs/package/yast2-autofs.changes (original) +++ trunk/autofs/package/yast2-autofs.changes Thu Sep 11 08:01:20 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Sep 11 07:56:54 CEST 2008 - jsrain@suse.cz + +- merged texts from proofread + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain@suse.cz - added categories Settings and System into desktop file Modified: trunk/autofs/src/Autofs.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/autofs/src/Autofs.pm?rev=50998&r1=50997&r2=50998&view=diff ============================================================================== --- trunk/autofs/src/Autofs.pm (original) +++ trunk/autofs/src/Autofs.pm Thu Sep 11 08:01:20 2008 @@ -221,7 +221,7 @@ if( $LDAPServer eq 'no' ) { y2milestone("------UNSUITABLE_LDAP_SERVER------"); - return YaPI->SetError( summary => __("The localhost cannot be LDAP server for autofs."), + return YaPI->SetError( summary => __("Cannot use localhost as the LDAP server for autofs."), code => "UNSUITABLE_LDAP_SERVER" ); } } Modified: trunk/autofs/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autofs/src/helps.ycp?rev=50998&r1=50997&r2=50998&view=diff ============================================================================== --- trunk/autofs/src/helps.ycp (original) +++ trunk/autofs/src/helps.ycp Thu Sep 11 08:01:20 2008 @@ -52,17 +52,17 @@ ") + /* Write dialog help 2/2 */ -_("<p><b>Aborting Saving:</b><br> +_("<p><b>Aborting Save:</b><br> Abort the save procedure by pressing <b>Abort</b>. </p> "), /* Configure dialog help 1/4 */ - "ConfigureDialog" : _("<p><b>Automounter Maps</b><br> -The automounter maps are maps referred to by the master -map of the automounter. The automounter maps entries describe how -file systems below the mountpoint of the map are to be mounted. -<br></p> + "ConfigureDialog" : _("<p><b>Automounter Maps</b><br/> +The automounter maps are referred to by the master map of the +automounter. Entries in the automounter maps describe how file +systems below the mountpoint of the map are to be mounted. +<br/></p> ") + /* Configure dialog help 2/4 */ @@ -87,27 +87,26 @@ /* EntryDialog for NFS entry */ "EntryDialogNFS" : _("<p><b><big>NFS Entry</big></b><br> -In case of NFS entry the <b>Server</b> is the DNS name or IP address of the NFS server.<br> -The <b>Path</p> is the absolute path of the directory on the NFS server.<br> -The <b>Options</b> must be valid options of the <b>mount</b>(8) command for NFS file system.<br> -<br></p> +In the case of NFS entries, the <b>Server</b> is the DNS name or IP address of the NFS server.<br/> +The <b>Path</b> is the absolute path to the directory on the NFS server.<br/> +The <b>Options</b> must be valid options of the <b>mount</b>(8) command for NFS file systems.<br/> +<br/></p> "), /* EntryDialog for SAMBA entry */ - "EntryDialogSAMBA" : _("<p><b>SAMBA Entry</b><br> -In case of the SAMBA entry the <b>Server</b> is the DNS name or IP address of the SAMBA server.<br> -The <b>Share</p> is the name of the share to be mounted.<br> -The <b>Options</b> must be valid options of the <b>mount</b>(8) command for SMB/CIFS file system<br> -<br></p> + "EntryDialogSAMBA" : _("<p><b>SAMBA Entry</b><br/> +In the case of SAMBA entries, the <b>Server</b> is the DNS name or IP address of the SAMBA server.<br/> +The <b>Share</b> is the name of the SAMBA share to be mounted.<br/> +The <b>Options</b> must be valid options of the <b>mount</b>(8) command for SMB/CIFS file systems.<br> +<br/></p> "), /* EntryDialog for Other entry */ - "EntryDialogOther" : _("<p><b><big>Other Entry</big></b><br> -The options are comma separated, as customary for the <b>mount</b>(8) command.<br> + "EntryDialogOther" : _("<p><b><big>Other Entry</big></b><br/> +The options are comma separated, as customary for the <b>mount</b>(8) command.<br/> The location specifies from where the file system is to be mounted. -Please consult <b>autofs</b>(5) for more information. -<br></p> -"), +Please consult the <b>autofs</b>(5) manual page for more information. +<br/></p>\n"), /* GetLDAPServer dialog if the ldapserver is localhost */ "GetLDAPServer" : _("<p><b><big>Warning</big></b><br> -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org