Author: jsrain Date: Wed Apr 2 11:04:57 2008 New Revision: 45947 URL: http://svn.opensuse.org/viewcvs/yast?rev=45947&view=rev Log: fixed some texts (bnc #373131, bnc #373103, bnc #373109) Modified: trunk/squid/package/yast2-squid.changes trunk/squid/src/SquidACL.ycp trunk/squid/src/SquidACL_local_functions.ycp trunk/squid/src/helps.ycp Modified: trunk/squid/package/yast2-squid.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/package/yast2-squid.changes?rev=45947&r1=45946&r2=45947&view=diff ============================================================================== --- trunk/squid/package/yast2-squid.changes (original) +++ trunk/squid/package/yast2-squid.changes Wed Apr 2 11:04:57 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Apr 2 11:51:34 CEST 2008 - jsrain@suse.cz + +- fixed some texts (bnc #373131, bnc #373103, bnc #373109) + +------------------------------------------------------------------- Fri Mar 21 13:22:21 CET 2008 - jsrain@suse.cz - changed 'Accept' button to 'Finish' (fate #120373) Modified: trunk/squid/src/SquidACL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/SquidACL.ycp?rev=45947&r1=45946&r2=45947&view=diff ============================================================================== --- trunk/squid/src/SquidACL.ycp (original) +++ trunk/squid/src/SquidACL.ycp Wed Apr 2 11:04:57 2008 @@ -87,7 +87,7 @@ "widget_init" : srcWidgetInit, "verification" : srcVerif, "options" : srcOptions, - "help" : _("The IP address of the requesting client, or the clients IP Address.") ], + "help" : _("The IP address of the requesting client.") ], "dst" : $[ "name" : "dst", "widget" : `Frame( _("dst"), @@ -180,7 +180,7 @@ "widget_init" : myportWidgetInit, "verification" : myportVerif, "options" : portOptions, - "help" : _("This provides match against local socket TCP port.") ], + "help" : _("This provides match against local TCP port number.") ], "proto" : $[ "name" : "proto", "widget" : `Frame ( _("proto"), Modified: trunk/squid/src/SquidACL_local_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/SquidACL_local_functions.ycp?rev=45947&r1=45946&r2=45947&view=diff ============================================================================== --- trunk/squid/src/SquidACL_local_functions.ycp (original) +++ trunk/squid/src/SquidACL_local_functions.ycp Wed Apr 2 11:04:57 2008 @@ -311,7 +311,7 @@ if (selected_items == 0){ ok = false; - Report::Error( _("You must select at least on day.")); + Report::Error( _("You must select at least one day.")); }else if (!isHHMMFormat(from) || !isHHMMFormat(to)){ ok = false; Report::Error( _("Time is not filled in correct format.")); @@ -518,10 +518,12 @@ string mac = (string)UI::QueryWidget(`id("acl_mac"), `Value); if (size(mac) == 0){ ok = false; + // error report Report::Error( _("MAC Address must not be empty.")); }else if (!regexpmatch(mac, "^([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}$")){ ok = false; - Report::Error( _("Incorrect formar of MAC Address.")); + // error report + Report::Error( _("Incorrect format of MAC Address.")); } return ok; } Modified: trunk/squid/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/helps.ycp?rev=45947&r1=45946&r2=45947&view=diff ============================================================================== --- trunk/squid/src/helps.ycp (original) +++ trunk/squid/src/helps.ycp Wed Apr 2 11:04:57 2008 @@ -84,7 +84,7 @@ _("<p><b>Min</b> determines how long (in minutes) should be an object considered fresh if no explicit expire time given.") + _("<p><b>Percent</b> is percentage of the objects age (time since last -modification age) an object without explicit expire time will be +modification) an object without explicit expire time will be considered fresh.</p>") + _("<p><b>Max</b> is upper limit on how long objects without an explicit expiry time will be considered fresh.</p>"), @@ -144,9 +144,9 @@ _("<p><b>ACL Group</b> has various types and description of ACL Group depends on them.</p>"), "http_access" : -_("<p>In <b>Access Control</b> table can be denied or allowed ACL Groups. -If there is more ACL Groups in one line it means that access will be allowed -or denied for those who are from all ACL Groups at the same time.</p>") + +_("<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 +or denied for those who belong to all ACL Groups at the same time.</p>") + _("<p><b>Access Control</b> table is checked in the order listed here. The first entry which matches is used.</p>"), -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org