2002/css-validator/org/w3c/css/util ApplContext.java,1.4,1.5 Codecs.java,1.2,1.3 Date.java,1.2,1.3 FakeFile.java,1.2,1.3 HTTPURL.java,1.14,1.15 InvalidParamException.java,1.2,1.3 Messages.properties,1.6,1.7 Messages.properties.de,1.15,1.16 Messages.properties.en,1.9,1.10 Messages.properties.es,1.2,1.3 Messages.properties.fr,1.10,1.11 Messages.properties.ja,1.5,1.6 Messages.properties.ja.EUCJIS,1.5,1.6 Messages.properties.nl,1.8,1.9 Messages.properties.zh,1.5,1.6 Messages.properties.zh-cn,1.5,1.6 Messages.properties.zh-cn.GB,1.5,1.6

Update of /sources/public/2002/css-validator/org/w3c/css/util
In directory hutz:/tmp/cvs-serv27412/org/w3c/css/util

Modified Files:
	ApplContext.java Codecs.java Date.java FakeFile.java 
	HTTPURL.java InvalidParamException.java Messages.properties 
	Messages.properties.de Messages.properties.en 
	Messages.properties.es Messages.properties.fr 
	Messages.properties.ja Messages.properties.ja.EUCJIS 
	Messages.properties.nl Messages.properties.zh 
	Messages.properties.zh-cn Messages.properties.zh-cn.GB 
Log Message:
All those changed made by Jean-Guilhem Rouel:

Huge patch, imports fixed (automatic)
Bug fixed: 372, 920, 778, 287, 696, 764, 233
Partial bug fix for 289

Issue with "inherit" in CSS2.
The validator now checks the number of values (extraneous values were previously ignored)




Index: Messages.properties.ja
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/Messages.properties.ja,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Messages.properties.ja	12 Jul 2005 13:09:47 -0000	1.5
+++ Messages.properties.ja	8 Aug 2005 13:19:46 -0000	1.6
@@ -50,7 +50,7 @@
 warning.relative: %s プロパティに相対指定の単位を使うことで、より強固なスタイルシートを作る事ができます
 
 # used by org.w3c.css.css.StyleSheetParser and org.w3c.css.css.StyleSheetXMLParser
-warning.at-rule: 申し訳ありませんが、at-rule %s はまだ実装されていません。
+error.at-rule: 申し訳ありませんが、at-rule %s はまだ実装されていません。
 
 # used by all properties and values
 error.operator: %s は正しい演算子 (operator) ではありません

Index: Messages.properties
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/Messages.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Messages.properties	9 Feb 2004 08:25:12 -0000	1.6
+++ Messages.properties	8 Aug 2005 13:19:46 -0000	1.7
@@ -40,7 +40,7 @@
 warning.relative: Using relative units gives more robust stylesheets in property %s
 
 # used by org.w3c.css.css.StyleSheetParser and org.w3c.css.css.StyleSheetXMLParser
-warning.at-rule: Sorry, the at-rule %s is not implemented.
+error.at-rule: Sorry, the at-rule %s is not implemented.
 
 # used by all properties and values
 error.operator: %s is an incorrect operator

Index: Messages.properties.de
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/Messages.properties.de,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Messages.properties.de	12 Jul 2005 13:09:47 -0000	1.15
+++ Messages.properties.de	8 Aug 2005 13:19:46 -0000	1.16
@@ -43,7 +43,7 @@
 warning.relative: Die Verwendung von relativen Einheiten bei der Eigenschaft %s führt zu robusteren Stylesheets
 
 # used by org.w3c.css.css.StyleSheetParser and org.w3c.css.css.StyleSheetXMLParser
-warning.at-rule: Leider ist die At-Regel %s nicht implementiert.
+error.at-rule: Leider ist die At-Regel %s nicht implementiert.
 
 # used by all properties and values
 error.operator: %s ist kein ungültiger Operator

Index: HTTPURL.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/HTTPURL.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- HTTPURL.java	22 Jul 2005 09:45:18 -0000	1.14
+++ HTTPURL.java	8 Aug 2005 13:19:46 -0000	1.15
@@ -8,8 +8,14 @@
  */
 package org.w3c.css.util;
 
