Merge branch 'branch_0.13.0' into branch_0.13.0-svn

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/RELEASE_0_13_0@4657 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/etc/device_data.xml b/etc/device_data.xml
index 28b192f..b9b5811 100644 (file)
--- a/etc/device_data.xml
+++ b/etc/device_data.xml
@@ -3850,6 +3850,30 @@
       <dpi_width>96</dpi_width>
       <dpi_heigh>96</dpi_heigh>
     </device>
+
+    <!-- 
+     W64SH
+     KDDI-SH37 UP.Browser/6.2_7.2.7.1.K.2.214 (GUI) MMP/2.0
+    -->
+    <device>
+      <device_id>SH37</device_id>
+      <device_name>au W64SH</device_name>
+      <html_spec_type>XHTML_MOBILE_1_0</html_spec_type>
+      <color>262144</color>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <width>234</width>
+      <heigh>384</heigh>
+      <emoji_type>D</emoji_type>
+      <wp_width>480</wp_width>
+      <wp_heigh>800</wp_heigh>
+      <cache>33000</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
     <!--======================================================================-->
     <!-- A1100 series                                                         -->
     <!--======================================================================-->
@@ -18330,6 +18354,203 @@
       <dpi_heigh>96</dpi_heigh>
     </device>
 
+    <!--
+      930SH
+      SoftBank/1.0/930SH/SHJ001[/serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
+    <device>
+      <device_id>930SH</device_id>
+      <device_name>SoftBank 930SH</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <color>16777216</color>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <width>480</width>
+      <heigh>754</heigh>
+      <emoji_type></emoji_type>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+
+    <!--
+      830CA
+      SoftBank/1.0/830CA/CAJ001[/serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
+    <device>
+      <device_id>830CA</device_id>
+      <device_name>SoftBank 830CA</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <color>262144</color>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <width>240</width>
+      <heigh>350</heigh>
+      <emoji_type></emoji_type>
+      <wp_width>240</wp_width>
+      <wp_heigh>427</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+
+
+    <!--
+      931SH
+      SoftBank/1.0/931SH/SHJ001[/serial] Browser/NetFront/3.5 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
+    <device>
+      <device_id>931SH</device_id>
+      <device_name>SoftBank 931SH</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <color>262144</color>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <width>480</width>
+      <heigh>824</heigh>
+      <emoji_type></emoji_type>
+      <wp_width>480</wp_width>
+      <wp_heigh>1024</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+
+
+    <!--
+      930SC
+      SoftBank/1.0/930SC/SCJ001[/serial] Browser/NetFront/3.4
+    -->
+    <device>
+      <device_id>930SC</device_id>
+      <device_name>SoftBank 930SC</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <color>262144</color>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <width>470</width>
+      <heigh>512</heigh>
+      <emoji_type></emoji_type>
+      <wp_width>480</wp_width>
+      <wp_heigh>800</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+
+
+    <!--
+      DM003SH
+      SoftBank/1.0/DM003SH/SHJ001[/serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
+    <device>
+      <device_id>DM003SH</device_id>
+      <device_name>SoftBank DM003SH</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <color>262144</color>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <width>240</width>
+      <heigh>350</heigh>
+      <emoji_type></emoji_type>
+      <wp_width>240</wp_width>
+      <wp_heigh>400</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+
+    <!--
+      830T
+      SoftBank/1.0/830T/TJ001[/serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
+    <device>
+      <device_id>830T</device_id>
+      <device_name>SoftBank 830T</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <color>262144</color>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <width>235</width>
+      <heigh>341</heigh>
+      <emoji_type></emoji_type>
+      <wp_width>240</wp_width>
+      <wp_heigh>400</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+
+
+
+    <!--
+      831T
+      SoftBank/1.0/831T/TJ001[/serial] Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
+    <device>
+      <device_id>831T</device_id>
+      <device_name>SoftBank 831T</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <color>262144</color>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <width>235</width>
+      <heigh>341</heigh>
+      <emoji_type></emoji_type>
+      <wp_width>240</wp_width>
+      <wp_heigh>400</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
+
+
+    <!--
+      930P
+      SoftBank/1.0/930P/PJP10[/serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1
+    -->
+    <device>
+      <device_id>930P</device_id>
+      <device_name>SoftBank 930P</device_name>
+      <html_spec_type>JXHTML</html_spec_type>
+      <color>262144</color>
+      <gif>true</gif>
+      <jpeg>true</jpeg>
+      <png>true</png>
+      <bmp2>false</bmp2>
+      <bmp4>false</bmp4>
+      <width>471</width>
+      <heigh>700</heigh>
+      <emoji_type></emoji_type>
+      <wp_width>480</wp_width>
+      <wp_heigh>854</wp_heigh>
+      <cache>307200</cache>
+      <dpi_width>96</dpi_width>
+      <dpi_heigh>96</dpi_heigh>
+    </device>
 
     <!--
     -->