Author: jsrain Date: Fri Apr 11 11:26:45 2008 New Revision: 46391 URL: http://svn.opensuse.org/viewcvs/yast?rev=46391&view=rev Log: more texts fixes (bnc #377805) Modified: trunk/squid/package/yast2-squid.changes trunk/squid/src/Squid.ycp trunk/squid/src/SquidACL_local_functions.ycp trunk/squid/src/dialogs.ycp trunk/squid/src/helps.ycp trunk/squid/src/store_del.ycp Modified: trunk/squid/package/yast2-squid.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/package/yast2-squid.changes?rev=46391&r1=46390&r2=46391&view=diff ============================================================================== --- trunk/squid/package/yast2-squid.changes (original) +++ trunk/squid/package/yast2-squid.changes Fri Apr 11 11:26:45 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Apr 11 11:19:42 CEST 2008 - jsrain@suse.cz + +- more texts fixes (bnc #377805) + +------------------------------------------------------------------- Wed Apr 2 11:51:34 CEST 2008 - jsrain@suse.cz - fixed some texts (bnc #373131, bnc #373103, bnc #373109) Modified: trunk/squid/src/Squid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Squid.ycp?rev=46391&r1=46390&r2=46391&view=diff ============================================================================== --- trunk/squid/src/Squid.ycp (original) +++ trunk/squid/src/Squid.ycp Fri Apr 11 11:26:45 2008 @@ -1033,16 +1033,16 @@ _("Read Refresh Patterns from config file."), _("Read ACL Groups from config file."), _("Read Access Control table from config file."), - _("Read the rest settings."), - _("Read service status."), - _("Read firewall settings.")], + _("Read Other Settings."), + _("Read Service Status."), + _("Read Firewall Settings.")], [_("Reading HTTP Ports ..."), _("Reading Refresh Patterns ..."), _("Reading ACL Groups ..."), _("Reading Access Control table ..."), - _("Reading the rest settings ..."), - _("Reading service status ..."), - _("Reading firewall settings ...")], + _("Reading Other Settings ..."), + _("Reading Service Status ..."), + _("Reading Firewall Settings ...")], ""); if(Abort()) return false; Modified: trunk/squid/src/SquidACL_local_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/SquidACL_local_functions.ycp?rev=46391&r1=46390&r2=46391&view=diff ============================================================================== --- trunk/squid/src/SquidACL_local_functions.ycp (original) +++ trunk/squid/src/SquidACL_local_functions.ycp Fri Apr 11 11:26:45 2008 @@ -317,7 +317,7 @@ Report::Error( _("Time is not filled in correct format.")); }else if (!isCorrectFromTo(from, to)){// from must be less then to ok = false; - Report::Error( _("From must be less then To."));//TODO: better error message + Report::Error( _("From must be less than To."));//TODO: better error message } return ok; } Modified: trunk/squid/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/dialogs.ycp?rev=46391&r1=46390&r2=46391&view=diff ============================================================================== --- trunk/squid/src/dialogs.ycp (original) +++ trunk/squid/src/dialogs.ycp Fri Apr 11 11:26:45 2008 @@ -57,7 +57,13 @@ `Left(`Label( _("Refresh Patterns"))), `HBox( `Table(`id("refresh_patterns"), `opt(`keepSorting, `notify), - `header(_("Regular Expression"), _("Min"), _("Precent"), _("Max")/*, _("Options")*/)), + `header(_("Regular Expression"), + // table header, stands for minimum + _("Min"), + // table header + _("Percent"), + // table header, stands for maximum + _("Max")/*, _("Options")*/)), `Top(`VBox( `PushButton(`id(`up), Label::UpButton()), `PushButton(`id(`down), Label::DownButton()) Modified: trunk/squid/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/helps.ycp?rev=46391&r1=46390&r2=46391&view=diff ============================================================================== --- trunk/squid/src/helps.ycp (original) +++ trunk/squid/src/helps.ycp Fri Apr 11 11:26:45 2008 @@ -142,7 +142,7 @@ "acl_groups" : _("<p>Access to Squid server can be controlled via <b>ACL Groups</b>.</p>") + _("<p><b>ACL Group</b> has various types and description of ACL Group depends -on them.</p>"), +on the particular type.</p>"), "http_access" : _("<p>In the <b>Access Control</b> table access can be denied or allowed to ACL Groups. If there are more ACL Groups in one line, it means that access will be allowed Modified: trunk/squid/src/store_del.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/store_del.ycp?rev=46391&r1=46390&r2=46391&view=diff ============================================================================== --- trunk/squid/src/store_del.ycp (original) +++ trunk/squid/src/store_del.ycp Fri Apr 11 11:26:45 2008 @@ -330,8 +330,8 @@ if (error){ ok = false; - Report::Error( _("ACL Group '") + name + _("' already exists with different type.\n") - + _("ACL Group '") + name + _("' has to have type '") + existed_type + "'.\n" + Report::Error( sformat (_("ACL Group '%1' already exists with different type.\n"), name) + + sformat (_("ACL Group '%1' has to have type '%2'.\n", name, existed_type) + _("If you want to change type of this ACL Group you must\ndelete other ACL Groups with same name before that.")); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org