-import java.io.*;
-import java.net.*;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.ProtocolException;
+import java.net.URL;
+import java.net.URLConnection;
 
 /**
  * @version $Revision$

Index: Messages.properties.en
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/Messages.properties.en,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Messages.properties.en	12 Jul 2005 13:09:47 -0000	1.9
+++ Messages.properties.en	8 Aug 2005 13:19:46 -0000	1.10
@@ -44,7 +44,7 @@
 warning.relative: Using relative units gives more robust stylesheets in property %s
 
 # used by org.w3c.css.css.StyleSheetParser and org.w3c.css.css.StyleSheetXMLParser
-warning.at-rule: Sorry, the at-rule %s is not implemented.
+error.at-rule: Sorry, the at-rule %s is not implemented.
 
 # used by all properties and values
 error.operator: %s is an incorrect operator

Index: Messages.properties.nl
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/Messages.properties.nl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Messages.properties.nl	12 Jul 2005 13:09:47 -0000	1.8
+++ Messages.properties.nl	8 Aug 2005 13:19:46 -0000	1.9
@@ -45,7 +45,7 @@
 warning.relative: Het gebruik van relatieve maten geeft robuustere stylesheets bij de eigenschap %s
 
 # gebruikt door org.w3c.css.css.StyleSheetParser and org.w3c.css.css.StyleSheetXMLParser
-warning.at-rule: Sorry, de at-regel %s is niet geimplementeerd.
+error.at-rule: Sorry, de at-regel %s is niet geimplementeerd.
 
 # gebruikt voor alle eigenschappen en waarden
 error.operator: %s is een incorrecte operator

Index: Messages.properties.es
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/Messages.properties.es,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Messages.properties.es	12 Jul 2005 13:09:47 -0000	1.2
+++ Messages.properties.es	8 Aug 2005 13:19:46 -0000	1.3
@@ -45,7 +45,7 @@
 warning.relative: Utilizar unidades relativas da lugar a hojas de estilo más robustas en la propiedad %s
 
 # used by org.w3c.css.css.StyleSheetParser and org.w3c.css.css.StyleSheetXMLParser
-warning.at-rule: Lo lamentamos, la regla-arroba %s no está implementada.
+error.at-rule: Lo lamentamos, la regla-arroba %s no está implementada.
 
 # used by all properties and values
 error.operator: %s es un operador incorrecto

Index: FakeFile.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/FakeFile.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FakeFile.java	8 Apr 2002 21:19:15 -0000	1.2
+++ FakeFile.java	8 Aug 2005 13:19:46 -0000	1.3
@@ -6,15 +6,25 @@
 // Please first read the full copyright statement in file COPYRIGHT.html
 /*
  * $Log$
+ * Revision 1.3  2005/08/08 13:19:46  ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
  * Revision 1.2  2002/04/08 21:19:15  plehegar
  * New
  *
  */
 package org.w3c.css.util;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.ByteArrayInputStream;
 
 /**
  * @version $Revision$

Index: Codecs.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/Codecs.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Codecs.java	8 Apr 2002 21:19:15 -0000	1.2
+++ Codecs.java	8 Aug 2005 13:19:46 -0000	1.3
@@ -38,12 +38,7 @@
 
 package org.w3c.css.util;
 
-import java.util.BitSet;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
 
 /**
  * This class collects various encoders and decoders.

Index: Messages.properties.fr
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/Messages.properties.fr,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Messages.properties.fr	12 Jul 2005 13:09:47 -0000	1.10
+++ Messages.properties.fr	8 Aug 2005 13:19:46 -0000	1.11
@@ -43,7 +43,7 @@
 "bloc".
 
 # used by org.w3c.css.parser.Frame
-warning.no-declaration: Pas de déclarations dans cette rèle
+warning.no-declaration: Pas de déclarations dans cette règle
 
 # used by org.w3c.css.values.CssColor
 warning.out-of-range: %s est hors-limites
@@ -57,7 +57,7 @@
 %s rend la feuille de style plus robuste
 
 # used by org.w3c.css.css.StyleSheetParser and org.w3c.css.css.StyleSheetXMLParser
-warning.at-rule: Désolé mais la règle-arobase %s n'est pas implementée
+error.at-rule: Désolé mais la règle-arobase %s n'est pas implementée
 
 # used by all properties and values
 error.operator: %s n'est pas un opérateur correct

Index: Messages.properties.ja.EUCJIS
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/Messages.properties.ja.EUCJIS,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Messages.properties.ja.EUCJIS	12 Jul 2005 13:09:47 -0000	1.5
+++ Messages.properties.ja.EUCJIS	8 Aug 2005 13:19:46 -0000	1.6
@@ -6,172 +6,172 @@
 # You can change the level warning like this (example) :
 # warning.redefinition.level: 5
 #  level is an integer between 0 and 9 (all others values are ignored)
-warning.redefinition: %s Ƥޤ
+warning.redefinition: %s ������d���Ƥ��ޤ�
 
 # used by org.w3c.css.properties.Css1Style
-warning.same-colors: %s  %s ƱǤ
-warning.no-color: ꤵ줿طʿ(background-color)б̿(color)ꤵƤޤ
-warning.no-background-color: ꤵ줿̿(color)бطʿ(background-color)ꤵƤޤ
-warning.color.mixed-capitalization: ̾ʸʸζ̤Ϥޤ󤬡\
-̤̾䤹뤿ᡢʸ򺮤ƻȤ侩ޤ: %s
-warning.no-generic-family: %s: ̥եȥեߥ꡼̾\
-(generic font family)ǸȤդäƤ侩ޤ
-warning.with-space: ʸޤեȥեߥ꡼̾ϰǰϤɬפ\
-ޤά硢̾ζʸ̵뤵졢ޤ\
-̾˴ޤޤϢ³ʸưĤζʸѴޤ
-warning.no-padding: طʿ(background-color)ä padding ΰ侩ޤ
-warning.same-colors2: ĤΥƥ %s  %s ǡƱ̿\
-(color) طʿ (background-color) ˻ȤƤޤ
-warning.relative-absolute: %s ˤĹˤĤơ\
-ͻͻ꤬ȤѤƤޤ\
-Ϥޤϴ(robust)ʥ륷ȤǤϤޤ
+warning.same-colors: %s �� %s ��Ʊ�����Ǥ�
+warning.no-color: ���ꤵ�줿�طʿ�(background-color)���б�����p�̿�(color)�����ꤵ��Ƥ��ޤ���
+warning.no-background-color: ���ꤵ�줿t�̿�(color)���б������طʿ�(background-color)�����ꤵ��Ƥ��ޤ���
+warning.color.mixed-capitalization: ����̾p����ʸ��ʸ��ζ��̤Ϥ���ޤ��󤬡�\
+̾p������̤��䤹�����뤿�ᡢ��ʸ��򺮤��ƻȤ���侩����ޤ�: %s
+warning.no-generic-family: %s: ���̥ե���ȥե��ߥ꡼̾\
+(generic font family)��Ǹ��j���Ȥ����դ��ä��Ƥ������侩���ޤ�
+warning.with-space: ����ʸ���ޤ�ե���ȥե��ߥ꡼̾�ϰ�����ǰϤ�ɬ�פ�\
+����ޤ�����������ά������硢̾p��p��ζ���ʸ���̵�뤵�졢�ޤ�\
+̾p������˴ޤޤ��Ϣ³��������ʸ���t�ư�Ĥζ���ʸ����Ѵ�����ޤ�
+warning.no-padding: �طʿ�(background-color)���ä� padding �ΰ������侩���ޤ�
+warning.same-colors2: ��ĤΥ���ƥ����� %s �� %s �ǡ�Ʊ������p�̿�\
+(color) ���طʿ� (background-color) �˻Ȥ��Ƥ��ޤ�
+warning.relative-absolute: %s �ˤ�����Ĺ������ˤĤ��ơ�\
+�����ͻ���������ͻ��꤬�Ȥ���Ѥ����Ƥ��ޤ���\
+����Ϥ��ޤ��ϴ(robust)�ʥ������륷���ȤǤϤ���ޤ���
 
 # used by org.w3c.css.properties.CssSelectors
-warning.unknown-html: %s HTMLǤǤϤޤ
-warning.html-inside: HTML Ǥ¾˴ޤळȤϤǤޤ
-warning.body-inside: BODY Ǥ HTML ǰʳ¾˴ޤϤǤޤ
-warning.pseudo-classes: 󥫡(Anchor) 饹 %s ϡ'A' ǰʳ¾Ǥˤϸ̤ޤ
+warning.unknown-html: %s ��HTML�����ǤǤϤ���ޤ���
+warning.html-inside: HTML ���Ǥ�¾��������˴ޤळ�ȤϤǤ��ޤ���
+warning.body-inside: BODY ���Ǥ� HTML ���ǰʳ���¾��������˴ޤ��ϤǤ��ޤ���
+warning.pseudo-classes: ���󥫡�(Anchor) ����饹 %s �ϡ�'A' ���ǰʳ���¾�����Ǥˤϸ�̤�����ޤ���
 
 # not used by org.w3c.css.properties.CssSelectors for the moment
-warning.noinside: %s ϥ饤˴ޤळȤϤǤޤ
-warning.withblock: դƲ - Ǥϥ֥å٥ǤˤΤդǤޤ
-warning.block-level: Υץѥƥϥ֥å٥ǤŬѤޤ
+warning.noinside: %s �ϥ���饤��������˴ޤळ�ȤϤǤ��ޤ���
+warning.withblock: ��դ��Ʋ����� - �������Ǥϥ֥�å���٥����ǤˤΤ��դ����Ǥ��ޤ�
+warning.block-level: ���Υץ�ѥƥ��ϥ֥�å���٥����Ǥ�Ŭ�Ѥ���ޤ�
 
 # used by org.w3c.css.parser.Frame
-warning.no-declaration: (declarations)롼¸ߤޤ
+warning.no-declaration: ���(declarations)���롼�����¸�ߤ��ޤ���
 
 # used by org.w3c.css.values.CssColor
-warning.out-of-range: %s ϻǽϰϤۤƤޤ
-error.invalid-color:  RGB ؿλǤϤޤ
+warning.out-of-range: %s �ϻ����ǽ�ϰϤ�ۤ��Ƥ��ޤ�
+error.invalid-color: 5���� RGB �ؿ�λ���ǤϤ���ޤ���
 
-warning.marker: marker-offset ץѥƥϡ'display: marker' ǤˤΤŬѤޤ
+warning.marker: marker-offset �ץ�ѥƥ��ϡ�'display: marker' ���ǤˤΤ�Ŭ�Ѥ���ޤ�
 
 # used by org.w3c.css.properties.ACssStyle
-warning.relative: %s ץѥƥлñ̤ȤȤǡ궯Ǥʥ륷ȤǤޤ
+warning.relative: %s �ץ�ѥƥ������л����ñ�̤�Ȥ����Ȥǡ���궯�Ǥʥ������륷���Ȥ����Ǥ��ޤ�
 
 # used by org.w3c.css.css.StyleSheetParser and org.w3c.css.css.StyleSheetXMLParser
-warning.at-rule: ޤ󤬡at-rule %s ϤޤƤޤ
+error.at-rule: �������ޤ��󤬡�at-rule %s �Ϥޤ<����Ƥ��ޤ���
 
 # used by all properties and values
-error.operator: %s 黻 (operator) ǤϤޤ
-error.negative-value: %s ͤϻȤޤ
-error.few-value: %s ץѥƥͤʤޤ
+error.operator: %s ��5�����黻�� (operator) �ǤϤ���ޤ���
+error.negative-value: %s ������ͤϻȤ��ޤ���
+error.few-value: %s �ץ�ѥƥ����ͤ����ʤ����ޤ�
 
 # be careful here, values comes first
 # You can't write something like this : For the color, blue is an incorrect value
-error.value: %s  %s ѤǤͤǤϤޤ
+error.value: %s �� %s �����ѤǤ����ͤǤϤ���ޤ���
 
 # used by org.w3c.css.properties.CssTextDecoration
-error.same-value: %s иޤ
+error.same-value: %s �����и����ޤ���
 
-error.generic-family.quote: ̥եȥեߥ꡼̾(Generic font family)\
-ϥɤʤΤǡǰϤϤǤޤ
+error.generic-family.quote: ���̥ե���ȥե��ߥ꡼̾(Generic font family)\
+�ϥ�����ɤʤΤǡ�������ǰϤ��ϤǤ��ޤ���
 
 # used by org.w3c.css.properties.CssClip
-error.shape: ְä꤬ rect(<top>,<right>,<bottom>,<left>) ˤʤƤޤ
-error.shape-separator: ζڤʸޤ\
-ϥ(,)Ǥɬפޤ
+error.shape: �ְ�ä��~���꤬ rect(<top>,<right>,<bottom>,<left>) �ˤʤ���Ƥ��ޤ�
+error.shape-separator: �~����ζ��ڤ�ʸ��5��������ޤ���\
+����ϥ����(,)�Ǥ���ɬ�פ�����ޤ�
 
 # used by org.w3c.css.properties.CssContent
-error.attr: °ְäƤޤ attr(X)
-error.counter: 󥿡ְäƤޤ counter(<identifier>[,<list-style-type>]?)
-error.counters: 󥿡ְäƤޤ counters(<identifier>,<string>[,<list-style-type>]?)
+error.attr: °-����d��ְ�äƤ��ޤ� attr(X)
+error.counter: �����󥿡���d��ְ�äƤ��ޤ� counter(<identifier>[,<list-style-type>]?)
+error.counters: �����󥿡���d��ְ�äƤ��ޤ� counters(<identifier>,<string>[,<list-style-type>]?)
 
 # used by org.w3c.css.font.Src
-error.format: եޥåְäƤޤ format(<string>[,<string>]*)
-error.local: եޥåְäƤޤ local(<string>|<ident>+)
+error.format: �ե����ޥå���d��ְ�äƤ��ޤ� format(<string>[,<string>]*)
+error.local: �ե����ޥå���d��ְ�äƤ��ޤ� local(<string>|<ident>+)
 
 # used by org.w3c.css.values.CssAngle, org.w3c.css.values.CssFrequency, org.w3c.css.values.CssTime, org.w3c.css.values.CssLength
-error.unit: %s ñ̤ǤϤޤ
+error.unit: %s ��5����ñ�̤ǤϤ���ޤ���
 
 # used by org.w3c.css.aural.ACssAzimuth
-error.degree: position  degrees ǻꤹɬפޤ
+error.degree: position �� degrees �ǻ��ꤹ��ɬ�פ�����ޤ���
 
 # used by org.w3c.css.aural.ACssElevation
-error.elevation.range: elevation  '-90deg'  '90deg' ϰϤγ٤ǻꤷƤ
+error.elevation.range: elevation �� '-90deg' ���� '90deg' ���ϰϤγ��٤ǻ��ꤷ�Ƥ��$���
 
 # used by org.w3c.css.aural.ACssPitchRange
-error.range: ͤǽϰϤۤƤޤͤ '0'  '100' δ֤ǻꤷƤ
+error.range: �ͤ������ǽ�ϰϤ�ۤ��Ƥ��ޤ��������ͤ� '0' ���� '100' �δ֤ǻ��ꤷ�Ƥ��$���
 
 # used by org.w3c.css.properties.CssTextShadow
-error.two-lengths: shadow offset Ĥ <legnth> ͤǻꤹɬפޤ\
-(blur radius ϡ shadow offset θ˥ץȤƻǤޤ)
+error.two-lengths: shadow offset ����Ĥ� <legnth> �ͤǻ��ꤹ��ɬ�פ�����ޤ���\
+(blur radius �ϡ� shadow offset �θ�˥��ץ����Ȥ��ƻ���Ǥ��ޤ���)
 
-error.integer: οǤɬפޤ
-error.comma: (,)ڤʸޤ
+error.integer: ���ο���0��Ǥ���ɬ�פ�����ޤ�
+error.comma: �����(,)���ڤ�ʸ����ޤ���
 
 # used by org.w3c.css.values.CssPercentage
-error.percent: %s ѡȻǤϤޤ
+error.percent: %s ��5�����ѡ�����Ȼ���ǤϤ���ޤ���
 
 # used by org.w3c.css.values.CssString
-error.string: %s ʸǤϤޤ
+error.string: %s ��5����ʸ����ǤϤ���ޤ���
 
 # used by org.w3c.css.values.CssURL
-error.url: %s URLǤϤޤ
+error.url: %s ��5����URL�ǤϤ���ޤ���
 
 # used by org.w3c.css.values.CssColor
-error.rgb: %s ϡ3ޤ6Ĥ16ʿοˤλǤϤޤ
+error.rgb: %s �ϡ�3�ޤ���6�Ĥ�16�ʿ�ο��ˤ��5�������λ���ǤϤ���ޤ���
 
 # used by org.w3c.css.values.CssNumber
-error.zero: %s ˤ 0 Ȥޤθˤñ̤ɬפޤ
+error.zero: %s �ˤ� 0 �$����Ȥ��ޤ������θ�ˤ�ñ�̤������ɬ�פ�����ޤ�
 
 # used by org.w3c.css.parser.CssPropertyFactory
-error.noexistence: ץѥƥ %s ¸ߤޤ
-error.noexistence-media: ץѥƥ %s ϥǥ %s ˤ¸ߤޤ
-warning.noexistence-media: ץѥƥ %s ϥǥ %s ˤ¸ߤޤ
+error.noexistence: �ץ�ѥƥ� %s ��¸�ߤ��ޤ���
+error.noexistence-media: �ץ�ѥƥ� %s �ϥ�ǥ��� %s �ˤ�¸�ߤ��ޤ���
+warning.noexistence-media: �ץ�ѥƥ� %s �ϥ�ǥ��� %s �ˤ�¸�ߤ��ޤ���
 
 # used by org.w3c.css.parser.CssFouffa
-error.unrecognize: ͤ¿뤫⤷ͤϤǤޤ
+error.unrecognize: �ͤ�¿�����뤫���⤷�����ͤ����ϤǤ��ޤ���
 
 # used by org.w3c.css.parser.CssFouffa
-generator.unrecognize: ʸˡϥ顼ȯޤ
+generator.unrecognize: ʸˡ���ϥ��顼��ȯ8���ޤ���
 
 # used by org.w3c.css.parser.CssSelectors
-error.pseudo-element:  :%s ϥƥ %s ΤξǤϻȤޤ
-error.pseudo-class: 饹 .%s  HTMLƥ %s ΤξǤϻȤޤ
-error.pseudo: ̤ΤεǤޤϵ饹Ǥ
-error.id: ID 쥯 #%s ϴְäƤޤ!\
-ñ㥻쥯 (simple selector) %s ˤϰĤID쥯Ǥޤ
-error.space: °쥯 (attriubte selector) ~= ѤƤ硢\
- %s θ϶ʸޤϤǤޤ
-error.todo : ޤ󤬡feature %s ϤޤƤޤ
-error.incompatible: %s  %s ϸߴޤ
+error.pseudo-element: �������� :%s �ϥ���ƥ����� %s ��Τ��ξ��ǤϻȤ��ޤ���
+error.pseudo-class: ����饹 .%s �� HTML����ƥ����� %s ��Τ��ξ��ǤϻȤ��ޤ���
+error.pseudo: ̤�Τε������Ǥޤ��ϵ���饹�Ǥ�
+error.id: ID ���쥯�� #%s �ϴְ�äƤ��ޤ�!\
+ñ�㥻�쥯�� (simple selector) %s �ˤϰ�Ĥ�ID���쥯����������Ǥ��ޤ���
+error.space: °-���쥯�� (attriubte selector) ~= ���Ѥ����Ƥ����硢\
+�� %s ����θ�϶���ʸ���ޤ��ϤǤ��ޤ���
+error.todo : �������ޤ��󤬡�feature %s �Ϥޤ<����Ƥ��ޤ���
+error.incompatible: %s �� %s �ϸߴ�-������ޤ���
 
-error.media: ǧǤʤǥ %s ꤵƤޤ
-error.page: ǧǤʤ̾դڡ(psuedo named page) %s ꤵƤޤ
+error.media: ǧ���Ǥ��ʤ���ǥ��� %s �����ꤵ��Ƥ��ޤ�
+error.page: ǧ���Ǥ��ʤ�����̾p�դ��ڡ���(psuedo named page) %s �����ꤵ��Ƥ��ޤ�
 
 
 # used by StyleSheetGeneratorHTML
-generator.context: ƥ
-generator.request: ꤵƥ륷Ȥν˥顼ȯޤ\
-ꥯȤ뤫plh@w3.org ˥᡼äƤ
-generator.unrecognized: ǧǤޤ
-generator.invalid-number: ǤϤޤ
-generator.property: Υץѥƥޤ
-generator.line: ֹ
-generator.not-found: ե뤬Ĥޤ
+generator.context: ����ƥ�����
+generator.request: ���ꤵ��ƥ������륷���Ȥν�����˥��顼��ȯ8���ޤ�����\
+�ꥯ�����Ȥ�5���뤫��plh@w3.org �˥᡼�����äƤ��$�����
+generator.unrecognized: ǧ���Ǥ��ޤ���
+generator.invalid-number: 5�������ǤϤ���ޤ���
+generator.property: ���Υץ�ѥƥ���5��������ޤ���
+generator.line: ���ֹ�
+generator.not-found: �ե����뤬���Ĥ���ޤ���
 generator.doc-html: <p>\
-CSS륷Ȥտޤ̤˵ǽˤϡʸڤɬפǤ\
-Ĥޤꡢ<a href="http://validator.w3.org/check?uri=%s"><span lang="en">(valid)</span>\
-HTML</a>ȶˡCSS륷ȤѤɬפޤ\
+CSS�������륷���Ȥ�տޤ����̤�˵�ǽ������ˤϡ�5����ʸ������ڤ�ɬ�פǤ���\
+�Ĥޤꡢ<a href="http://validator.w3.org/check?uri=%s">5��<span lang="en">(valid)</span>\
+��HTML</a>�ȶ��ˡ�CSS�������륷���Ȥ��Ѥ���ɬ�פ�����ޤ���\
 </p>
 
 generator.doc:<p>\
-CSS륷Ȥտޤ̤˵ǽˤϡʸڤɬפǤ\
-Ĥޤꡢ<a href="http://validator.w3.org/"><span lang="en">(valid)</span>\
-HTML</a>ʸȶˡ\
-CSS륷ȤѤɬפޤ\
+CSS�������륷���Ȥ�տޤ����̤�˵�ǽ������ˤϡ�5����ʸ������ڤ�ɬ�פǤ���\
+�Ĥޤꡢ<a href="http://validator.w3.org/">5��<span lang="en">(valid)</span>\
+��HTML</a>ʸ��ȶ��ˡ�\
+CSS�������륷���Ȥ��Ѥ���ɬ�פ�����ޤ���\
 </p>
 
 # used by the parser
-parser.semi-colon: ץѥƥ̾˥ߥ(;)ɲäƤߤƲ
+parser.semi-colon: �ץ�ѥƥ�̾��p�˥��ߥ����(;)���ɲä��ƤߤƲ�����
 
-parser.old_class: CSS1Ǥϡ dimension (".55in") Ǥʤ¤ꡢ饹̾Ͽ (".55ft") ϤޤǤޤ\
-CSS2ǤϡΤ褦ʥ饹̤Τ dimension ȤƲϤޤ(ϡ迷ñ̤ɲäǽݤĤǤ)
+parser.old_class: CSS1�Ǥϡ� dimension (".55in") �Ǥʤ��¤ꡢ���饹̾�Ͽ��� (".55ft") ����Ϥޤ��Ǥ��ޤ���\
+CSS2�Ǥϡ����Τ褦�ʥ��饹��̤�Τ� dimension �Ȥ��Ʋ��Ϥ���ޤ���(����ϡ����迷����ñ�̤��ɲä�����ǽ-���ݤĤ���Ǥ�)
 
 # used by the servlet
-servlet.invalid-request: ꥯȤǤϤޤ
-servlet.process: ꤵ줿֥ȤϽǤޤ
+servlet.invalid-request: 5�����ꥯ�����ȤǤϤ���ޤ���
+servlet.process: ���ꤵ�줿���֥������ȤϽ���Ǥ��ޤ���
 
 error.unrecognized.link: Unrecognized link element or xml-stylesheet PI.
 

Index: Messages.properties.zh
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/Messages.properties.zh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Messages.properties.zh	12 Jul 2005 13:09:47 -0000	1.5
+++ Messages.properties.zh	8 Aug 2005 13:19:46 -0000	1.6
@@ -43,7 +43,7 @@
 warning.relative: ÔÚÊôÐÔ %s ʹÓÃÏà¶Ôµ¥Î»ÁîÑùʽ±í¸ü¼Ó°ô
 
 # used by org.w3c.css.css.StyleSheetParser and org.w3c.css.css.StyleSheetXMLParser
-warning.at-rule: ¶Ô²»Æð£¬'@¹æÔò' %s ²»ÄÜÓ¦ÓÃ
+error.at-rule: ¶Ô²»Æð£¬'@¹æÔò' %s ²»ÄÜÓ¦ÓÃ
 
 # used by all properties and values
 error.operator: %s ÊÇÒ»¸ö´íÎóµÄÔËËã·û

Index: ApplContext.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/ApplContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ApplContext.java	12 Jul 2005 13:14:49 -0000	1.4
+++ ApplContext.java	8 Aug 2005 13:19:46 -0000	1.5
@@ -9,11 +9,8 @@
 package org.w3c.css.util;
 
 import java.nio.charset.Charset;
-import java.nio.charset.IllegalCharsetNameException;
-import java.util.StringTokenizer;
 
 import org.w3c.css.parser.Frame;
-import org.w3c.www.http.HttpAccept;
 import org.w3c.www.http.HttpAcceptCharset;
 import org.w3c.www.http.HttpAcceptCharsetList;
 import org.w3c.www.http.HttpFactory;

Index: Date.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/Date.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Date.java	8 Apr 2002 21:19:15 -0000	1.2
+++ Date.java	8 Aug 2005 13:19:46 -0000	1.3
@@ -13,10 +13,10 @@
 
 package org.w3c.css.util;
 
-import java.util.GregorianCalendar;
-import java.util.TimeZone;
 import java.util.Calendar;
+import java.util.GregorianCalendar;
 import java.util.Locale;
+import java.util.TimeZone;
 
 public class Date {
   protected static String days[] = { "Sun", "Mon", "Tue", "Wed",

Index: Messages.properties.zh-cn.GB
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/Messages.properties.zh-cn.GB,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Messages.properties.zh-cn.GB	12 Jul 2005 13:09:47 -0000	1.5
+++ Messages.properties.zh-cn.GB	8 Aug 2005 13:19:46 -0000	1.6
@@ -6,158 +6,158 @@
 # You can change the level warning like this (example) :
 # warning.redefinition.level: 5
 #  level is an integer between 0 and 9 (all others values are ignored)
-warning.redefinition: ض %s
+warning.redefinition: �ض����� %s
 
 # used by org.w3c.css.properties.Css1Style
-warning.same-colors: һɫ %s  %s
-warning.no-color: ûΪıɫ(ǰ)ɫ
+warning.same-colors: һ�����ɫ���� %s �� %s
+warning.no-color: ��û��Ϊ��ı���ɫ����(ǰ��)��ɫ
 warning.color.mixed-capitalization: Although color names are case-insensitive, it is recommended to use the mixed capitalization, to make the names more legible: %s
-warning.no-background-color: ûΪ(ǰ)ɫñɫ
-warning.no-generic-family: %s: ָһΪѡ
-warning.with-space: հ׵ӦðޢޢСʡˣκ \
-ǰĿհ׷ŶᱻԶĿհ \
-ŻᱻתΪһո
-warning.no-padding: ʹбɫĸ(padding area)
-warning.same-colors2: ɫͱɫʹͬɫ %s  %s
-warning.relative-absolute:  %s ʹһЩԺԳȡⲻǰʽ
+warning.no-background-color: ��û��Ϊ���(ǰ��)��ɫ���ñ���ɫ
+warning.no-generic-family: %s: ������ָ��һ�����������Ϊ����ѡ��
+warning.with-space: ��հ׵�������Ӧ�ð���ޢޢ�С����ʡ���ˣ��κ� \
+����ǰ���Ŀհ׷�Ŷ��ᱻ���Զ�����������l��Ŀհ� \
+��Żᱻת��Ϊ��һ��ո�
+warning.no-padding: ������ʹ���б���ɫ�ĸ�������(padding area)
+warning.same-colors2: ��ɫ�ͱ�����ɫʹ������ͬ����ɫ %s �� %s
+warning.relative-absolute: ���� %s ʹ����һЩ��Ժ���Գ��ȡ��ⲻ�ǰ����ʽ��
 
 # used by org.w3c.css.properties.CssSelectors
-warning.unknown-html: %s HTMLԪ
-warning.html-inside: HTML ԪزǶԪ
-warning.body-inside: BODY ԪزǶڳHTMLԪصԪ
-warning.pseudo-classes: λêα %s ˶'A'⣬ԪûЧ
+warning.unknown-html: %s ����HTMLԪ��
+warning.html-inside: HTML Ԫ�ز���Ƕ������Ԫ����
+warning.body-inside: BODY Ԫ�ز���Ƕ�ڳ���HTMLԪ�ص�����Ԫ����
+warning.pseudo-classes: ��λêα�� %s ���˶�'A'�⣬��Ԫ����û��Ч��
 
 # not used by org.w3c.css.properties.CssSelectors for the moment
-warning.noinside: %s ǶԪ
-warning.withblock: СġαԪֻܸڿ鼶Ԫ
-warning.block-level: Ӧڿ鼶Ԫ
+warning.noinside: %s ����Ƕ����jԪ����
+warning.withblock: ��С�ġ�αԪ��ֻ�ܸ��ڿ鼶Ԫ����
+warning.block-level: �������Ӧ���ڿ鼶Ԫ��
 
 # used by org.w3c.css.parser.Frame
-warning.no-declaration: ڹû
+warning.no-declaration: �ڹ�����û������
 
 # used by org.w3c.css.values.CssColor
-warning.out-of-range: %s Χ
+warning.out-of-range: %s ����Χ
 
 warning.marker: The marker-offset property applies on elements with 'display: marker'
 
 # used by org.w3c.css.properties.ACssStyle
-warning.relative:  %s ʹԵλʽӰ
+warning.relative: ������ %s ʹ����Ե�λ����ʽ���Ӱ�
 
 # used by org.w3c.css.css.StyleSheetParser and org.w3c.css.css.StyleSheetXMLParser
-warning.at-rule: Բ'@' %s Ӧ
+error.at-rule: �Բ���'@����' %s ����Ӧ��
 
 # used by all properties and values
-error.operator: %s һ
-error.negative-value: %s ʹøֵ
-error.few-value:  %s ֵ̫С
+error.operator: %s ��һ�����������
+error.negative-value: %s ������ʹ�ø�ֵ
+error.few-value: ���� %s ��ֵ̫С
 
 # be careful here, values comes first
 # You can't write something like this : For the color, blue is an incorrect value
-error.value: %s һ %s ֵ
+error.value: %s ����һ�� %s ֵ
 
 error.generic-family.quote: Generic family names are keywords, and therefore must not be quoted.
 
 # used by org.w3c.css.properties.CssTextDecoration
-error.same-value: %s ظ
+error.same-value: %s �ظ�����
 
 # used by org.w3c.css.properties.CssClip
-error.shape: Ч״ rect(<top>,<right>,<bottom>,<left>)
-error.shape-separator: ״ķָЧΪ
+error.shape: ��Ч����״���� rect(<top>,<right>,<bottom>,<left>)
+error.shape-separator: ��״����ķָ����Ч������Ϊ����
 
 # used by org.w3c.css.properties.CssContent
-error.attr: ЧԶ attr(X)
-error.counter: Чļ counter(<identifier>[,<list-style-type>]?)
-error.counters: Чļ counters(<identifier>,<string>[,<list-style-type>]?)
+error.attr: ��Ч�����Զ��� attr(X)
+error.counter: ��Ч�ļ������� counter(<identifier>[,<list-style-type>]?)
+error.counters: ��Ч�ļ������� counters(<identifier>,<string>[,<list-style-type>]?)
 
 # used by org.w3c.css.font.Src
-error.format: Чĸʽ format(<string>[,<string>]*)
-error.local: Чĸʽ local(<string>|<ident>+)
+error.format: ��Ч�ĸ�ʽ���� format(<string>[,<string>]*)
+error.local: ��Ч�ĸ�ʽ���� local(<string>|<ident>+)
 
 # used by org.w3c.css.values.CssAngle, org.w3c.css.values.CssFrequency, org.w3c.css.values.CssTime, org.w3c.css.values.CssLength
-error.unit: %s Ǵĵλ
+error.unit: %s �Ǵ���ĵ�λ
 
 # used by org.w3c.css.aural.ACssAzimuth
-error.degree: λñΪЧĽǶȷΧ
+error.degree: λ�ñ�������Ϊ��Ч�ĽǶȷ�Χ
 
 # used by org.w3c.css.aural.ACssElevation
-error.elevation.range: ָ(elevation)һǶֵ'-90deg''90deg'֮("deg"Ϊ).
+error.elevation.range: ��ָ�����(elevation)��һ��Ƕ�ֵ����'-90deg'��'90deg'֮��("deg"Ϊ��).
 
 # used by org.w3c.css.aural.ACssPitchRange
-error.range: ֵΧֵ'0''100'֮
+error.range: ��ֵ����Χ����ֵ������'0'��'100'֮��
 
 # used by org.w3c.css.properties.CssTextShadow
-error.two-lengths: һӰλ<length>ֵ(һģΧѡӰλ֮)
+error.two-lengths: һ����Ӱλ����}��<length>ֵ(һ��ģ��Χ����ѡ�������Ӱλ��֮��)
 
 error.integer: This number should be an integer.
-error.comma: ȱٶŷָ
+error.comma: ȱ�ٶ��ŷָ��
 
 # used by org.w3c.css.values.CssPercentage
-error.percent: %s Ǵİٷֱ
+error.percent: %s �Ǵ���İٷֱ�
 
 # used by org.w3c.css.values.CssString
-error.string: %s Ǵַ
+error.string: %s �Ǵ�����ַ�
 
 # used by org.w3c.css.values.CssURL
-error.url: %s ǴURL
+error.url: %s �Ǵ����URL
 
 # used by org.w3c.css.values.CssColor
-error.rgb: %s Ч36αʮֵɫ
+error.rgb: %s ������Ч��3��6αʮ��������ֵ���ɫ
 
 # used by org.w3c.css.values.CssNumber
-error.zero: ֻ0ԳΪ %s. ֺ뵥λ
+error.zero: ֻ��0���Գ�Ϊ %s. �������������ֺ���뵥λ
 
 # used by org.w3c.css.parser.CssPropertyFactory
-error.noexistence:  %s 
-error.noexistence-media: ý %s  %s 
-warning.noexistence-media: ý %s  %s 
+error.noexistence: ���� %s ������
+error.noexistence-media: ý�� %s ������ %s ������
+warning.noexistence-media: ý�� %s ������ %s ������
 
 # used by org.w3c.css.parser.CssFouffa
-error.unrecognize: ֵ̫ʶ
+error.unrecognize: ̫��ֵ����ʶ��
 
 # used by org.w3c.css.parser.CssSelectors
-error.pseudo-element: αԪ: %s ڴδ %s г
-error.pseudo-class: α .%s ڴ˴HTML %s г
-error.pseudo: ʶαԪػα
-error.id: IDѡ #%s ЧֻһIDѡԱָͨѡ: %s.
-error.space: ʹѡ ~= ֵ %s еֱ벻ո
-error.todo : Ǹ %s ֧
-error.incompatible: %s  %s 
+error.pseudo-element: αԪ��: %s �����ڴδ��������� %s �г���
+error.pseudo-class: α�� .%s �����ڴ˴���HTML������ %s �г���
+error.pseudo: ��ʶ���αԪ�ػ�α��
+error.id: IDѡ��� #%s ��Ч��ֻ��һ��IDѡ�����Ա�ָ������ͨѡ���: %s.
+error.space: ���ʹ��������ѡ��� ~= ����ֵ %s �е��ֱ��벻��ո�
+error.todo : ��Ǹ������ %s ������֧��
+error.incompatible: %s �� %s ������
 
-error.media: ʶý %s 
-error.page: ְαҳ %s
+error.media: ����ʶ���ý�� %s 
+error.page: ����ְ���α����ҳ %s
 
 
 # used by StyleSheetGeneratorHTML
-generator.context: 
-generator.request: ʽʱ \
-ʼ plh@w3.org.
-generator.unrecognized: ʶ
-generator.invalid-number: Ч
-generator.property: Ч
-generator.line: 
-generator.not-found: Ҳļ
+generator.context: ������
+generator.request: ���������ʽ��ʱ������� \
+����������������ʼ��� plh@w3.org.
+generator.unrecognized: ����ʶ���
+generator.invalid-number: ������
+generator.property: ������
+generator.line: ��
+generator.not-found: �Ҳ����ļ�
 generator.doc-html: <p>\
-ҪڹCSSʽҪһȷĵ \
-ζӦʹ<a href="http://validator.w3.org/check?uri=\
-%s">ȷHTML</a></p>
+��Ҫ���ڹ������CSS��ʽ����Ҫһ����ȷ���ĵ������� \
+����ζ����Ӧ��ʹ��<a href="http://validator.w3.org/check?uri=\
+%s">��ȷ��HTML</a>��</p>
 
 generator.doc:<p>\
-ҪCSSʽҪһȷĵ \
-ζӦʹ<a href="http://validator.w3.org/">ȷ \
-HTML</a>.</p>
+��Ҫ�������CSS��ʽ����Ҫһ����ȷ���ĵ������� \
+����ζ����Ӧ��ʹ��<a href="http://validator.w3.org/">��ȷ \
+��HTML</a>.</p>
 
 
 # used by the parser
-parser.semi-colon: ͼѰǰðšϣ
+parser.semi-colon: ��ͼѰ��������ǰ���ð�š����ϣ�
 
-parser.old_class:CSS1ӦԵ㿪ʼ (".55ft"), \
-һߴֵ (".55in")CSS2ϵ \
-Ϊʶijߴֵ(µĵλ)
+parser.old_class:��CSS1������Ӧ���Ե㿪ʼ (".55ft"), \
+�������һ��ߴ�ֵ (".55in")����CSS2�����ϵ��� \
+������Ϊ��ʶ��ijߴ�ֵ(�����?4�����µĵ�λ)
 
 
 # used by the servlet
-servlet.invalid-request: 㷢Ч
-servlet.process: ܶԶд
+servlet.invalid-request: �㷢������Ч������
+servlet.process: ���ܶԶ�����д���
 
 error.unrecognized.link: Unrecognized link element or xml-stylesheet PI.
 

Index: InvalidParamException.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/InvalidParamException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- InvalidParamException.java	8 Apr 2002 21:19:15 -0000	1.2
+++ InvalidParamException.java	8 Aug 2005 13:19:46 -0000	1.3
@@ -6,6 +6,16 @@
 // Please first read the full copyright statement in file COPYRIGHT.html
 /*
  * $Log$
+ * Revision 1.3  2005/08/08 13:19:46  ylafon
+ * All those changed made by Jean-Guilhem Rouel:
+ *
+ * Huge patch, imports fixed (automatic)
+ * Bug fixed: 372, 920, 778, 287, 696, 764, 233
+ * Partial bug fix for 289
+ *
+ * Issue with "inherit" in CSS2.
+ * The validator now checks the number of values (extraneous values were previously ignored)
+ *
  * Revision 1.2  2002/04/08 21:19:15  plehegar
  * New
  *
@@ -26,7 +36,6 @@
 
 
 import org.w3c.css.parser.analyzer.ParseException;
-import org.w3c.css.values.CssExpression;
 
 /**
  * @version $Revision$

Index: Messages.properties.zh-cn
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/Messages.properties.zh-cn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Messages.properties.zh-cn	12 Jul 2005 13:09:47 -0000	1.5
+++ Messages.properties.zh-cn	8 Aug 2005 13:19:46 -0000	1.6
@@ -44,7 +44,7 @@
 warning.relative: 在属性 %s 使用相对单位令样式表更加棒
 
 # used by org.w3c.css.css.StyleSheetParser and org.w3c.css.css.StyleSheetXMLParser
-warning.at-rule: 对不起，'@规则' %s 不能应用
+error.at-rule: 对不起，'@规则' %s 不能应用
 
 # used by all properties and values
 error.operator: %s 是一个错误的运算符

Received on Monday, 8 August 2005 13:20:00 UTC