Merge branch 'dev' into patch-2

2019-07-07 20:39:26 +02:00 · 2019-07-07 20:39:26 +02:00 · d862a59349
commit d862a59349
parent fc8746e077 806896ea05
52 changed files with 11 additions and 266 deletions
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@ -1235,9 +1235,7 @@ public class VideoDetailFragment
    protected boolean onError(Throwable exception) {
        if (super.onError(exception)) return true;

-        if (exception instanceof YoutubeStreamExtractor.GemaException) {
-            onBlockedByGemaError();
-        } else if (exception instanceof ContentNotAvailableException) {
+        else if (exception instanceof ContentNotAvailableException) {
            showError(getString(R.string.content_not_available), false);
        } else {
            int errorId = exception instanceof YoutubeStreamExtractor.DecryptException
@ -1255,17 +1253,6 @@ public class VideoDetailFragment
        return true;
    }

-    public void onBlockedByGemaError() {
-        thumbnailBackgroundButton.setOnClickListener((View v) -> {
-            Intent intent = new Intent();
-            intent.setAction(Intent.ACTION_VIEW);
-            intent.setData(Uri.parse(getString(R.string.c3s_url)));
-            startActivity(intent);
-        });
-
-        showError(getString(R.string.blocked_by_gema), false, R.drawable.gruese_die_gema);
-    }
-
    private void updateProgressInfo(@NonNull final StreamInfo info) {
        if (positionSubscriber != null) {
            positionSubscriber.dispose();
--- a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
@ -243,8 +243,6 @@ public final class ExtractorHelper {
                context.startActivity(intent);
            } else if (exception instanceof IOException) {
                Toast.makeText(context, R.string.network_error, Toast.LENGTH_LONG).show();
-            } else if (exception instanceof YoutubeStreamExtractor.GemaException) {
-                Toast.makeText(context, R.string.blocked_by_gema, Toast.LENGTH_LONG).show();
            } else if (exception instanceof ContentNotAvailableException) {
                Toast.makeText(context, R.string.content_not_available, Toast.LENGTH_LONG).show();
            } else {
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -52,7 +52,6 @@
    <string name="use_tor_summary">(إختبارية) إجراء التنزيلات من خلال استخدام بروكسي Tor لزيادة الخصوصية ( تشغيل الفيديو المباشر غير مدعوم حتى الأن ).</string>
    <string name="use_tor_title">استخدام تور</string>
    <string name="view_count_text">مشاهدات %1$s</string>
-    <string name="blocked_by_gema">تم حجبه بواسطة GEMA</string>
    <string name="content_not_available">محتوى غير متوفر</string>
    <string name="could_not_load_thumbnails">تعذرت عملية تحميل كافة صور المعاينة</string>
    <string name="general_error">خطأ</string>
--- a/app/src/main/res/values-b+ast/strings.xml
+++ b/app/src/main/res/values-b+ast/strings.xml
@ -62,7 +62,6 @@
    <string name="parsing_error">Nun pudo analizase\'l sitiu web</string>
    <string name="light_parsing_error">Nun pudo analizase dafechu\'l sitiu web</string>
    <string name="content_not_available">Conteníu non disponible</string>
-    <string name="blocked_by_gema">Bloquiáu por GEMA</string>
    <string name="could_not_setup_download_menu">Nun pudo configurase\'l menú de descarga</string>
    <string name="live_streams_not_supported">Esto ye una tresmisión de direuto qu\'entá nun se sofita.</string>
    <string name="could_not_get_stream">Nun pudo consiguise tresmisión dala</string>
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@ -155,7 +155,6 @@
    <string name="parsing_error">Не атрымалася разабраць вэб-сайт</string>
    <string name="light_parsing_error">Не атрымалася цалкам разабраць вэб-сайт</string>
    <string name="content_not_available">Кантэнт недаступны</string>
-    <string name="blocked_by_gema">Заблакавана GEMA</string>
    <string name="could_not_setup_download_menu">Не атрымалася стварыць меню загрузкі</string>
    <string name="live_streams_not_supported">Гэта прамая трансляцыя, яны пакуль не падтрымліваюцца.</string>
    <string name="could_not_get_stream">Не атрымалася знайсці ні аднаго патока</string>
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@ -119,7 +119,6 @@
    <string name="parsing_error">Неуспешно пресъздаване на уебсайта</string>
    <string name="light_parsing_error">Не мога да пресъздам изцяло уебсайта</string>
    <string name="content_not_available">Съдържанието не е налично</string>
-    <string name="blocked_by_gema">Блокирано от „GEMA“</string>
    <string name="could_not_setup_download_menu">Не мога да настроя меню за сваляне</string>
    <string name="live_streams_not_supported">Предаването на живо все още не се поддържа</string>
    <string name="could_not_get_stream">Не мога да достъпя нито един поток</string>
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@ -86,7 +86,6 @@
    <string name="parsing_error">ওয়েবসাইট বিশ্লেষন করা যায়নি।</string>
    <string name="light_parsing_error">ওয়েবসাইট সম্পুর্নভাবে বিশ্লেষন করা যায়নি।</string>
    <string name="content_not_available">কন্টেন্ট উপলব্ধ নয়।</string>
-    <string name="blocked_by_gema">GEMA কর্তৃক ব্লক করা হয়েছে।</string>
    <string name="could_not_setup_download_menu">ডাউনলোড মেনু সেটআপ করা যায়নি।</string>
    <string name="live_streams_not_supported">এটি একটি লাইভ স্ট্রিম। যা এখনও সমর্থিত নয়।</string>
    <string name="could_not_get_stream">কোনও স্ট্রিম পাওয়া যায়নি।</string>
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@ -177,7 +177,6 @@
    <string name="parsing_error">No s\'ha pogut processar el lloc web</string>
    <string name="light_parsing_error">No s\'ha pogut processar del tot el lloc web</string>
    <string name="content_not_available">Contingut no disponible</string>
-    <string name="blocked_by_gema">Blocat per la GEMA</string>
    <string name="could_not_setup_download_menu">No s\'ha pogut configurar el menú de baixades</string>
    <string name="live_streams_not_supported">Les emissions en directe encara no són compatibles</string>
    <string name="could_not_get_stream">No s\'ha pogut obtenir cap vídeo</string>
--- a/app/src/main/res/values-cmn/strings.xml
+++ b/app/src/main/res/values-cmn/strings.xml
@ -197,7 +197,6 @@
    <string name="parsing_error">无法解析网站</string>
    <string name="light_parsing_error">无法完全解析网站</string>
    <string name="content_not_available">内容不可用</string>
-    <string name="blocked_by_gema">内容被 GEMA 封锁</string>
    <string name="could_not_setup_download_menu">无法设置下载菜单</string>
    <string name="live_streams_not_supported">目前还不支持观看直播</string>
    <string name="could_not_get_stream">无法获得任何媒体</string>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -48,7 +48,8 @@
    <string name="youtube_signature_decryption_error">Nebylo možné dekódovat URL videa</string>
    <string name="parsing_error">Nebylo možné analyzovat stránku</string>
    <string name="content_not_available">Obsah není k dispozici</string>
-    <string name="blocked_by_gema">Obsah blokuje GEMA</string>
+
+
    <string name="list_thumbnail_view_description">Náhled videa</string>
    <string name="detail_thumbnail_view_description">Náhled videa</string>
    <string name="detail_uploader_thumbnail_view_description">Náhled avataru uploadera</string>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@ -172,7 +172,6 @@
    <string name="parsing_error">Kunne ikke analysere websted</string>
    <string name="light_parsing_error">Kunne ikke analysere webstedet fuldstændig</string>
    <string name="content_not_available">Indhold ikke tilgængeligt</string>
-    <string name="blocked_by_gema">Blokeret af GEMA</string>
    <string name="could_not_setup_download_menu">Kunne ikke oprette downloadmenu</string>
    <string name="live_streams_not_supported">Livestreams er endnu ikke understøttet</string>
    <string name="could_not_get_stream">Kunne ikke hente nogen stream</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -58,7 +58,7 @@
    <string name="youtube_signature_decryption_error">Konnte Video-URL-Signatur nicht entschlüsseln</string>
    <string name="parsing_error">Konnte Webseite nicht analysieren</string>
    <string name="content_not_available">Inhalt nicht verfügbar</string>
-    <string name="blocked_by_gema">Durch die GEMA gesperrt</string>
+
    <string name="content">Inhalt</string>
    <string name="show_age_restricted_content_title">Altersbeschränkte Inhalte</string>
    <string name="video_is_age_restricted">Altersbeschränktes Video anzeigen. Das Zulassen dieses Materials ist von den Einstellungen aus möglich.</string>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -185,7 +185,6 @@
    <string name="parsing_error">Δεν ήταν δυνατή η ανάλυση του ιστοτόπου</string>
    <string name="light_parsing_error">Δεν ήταν δυνατή η ανάλυση ολόκληρου του ιστοτόπου</string>
    <string name="content_not_available">Το περιεχόμενο δεν είναι διαθέσιμο</string>
-    <string name="blocked_by_gema">"Έχει αποκλειστεί  από την GEMA"</string>
    <string name="could_not_setup_download_menu">Δεν ήταν δυνατή η ρύθμιση του μενού λήψεων</string>
    <string name="live_streams_not_supported">Η Ζωντανή Ροή δεν υποστηρίζεται ακόμα</string>
    <string name="could_not_get_stream">Δεν ήταν δυνατή η λήψη καμίας ροής</string>
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@ -37,7 +37,6 @@
    <string name="general_error">Eraro</string>
    <string name="network_error">Reteraro</string>
    <string name="content_not_available">Enhavo ne estas disponebla</string>
-    <string name="blocked_by_gema">Blokita de GEMA</string>

    <string name="detail_likes_img_view_description">Ŝatoj</string>
    <string name="detail_dislikes_img_view_description">Malŝatoj</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -42,7 +42,7 @@
    <string name="info_dir_created">Carpeta de descarga creada \'%1$s\'</string>
    <string name="download_path_audio_summary">Ruta para almacenar los audios descargados</string>
    <string name="download_path_audio_dialog_title">Introducir ruta de descarga para archivos de audio</string>
-    <string name="blocked_by_gema">Bloqueado por GEMA</string>
+
    <string name="download_path_audio_title">Carpeta de descarga de audio</string>
    <string name="settings_category_video_audio_title">Vídeo y audio</string>
    <string name="play_btn_text">Reproducir</string>
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@ -149,7 +149,6 @@
    <string name="parsing_error">Veebilehe töötlemine nurjus</string>
    <string name="light_parsing_error">Veebilehe täielik töötlemine nurjus</string>
    <string name="content_not_available">Sisu pole saadaval</string>
-    <string name="blocked_by_gema">GEMA poolt blokeeritud</string>
    <string name="could_not_setup_download_menu">Allalaadimismenüü seadistamine nurjus</string>
    <string name="live_streams_not_supported">Otsevood ei ole veel toetatud</string>
    <string name="could_not_get_stream">Ühtegi voogu ei leitud</string>
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@ -94,7 +94,6 @@
    <string name="parsing_error">Ezin izan da webgunea analizatu</string>
    <string name="light_parsing_error">Ezin izan da webgunea guztiz analizatu</string>
    <string name="content_not_available">Edukia ez dago eskuragarri</string>
-    <string name="blocked_by_gema">GEMAk blokeatuta</string>
    <string name="could_not_setup_download_menu">Ezin izan da deskargen menua ezarri</string>
    <string name="live_streams_not_supported">Zuzeneko jarioek ez dute euskarririk oraindik</string>
    <string name="could_not_get_stream">Ezin izan da jariorik eskuratu</string>
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@ -59,7 +59,6 @@
    <string name="parsing_error">نمی‌توان پایگاه وب را تجزیه کرد.</string>
    <string name="light_parsing_error">نمی‌توان پایگاه وب را به صورت کامل تجزیه کرد.</string>
    <string name="content_not_available">محتوا در دسترس نیست.</string>
-    <string name="blocked_by_gema">مسدود شده توسّط GEMA.</string>
    <string name="could_not_setup_download_menu">نمی‌توان فهرست بارگیری را برپا ساخت.</string>
    <string name="live_streams_not_supported">این یک جریان زنده است. این جریان‌ها هنوز پشتیبانی نمی‌شوند.</string>
    <string name="could_not_get_stream">نمی‌توان هیچ جریانی را گرفت.</string>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@ -114,7 +114,6 @@
    <string name="parsing_error">Ei pystytty jäsentämään websivua</string>
    <string name="light_parsing_error">Ei pystytty jäsentämään websivua kokonaan</string>
    <string name="content_not_available">Sisältö ei ole saatavilla</string>
-    <string name="blocked_by_gema">Estetty GEMA</string>
    <string name="could_not_setup_download_menu">Ei pystytty asettamaan latausvalikkoa</string>
    <string name="live_streams_not_supported">Tämä on LIVE LÄHETYS, mitä ei vielä tueta.</string>
    <string name="could_not_get_stream">Ei saatu mitään suoratoistoa</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -55,7 +55,7 @@
    <string name="general_error">Erreur</string>
    <string name="parsing_error">Impossible d\'analyser le site web</string>
    <string name="content_not_available">Contenu non disponible</string>
-    <string name="blocked_by_gema">Bloqué par GEMA</string>
+
    <string name="error_snackbar_message">Désolé, des erreurs se sont produites.</string>
    <string name="content">Contenu</string>
    <string name="show_age_restricted_content_title">Contenu avec limite d\'âge</string>
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@ -165,7 +165,6 @@
    <string name="light_parsing_error">Non foi posíbel procesar o sitio web por completo</string>
    <string name="content_not_available">O contido non está dispoñíbel
 \n</string>
-    <string name="blocked_by_gema">Bloqueado pola GEMA</string>
    <string name="could_not_setup_download_menu">Non foi posíbel configurar o menú de descargas</string>
    <string name="live_streams_not_supported">Isto é unha emisión en directo, polo que aínda non está soportado.</string>
    <string name="could_not_get_stream">Non foi posíbel obter unha emisión</string>
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@ -86,7 +86,6 @@
    <string name="parsing_error">ניתוח האתר לא התאפשר</string>
    <string name="light_parsing_error">לא הייתה אפשרות לנתח את האתר לחלוטין</string>
    <string name="content_not_available">תוכן אינו זמין</string>
-    <string name="blocked_by_gema">נחסם ע״י GEMA</string>
    <string name="could_not_setup_download_menu">לא הייתה אפשרות להכין את תפריט ההורדה</string>
    <string name="live_streams_not_supported">עדיין אין תמיכה בתזרימים חיים</string>
    <string name="could_not_get_stream">לא הייתה אפשרות לקבל תזרים כלשהו</string>
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@ -137,7 +137,6 @@
    <string name="parsing_error">इस website का निरंक्षण नहीं कर सकते</string>
    <string name="light_parsing_error">website का पूरी तरह से निरंक्षण नहीं हो सकता</string>
    <string name="content_not_available">विषय वस्तु उपलब्ध नहीं है</string>
-    <string name="blocked_by_gema">GEMA ने block किया है</string>
    <string name="could_not_setup_download_menu">डाउनलोड मेनू को स्थापित नहीं कर सकते</string>
    <string name="live_streams_not_supported">"सीधे प्रसारण के लिये फिलहाल समर्थन नहीं है "</string>
    <string name="could_not_get_stream">कोई भी विडियो नहीं मिल रहा</string>
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@ -101,7 +101,6 @@
    <string name="parsing_error">Nije moguće dohvatiti stranicu</string>
    <string name="light_parsing_error">Nije moguće u potpunosti dohvatiti stranicu</string>
    <string name="content_not_available">Sadržaj nije dostupan</string>
-    <string name="blocked_by_gema">Blokirano od GEMA-e</string>
    <string name="could_not_setup_download_menu">Nije moguće postaviti izbornik za preuzimanje</string>
    <string name="live_streams_not_supported">Prijenos uživo još nije podržan</string>
    <string name="could_not_get_stream">Nije moguće dobaviti stream</string>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -61,7 +61,6 @@
    <string name="show_age_restricted_content_title">Korhatáros tartalom</string>
    <string name="general_error">Hiba</string>
    <string name="content_not_available">A tartalom nem elérhető</string>
-    <string name="blocked_by_gema">GEMA által blokkolt</string>
    <string name="live_streams_not_supported">Ez egy élő közvetítés, amely még nem támogatott.</string>
    <string name="autoplay_by_calling_app_title">Automatikus lejátszás</string>
    <string name="autoplay_by_calling_app_summary">Videók automatikus lejátszása, ha a NewPipe egy másik alkalmazásból lett indítva</string>
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@ -56,7 +56,6 @@
    <string name="parsing_error">Tidak bisa mengurai situs web</string>
    <string name="light_parsing_error">Tidak dapat menguraikan situs web sepenuhnya</string>
    <string name="content_not_available">Konten tidak tersedia</string>
-    <string name="blocked_by_gema">Diblokir oleh GEMA</string>
    <string name="could_not_setup_download_menu">Tidak bisa menyiapkan menu unduh</string>
    <string name="live_streams_not_supported">Siaran langsung belum didukung</string>
    <string name="could_not_load_image">Tidak bisa memuat gambar</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -54,7 +54,6 @@
    <string name="could_not_load_thumbnails">Impossibile caricare tutte le miniature</string>
    <string name="youtube_signature_decryption_error">Impossibile decriptare la firma dell\'URL del video</string>
    <string name="content_not_available">Contenuto non disponibile</string>
-    <string name="blocked_by_gema">Bloccato da GEMA</string>
    <string name="use_tor_title">Usa Tor</string>
    <string name="use_tor_summary">(Sperimentale) Forza il download tramite Tor per una maggiore riservatezza (lo streaming dei video non è ancora supportato).</string>
    <string name="parsing_error">Impossibile analizzare il sito web</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -57,7 +57,7 @@
    <string name="youtube_signature_decryption_error">動画のURLを復号できませんでした</string>
    <string name="parsing_error">Webサイトを解析できませんでした</string>
    <string name="content_not_available">コンテンツが利用できません</string>
-    <string name="blocked_by_gema">GEMA にブロックされました</string>
+
    <string name="could_not_setup_download_menu">保存メニューを設定できませんでした</string>
    <string name="live_streams_not_supported">生放送にはまだ対応していません</string>
    <string name="content">コンテンツ</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -65,7 +65,6 @@
    <string name="parsing_error">웹사이트를 가져올 수 없습니다</string>
    <string name="light_parsing_error">웹사이트를 완전히 가져올 수 없습니다</string>
    <string name="content_not_available">컨텐츠를 사용할 수 없습니다</string>
-    <string name="blocked_by_gema">GEMA에 의해 차단되었습니다</string>
    <string name="could_not_setup_download_menu">다운로드 메뉴를 설정할 수 없습니다</string>
    <string name="live_streams_not_supported">라이브 스트림은 아직 지원하지 않습니다</string>
    <string name="could_not_get_stream">어떠한 스트림도 가져올 수 없습니다</string>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@ -88,7 +88,6 @@
    <string name="parsing_error">Negalima apdoroti tinklapio</string>
    <string name="light_parsing_error">Negalima visiškai apdoroti tinklapio</string>
    <string name="content_not_available">Turinys neprieinamas</string>
-    <string name="blocked_by_gema">Užblokavo GEMA</string>
    <string name="could_not_setup_download_menu">Negalima sutvarkyti atsisiuntimų meniu</string>
    <string name="live_streams_not_supported">Tai gyvas srautas. Tokie kol kas nepalaikomi.</string>
    <string name="could_not_get_stream">Negalima gauti jokio srauto</string>
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@ -152,7 +152,6 @@
    <string name="parsing_error">Не може да се прочита страната</string>
    <string name="light_parsing_error">Не може целосно да се прочита страната</string>
    <string name="content_not_available">Содржината е недостапна</string>
-    <string name="blocked_by_gema">Блокирано од GEMA</string>
    <string name="could_not_setup_download_menu">Неуспешно поставување на менито за превземања</string>
    <string name="live_streams_not_supported">Ова е пренос ВО ЖИВО, што сеуште не е поддржано.</string>
    <string name="could_not_get_stream">Не е пронајден поток на податоци</string>
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@ -172,7 +172,6 @@
    <string name="parsing_error">Tidak dapat menghuraikan laman web</string>
    <string name="light_parsing_error">Tidak dapat menghuraikan laman web sepenuhnya</string>
    <string name="content_not_available">Kandungan tidak tersedia</string>
-    <string name="blocked_by_gema">Disekat oleh GEMA</string>
    <string name="could_not_setup_download_menu">Tidak dapat menyediakan menu muat turun</string>
    <string name="live_streams_not_supported">Siaran langsung belum disokong</string>
    <string name="could_not_get_stream">Tidak boleh mendapat sebarang strim</string>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@ -70,7 +70,6 @@
    <string name="parsing_error">Kunne ikke tolke nettside</string>
    <string name="light_parsing_error">Kunne ikke tolke nettside fullstendig</string>
    <string name="content_not_available">Innholdet er ikke tilgjengelig</string>
-    <string name="blocked_by_gema">Blokkert av GEMA</string>
    <string name="could_not_setup_download_menu">Kunne ikke sette opp nedlastingsmeny</string>
    <string name="live_streams_not_supported">Direktesendinger støttes ikke enda.</string>
    <string name="could_not_get_stream">Kunne ikke finne noen strømmer</string>
--- a/app/src/main/res/values-nl-rBE/strings.xml
+++ b/app/src/main/res/values-nl-rBE/strings.xml
@ -143,7 +143,6 @@
    <string name="parsing_error">Kon website niet verwerken</string>
    <string name="light_parsing_error">Kon de website niet volledig inlezen</string>
    <string name="content_not_available">Inhoud niet beschikbaar</string>
-    <string name="blocked_by_gema">Geblokkeerd door GEMA</string>
    <string name="could_not_setup_download_menu">Kon downloadmenu niet instellen</string>
    <string name="live_streams_not_supported">Livestreams worden nog niet ondersteund</string>
    <string name="could_not_get_stream">Kon geen streams vinden</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -55,7 +55,6 @@
    <string name="youtube_signature_decryption_error">Kan video-URL-ondertekening niet ontsleutelen</string>
    <string name="parsing_error">Kan website niet verwerken</string>
    <string name="content_not_available">Inhoud niet beschikbaar</string>
-    <string name="blocked_by_gema">Geblokkeerd door GEMA</string>
    <string name="could_not_setup_download_menu">Kan downloadmenu niet instellen</string>
    <string name="live_streams_not_supported">Livestreams zijn nog niet ondersteund</string>
    <string name="detail_likes_img_view_description">Vind-ik-leuks</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -59,7 +59,6 @@
    <string name="parsing_error">Nie można przetworzyć strony</string>
    <string name="light_parsing_error">Nie można przetworzyć całości strony</string>
    <string name="content_not_available">Zawartość niedostępna</string>
-    <string name="blocked_by_gema">Zablokowane przez GEMA</string>
    <string name="could_not_setup_download_menu">Nie można ustawić menu pobierania</string>
    <string name="live_streams_not_supported">Transmisje na żywo nie są jeszcze obsługiwane</string>
    <string name="could_not_get_stream">Nie można otrzymać żadnego strumienia</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -12,7 +12,6 @@
    <string name="autoplay_by_calling_app_summary">Reproduz o vídeo quando o NewPipe for aberto a partir de outro aplicativo</string>
    <string name="autoplay_by_calling_app_title">Reproduzir automaticamente</string>
    <string name="black_theme_title">Preto</string>
-    <string name="blocked_by_gema">Bloqueado pelo GEMA</string>
    <string name="cancel">Cancelar</string>
    <string name="checksum">Soma de Verificação</string>
    <string name="choose_browser">Escolher navegador</string>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -57,7 +57,7 @@
    <string name="youtube_signature_decryption_error">Incapaz de descodificar a assinatura do vídeo</string>
    <string name="parsing_error">Incapaz de processar o site</string>
    <string name="content_not_available">Conteúdo não disponível</string>
-    <string name="blocked_by_gema">Bloqueado por GEMA</string>
+
    <string name="content">Conteúdo</string>
    <string name="show_age_restricted_content_title">Restringir conteúdo por idade</string>
    <string name="video_is_age_restricted">Mostrar vídeo com restrição de idade. É possível permitir tal material nas Configurações.</string>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@ -52,7 +52,6 @@
    <string name="youtube_signature_decryption_error">Nu s-a putut decripta semnătura URL a videoclipului</string>
    <string name="parsing_error">Nu s-a putut analiza website-ul</string>
    <string name="content_not_available">Conținut indisponibil</string>
-    <string name="blocked_by_gema">Blocat de către GEMA</string>
    <string name="could_not_setup_download_menu">Imposibil de inițializat meniul pentru descărcări</string>
    <string name="live_streams_not_supported">LIVE STREAM-uri încă nu sunt suportate</string>
    <string name="list_thumbnail_view_description">Thumbnail-ul videoclipului</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -81,7 +81,6 @@
    <string name="parsing_error">Не удалось разобрать веб-сайт</string>
    <string name="light_parsing_error">Не удалось полностью разобрать веб-сайт</string>
    <string name="content_not_available">Контент недоступен</string>
-    <string name="blocked_by_gema">Заблокировано GEMA</string>
    <string name="could_not_setup_download_menu">Не удалось создать меню загрузки</string>
    <string name="live_streams_not_supported">Прямые трансляции пока не поддерживается</string>
    <string name="could_not_load_image">Не удалось загрузить изображение</string>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -48,7 +48,7 @@
    <string name="youtube_signature_decryption_error">Nepodarilo sa dekódovať URL videa</string>
    <string name="parsing_error">Nemožno analyzovať webovú stránku</string>
    <string name="content_not_available">Obsah nie je dostupný</string>
-    <string name="blocked_by_gema">Obsah blokuje GEMA</string>
+
    <string name="list_thumbnail_view_description">Náhľad videa</string>
    <string name="detail_thumbnail_view_description">Náhľad videa</string>
    <string name="detail_uploader_thumbnail_view_description">Náhľad avataru uploadera</string>
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@ -62,7 +62,6 @@
    <string name="youtube_signature_decryption_error">Ni mogoče odšifrirati podpisa naslova URL videa</string>
    <string name="parsing_error">Ni mogoče razčleniti spletišča.</string>
    <string name="content_not_available">Vsebina ni na voljo.</string>
-    <string name="blocked_by_gema">Blokirano zaradi pripomb GEMA.</string>

    <string name="could_not_setup_download_menu">Ni mogoče nastaviti menija za prejem datotek.</string>

--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@ -57,7 +57,7 @@
    <string name="youtube_signature_decryption_error">Не могу да дешифрујем потпис видео урл-а</string>
    <string name="parsing_error">Не могу да рашчланим веб-сајт</string>
    <string name="content_not_available">Садржај није доступан</string>
-    <string name="blocked_by_gema">Блокирала ГЕМА</string>
+
    <string name="content">Садржај</string>
    <string name="show_age_restricted_content_title">Прикажи старосно-ограничени садржај</string>
    <string name="video_is_age_restricted">Старосно-ограничени видео. Премошћавање је доступно у поставкама.</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -88,7 +88,6 @@
    <string name="parsing_error">Det gick inte att analysera webbplatsen</string>
    <string name="light_parsing_error">Det gick inte att analysera webbplatsen helt</string>
    <string name="content_not_available">Innehållet är inte tillgängligt</string>
-    <string name="blocked_by_gema">Blockerat av GEMA</string>
    <string name="could_not_setup_download_menu">Kunde inte ställa in nedladdningsmenyn</string>
    <string name="live_streams_not_supported">Direktsändningar stöds inte än</string>
    <string name="could_not_load_image">Kunde inte ladda Bild</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -59,7 +59,6 @@
    <string name="parsing_error">Web sitesi ayrıştırılamadı</string>
    <string name="light_parsing_error">Web sitesi tamamen ayrıştırılamadı</string>
    <string name="content_not_available">İçerik kullanılamıyor</string>
-    <string name="blocked_by_gema">GEMA tarafından engellendi</string>
    <string name="live_streams_not_supported">Canlı akışlar henüz desteklenmiyor</string>
    <string name="could_not_get_stream">Herhangi bir akış alınamadı</string>
    <string name="could_not_load_image">Görüntü yüklenemedi</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -56,7 +56,6 @@
    <string name="parsing_error">Не вдалося проаналізувати веб-сайт</string>
    <string name="light_parsing_error">Не вдалося повністю проаналізувати веб-сайт</string>
    <string name="content_not_available">Контент недоступний</string>
-    <string name="blocked_by_gema">Заблоковано GEMA</string>
    <string name="could_not_setup_download_menu">Не вдалося налаштувати меню завантаження</string>
    <string name="live_streams_not_supported">Трансляції НАЖИВО поки що не підтримуються</string>
    <string name="could_not_get_stream">Не вдалося отримати жодного потоку</string>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@ -83,7 +83,6 @@
    <string name="parsing_error">Không thể phân tích cú pháp trang web</string>
    <string name="light_parsing_error">Không thể phân tích cú pháp hoàn toàn trang web</string>
    <string name="content_not_available">Nội dung không khả dụng</string>
-    <string name="blocked_by_gema">Chặn bởi GEMA</string>
    <string name="could_not_setup_download_menu">Không thể thiết lập menu tải về</string>
    <string name="live_streams_not_supported">Livestream chưa được hỗ trợ</string>
    <string name="could_not_get_stream">Không thể lấy bất kỳ luồng nào</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -64,7 +64,6 @@
    <string name="parsing_error">无法解析网站</string>
    <string name="light_parsing_error">无法完全解析网站</string>
    <string name="content_not_available">内容不可用</string>
-    <string name="blocked_by_gema">已被 GEMA 屏蔽</string>
    <string name="could_not_setup_download_menu">无法设置下载菜单</string>
    <string name="live_streams_not_supported">这是一个在线流媒体，尚不支持。</string>
    <string name="could_not_get_stream">无法获取任何流媒体</string>
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@ -52,7 +52,6 @@
    <string name="download_path_audio_dialog_title">請輸入聲音檔案的下載路徑</string>
    <string name="err_dir_create">未能建立下載路徑「%1$s」</string>
    <string name="info_dir_created">已建立下載路徑「%1$s」</string>
-    <string name="blocked_by_gema">內容被 GEMA 封鎖</string>
    <string name="main_bg_subtitle">按一下搜尋按鈕以開始操作</string>
    <string name="autoplay_by_calling_app_title">自動撥放</string>
    <string name="autoplay_by_calling_app_summary">當其他應用程式要求播放影片時，NewPipe 將會自動播放</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -94,7 +94,6 @@
    <string name="parsing_error">無法解析網站</string>
    <string name="light_parsing_error">無法完全解析網站</string>
    <string name="content_not_available">內容無法使用</string>
-    <string name="blocked_by_gema">已被 GEMA 阻擋</string>
    <string name="could_not_setup_download_menu">無法設定下載選單</string>
    <string name="live_streams_not_supported">尚未支援現場串流</string>
    <string name="could_not_get_stream">無法取得串流</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -188,7 +188,6 @@
    <string name="parsing_error">Could not parse website</string>
    <string name="light_parsing_error">Could not parse website completely</string>
    <string name="content_not_available">Content unavailable</string>
-    <string name="blocked_by_gema">Blocked by GEMA</string>
    <string name="could_not_setup_download_menu">Could not set up download menu</string>
    <string name="live_streams_not_supported">Live streams are not supported yet</string>
    <string name="could_not_get_stream">Could not get any stream</string>
@ -561,4 +560,4 @@
    <string name="downloads_storage_ask_summary">You will be asked where to save each download</string>
    <string name="downloads_storage_ask_summary_kitkat">You will be asked where to save each download.\nEnable this option if you want download to the external SD Card</string>

-</resources>
+</resources>
--- a/assets/gruese_die_gema.svg
+++ b/assets/gruese_die_gema.svg