Index: /trunk/epgdumpr2/epgdump.c
===================================================================
--- /trunk/epgdumpr2/epgdump.c (リビジョン 143)
+++ /trunk/epgdumpr2/epgdump.c (リビジョン 144)
@@ -96,60 +96,64 @@
 
 static STATION csSta[] = {
-//	{ "�鴻��種�鐔�����", "1002.ontvjapan.com", 24608, 6, 237},//綮��
-//	{ "�ユ����絨��鐔��鐚�爾", "1086.ontvjapan.com", 24608, 6, 239},//BS紊��
-	{ "��������汐鐚ワ叱鐚�, "309ch.epgdata.ontvjapan", 24608, 6, 309},//306��09����c����紊��
+//ND2
+	{ "鐚器滋鐚潟��c����鐚�, "3201.ontvjapan.com", 24608, 6, 296},//2012綛�����CS1/Ch.296�����	{ "�������c����鐚�爾", "1092.ontvjapan.com", 24608, 6, 298},//2012綛�����CS1/Ch.298�����	{ "�������若��帥�鐚�爾", "1067.ontvjapan.com", 24608, 6, 299},//2012綛�����CS1/Ch.299�����
+//ND4
+	{ "�鴻����鐚�����", "100ch.epgdata.ontvjapan", 28736, 7, 100},
+	{ "����潟���汐鐚ワ治鐚�, "1008.ontvjapan.com", 28736, 7, 223},
+	{ "�吟��激���, "1217.ontvjapan.com", 28736, 7, 227},//228��27
+	{ "鐔��鐔��鐚<�������", "1040.ontvjapan.com", 28736, 7, 250},//2012綛���4��Ch.255���Ch.250�����	{ "�������若��c����", "1050.ontvjapan.com", 28736, 7, 342},
+	{ "�牙��糸�罍���c����", "363ch.epgdata.ontvjapan", 28736, 7, 363},
+		
+//ND6
+	{ "���������鐚o示", "294ch.epgdata.ontvjapan", 28768, 7, 294}, 
+	{ "鐚�軸鐚吟�鐚�爾", "1019.ontvjapan.com", 28768, 7, 323},
+	{ "罩��������", "329ch.epgdata.ontvjapan", 28768, 7, 329},
+	{ "����鴻������, "1062.ontvjapan.com", 28768, 7, 340},
+	{ "�≪������������, "1193.ontvjapan.com", 28768, 7, 341},
+	{ "鐚o汐鐚��", "1069.ontvjapan.com", 28768, 7, 354},
+//ND8
 	{ "�激��������潟���, "1059.ontvjapan.com", 24704, 6, 55},
-	{ "�吟��激���, "1217.ontvjapan.com", 24736, 6, 227},//228��27
-	{ "�鴻������ HD", "800ch.epgdata.ontvjapan", 24736, 6, 800},
-	{ "�鴻������ HD", "801ch.epgdata.ontvjapan", 24736, 6, 801},
-	{ "�鴻������", "802ch.epgdata.ontvjapan", 24736, 6, 802},
-	{ "鐔�������, "100ch.epgdata.ontvjapan", 28736, 7, 100},
-//	{ "�ゃ��帥�������鐚器雫", "194ch.epgdata.ontvjapan", 28736, 7, 194},//綮�� 2010/9/16/
-//	{ "鐚��������鐚ワ竺鐚逸汐", "1025.ontvjapan.com", 28736, 7, 256},//BS�����	{ "鐚�鹿鐚�, "1016.ontvjapan.com", 28736, 7, 312},
-	{ "FOX�����, "315ch.epgdata.ontvjapan", 28736, 7, 315},
-	{ "�鴻��若��激����鐚器雫", "1018.ontvjapan.com", 28736, 7, 322},
-	{ "�������若�������", "1046.ontvjapan.com", 28736, 7, 331},
-	{ "����冴��種叱鐚�, "1213.ontvjapan.com", 28736, 7, 334},//����若��祉��c���� ��	{ "�掩�����潟���, "1010.ontvjapan.com", 28768, 7, 221},
-	{ "茵�����", "1005.ontvjapan.com", 28768, 7, 222},
-	{ "����潟���汐鐚ワ治鐚�, "1008.ontvjapan.com", 28768, 7, 223},
-//	{ "羇���������c�", "1009.ontvjapan.com", 28768, 7, 224},//BS紊��
-//	{ "�鴻��若�����激���, "1003.ontvjapan.com", 28768, 7, 238},//BS紊��
-	{ "��撮�������c����", "1133.ontvjapan.com", 28768, 7, 292},
-	{ "�鴻���������, "1006.ontvjapan.com", 28768, 7, 310},
-	{ "鐚¥叱鐚�, "1014.ontvjapan.com", 28768, 7, 311},
-	{ "�������c����", "1204.ontvjapan.com", 28768, 7, 343},
-//	{ "����������帥�", "110ch.epgdata.ontvjapan", 28864, 7, 110},//2011綛�1��0�ュ�罩�//	{ "�眼�����c����", "1028.ontvjapan.com", 28864, 7, 260},//2012綛���1�ュ�罩�	{ "�������c����HD", "1092.ontvjapan.com", 28864, 6, 298},//2012綛�����CS1/Ch.298�����	{ "鐚�軸鐚�, "1019.ontvjapan.com", 28864, 7, 323},
-	{ "����若�����祉���, "1024.ontvjapan.com", 28864, 7, 324},
-	{ "�������若��帥�HD", "1067.ontvjapan.com", 28864, 6, 299},//2012綛�����CS1/Ch.299�����	{ "鐚�滋鐚c��若���, "1070.ontvjapan.com", 28864, 7, 353},
-	{ "鐚o汐鐚��", "1069.ontvjapan.com", 28864, 7, 354},
-//	{ "�吾��鴻��祉���, "361ch.epgdata.ontvjapan", 28864, 7, 361},// 綮�� 2011/8/31
-	{ "�������������潟���, "294ch.epgdata.ontvjapan", 28736, 7, 294}, 
-//	{ "鐚��������鐚�, "1041.ontvjapan.com", 28896, 7, 251},// 2011/10/1 BS�後���//	{ "鐚��������鐚�, "1042.ontvjapan.com", 28896, 7, 252},// 2011/10/1 BS�後���//	{ "鐚�������式鐔��鐔�示", "1043.ontvjapan.com", 28896, 7, 253},//BS紊��
-	{ "鐚э次鐚�鴫鐚�, "1026.ontvjapan.com", 28896, 7, 254},
-	{ "�鴻��ゃ�A sports鐚�, "1040.ontvjapan.com", 28896, 7, 250},//2012綛���4��Ch.255���Ch.250�����//	{ "絎������≪��c����", "101ch.epgdata.ontvjapan", 28928, 7, 101},
-	{ "TAKARAZUKA SKY STAGE", "1207.ontvjapan.com", 28928, 7, 290},
+	{ "�掩�����潟���, "1010.ontvjapan.com", 24704, 6, 218},//2012/8/1���
+	{ "茵�����", "1005.ontvjapan.com", 24704, 6, 219},//2012/8/1���
+	{ "����若�����祉���, "1024.ontvjapan.com", 24704, 6, 326},//2012/8/1���
+	{ "����冴��若��ャ���, "339ch.epgdata.ontvjapan", 24704, 6, 339},
+	{ "�ャ���汐鐚ワ七鐚鰹�鐚�, "2002.ontvjapan.com", 24704, 6, 349},
+//ND10
+	{ "�鴻�����鰹�", "800ch.epgdata.ontvjapan", 24736, 6, 800},
+	{ "�鴻�����鰹�", "801ch.epgdata.ontvjapan", 24736, 6, 801},
+	{ "�鴻�����鰹�", "802ch.epgdata.ontvjapan", 24736, 6, 802},
+	{ "�鴻�����鰹�", "805ch.epgdata.ontvjapan", 24736, 6, 805},
+//ND12
+	{ "鐚э次鐚�鴫鐚�, "1026.ontvjapan.com", 28864, 7, 254},
+	{ "������鐚�示鐚�, "1022.ontvjapan.com", 28864, 7, 325},
+	{ "����冴�����激���, "1045.ontvjapan.com", 28864, 7, 330},//HD��2012/07/26�泣����330��Щ��/ND14
+//ND14
+	{ "��撮������鐔�示鐚�, "1133.ontvjapan.com", 28896, 7, 292},
+	{ "�������弱��器示鐚�, "1015.ontvjapan.com", 28896, 7, 293},
+	{ "�鴻����鐚�����鐚�爾", "1006.ontvjapan.com", 28896, 7, 310},
+//ND16
+	{ "鐚鰹自鐚鴻�鐚鰹軸鐚¥磁鐚�, "1207.ontvjapan.com", 28928, 7, 290},
 	{ "����潟����羃�, "305ch.epgdata.ontvjapan", 28928, 7, 305},
-	{ "鐚¥軸-鐚�, "1201.ontvjapan.com", 28928, 7, 333},
-	{ "�������若��c����", "1050.ontvjapan.com", 28928, 7, 342},
-//	{ "�鴻�����鰹�鐚��", "803ch.epgdata.ontvjapan", 28928, 7, 803},//�鴻�����������//	{ "�鴻�����鰹�鐚��", "804ch.epgdata.ontvjapan", 28928, 7, 804},
-	{ "�鴻������", "805ch.epgdata.ontvjapan", 28928, 7, 805},
+	{ "鐚¥叱鐚�, "1014.ontvjapan.com", 28928, 7, 311},
+	{ "鐚¥軸��叱", "1201.ontvjapan.com", 28928, 7, 333},
+	{ "�������c����", "1204.ontvjapan.com", 28928, 7, 343},
+	{ "鐚�滋鐚c��若���, "1070.ontvjapan.com", 28928, 7, 353},
+//ND18
 	{ "����������刻示鐚�, "1007.ontvjapan.com", 28960, 7, 240},
-	{ "�眼������������, "1027.ontvjapan.com", 28960, 7, 262},
-	{ "鐚��鐚����示鐚�, "1074.ontvjapan.com", 28960, 7, 314},
-	{ "��������鹿鐚�璽", "1073.ontvjapan.com", 28992, 7, 307},//��������39��	{ "��������軸鐚件鹿", "1072.ontvjapan.com", 28992, 7, 308},//��������21��//	{ "�≪�������", "1047.ontvjapan.com", 28992, 7, 332},//BS�≪���������Щ��	{ "����鴻������, "1062.ontvjapan.com", 28992, 7, 340},
-	{ "�≪������������, "1193.ontvjapan.com", 28992, 7, 341},
-//	{ "鐚�鐚器滋鐚潟�������", "160ch.epgdata.ontvjapan", 29024, 7, 160},//2012綛���1�ュ�罩�	{ "鐚縁雫鐚�, "1120.ontvjapan.com", 29024, 7, 161},
-//	{ "����ゃ�鐚��鐚��鐚器雫", "185ch.epgdata.ontvjapan", 29024, 7, 185},//2012綛���1��綮��
-	{ "�������弱���, "1015.ontvjapan.com", 29024, 7, 293},
-	{ "TBS����潟���D", "3201.ontvjapan.com", 29024, 6, 296},//2012綛�����CS1/Ch.296�����	
-//	{ "����冴��若��c����", "1090.ontvjapan.com", 29024, 7, 304},//BS�後���	{ "MUSIC ON! TV", "1022.ontvjapan.com", 29024, 7, 325},
-	{ "����冴�����激���D", "1045.ontvjapan.com", 29024, 7, 330},//HD��	{ "鐚器滋鐚潟��ャ��鴻��若�", "1076.ontvjapan.com", 29024, 7, 351},
-//	{ "鐚o竺�ユ���������, "147ch.epgdata.ontvjapan", 29056, 7, 147},//綮�� 2010/2/28
-	{ "�ャ���磁鐚�示鐚�, "1068.ontvjapan.com", 29056, 7, 257},//HD��//	{ "fashion TV", "5004.ontvjapan.com", 29056, 7, 291},//綮�� 2009/3/31
-	{ "�ャ�������", "300ch.epgdata.ontvjapan", 29056, 7, 300},
-//	{ "�������若����鐚器雫", "1023.ontvjapan.com", 29056, 7, 320},//綮��	2009/3/31
-//	{ "Music Japan TV", "1208.ontvjapan.com", 29056, 7, 321},//綮�� 2012/3/31
-	{ "�鴻��若��激����鐚器雫 �����, "321ch.epgdata.ontvjapan", 29056, 7, 321},
-	{ "�ャ���汐鐚ワ七鐚鰹�鐚�, "2002.ontvjapan.com", 29056, 7, 350},
+	{ "�眼�������鐚�爾", "1027.ontvjapan.com", 28960, 7, 262},
+	{ "絅恰�鐔��鐚���鐚��", "1074.ontvjapan.com", 28960, 7, 314},
+//ND20
+	{ "��������鹿鐚�璽", "1073.ontvjapan.com", 28992, 7, 307},//��������39��	{ "��������軸鐚件鹿", "1072.ontvjapan.com", 28992, 7, 308},//��������21��	{ "��������汐鐚ワ叱鐚�, "309ch.epgdata.ontvjapan", 28992, 6, 309},//306��09����c����紊��
+//ND22
+	{ "鐚縁雫鐚�, "1120.ontvjapan.com", 29024, 7, 161},
+	{ "鐚器滋鐚潟��c����鐚�, "297ch.epgdata.ontvjapan", 29024, 7, 297},
+	{ "鐚�鹿鐚�, "1016.ontvjapan.com", 29024, 7, 312},
+	{ "�鴻��若��激����鐚器雫", "1018.ontvjapan.com", 29024, 7, 322},
+	{ "�������若�", "1046.ontvjapan.com", 29024, 7, 331},
+	{ "鐚器滋鐚潟��ャ��鴻��若�", "1076.ontvjapan.com", 29024, 7, 351},
+//ND24
+	{ "鐚�鹿鐚吾��若���, "229ch.epgdata.ontvjapan", 29056, 7, 229},
+	{ "�ャ���磁鐚��鐚�爾", "1068.ontvjapan.com", 29056, 7, 257},//HD��	{ "�ャ�������", "300ch.epgdata.ontvjapan", 29056, 7, 300},
+	{ "�鴻��激������, "321ch.epgdata.ontvjapan", 29056, 7, 321},
 	{ "����c����", "1052.ontvjapan.com", 29056, 7, 362},
 };
Index: /trunk/epgdumpr2/xmldata.c
===================================================================
--- /trunk/epgdumpr2/xmldata.c (リビジョン 143)
+++ /trunk/epgdumpr2/xmldata.c (リビジョン 144)
@@ -52,60 +52,64 @@
 
 static STATION csSta[] = {
-//	{ "�鴻��種�鐔�����", "1002.ontvjapan.com", 24608, 6, 237},//綮��
-//	{ "�ユ����絨��鐔��鐚�爾", "1086.ontvjapan.com", 24608, 6, 239},//BS紊��
-	{ "��������汐鐚ワ叱鐚�, "309ch.epgdata.ontvjapan", 24608, 6, 309},//306��09����c����紊��
+//ND2
+	{ "鐚器滋鐚潟��c����鐚�, "3201.ontvjapan.com", 24608, 6, 296},//2012綛�����CS1/Ch.296�����	{ "�������c����鐚�爾", "1092.ontvjapan.com", 24608, 6, 298},//2012綛�����CS1/Ch.298�����	{ "�������若��帥�鐚�爾", "1067.ontvjapan.com", 24608, 6, 299},//2012綛�����CS1/Ch.299�����
+//ND4
+	{ "�鴻����鐚�����", "100ch.epgdata.ontvjapan", 28736, 7, 100},
+	{ "����潟���汐鐚ワ治鐚�, "1008.ontvjapan.com", 28736, 7, 223},
+	{ "�吟��激���, "1217.ontvjapan.com", 28736, 7, 227},//228��27
+	{ "鐔��鐔��鐚<�������", "1040.ontvjapan.com", 28736, 7, 250},//2012綛���4��Ch.255���Ch.250�����	{ "�������若��c����", "1050.ontvjapan.com", 28736, 7, 342},
+	{ "�牙��糸�罍���c����", "363ch.epgdata.ontvjapan", 28736, 7, 363},
+		
+//ND6
+	{ "���������鐚o示", "294ch.epgdata.ontvjapan", 28768, 7, 294}, 
+	{ "鐚�軸鐚吟�鐚�爾", "1019.ontvjapan.com", 28768, 7, 323},
+	{ "罩��������", "329ch.epgdata.ontvjapan", 28768, 7, 329},
+	{ "����鴻������, "1062.ontvjapan.com", 28768, 7, 340},
+	{ "�≪������������, "1193.ontvjapan.com", 28768, 7, 341},
+	{ "鐚o汐鐚��", "1069.ontvjapan.com", 28768, 7, 354},
+//ND8
 	{ "�激��������潟���, "1059.ontvjapan.com", 24704, 6, 55},
-	{ "�吟��激���, "1217.ontvjapan.com", 24736, 6, 227},//228��27
-	{ "�鴻������ HD", "800ch.epgdata.ontvjapan", 24736, 6, 800},
-	{ "�鴻������ HD", "801ch.epgdata.ontvjapan", 24736, 6, 801},
-	{ "�鴻������", "802ch.epgdata.ontvjapan", 24736, 6, 802},
-	{ "鐔�������, "100ch.epgdata.ontvjapan", 28736, 7, 100},
-//	{ "�ゃ��帥�������鐚器雫", "194ch.epgdata.ontvjapan", 28736, 7, 194},//綮�� 2010/9/16/
-//	{ "鐚��������鐚ワ竺鐚逸汐", "1025.ontvjapan.com", 28736, 7, 256},//BS�����	{ "鐚�鹿鐚�, "1016.ontvjapan.com", 28736, 7, 312},
-	{ "FOX�����, "315ch.epgdata.ontvjapan", 28736, 7, 315},
-	{ "�鴻��若��激����鐚器雫", "1018.ontvjapan.com", 28736, 7, 322},
-	{ "�������若�������", "1046.ontvjapan.com", 28736, 7, 331},
-	{ "����冴��種叱鐚�, "1213.ontvjapan.com", 28736, 7, 334},//����若��祉��c���� ��	{ "�掩�����潟���, "1010.ontvjapan.com", 28768, 7, 221},
-	{ "茵�����", "1005.ontvjapan.com", 28768, 7, 222},
-	{ "����潟���汐鐚ワ治鐚�, "1008.ontvjapan.com", 28768, 7, 223},
-//	{ "羇���������c�", "1009.ontvjapan.com", 28768, 7, 224},//BS紊��
-//	{ "�鴻��若�����激���, "1003.ontvjapan.com", 28768, 7, 238},//BS紊��
-	{ "��撮�������c����", "1133.ontvjapan.com", 28768, 7, 292},
-	{ "�鴻���������, "1006.ontvjapan.com", 28768, 7, 310},
-	{ "鐚¥叱鐚�, "1014.ontvjapan.com", 28768, 7, 311},
-	{ "�������c����", "1204.ontvjapan.com", 28768, 7, 343},
-//	{ "����������帥�", "110ch.epgdata.ontvjapan", 28864, 7, 110},//2011綛�1��0�ュ�罩�//	{ "�眼�����c����", "1028.ontvjapan.com", 28864, 7, 260},//2012綛���1�ュ�罩�	{ "�������c����HD", "1092.ontvjapan.com", 28864, 6, 298},//2012綛�����CS1/Ch.298�����	{ "鐚�軸鐚�, "1019.ontvjapan.com", 28864, 7, 323},
-	{ "����若�����祉���, "1024.ontvjapan.com", 28864, 7, 324},
-	{ "�������若��帥�HD", "1067.ontvjapan.com", 28864, 6, 299},//2012綛�����CS1/Ch.299�����	{ "鐚�滋鐚c��若���, "1070.ontvjapan.com", 28864, 7, 353},
-	{ "鐚o汐鐚��", "1069.ontvjapan.com", 28864, 7, 354},
-//	{ "�吾��鴻��祉���, "361ch.epgdata.ontvjapan", 28864, 7, 361},// 綮�� 2011/8/31
-	{ "�������������潟���, "294ch.epgdata.ontvjapan", 28736, 7, 294}, 
-//	{ "鐚��������鐚�, "1041.ontvjapan.com", 28896, 7, 251},// 2011/10/1 BS�後���//	{ "鐚��������鐚�, "1042.ontvjapan.com", 28896, 7, 252},// 2011/10/1 BS�後���//	{ "鐚�������式鐔��鐔�示", "1043.ontvjapan.com", 28896, 7, 253},//BS紊��
-	{ "鐚э次鐚�鴫鐚�, "1026.ontvjapan.com", 28896, 7, 254},
-	{ "�鴻��ゃ�A sports鐚�, "1040.ontvjapan.com", 28896, 7, 250},//2012綛���4��Ch.255���Ch.250�����//	{ "絎������≪��c����", "101ch.epgdata.ontvjapan", 28928, 7, 101},
-	{ "TAKARAZUKA SKY STAGE", "1207.ontvjapan.com", 28928, 7, 290},
+	{ "�掩�����潟���, "1010.ontvjapan.com", 24704, 6, 218},//2012/8/1���
+	{ "茵�����", "1005.ontvjapan.com", 24704, 6, 219},//2012/8/1���
+	{ "����若�����祉���, "1024.ontvjapan.com", 24704, 6, 326},//2012/8/1���
+	{ "����冴��若��ャ���, "339ch.epgdata.ontvjapan", 24704, 6, 339},
+	{ "�ャ���汐鐚ワ七鐚鰹�鐚�, "2002.ontvjapan.com", 24704, 6, 349},
+//ND10
+	{ "�鴻�����鰹�", "800ch.epgdata.ontvjapan", 24736, 6, 800},
+	{ "�鴻�����鰹�", "801ch.epgdata.ontvjapan", 24736, 6, 801},
+	{ "�鴻�����鰹�", "802ch.epgdata.ontvjapan", 24736, 6, 802},
+	{ "�鴻�����鰹�", "805ch.epgdata.ontvjapan", 24736, 6, 805},
+//ND12
+	{ "鐚э次鐚�鴫鐚�, "1026.ontvjapan.com", 28864, 7, 254},
+	{ "������鐚�示鐚�, "1022.ontvjapan.com", 28864, 7, 325},
+	{ "����冴�����激���, "1045.ontvjapan.com", 28864, 7, 330},//HD��2012/07/26�泣����330��Щ��/ND14
+//ND14
+	{ "��撮������鐔�示鐚�, "1133.ontvjapan.com", 28896, 7, 292},
+	{ "�������弱��器示鐚�, "1015.ontvjapan.com", 28896, 7, 293},
+	{ "�鴻����鐚�����鐚�爾", "1006.ontvjapan.com", 28896, 7, 310},
+//ND16
+	{ "鐚鰹自鐚鴻�鐚鰹軸鐚¥磁鐚�, "1207.ontvjapan.com", 28928, 7, 290},
 	{ "����潟����羃�, "305ch.epgdata.ontvjapan", 28928, 7, 305},
-	{ "鐚¥軸-鐚�, "1201.ontvjapan.com", 28928, 7, 333},
-	{ "�������若��c����", "1050.ontvjapan.com", 28928, 7, 342},
-//	{ "�鴻�����鰹�鐚��", "803ch.epgdata.ontvjapan", 28928, 7, 803},//�鴻�����������//	{ "�鴻�����鰹�鐚��", "804ch.epgdata.ontvjapan", 28928, 7, 804},
-	{ "�鴻������", "805ch.epgdata.ontvjapan", 28928, 7, 805},
+	{ "鐚¥叱鐚�, "1014.ontvjapan.com", 28928, 7, 311},
+	{ "鐚¥軸��叱", "1201.ontvjapan.com", 28928, 7, 333},
+	{ "�������c����", "1204.ontvjapan.com", 28928, 7, 343},
+	{ "鐚�滋鐚c��若���, "1070.ontvjapan.com", 28928, 7, 353},
+//ND18
 	{ "����������刻示鐚�, "1007.ontvjapan.com", 28960, 7, 240},
-	{ "�眼������������, "1027.ontvjapan.com", 28960, 7, 262},
-	{ "鐚��鐚����示鐚�, "1074.ontvjapan.com", 28960, 7, 314},
-	{ "��������鹿鐚�璽", "1073.ontvjapan.com", 28992, 7, 307},//��������39��	{ "��������軸鐚件鹿", "1072.ontvjapan.com", 28992, 7, 308},//��������21��//	{ "�≪�������", "1047.ontvjapan.com", 28992, 7, 332},//BS�≪���������Щ��	{ "����鴻������, "1062.ontvjapan.com", 28992, 7, 340},
-	{ "�≪������������, "1193.ontvjapan.com", 28992, 7, 341},
-//	{ "鐚�鐚器滋鐚潟�������", "160ch.epgdata.ontvjapan", 29024, 7, 160},//2012綛���1�ュ�罩�	{ "鐚縁雫鐚�, "1120.ontvjapan.com", 29024, 7, 161},
-//	{ "����ゃ�鐚��鐚��鐚器雫", "185ch.epgdata.ontvjapan", 29024, 7, 185},//2012綛���1��綮��
-	{ "�������弱���, "1015.ontvjapan.com", 29024, 7, 293},
-	{ "TBS����潟���D", "3201.ontvjapan.com", 29024, 6, 296},//2012綛�����CS1/Ch.296�����	
-//	{ "����冴��若��c����", "1090.ontvjapan.com", 29024, 7, 304},//BS�後���	{ "MUSIC ON! TV", "1022.ontvjapan.com", 29024, 7, 325},
-	{ "����冴�����激���D", "1045.ontvjapan.com", 29024, 7, 330},//HD��2012/07/26�泣����330��Щ��	{ "鐚器滋鐚潟��ャ��鴻��若�", "1076.ontvjapan.com", 29024, 7, 351},
-//	{ "鐚o竺�ユ���������, "147ch.epgdata.ontvjapan", 29056, 7, 147},//綮�� 2010/2/28
-	{ "�ャ���磁鐚�示鐚�, "1068.ontvjapan.com", 29056, 7, 257},//HD��//	{ "fashion TV", "5004.ontvjapan.com", 29056, 7, 291},//綮�� 2009/3/31
-	{ "�ャ�������", "300ch.epgdata.ontvjapan", 29056, 7, 300},
-//	{ "�������若����鐚器雫", "1023.ontvjapan.com", 29056, 7, 320},//綮��	2009/3/31
-//	{ "Music Japan TV", "1208.ontvjapan.com", 29056, 7, 321},//綮�� 2012/3/31
-	{ "�鴻��若��激����鐚器雫 �����, "321ch.epgdata.ontvjapan", 29056, 7, 321},
-	{ "�ャ���汐鐚ワ七鐚鰹�鐚�, "2002.ontvjapan.com", 29056, 7, 350},
+	{ "�眼�������鐚�爾", "1027.ontvjapan.com", 28960, 7, 262},
+	{ "絅恰�鐔��鐚���鐚��", "1074.ontvjapan.com", 28960, 7, 314},
+//ND20
+	{ "��������鹿鐚�璽", "1073.ontvjapan.com", 28992, 7, 307},//��������39��	{ "��������軸鐚件鹿", "1072.ontvjapan.com", 28992, 7, 308},//��������21��	{ "��������汐鐚ワ叱鐚�, "309ch.epgdata.ontvjapan", 28992, 6, 309},//306��09����c����紊��
+//ND22
+	{ "鐚縁雫鐚�, "1120.ontvjapan.com", 29024, 7, 161},
+	{ "鐚器滋鐚潟��c����鐚�, "297ch.epgdata.ontvjapan", 29024, 7, 297},
+	{ "鐚�鹿鐚�, "1016.ontvjapan.com", 29024, 7, 312},
+	{ "�鴻��若��激����鐚器雫", "1018.ontvjapan.com", 29024, 7, 322},
+	{ "�������若�", "1046.ontvjapan.com", 29024, 7, 331},
+	{ "鐚器滋鐚潟��ャ��鴻��若�", "1076.ontvjapan.com", 29024, 7, 351},
+//ND24
+	{ "鐚�鹿鐚吾��若���, "229ch.epgdata.ontvjapan", 29056, 7, 229},
+	{ "�ャ���磁鐚��鐚�爾", "1068.ontvjapan.com", 29056, 7, 257},//HD��	{ "�ャ�������", "300ch.epgdata.ontvjapan", 29056, 7, 300},
+	{ "�鴻��激������, "321ch.epgdata.ontvjapan", 29056, 7, 321},
 	{ "����c����", "1052.ontvjapan.com", 29056, 7, 362},
 };