From d85953a84de8c1c34a472baf6aa47e13d3a99702 Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@tuxfamily.org>
Date: Fri, 20 Sep 2013 21:50:39 +0200
Subject: [PATCH] show deactivation info for disabled services channels

---
 ChangeLog   |  9 +++++----
 TitleIDs.py | 30 +++++++++++++++---------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e956da6..e1d88dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,11 @@
 -- 0.9 --
 * bugfix: fix downloading youtube from cli
 * bugfix: fix tmd-viewer file-chooser not offering all tmd-files
-* update available youtube channel versions
-* support downloading skyward sword savegame fix
-* support downloading lovefilm
-* support downloading wii u transfer channel
+* update: added new youtube channel versions
+* update: show deactivation info for disabled services channels
+* new: support downloading skyward sword savegame fix
+* new: support downloading lovefilm
+* new: support downloading wii u transfer channel
 
 -- 0.8 --
 * bugfix: fix relative paths for -d/--download cli on linux
diff --git a/TitleIDs.py b/TitleIDs.py
index 2b176cc..b74509d 100644
--- a/TitleIDs.py
+++ b/TitleIDs.py
@@ -158,15 +158,15 @@ ChannelJAPVerDict = {
 "BOOT2":"4",
 "System Menu":"128 2.0, 192 2.1, 224 3.0, 256 3.1, 288 3.2,\
 \n352 3.3, 384 3.4, 416 4.0, 448 4.1, 480 4.2,\n512 4.3",
-"Check Mii Out":"1, 3, 512",
+"Check Mii Out":"1, 3, 512\n***deactivated since Jun 2013***",
 "Digicam Print":"latest",
 "EULA":"1, 2, 3",
-"Everyone Votes":"latest",
+"Everyone Votes":"latest\n***deactivated since Jun 2013***",
 "Japan Food Service":"latest",
 "Jam With The Band":"latest",
 "Mii Channel":"2, 3, 4, 5, 6",
-"News":"3, 6, 7",
-"Nintendo":"latest",
+"News":"3, 6, 7\n***deactivated since Jun 2013***",
+"Nintendo":"latest\n***deactivated since Jun 2013***",
 "Opera":"1, 3, 257, 512, 1024",
 "Photo":"1, 2",
 "Photo 1.1":"1, 2, 3",
@@ -176,7 +176,7 @@ ChannelJAPVerDict = {
 "Skyward Sword Fix":"latest",
 "Today & Tomorrow":"latest",
 "TV Friend / G-Guide":"latest",
-"Weather":"3, 6, 7",
+"Weather":"3, 6, 7\n***deactivated since Jun 2013***",
 "Wii No Ma":"latest",
 "Wii Speak":"1, 256, 512",
 "Wii U Transfer Channel":"latest",
@@ -213,14 +213,14 @@ ChannelPALVerDict = {
 "System Menu":"130 2.0, 162 2.1, 194 2.2, 226 3.0, 257 3.1,\
 \n290 3.2, 354 3.3, 386 3.4, 418 4.0, 450 4.1,\n482 4.2, 514 4.3",
 "BBC iPlayer":"latest",
-"Check Mii Out":"1, 3, 512",
+"Check Mii Out":"1, 3, 512\n***deactivated since Jun 2013***",
 "EULA":"1, 2, 3",
-"Everyone Votes":"latest",
+"Everyone Votes":"latest\n***deactivated since Jun 2013***",
 "Jam With The Band":"latest",
 "Lovefilm":"258",
 "Mii Channel":"2, 3, 4, 5, 6",
-"News":"3, 6, 7",
-"Nintendo":"latest",
+"News":"3, 6, 7\n***deactivated since Jun 2013***",
+"Nintendo":"latest\n***deactivated since Jun 2013***",
 "Opera":"1, 3, 257, 512, 1024",
 "Photo":"1, 2",
 "Photo 1.1":"1, 2, 3",
@@ -228,7 +228,7 @@ ChannelPALVerDict = {
 "Shop":"3, 4, 5, 6, 7, 8, 10, 13, 16,\n17, 18, 19, 20, 21",
 "Skyward Sword Fix":"latest",
 "Today & Tomorrow":"latest",
-"Weather":"3, 6, 7",
+"Weather":"3, 6, 7\n***deactivated since Jun 2013***",
 "Wii Speak":"1, 256, 512",
 "Wii U Transfer Channel":"257",
 "YouTube":"1, 258, 1281"
@@ -262,14 +262,14 @@ ChannelUSAVerDict = {
 "BOOT2":"4",
 "System Menu":"97 2.0, 193 2.2, 225 3.0, 257 3.1, 289 3.2,\
 \n353 3.3, 385 3.4, 417 4.0, 449 4.1, 481 4.2,\n513 4.3",
-"Check Mii Out":"1, 3, 512",
+"Check Mii Out":"1, 3, 512\n***deactivated since Jun 2013***",
 "EULA":"1, 2, 3",
-"Everyone Votes":"latest",
+"Everyone Votes":"latest\n***deactivated since Jun 2013***",
 "Jam With The Band":"latest",
 "Lovefilm":"latest",
 "Mii Channel":"2, 3, 4, 5, 6",
-"News":"3, 6, 7",
-"Nintendo":"latest",
+"News":"3, 6, 7\n***deactivated since Jun 2013***",
+"Nintendo":"latest\n***deactivated since Jun 2013***",
 "Opera":"1, 3, 257, 512, 1024",
 "Photo":"1, 2",
 "Photo 1.1":"1, 2, 3",
@@ -277,7 +277,7 @@ ChannelUSAVerDict = {
 "Shop":"3, 4, 5, 6, 7, 8, 10, 13, 16,\n17, 18, 19, 20, 21",
 "Skyward Sword Fix":"latest",
 "Today & Tomorrow":"latest",
-"Weather":"3, 6, 7",
+"Weather":"3, 6, 7\n***deactivated since Jun 2013***",
 "Wii Speak":"1, 256, 512",
 "Wii U Transfer Channel":"latest",
 "YouTube":"257, 1280"