From e7aaa7a599c45545577344f73ca9a78b402b44ab Mon Sep 17 00:00:00 2001
From: telluroid <44676518+telluroid@users.noreply.github.com>
Date: Sat, 12 Nov 2022 01:15:26 +0100
Subject: [PATCH 1/2] Update germany.md
added missing tvg ids
replaced some logos
---
lists/germany.md | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/lists/germany.md b/lists/germany.md
index 57faa99..72ae5f2 100644
--- a/lists/germany.md
+++ b/lists/germany.md
@@ -8,33 +8,33 @@ https://wiki.ubuntuusers.de/Internet-TV/Stationen
| # | Channel | Link | Logo | EPG id |
|:---:|:--------------:|:-----:|:----:|:------:|
| 1 | Das Erste Ⓖ | [>](https://mcdn.daserste.de/daserste/de/master.m3u8) | 
| DasErste.de |
-| 2 | ZDF Ⓖ | [>](http://zdf-hls-15.akamaized.net/hls/live/2016498/de/veryhigh/master.m3u8) | 
| ZDF.de |
+| 2 | ZDF Ⓖ | [>](http://zdf-hls-15.akamaized.net/hls/live/2016498/de/veryhigh/master.m3u8) | 
| ZDF.de |
| 3 | 3sat Ⓖ | [>](https://zdf-hls-18.akamaized.net/hls/live/2016501/dach/veryhigh/master.m3u8) | 
| 3sat.de |
| 4 | ARTE Ⓖ | [>](https://artesimulcast.akamaized.net/hls/live/2030993/artelive_de/index.m3u8) | 
| ARTEDeutsch.de |
| 5 | ONE Ⓖ | [>](https://mcdn.one.ard.de/ardone/hls/master.m3u8) | 
| One.de |
-| 6 | ZDFinfo Ⓖ | [>](https://zdf-hls-17.akamaized.net/hls/live/2016500/de/veryhigh/master.m3u8) | 
| ZDFinfo.de |
-| 7 | ZDFneo Ⓖ | [>](https://zdf-hls-16.akamaized.net/hls/live/2016499/de/veryhigh/master.m3u8) | 
| ZDFneo.de |
+| 6 | ZDFinfo Ⓖ | [>](https://zdf-hls-17.akamaized.net/hls/live/2016500/de/veryhigh/master.m3u8) | 
| ZDFinfo.de |
+| 7 | ZDFneo Ⓖ | [>](https://zdf-hls-16.akamaized.net/hls/live/2016499/de/veryhigh/master.m3u8) | 
| ZDFneo.de |
| 8 | Phoenix Ⓖ | [>](https://zdf-hls-19.akamaized.net/hls/live/2016502/de/veryhigh/master.m3u8) | 
| Phoenix.de |
| 9 | MDR Sachsen-Anhalt Ⓖ | [>](https://mdrtvsahls.akamaized.net/hls/live/2016879/mdrtvsa/master.m3u8) | 
| MDRSAnhalt.de |
| 10 | MDR Sachsen Ⓖ | [>](https://mdrtvsnhls.akamaized.net/hls/live/2016928/mdrtvsn/master.m3u8) | | MDRSachsen.de |
| 11 | MDR Thüringen Ⓖ | [>](https://mdrtvthhls.akamaized.net/hls/live/2016880/mdrtvth/master.m3u8) | | MDRThuringen.de |
-| 12 | NDR Hamburg Ⓖ | [>](https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_hh/master.m3u8) | 
|
-| 13 | NDR Mecklenburg-Vorpommern Ⓖ | [>](https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_mv/master.m3u8) | |
-| 14 | NDR Niedersachsen Ⓖ | [>](https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_nds/master.m3u8) | | ndrNiedersachsen.de |
-| 15 | NDR Schleswig-Holstein Ⓖ | [>](https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_sh/master.m3u8) | |
+| 12 | NDR Hamburg Ⓖ | [>](https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_hh/master.m3u8) | 
| ndr.de |
+| 13 | NDR Mecklenburg-Vorpommern Ⓖ | [>](https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_mv/master.m3u8) | | ndr.de |
+| 14 | NDR Niedersachsen Ⓖ | [>](https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_nds/master.m3u8) | | ndrNiedersachsen.de |
+| 15 | NDR Schleswig-Holstein Ⓖ | [>](https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_sh/master.m3u8) | | ndr.de |
| 16 | WDR Ⓖ | [>](https://mcdn.wdr.de/wdr/wdrfs/de/master.m3u8) | 
| WDR.de |
-| 17 | SWR Baden-Württemberg Ⓖ | [>](https://swrbwd-hls.akamaized.net/hls/live/2018672/swrbwd/master.m3u8) | 
| SWRFernsehen.de |
-| 18 | SWR Rheinland-Pfalz Ⓖ | [>](https://swrrpd-hls.akamaized.net/hls/live/2018676/swrrpd/master.m3u8) | | SWRFernsehen-rp.de |
+| 17 | SWR Baden-Württemberg Ⓖ | [>](https://swrbwd-hls.akamaized.net/hls/live/2018672/swrbwd/master.m3u8) | 
| SWRFernsehen.de |
+| 18 | SWR Rheinland-Pfalz Ⓖ | [>](https://swrrpd-hls.akamaized.net/hls/live/2018676/swrrpd/master.m3u8) | | SWRFernsehen-rp.de |
| 19 | SR Ⓖ | [>](https://srfs.akamaized.net/hls/live/689649/srfsgeo/index.m3u8) | 
| SRFernsehen.de |
| 20 | HR Ⓖ | [>](https://hrhls.akamaized.net/hls/live/2024525/hrhls/master.m3u8) | 
| HR.de |
-| 21 | BR Nord Ⓖ | [>](https://mcdn.br.de/br/fs/bfs_nord/hls/de/master.m3u8) | 
| BRFernsehenNord.de |
-| 22 | BR Süd Ⓖ | [>](https://brcdn.vo.llnwd.net/br/fs/bfs_sued/hls/de/master.m3u8) | | BRFernsehenSüd.de |
+| 21 | BR Nord Ⓖ | [>](https://mcdn.br.de/br/fs/bfs_nord/hls/de/master.m3u8) | 
| BRFernsehenNord.de |
+| 22 | BR Süd Ⓖ | [>](https://brcdn.vo.llnwd.net/br/fs/bfs_sued/hls/de/master.m3u8) | | BRFernsehenSüd.de |
| 23 | KiKa Ⓖ | [>](https://kikageohls.akamaized.net/hls/live/2022693/livetvkika_de/master.m3u8) | 
| KIKA.de |
| 24 | Tagesschau24 | [>](https://tagesschau.akamaized.net/hls/live/2020115/tagesschau/tagesschau_1/master.m3u8) | 
| tagesschau24.de |
| 25 | ARD Alpha Ⓖ | [>](https://mcdn.br.de/br/fs/ard_alpha/hls/de/master.m3u8) | 
| ARDalpha.de |
| 26 | DW Ⓖ | [>](http://dwstream6-lh.akamaihd.net/i/dwstream6_live@123962/master.m3u8) | 
| DeutscheWelle.de |
-| 27 | RBB Berlin Ⓖ | [>](https://rbb-hls-berlin.akamaized.net/hls/live/2017824/rbb_berlin/master.m3u8) | 
| RBBBerlin.de |
-| 28 | RBB Brandenburg Ⓖ | [>](https://rbb-hls-brandenburg.akamaized.net/hls/live/2017825/rbb_brandenburg/master.m3u8) | | RBBBrandenburg.de |
+| 27 | RBB Berlin Ⓖ | [>](https://rbb-hls-berlin.akamaized.net/hls/live/2017824/rbb_berlin/master.m3u8) | 
| RBBBerlin.de |
+| 28 | RBB Brandenburg Ⓖ | [>](https://rbb-hls-brandenburg.akamaized.net/hls/live/2017825/rbb_brandenburg/master.m3u8) | | RBBBrandenburg.de |
| 29 | Radio Bremen Ⓖ | [>](https://rbhlslive.akamaized.net/hls/live/2020435/rbfs/master.m3u8) | 
| RadioBremenTV.de |
| 30 | Nick Ⓖ | [>](https://0d26a00dfbb1.airspace-cdn.cbsivideo.com/nick1999/master/nick1999.m3u8) | 
| NickGermany.de |
| 31 | Deluxe Music | [>](https://sdn-global-live-streaming-packager-cache.3qsdn.com/13456/13456_264_live.m3u8) | 
| DeluxeMusic.de |
From 07679b619ed9be99adf371627ab5e7b444dc94bc Mon Sep 17 00:00:00 2001
From: telluroid <44676518+telluroid@users.noreply.github.com>
Date: Sat, 12 Nov 2022 17:27:17 +0100
Subject: [PATCH 2/2] Update germany.md
added DW Deutsch+
updated link for DW Deutsch
sorted programs into national, regional and international
---
lists/germany.md | 74 ++++++++++++++++++++++++++++--------------------
1 file changed, 43 insertions(+), 31 deletions(-)
diff --git a/lists/germany.md b/lists/germany.md
index 72ae5f2..d7c1866 100644
--- a/lists/germany.md
+++ b/lists/germany.md
@@ -4,40 +4,52 @@
https://en.wikipedia.org/wiki/Television_in_Germany
https://wiki.ubuntuusers.de/Internet-TV/Stationen
+National
| # | Channel | Link | Logo | EPG id |
|:---:|:--------------:|:-----:|:----:|:------:|
| 1 | Das Erste Ⓖ | [>](https://mcdn.daserste.de/daserste/de/master.m3u8) | | DasErste.de |
| 2 | ZDF Ⓖ | [>](http://zdf-hls-15.akamaized.net/hls/live/2016498/de/veryhigh/master.m3u8) | | ZDF.de |
| 3 | 3sat Ⓖ | [>](https://zdf-hls-18.akamaized.net/hls/live/2016501/dach/veryhigh/master.m3u8) | | 3sat.de |
-| 4 | ARTE Ⓖ | [>](https://artesimulcast.akamaized.net/hls/live/2030993/artelive_de/index.m3u8) | | ARTEDeutsch.de |
-| 5 | ONE Ⓖ | [>](https://mcdn.one.ard.de/ardone/hls/master.m3u8) | | One.de |
-| 6 | ZDFinfo Ⓖ | [>](https://zdf-hls-17.akamaized.net/hls/live/2016500/de/veryhigh/master.m3u8) | | ZDFinfo.de |
-| 7 | ZDFneo Ⓖ | [>](https://zdf-hls-16.akamaized.net/hls/live/2016499/de/veryhigh/master.m3u8) | | ZDFneo.de |
-| 8 | Phoenix Ⓖ | [>](https://zdf-hls-19.akamaized.net/hls/live/2016502/de/veryhigh/master.m3u8) | | Phoenix.de |
-| 9 | MDR Sachsen-Anhalt Ⓖ | [>](https://mdrtvsahls.akamaized.net/hls/live/2016879/mdrtvsa/master.m3u8) | | MDRSAnhalt.de |
-| 10 | MDR Sachsen Ⓖ | [>](https://mdrtvsnhls.akamaized.net/hls/live/2016928/mdrtvsn/master.m3u8) | | MDRSachsen.de |
-| 11 | MDR Thüringen Ⓖ | [>](https://mdrtvthhls.akamaized.net/hls/live/2016880/mdrtvth/master.m3u8) | | MDRThuringen.de |
-| 12 | NDR Hamburg Ⓖ | [>](https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_hh/master.m3u8) | | ndr.de |
-| 13 | NDR Mecklenburg-Vorpommern Ⓖ | [>](https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_mv/master.m3u8) | | ndr.de |
-| 14 | NDR Niedersachsen Ⓖ | [>](https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_nds/master.m3u8) | | ndrNiedersachsen.de |
-| 15 | NDR Schleswig-Holstein Ⓖ | [>](https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_sh/master.m3u8) | | ndr.de |
-| 16 | WDR Ⓖ | [>](https://mcdn.wdr.de/wdr/wdrfs/de/master.m3u8) | | WDR.de |
-| 17 | SWR Baden-Württemberg Ⓖ | [>](https://swrbwd-hls.akamaized.net/hls/live/2018672/swrbwd/master.m3u8) | | SWRFernsehen.de |
-| 18 | SWR Rheinland-Pfalz Ⓖ | [>](https://swrrpd-hls.akamaized.net/hls/live/2018676/swrrpd/master.m3u8) | | SWRFernsehen-rp.de |
-| 19 | SR Ⓖ | [>](https://srfs.akamaized.net/hls/live/689649/srfsgeo/index.m3u8) | | SRFernsehen.de |
-| 20 | HR Ⓖ | [>](https://hrhls.akamaized.net/hls/live/2024525/hrhls/master.m3u8) | | HR.de |
-| 21 | BR Nord Ⓖ | [>](https://mcdn.br.de/br/fs/bfs_nord/hls/de/master.m3u8) | | BRFernsehenNord.de |
-| 22 | BR Süd Ⓖ | [>](https://brcdn.vo.llnwd.net/br/fs/bfs_sued/hls/de/master.m3u8) | | BRFernsehenSüd.de |
-| 23 | KiKa Ⓖ | [>](https://kikageohls.akamaized.net/hls/live/2022693/livetvkika_de/master.m3u8) | | KIKA.de |
-| 24 | Tagesschau24 | [>](https://tagesschau.akamaized.net/hls/live/2020115/tagesschau/tagesschau_1/master.m3u8) | | tagesschau24.de |
-| 25 | ARD Alpha Ⓖ | [>](https://mcdn.br.de/br/fs/ard_alpha/hls/de/master.m3u8) | | ARDalpha.de |
-| 26 | DW Ⓖ | [>](http://dwstream6-lh.akamaihd.net/i/dwstream6_live@123962/master.m3u8) | | DeutscheWelle.de |
-| 27 | RBB Berlin Ⓖ | [>](https://rbb-hls-berlin.akamaized.net/hls/live/2017824/rbb_berlin/master.m3u8) | | RBBBerlin.de |
-| 28 | RBB Brandenburg Ⓖ | [>](https://rbb-hls-brandenburg.akamaized.net/hls/live/2017825/rbb_brandenburg/master.m3u8) | | RBBBrandenburg.de |
-| 29 | Radio Bremen Ⓖ | [>](https://rbhlslive.akamaized.net/hls/live/2020435/rbfs/master.m3u8) | | RadioBremenTV.de |
-| 30 | Nick Ⓖ | [>](https://0d26a00dfbb1.airspace-cdn.cbsivideo.com/nick1999/master/nick1999.m3u8) | | NickGermany.de |
-| 31 | Deluxe Music | [>](https://sdn-global-live-streaming-packager-cache.3qsdn.com/13456/13456_264_live.m3u8) | | DeluxeMusic.de |
-| 32 | Euronews Deutsch | [>](https://euronews.alteox.app/hls/de_stream.m3u8) | 
| EuronewsGerman.fr |
-| 33 | MTV Germany | [>](https://0d26a00dfbb1.airspace-cdn.cbsivideo.com/mtvg18ef/master/mtvg18ef.m3u8) | 
| MTVGermany.de |
-| 34 | Welt | [>](https://w-live2weltcms.akamaized.net/hls/live/2041019/Welt-LivePGM/index.m3u8) | 
| WELT.de |
+| 4 | ARD Alpha Ⓖ | [>](https://mcdn.br.de/br/fs/ard_alpha/hls/de/master.m3u8) | | ARDalpha.de |
+| 5 | ARTE Ⓖ | [>](https://artesimulcast.akamaized.net/hls/live/2030993/artelive_de/index.m3u8) | | ARTEDeutsch.de |
+| 6 | Deluxe Music | [>](https://sdn-global-live-streaming-packager-cache.3qsdn.com/13456/13456_264_live.m3u8) | | DeluxeMusic.de |
+| 7 | Euronews Deutsch | [>](https://euronews.alteox.app/hls/de_stream.m3u8) | | EuronewsGerman.fr |
+| 8 | KiKa Ⓖ | [>](https://kikageohls.akamaized.net/hls/live/2022693/livetvkika_de/master.m3u8) | | KIKA.de |
+| 9 | MTV Germany | [>](https://0d26a00dfbb1.airspace-cdn.cbsivideo.com/mtvg18ef/master/mtvg18ef.m3u8) | | MTVGermany.de |
+| 10 | Nick Ⓖ | [>](https://0d26a00dfbb1.airspace-cdn.cbsivideo.com/nick1999/master/nick1999.m3u8) | | NickGermany.de |
+| 11 | ONE Ⓖ | [>](https://mcdn.one.ard.de/ardone/hls/master.m3u8) | | One.de |
+| 12 | Phoenix Ⓖ | [>](https://zdf-hls-19.akamaized.net/hls/live/2016502/de/veryhigh/master.m3u8) | | Phoenix.de |
+| 13 | Tagesschau24 | [>](https://tagesschau.akamaized.net/hls/live/2020115/tagesschau/tagesschau_1/master.m3u8) | | tagesschau24.de |
+| 14 | Welt | [>](https://w-live2weltcms.akamaized.net/hls/live/2041019/Welt-LivePGM/index.m3u8) | | WELT.de |
+| 15 | ZDFinfo Ⓖ | [>](https://zdf-hls-17.akamaized.net/hls/live/2016500/de/veryhigh/master.m3u8) | | ZDFinfo.de |
+| 16 | ZDFneo Ⓖ | [>](https://zdf-hls-16.akamaized.net/hls/live/2016499/de/veryhigh/master.m3u8) | | ZDFneo.de |
+
+Regional (Dritte)
+
+| # | Channel | Link | Logo | EPG id |
+|:---:|:--------------:|:-----:|:----:|:------:|
+| 17 | BR Nord Ⓖ | [>](https://mcdn.br.de/br/fs/bfs_nord/hls/de/master.m3u8) | | BRFernsehenNord.de |
+| 18 | BR Süd Ⓖ | [>](https://brcdn.vo.llnwd.net/br/fs/bfs_sued/hls/de/master.m3u8) | | BRFernsehenSüd.de |
+| 19 | HR Ⓖ | [>](https://hrhls.akamaized.net/hls/live/2024525/hrhls/master.m3u8) | | HR.de |
+| 20 | MDR Sachsen Ⓖ | [>](https://mdrtvsnhls.akamaized.net/hls/live/2016928/mdrtvsn/master.m3u8) | | MDRSachsen.de |
+| 21 | MDR Sachsen-Anhalt Ⓖ | [>](https://mdrtvsahls.akamaized.net/hls/live/2016879/mdrtvsa/master.m3u8) | | MDRSAnhalt.de |
+| 22 | MDR Thüringen Ⓖ | [>](https://mdrtvthhls.akamaized.net/hls/live/2016880/mdrtvth/master.m3u8) | | MDRThuringen.de |
+| 23 | NDR Hamburg Ⓖ | [>](https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_hh/master.m3u8) | | ndr.de |
+| 24 | NDR Mecklenburg-Vorpommern Ⓖ| [>](https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_mv/master.m3u8) | | ndr.de |
+| 25 | NDR Niedersachsen Ⓖ| [>](https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_nds/master.m3u8) | | ndrNiedersachsen.de |
+| 26 | NDR Schleswig-Holstein Ⓖ | [>](https://mcdn.ndr.de/ndr/hls/ndr_fs/ndr_sh/master.m3u8) | | ndr.de |
+| 27 | RBB Berlin Ⓖ | [>](https://rbb-hls-berlin.akamaized.net/hls/live/2017824/rbb_berlin/master.m3u8) | | RBBBerlin.de |
+| 28 | RBB Brandenburg Ⓖ | [>](https://rbb-hls-brandenburg.akamaized.net/hls/live/2017825/rbb_brandenburg/master.m3u8) | | RBBBrandenburg.de |
+| 29 | Radio Bremen Ⓖ | [>](https://rbhlslive.akamaized.net/hls/live/2020435/rbfs/master.m3u8) | | RadioBremenTV.de |
+| 30 | SWR Baden-Württemberg Ⓖ | [>](https://swrbwd-hls.akamaized.net/hls/live/2018672/swrbwd/master.m3u8) | | SWRFernsehen.de |
+| 31 | SWR Rheinland-Pfalz Ⓖ | [>](https://swrrpd-hls.akamaized.net/hls/live/2018676/swrrpd/master.m3u8) | | SWRFernsehen-rp.de |
+| 32 | SR Ⓖ | [>](https://srfs.akamaized.net/hls/live/689649/srfsgeo/index.m3u8) | | SRFernsehen.de |
+| 33 | WDR Ⓖ | [>](https://mcdn.wdr.de/wdr/wdrfs/de/master.m3u8) | | WDR.de |
+
+International
+
+| # | Channel | Link | Logo | EPG id |
+|:---:|:--------------:|:-----:|:----:|:------:|
+| 34 | DW Deutsch Ⓖ | [>](https://dwamdstream111.akamaized.net/hls/live/2017972/dwstream111/index.m3u8) | | DeutscheWelleDE.de |
+| 35 | DW Deutsch+ | [>](https://dwamdstream110.akamaized.net/hls/live/2017971/dwstream110/index.m3u8) | | DeutscheWelleDE+.de |