Author: jsuchome Date: Thu Mar 29 15:57:17 2012 New Revision: 67806 URL: http://svn.opensuse.org/viewcvs/yast?rev=67806&view=rev Log: - merge proofread texts - 2.22.2 Modified: trunk/samba-server/VERSION trunk/samba-server/package/yast2-samba-server.changes trunk/samba-server/src/dialogs-items.ycp trunk/samba-server/src/dialogs.ycp trunk/samba-server/src/helps.ycp trunk/samba-server/users-plugin/users_plugin_samba_groups.ycp Modified: trunk/samba-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/VERSION?rev=67806&r1=67805&r2=67806&view=diff ============================================================================== --- trunk/samba-server/VERSION (original) +++ trunk/samba-server/VERSION Thu Mar 29 15:57:17 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 Modified: trunk/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba-server.changes?rev=67806&r1=67805&r2=67806&view=diff ============================================================================== --- trunk/samba-server/package/yast2-samba-server.changes (original) +++ trunk/samba-server/package/yast2-samba-server.changes Thu Mar 29 15:57:17 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 29 15:56:35 CEST 2012 - jsuchome@suse.cz + +- merge proofread texts +- 2.22.2 + +------------------------------------------------------------------- Mon Mar 26 11:21:09 CEST 2012 - jsuchome@suse.cz - adpated for recent changes in FileUtils.ycp Modified: trunk/samba-server/src/dialogs-items.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/dialogs-items.ycp?rev=67806&r1=67805&r2=67806&view=diff ============================================================================== --- trunk/samba-server/src/dialogs-items.ycp (original) +++ trunk/samba-server/src/dialogs-items.ycp Thu Mar 29 15:57:17 2012 @@ -235,7 +235,7 @@ if (size(urls) > 1 && !quotes_used) { // TRANSLATORS: popup error - Report::Error (_("Multiple optional values for one back-end must be quoted.")); + Report::Error (_("Multiple optional values for one backend must be quoted.")); return false; } @@ -473,7 +473,7 @@ define boolean PassdbEditOptionValidate (string key, map event_descr) { if (! SomeBackendsAreInUse()) { - Report::Error (_("At least one back-end must be specified.")); + Report::Error (_("At least one backend must be specified.")); return false; } Modified: trunk/samba-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/dialogs.ycp?rev=67806&r1=67805&r2=67806&view=diff ============================================================================== --- trunk/samba-server/src/dialogs.ycp (original) +++ trunk/samba-server/src/dialogs.ycp Thu Mar 29 15:57:17 2012 @@ -442,7 +442,7 @@ if (new_share_name == "") { // TRANSLATORS: popup error message - Report::Error (_("Please enter a new share name.")); + Report::Error (_("Enter a new share name.")); continue; } else if (share == new_share_name) { y2milestone ("Old and new share names are the same"); @@ -450,7 +450,9 @@ } else if (SambaConfig::ShareExists (new_share_name)) { // TRANSLATORS: popup error message, %1 is a variable share name Report::Error (sformat ( - _("Share '%1' already exists.\nPlease choose another share name."), + _("Share '%1' already exists. +Choose another share name. +"), new_share_name )); continue; Modified: trunk/samba-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/helps.ycp?rev=67806&r1=67805&r2=67806&view=diff ============================================================================== --- trunk/samba-server/src/helps.ycp (original) +++ trunk/samba-server/src/helps.ycp Thu Mar 29 15:57:17 2012 @@ -202,15 +202,15 @@ "), /* passdb backend configuration dialog help 1 */ - "passdb_edit" : _("<p><b><big>User Authentication Information Back-Ends</big></b><br> -Here, choose where the Samba server should look for the authentication -information. Samba does not support multiple back-ends at once anymore, + "passdb_edit" : _("<p><b><big>User Authentication Information Backends</big></b><br> +Choose where the Samba server should look for the authentication +information. Samba does not support multiple backends at once anymore, only one is allowed.</p> ") + /* passdb backend configuration dialog help 2 */ _("<p>If you want to change the user authentication source, remove the current one first -by pressing <b>Delete</b> button and add a new one with <b>Add</b> button.</p> +by pressing <b>Delete</b> and add a new one with <b>Add</b>.</p> ") + /* passdb backend configuration dialog help 3 */ Modified: trunk/samba-server/users-plugin/users_plugin_samba_groups.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/users-plugin/users_plugin_samba_groups.ycp?rev=67806&r1=67805&r2=67806&view=diff ============================================================================== --- trunk/samba-server/users-plugin/users_plugin_samba_groups.ycp (original) +++ trunk/samba-server/users-plugin/users_plugin_samba_groups.ycp Thu Mar 29 15:57:17 2012 @@ -68,10 +68,12 @@ string help_text = # help text _("<p>This plugin can be used to enable an LDAP group to be available for Samba. -The only setting that you can edit here is the <b>Samba Group Name</b> Attribute, -which is the Name of the Group as it should appear for Samba-Clients. All other -settings are computed automatically. If you leave the <b>Samba Group Name</b> empty, -the same name as configured in the Global Settings of this Group will be used.</p>"); +The only setting that you can edit here is the <b>Samba Group Name</b> attribute, +which is the Name of the Group as it should appear to Samba-Clients. All other +settings are computed automatically. If you leave the <b>Samba Group Name</b> +empty, the same name as configured in the Global Settings of this Group will +be used.</p> +"); term contents = `Empty(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org