Author: jsrain Date: Fri Jul 8 13:13:30 2011 New Revision: 64772 URL: http://svn.opensuse.org/viewcvs/yast?rev=64772&view=rev Log: - fixed typo (bnc#703240) - fixed testsuite Modified: trunk/squid/VERSION trunk/squid/package/yast2-squid.changes trunk/squid/src/store_del.ycp trunk/squid/testsuite/tests/SquidErrorMessages.out Modified: trunk/squid/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/VERSION?rev=64772&r1=64771&r2=64772&view=diff ============================================================================== --- trunk/squid/VERSION (original) +++ trunk/squid/VERSION Fri Jul 8 13:13:30 2011 @@ -1 +1 @@ -2.21.0 +2.21.1 Modified: trunk/squid/package/yast2-squid.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/package/yast2-squid.changes?rev=64772&r1=64771&r2=64772&view=diff ============================================================================== --- trunk/squid/package/yast2-squid.changes (original) +++ trunk/squid/package/yast2-squid.changes Fri Jul 8 13:13:30 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 8 12:55:08 CEST 2011 - jsrain@suse.cz + +- fixed typo (bnc#703240) +- 2.21.1 + +------------------------------------------------------------------- Mon Jun 27 13:42:41 UTC 2011 - jreidinger@novell.com - use ButtonBox instead of HBox for OK/Cancel buttons (bnc#701271) Modified: trunk/squid/src/store_del.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/store_del.ycp?rev=64772&r1=64771&r2=64772&view=diff ============================================================================== --- trunk/squid/src/store_del.ycp (original) +++ trunk/squid/src/store_del.ycp Fri Jul 8 13:13:30 2011 @@ -336,12 +336,12 @@ } } - //verification where name is changed and this ACL has 1 occurence + //verification where name is changed and this ACL has 1 occurrence if (ok && id_item != nil && old_name != name && Squid::NumACLs(id_item) == 1){ //test if changed ACL is used in http_access option. if (size(affected_options) > 0 && contains(affected_options, "http_access")){ Report::Error( _("You can not change name of this ACL Group, because \nit's used in Access Control table.\n") - + _("If you want to change name of this ACL Group you must\ndelete all of its occurences in Access Control table.")); + + _("If you want to change name of this ACL Group you must\ndelete all of its occurrences in Access Control table.")); ok = false; }else //test if changed ACL is used in other option (not managed by thid module) @@ -374,7 +374,7 @@ /** * Delete ACL with id id_item. - * If ACL has only one occurence (one definition line) in config file and + * If ACL has only one occurrence (one definition line) in config file and * ACL is used by any option (http_access, no_cache ...) than user is asked * if he really want to delete the ACL. If option 'http_access' uses this ACL * than it's unaccepted to delete the ACL. @@ -391,7 +391,7 @@ if (contains(affected_options, "http_access")){ //Report::Error( _("This ACL Group can't be deleted.\nIt's used in Access Control table.")); Report::Error( _("You must not delete this ACL Group, because \nit's used in Access Control table.\n") - + _("If you want to change name of this ACL Group you must\ndelete all of its occurences in Access Control table.")); + + _("If you want to change name of this ACL Group you must\ndelete all of its occurrences in Access Control table.")); }else{ string message = _("If you delete this ACL Group these options might be affected: \n") + " " + mergestring(affected_options, ",\n ") + ".\n";// + Modified: trunk/squid/testsuite/tests/SquidErrorMessages.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/testsuite/tests/SquidErrorMessages.out?rev=64772&r1=64771&r2=64772&view=diff ============================================================================== --- trunk/squid/testsuite/tests/SquidErrorMessages.out (original) +++ trunk/squid/testsuite/tests/SquidErrorMessages.out Fri Jul 8 13:13:30 2011 @@ -3,7 +3,7 @@ Return ["English", "Russian-1251", "Simplify Chinese"] Dump Dump GetLanguagesToComboBox() -Return [`item (`id ("English"), "English"), `item (`id ("Russian-1251"), "Russian-1251"), `item (`id ("Simplify Chinese"), "Simplify Chinese")] +Return [`item (`id ("English"), "English"), `item (`id ("Russian-1251"), "Russian-1251"), `item (`id ("Simplify Chinese"), "Simplified Chinese")] Dump Dump GetPath("English") Return /usr/share/squid/errors/English -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org