Bug 489096, Bug 490310
diff --git a/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/checkitem.xml b/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/checkitem.xml
index 547759a..cd1c56d 100644
--- a/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/checkitem.xml
+++ b/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/checkitem.xml
@@ -308,7 +308,7 @@
<mItem name="Understandable"/>
</metrics>
<description>
- <desc>Use the ABBR and ACRONYM elements to denote and expand any abbreviations and acronyms that are present.</desc>
+ <desc>Use the ABBR element to denote and expand any abbreviations and acronyms that are present.</desc>
</description>
</checkitem>
<checkitem type="user" id="C_200.0">
@@ -986,9 +986,9 @@
<gItem id="1.1" name="WCAG"/>
<gItem id="a" name="Section508"/>
<gItem id="b" name="Section508"/>
- <gItem techniques="G87,G93" id="1.2.2" name="JIS"/>
+ <gItem techniques="H95,G87,G93" id="1.2.2" name="JIS"/>
<gItem id="4" name="IBMGuideline"/>
- <gItem techniques="G87,G93" id="1.2.2" name="WCAG 2.0"/>
+ <gItem techniques="H95,G87,G93" id="1.2.2" name="WCAG 2.0"/>
</guideline>
<metrics>
<mItem name="Perceivable"/>
@@ -1664,8 +1664,8 @@
<gItem id="2.1" name="WCAG"/>
<gItem id="c" name="Section508"/>
<gItem id="12" name="IBMGuideline"/>
- <gItem techniques="G14,G122,G182" id="1.4.1" name="JIS"/>
- <gItem techniques="G14,G122,G182" id="1.4.1" name="WCAG 2.0"/>
+ <gItem techniques="G14,G182,G205" id="1.4.1" name="JIS"/>
+ <gItem techniques="G14,G182,G205" id="1.4.1" name="WCAG 2.0"/>
</guideline>
<metrics>
<mItem name="Perceivable"/>
@@ -2564,8 +2564,8 @@
</checkitem>
<checkitem type="user" id="C_500.0">
<guideline>
- <gItem techniques="G9,G93,G87,SM11,SM12" id="1.2.4" name="JIS"/>
- <gItem techniques="G9,G93,G87,SM11,SM12" id="1.2.4" name="WCAG 2.0"/>
+ <gItem techniques="H95,G9,G93,G87,SM11,SM12" id="1.2.4" name="JIS"/>
+ <gItem techniques="H95,G9,G93,G87,SM11,SM12" id="1.2.4" name="WCAG 2.0"/>
</guideline>
<metrics>
<mItem name="Perceivable"/>
@@ -2576,8 +2576,8 @@
</checkitem>
<checkitem type="user" id="C_500.1">
<guideline>
- <gItem techniques="G78,G173,SM6,SM7,G8,SM1,SM2" id="1.2.5" name="JIS"/>
- <gItem techniques="G78,G173,SM6,SM7,G8,SM1,SM2" id="1.2.5" name="WCAG 2.0"/>
+ <gItem techniques="H96,G78,G173,G203,SM6,SM7,G8,SM1,SM2" id="1.2.5" name="JIS"/>
+ <gItem techniques="H96,G78,G173,G203,SM6,SM7,G8,SM1,SM2" id="1.2.5" name="WCAG 2.0"/>
</guideline>
<metrics>
<mItem name="Perceivable"/>
@@ -2786,8 +2786,8 @@
<guideline>
<gItem techniques="F24,G18,G145" id="1.4.3" name="JIS"/>
<gItem techniques="F24,G17,G18" id="1.4.6" name="JIS"/>
- <gItem techniques="G14,G122,G182" id="1.4.1" name="JIS"/>
- <gItem techniques="G14,G122,G182" id="1.4.1" name="WCAG 2.0"/>
+ <gItem techniques="G14,G182,G205" id="1.4.1" name="JIS"/>
+ <gItem techniques="G14,G182,G205" id="1.4.1" name="WCAG 2.0"/>
<gItem techniques="F24,G18,G145" id="1.4.3" name="WCAG 2.0"/>
<gItem techniques="F24,G17,G18" id="1.4.6" name="WCAG 2.0"/>
</guideline>
@@ -2802,8 +2802,8 @@
<guideline>
<gItem techniques="F24,G18,G145" id="1.4.3" name="JIS"/>
<gItem techniques="F24,G17,G18" id="1.4.6" name="JIS"/>
- <gItem techniques="G14,G122,G182" id="1.4.1" name="JIS"/>
- <gItem techniques="G14,G122,G182" id="1.4.1" name="WCAG 2.0"/>
+ <gItem techniques="G14,G182,G205" id="1.4.1" name="JIS"/>
+ <gItem techniques="G14,G182,G205" id="1.4.1" name="WCAG 2.0"/>
<gItem techniques="F24,G18,G145" id="1.4.3" name="WCAG 2.0"/>
<gItem techniques="F24,G17,G18" id="1.4.6" name="WCAG 2.0"/>
</guideline>
@@ -2924,8 +2924,8 @@
</checkitem>
<checkitem type="error" id="C_422.0">
<guideline>
- <gItem techniques="F17,H88" id="4.1.1" name="JIS"/>
- <gItem techniques="F17,H88" id="4.1.1" name="WCAG 2.0"/>
+ <gItem techniques="H88" id="4.1.1" name="JIS"/>
+ <gItem techniques="H88" id="4.1.1" name="WCAG 2.0"/>
</guideline>
<metrics>
<mItem score="5" name="Perceivable"/>
@@ -2973,8 +2973,8 @@
</checkitem>
<checkitem type="user" id="C_600.2">
<guideline>
- <gItem techniques="G58,G69,H53,G78,G173,SM6,SM7,G8,SM1,SM2" id="1.2.3" name="JIS"/>
- <gItem techniques="G58,G69,H53,G78,G173,SM6,SM7,G8,SM1,SM2" id="1.2.3" name="WCAG 2.0"/>
+ <gItem techniques="G58,G69,H53,H96,G78,G173,G203,SM6,SM7,G8,SM1,SM2" id="1.2.3" name="JIS"/>
+ <gItem techniques="G58,G69,H53,H96,G78,G173,G203,SM6,SM7,G8,SM1,SM2" id="1.2.3" name="WCAG 2.0"/>
</guideline>
<metrics>
<mItem name="Perceivable"/>
@@ -3033,8 +3033,8 @@
</checkitem>
<checkitem type="user" id="C_600.7">
<guideline>
- <gItem techniques="G93,G87,SM11,SM12" id="1.2.2" name="JIS"/>
- <gItem techniques="G93,G87,SM11,SM12" id="1.2.2" name="WCAG 2.0"/>
+ <gItem techniques="H95,G93,G87,SM11,SM12" id="1.2.2" name="JIS"/>
+ <gItem techniques="H95,G93,G87,SM11,SM12" id="1.2.2" name="WCAG 2.0"/>
</guideline>
<metrics>
<mItem name="Perceivable"/>
@@ -3179,14 +3179,14 @@
</checkitem>
<checkitem type="info" id="C_600.19">
<guideline>
- <gItem techniques="G111,G14" id="1.4.1" name="JIS"/>
- <gItem techniques="G111,G14" id="1.4.1" name="WCAG 2.0"/>
+ <gItem techniques="G111,G14,G205" id="1.4.1" name="JIS"/>
+ <gItem techniques="G111,G14,G205" id="1.4.1" name="WCAG 2.0"/>
</guideline>
<metrics>
<mItem name="Perceivable"/>
</metrics>
<description>
- <desc>If color is used within an image to convey information, If you use color to convey information, make sure the information is also represented another way.</desc>
+ <desc>If color is used within an image to convey information, make sure the information is also represented another way.</desc>
</description>
</checkitem>
<checkitem type="user" id="C_600.20">
diff --git a/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description.properties b/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description.properties
index d8dd5ef..8f48c0f 100644
--- a/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description.properties
+++ b/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description.properties
@@ -43,7 +43,7 @@
C_18.1 = Use q elements for short text blocks.
C_18.2 = Please provide the URI of the source of the quotation as cite attribute.
C_19.0 = Identify any changes in the language used in the document.
-C_20.0 = Use the abbr and acronym elements to denote and expand any abbreviations and acronyms that are present.
+C_20.0 = Use the abbr element to denote and expand any abbreviations and acronyms that are present. (acronym is deprecated in HTML5)
C_21.0 = Identify the human language of the content by providing {0} attribute (e.g. <html {0}="en">).
C_22.0 = Linearize the content using Voice browser mode of this tool and check that the linear reading order matches any meaningful sequence conveyed through presentation.
C_23.0 = If this table is used for layout only, do not use th element, caption element, nor summary attribute.
diff --git a/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description_ja.properties b/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description_ja.properties
index 9b3d8d8..f374e56 100644
--- a/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description_ja.properties
+++ b/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description_ja.properties
@@ -43,7 +43,7 @@
C_18.1 = \u77ed\u3044\u6587\u7ae0\u306e\u5f15\u7528\u306b\u306fq\u3092\u7528\u3044\u3066\u304f\u3060\u3055\u3044
C_18.2 = \u5f15\u7528\u7b87\u6240\u306b\u306f\u5f15\u7528\u5143\u306eURI\u3092cite\u5c5e\u6027\u3068\u3057\u3066\u63d0\u4f9b\u3059\u308b\u3088\u3046\u306b\u3057\u3066\u304f\u3060\u3055\u3044
C_19.0 = \u3082\u3057\u3001\u6587\u66f8\u4e2d\u3067\u5229\u7528\u3059\u308b\u8a00\u8a9e\u304c\u5909\u5316\u3059\u308b\u7b87\u6240\u304c\u5b58\u5728\u3059\u308b\u5834\u5408\u306f\u3001\u5168\u3066\u660e\u8a18\u3059\u308b\u3088\u3046\u306b\u3057\u3066\u304f\u3060\u3055\u3044
-C_20.0 = \u6587\u66f8\u4e2d\u306e\u7565\u8a9e\u304a\u3088\u3073\u982d\u5b57\u8a9e\u306f\u3001abbr\u304a\u3088\u3073acronym\u3092\u7528\u3044\u3066\u672c\u6765\u306e\u5f62\u5f0f\u3092\u8868\u8a18\u3057\u3066\u304f\u3060\u3055\u3044
+C_20.0 = \u6587\u66f8\u4e2d\u306e\u7565\u8a9e\u304a\u3088\u3073\u982d\u5b57\u8a9e\u306f\u3001abbr\u3092\u7528\u3044\u3066\u672c\u6765\u306e\u5f62\u5f0f\u3092\u8868\u8a18\u3057\u3066\u304f\u3060\u3055\u3044(HTML5\u3067\u306f acronym\u306f\u5ec3\u6b62\u3055\u308c\u307e\u3057\u305f)
C_21.0 = \u6587\u66f8\u5185\u3067\u4e3b\u306b\u5229\u7528\u3055\u308c\u3066\u3044\u308b\u8a00\u8a9e\u3092{0}\u5c5e\u6027\u3092\u7528\u3044\u3066\u660e\u793a\u3057\u3066\u304f\u3060\u3055\u3044 (\u4f8b\uff1a <html {0}="ja">)
C_22.0 = \u672c\u30c4\u30fc\u30eb\u306e\u97f3\u58f0\u30d6\u30e9\u30a6\u30b6\u30e2\u30fc\u30c9\u3092\u7528\u3044\u3066\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u7dda\u5f62\u5316\u3057\u3001\u7dda\u5f62\u5316\u3057\u305f\u8aad\u307f\u4e0a\u3052\u9806\u5e8f\u304c\u8868\u73fe\u306b\u3088\u3063\u3066\u4f1d\u3048\u3089\u308c\u3066\u3044\u308b\u610f\u5473\u306e\u3042\u308b\u9806\u5e8f\u3068\u5408\u81f4\u3059\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u4e0b\u3055\u3044\u3002
C_23.0 = \u3082\u3057\u3001\u3053\u306e\u30c6\u30fc\u30d6\u30eb\u304c\u30ec\u30a4\u30a2\u30a6\u30c8\u30c6\u30fc\u30d6\u30eb\u3067\u3042\u308b\u5834\u5408\u3001th\u3092\u592a\u5b57\u306a\u3069\u306e\u8868\u73fe\u306e\u305f\u3081\u306b\u7528\u3044\u308b\u3053\u3068\u306f\u907f\u3051\u3066\u304f\u3060\u3055\u3044
diff --git a/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description_zh.properties b/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description_zh.properties
index 291f4f1..5aa7262 100644
--- a/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description_zh.properties
+++ b/plugins/org.eclipse.actf.examples.adesigner.eval.html/resources/description_zh.properties
@@ -41,7 +41,7 @@
C_18.1 =\u5bf9\u6bd4\u8f83\u77ed\u7684\u6587\u672c\u5757\uff0c\u4f7f\u7528Q\u5143\u7d20\u3002
C_18.2 =\u8bf7\u63d0\u4f9b\u5f15\u7528\u6765\u6e90\u7684URI\u4f5c\u4e3a\u5f15\u7528\u5c5e\u6027\u3002
C_19.0 =\u8bc6\u522b\u5728\u6587\u6863\u4e2d\u4f7f\u7528\u7684\u8bed\u8a00\u7684\u4efb\u4f55\u53d8\u5316\u3002
-C_20.0 =\u4f7f\u7528ABBR\u548cACRONYM\u5143\u7d20\u6765\u8868\u793a\u548c\u6269\u5c55\u4efb\u4f55\u5b58\u5728\u7684\u7f29\u7565\u8bed\u3002
+C_20.0 =\u4f7f\u7528ABBR\u5143\u7d20\u6765\u8868\u793a\u548c\u6269\u5c55\u4efb\u4f55\u5b58\u5728\u7684\u7f29\u7565\u8bed\u3002
C_21.0 =\u6807\u8bc6\u6587\u5b57\u8bed\u8a00\uff08\u4f8b\u5982<html lang="en">\uff09\u3002
C_22.0 =\u907f\u514d\u5c06\u6587\u672c\u683c\u5f0f\u7684\u6587\u4ef6\u8f6c\u5316\u4e3a\uff0c\u9664\u975e\u8868\u53ef\u4ee5\u8fdb\u884c\u7ebf\u6027\u5316\u3002
C_23.0 =\u5982\u679c\u8be5\u8868\u4ec5\u7528\u4e8e\u5e03\u5c40\uff0c\u4e0d\u8981\u4f7f\u7528TH\u6807\u7b7e\u6765\u5b9e\u73b0\u683c\u5f0f\u6548\u679c\u3002
