Author: jsuchome Date: Wed Nov 16 11:16:45 2011 New Revision: 66808 URL: http://svn.opensuse.org/viewcvs/yast?rev=66808&view=rev Log: - merged texts from proofreading - 2.22.0 Modified: trunk/samba-client/VERSION trunk/samba-client/package/yast2-samba-client.changes trunk/samba-client/src/dialogs.ycp trunk/samba-client/src/helps.ycp trunk/samba-client/src/routines.ycp trunk/samba-client/src/samba-client.ycp Modified: trunk/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/VERSION?rev=66808&r1=66807&r2=66808&view=diff ============================================================================== --- trunk/samba-client/VERSION (original) +++ trunk/samba-client/VERSION Wed Nov 16 11:16:45 2011 @@ -1 +1 @@ -2.21.5 +2.22.0 Modified: trunk/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/package/yast2-samba-client.changes?rev=66808&r1=66807&r2=66808&view=diff ============================================================================== --- trunk/samba-client/package/yast2-samba-client.changes (original) +++ trunk/samba-client/package/yast2-samba-client.changes Wed Nov 16 11:16:45 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 16 11:16:17 CET 2011 - jsuchome@suse.cz + +- merged texts from proofreading +- 2.22.0 + +------------------------------------------------------------------- Thu Sep 29 13:46:52 CEST 2011 - visnov@suse.cz - set dialog title Modified: trunk/samba-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/dialogs.ycp?rev=66808&r1=66807&r2=66808&view=diff ============================================================================== --- trunk/samba-client/src/dialogs.ycp (original) +++ trunk/samba-client/src/dialogs.ycp Wed Nov 16 11:16:45 2011 @@ -451,7 +451,7 @@ ), `Left ( // checkbox label - `CheckBox (`id(`ssh), `opt (`notify), _("&Single Sign-On for SSH"), + `CheckBox (`id(`ssh), `opt (`notify), _("&Single Sign-on for SSH"), Samba::GetSSHSupport ()) ), `VSpacing (0.2) Modified: trunk/samba-client/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/helps.ycp?rev=66808&r1=66807&r2=66808&view=diff ============================================================================== --- trunk/samba-client/src/helps.ycp (original) +++ trunk/samba-client/src/helps.ycp Wed Nov 16 11:16:45 2011 @@ -18,7 +18,7 @@ /* Read dialog help 1/2 */ "read" : _("<p><b><big>Initializing Samba Client Configuration</big></b><br> -Please wait...<br></p> +</p> ") + /* Read dialog help 2/2 */ @@ -28,7 +28,7 @@ /* Write dialog help 1/2 */ "write" : _("<p><b><big>Saving Samba Client Configuration</big></b><br> -Please wait...<br></p> +</p> ") + /* Write dialog help 2/2 */ @@ -42,7 +42,7 @@ "MembershipDialog_nocont" : _("<p><b><big>Selecting Windows Domain Membership</big></b></p>") /* translators: Samba workgroup dialog help 1/3 */ + _("<p>A Linux client can be a member of a workgroup, NT domain, or Active Directory domain. -Here, specify the name of the membership.</p> +Specify the name of the membership.</p> ") + /* Samba role dialog help 2/3 */ @@ -78,7 +78,7 @@ "MembershipDialog_config" : _("<p><b>Join Settings</b></p>") + // Samba membership dialog - additional help for autoyast config - _("<p>Set the <b>Username</b> and <b>Password</b> that should be used for joining selected domain during autoinstallation. Note that the password will be saved to the profile in the cleartext (unencrypted) form.</p>") + + _("<p>Set the <b>Username</b> and <b>Password</b> that should be used for joining\nthe selected domain during autoinstallation. Note that the password will be saved to the profile in cleartext (unencrypted) form.</p>") + // Samba membership dialog - additional help for autoyast config _("<p>Specify the <b>Active Directory Server</b> to use for joining an Active Directory domain. This is also used as the value for KDC in the Kerberos configuration.</p>"), Modified: trunk/samba-client/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/routines.ycp?rev=66808&r1=66807&r2=66808&view=diff ============================================================================== --- trunk/samba-client/src/routines.ycp (original) +++ trunk/samba-client/src/routines.ycp Wed Nov 16 11:16:45 2011 @@ -422,7 +422,7 @@ string PAMMountHelp () { // help text for PAM Mount table - return _("<p>In the table <b>Mount Server Directories</b>, you can specify server directories (such as home directory) which should be locally mounted when the user is logged in. If mounting should be user-specific, specify <b>User Name</b> for selected rule. Otherwise, the directory is mounted for each user. For more information, see pam_mount.conf manual page.</p>") + + return _("<p>In the table <b>Mount Server Directories</b>, you can specify server\ndirectories (such as home directory) which should be locally mounted when the\nuser is logged in. If mounting should be user-specific, specify <b>User\nName</b> for the selected rule. Otherwise, the directory is mounted for each user. For more information, see pam_mount.conf manual page.</p>") + // help text for PAM Mount table: example _("<p>For example, you may use <tt>/home/%(DOMAIN_USER)</tt> value for <b>Remote Path</b>, <tt>~/</tt> value for <b>Local Mount Point</b> to mount the home directory, together with a value <tt>user=%(DOMAIN_USER)</tt> as a part of <b>Options</b>.</p>"); @@ -431,7 +431,7 @@ // return help for Kerberos Method string KerberosMethodHelp () { // help text for kerberos method option - return _("<p>The value of <b>Kerberos Method</b> sets how kerberos tickets are verified. When <b>Single Sing-on for SSH</b> is used, the default Kerberos Method set by YaST is <tt>secrets and keytab</tt>. See smb.conf manual page for details.</p>"); + return _("<p>The value of <b>Kerberos Method</b> defines how kerberos tickets are verified. When <b>Single Sing-on for SSH</b> is used, the default Kerberos Method set by YaST is <tt>secrets and keytab</tt>. See smb.conf manual page for details.</p>"); } /* EOF */ Modified: trunk/samba-client/src/samba-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/samba-client.ycp?rev=66808&r1=66807&r2=66808&view=diff ============================================================================== --- trunk/samba-client/src/samba-client.ycp (original) +++ trunk/samba-client/src/samba-client.ycp Wed Nov 16 11:16:45 2011 @@ -74,10 +74,10 @@ if( result ) { // translators: result message for isdomainmember command line action - CommandLine::Print( sformat( _("This machine is a member of %1"), domain ) ); + CommandLine::Print( sformat( _("This machine is a member of %1."), domain ) ); } else { // translators: result message for isdomainmember command line action - CommandLine::Print( sformat( _("This machine is not a member of %1"), domain ) ); + CommandLine::Print( sformat( _("This machine is not a member of %1."), domain ) ); } return true; @@ -170,7 +170,7 @@ "joindomain" : $[ "handler" : JoinDomainHandler, // translators: command line help text for joindomain action - "help" : _("Join this machine into a domain") + "help" : _("Join this machine to a domain") ], "configure" : $[ "handler" : ChangeConfiguration, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org