Merge remote-tracking branch 'origin/dev' into dev

app/src/main/AndroidManifest.xml

@@ -132,7 +132,7 @@
         <activity
             android:name=".RouterActivity"
             android:excludeFromRecents="true"
-            android:label="@string/preferred_player_share_menu_title"
+            android:label="@string/preferred_open_action_share_menu_title"
             android:taskAffinity=""
             android:theme="@style/RouterActivityThemeDark">
 

app/src/main/java/org/schabi/newpipe/RouterActivity.java

@@ -218,7 +218,7 @@ public class RouterActivity extends AppCompatActivity {
         };
 
         final AlertDialog alertDialog = new AlertDialog.Builder(themeWrapperContext)
-                .setTitle(R.string.preferred_player_share_menu_title)
+                .setTitle(R.string.preferred_open_action_share_menu_title)
                 .setView(radioGroup)
                 .setCancelable(true)
                 .setNegativeButton(R.string.just_once, dialogButtonsClickListener)

app/src/main/res/values-ar/strings.xml

@@ -305,7 +305,6 @@
     <string name="just_once">مرة واحدة فقط</string>
 
     <string name="invalid_url_toast">العنوان خاطئ</string>
-    <string name="preferred_player_share_menu_title">\@string/preferred_player_settings_title</string>
     <string name="no_player_found_toast">لم يتم العثور على مشغل بث (يمكنك تثبيت VLC لتشغيله)</string>
     <string name="import_data_title">استيراد قاعدة البيانات</string>
     <string name="export_data_title">تصدير قاعدة البيانات</string>
@@ -334,8 +333,6 @@
     <string name="drawer_header_action_paceholder_text">سوف نقوم بإدماج شيء جديد هنا قريبا ;D</string>
 
 
-    <string name="preferred_player_settings_title">قارئ الوسائط المُفضّل</string>
-
     <string name="video_player">قارئ الفيديوهات</string>
     <string name="always_ask_open_action">أُطلُب دائمًا</string>
     

app/src/main/res/values-b+ast/strings.xml

@@ -323,8 +323,6 @@
 
     <string name="drawer_open">Abrir caxón</string>
     <string name="drawer_close">Zarrar caxón</string>
-    <string name="preferred_player_share_menu_dialog_title">Abrir col reproductor preferíu</string>
-    <string name="preferred_player_settings_title">Reproductor preferíu</string>
 
     <string name="video_player">Reproductor de videu</string>
     <string name="background_player">Reproductor en segundu planu</string>

app/src/main/res/values-cs/strings.xml

@@ -326,9 +326,6 @@ otevření ve vyskakovacím okně</string>
     <string name="could_not_import_all_files">Upozornění: Nelze importovat všechny soubory.</string>
     <string name="override_current_data">Tímto se anuluje vaše aktuální nastavení.</string>
 
-    <string name="preferred_player_share_menu_dialog_title">Otevřít preferovaným přehrávačem</string>
-    <string name="preferred_player_settings_title">Preferovaný přehrávač</string>
-
     <string name="video_player">Video přehrávač</string>
     <string name="background_player">Přehrávač na pozadí</string>
     <string name="popup_player">Přehrávač v okně</string>

app/src/main/res/values-de/strings.xml

@@ -318,8 +318,6 @@
 
     <string name="drawer_open">Navigationsleiste öffnen</string>
     <string name="drawer_close">Navigationsleiste schließen</string>
-    <string name="preferred_player_share_menu_dialog_title">Mit bevorzugtem Player öffnen</string>
-    <string name="preferred_player_settings_title">Bevorzugter Player</string>
 
     <string name="video_player">Video-Player</string>
     <string name="background_player">Hintergrund-Player</string>

app/src/main/res/values-es/strings.xml

@@ -320,10 +320,6 @@ abrir en modo popup</string>
     <string name="video_streams_empty">No se encontraron transmisiones de vídeo</string>
     <string name="audio_streams_empty">No se encontraron transmisiones de audio</string>
 
-    <string name="preferred_player_share_menu_title">\@string/preferred_player_settings_title</string>
-    <string name="preferred_player_share_menu_dialog_title">Abrir con el reproductor preferido</string>
-    <string name="preferred_player_settings_title">Reproductor preferido</string>
-
     <string name="video_player">Reproductor de vídeo</string>
     <string name="background_player">Reproductor de fondo</string>
     <string name="popup_player">Reproductor de popup</string>

app/src/main/res/values-eu/strings.xml

@@ -307,9 +307,6 @@
     <string name="video_streams_empty">Ez da bideo jariorik aurkitu</string>
     <string name="audio_streams_empty">Ez da audio jariorik aurkitu</string>
 
-    <string name="preferred_player_share_menu_dialog_title">Ireki gogoko erreproduzigailuarekin</string>
-    <string name="preferred_player_settings_title">Gogoko erreproduzigailua</string>
-
     <string name="video_player">Bideo erreproduzigailua</string>
     <string name="background_player">Bigarren planoko erreproduzigailua</string>
     <string name="popup_player">Laster-leiho erreproduzigailua</string>

app/src/main/res/values-fr/strings.xml

@@ -318,9 +318,6 @@
     <string name="video_streams_empty">Aucun flux vidéo trouvé</string>
     <string name="audio_streams_empty">Aucun flux audio trouvé</string>
 
-    <string name="preferred_player_share_menu_dialog_title">Ouvrir avec le lecteur préféré</string>
-    <string name="preferred_player_settings_title">Lecteur préféré</string>
-
     <string name="video_player">Lecteur vidéo</string>
     <string name="background_player">Lecteur en arrière-plan</string>
     <string name="popup_player">Lecteur en fenêtré</string>

app/src/main/res/values-hi/strings.xml

@@ -332,9 +332,6 @@
     <string name="drawer_header_action_paceholder_text">जल्द ही यहां पर कुछ आएगा ;D</string>
 
 
-    <string name="preferred_player_share_menu_dialog_title">पसंदीदा प्लेयर से खोलें</string>
-    <string name="preferred_player_settings_title">पसंदीदा प्लेयर</string>
-
     <string name="video_player">वीडियो प्लेयर</string>
     <string name="background_player">बैकग्राउंड प्लेयर</string>
     <string name="popup_player">पॉपअप प्लेयर</string>

app/src/main/res/values-hr/strings.xml

@@ -295,9 +295,6 @@
     <string name="drawer_header_action_paceholder_text">Nešto će zasigurno doći ovdje :D</string>
 
 
-    <string name="preferred_player_share_menu_dialog_title">Otvoriti sa Vašim reproduktorom</string>
-    <string name="preferred_player_settings_title">Odabrani reproduktor</string>
-
     <string name="video_player">Video reprodukcija</string>
     <string name="background_player">Pozadinska reprodukcija</string>
     <string name="popup_player">Skočna reprodukcija</string>

app/src/main/res/values-id/strings.xml

@@ -344,9 +344,6 @@ membuka di mode popup</string>
     <string name="drawer_header_action_paceholder_text">Sesuatu akan hadir disini nanti ;D</string>
 
 
-    <string name="preferred_player_share_menu_dialog_title">Buka dengan pemutar yg diinginkan</string>
-    <string name="preferred_player_settings_title">Pemutar yg diinginkan</string>
-
     <string name="video_player">Pemutar video</string>
     <string name="background_player">Pemutar Layar Belakang</string>
     <string name="popup_player">Pemutar sembulan</string>

app/src/main/res/values-it/strings.xml

@@ -325,10 +325,6 @@
     <string name="video_streams_empty">Nessun flusso video trovato</string>
     <string name="audio_streams_empty">Nessun flusso audio trovato</string>
 
-    <string name="preferred_player_share_menu_title">Riproduttore preferito</string>
-    <string name="preferred_player_share_menu_dialog_title">Apri con il riproduttore preferito</string>
-    <string name="preferred_player_settings_title">Riproduttore preferito</string>
-
     <string name="video_player">Riproduttore video</string>
     <string name="background_player">Riproduttore di fondo</string>
     <string name="popup_player">Riproduttore a comparsa</string>

app/src/main/res/values-ja/strings.xml

@@ -302,8 +302,6 @@
     <string name="start_here_on_background">ここからバックグランド再生を開始</string>
     <string name="drawer_open">ドロワーを開く</string>
     <string name="drawer_close">ドロワーを閉じる</string>
-    <string name="preferred_player_share_menu_dialog_title">優先プレーヤーで開く</string>
-    <string name="preferred_player_settings_title">優先プレーヤー</string>
 
     <string name="video_player">動画プレーヤー</string>
     <string name="background_player">バックグラウンドプレーヤー</string>

app/src/main/res/values-ko/strings.xml

@@ -342,9 +342,6 @@
     <string name="drawer_header_action_paceholder_text">여기에 무언가가 추가될 거에요~ :D</string>
 
 
-    <string name="preferred_player_share_menu_dialog_title">선호하는 플레이어로 열기</string>
-    <string name="preferred_player_settings_title">선호하는 플레이어</string>
-
     <string name="video_player">비디오 플레이어</string>
     <string name="background_player">백그라운드 플레이어</string>
     <string name="popup_player">팝업 플레이어</string>

app/src/main/res/values-lt/strings.xml

@@ -336,9 +336,6 @@
     <string name="drawer_header_action_paceholder_text">Kai kas čia greit atsiras ;D</string>
 
 
-    <string name="preferred_player_share_menu_dialog_title">Atidaryti su numatytu grotuvu</string>
-    <string name="preferred_player_settings_title">Numatytas grotuvas</string>
-
     <string name="video_player">Video grotuvas</string>
     <string name="background_player">Foninis grotuvas</string>
     <string name="popup_player">Iššokantis grotuvas</string>

app/src/main/res/values-mk/strings.xml

@@ -342,9 +342,6 @@
     <string name="drawer_header_action_paceholder_text">Нешто спремаме за тука ;D</string>
 
 
-    <string name="preferred_player_share_menu_dialog_title">Отвори со претпочитаниот плеер</string>
-    <string name="preferred_player_settings_title">Претпочитан плеер</string>
-
     <string name="video_player">Видео плеер</string>
     <string name="background_player">Позадински плеер</string>
     <string name="popup_player">Пушти во прозорче</string>

app/src/main/res/values-nb-rNO/strings.xml

@@ -314,9 +314,6 @@
     <string name="video_streams_empty">Fant ingen videostrømmer</string>
     <string name="audio_streams_empty">Fant ingen lydstrømmer</string>
 
-    <string name="preferred_player_share_menu_dialog_title">Åpne med foretrukket avspiller</string>
-    <string name="preferred_player_settings_title">Foretrukket avpsiller</string>
-
     <string name="video_player">Videoavspiller</string>
     <string name="background_player">Bakgrunnsavspiller</string>
     <string name="popup_player">Oppsprettsavspiller</string>

app/src/main/res/values-nl/strings.xml

@@ -321,10 +321,6 @@ te openen in pop-upmodus</string>
     <string name="video_streams_empty">Geen videostreams gevonden</string>
     <string name="audio_streams_empty">Geen audiostreams gevonden</string>
 
-    <string name="preferred_player_share_menu_title">Voorkeursspeler</string>
-    <string name="preferred_player_share_menu_dialog_title">Openen met voorkeursspeler</string>
-    <string name="preferred_player_settings_title">Voorkeursspeler</string>
-
     <string name="video_player">Videospeler</string>
     <string name="background_player">Achtergrondspeler</string>
     <string name="popup_player">Pop-upspeler</string>

app/src/main/res/values-pl/strings.xml

@@ -311,10 +311,6 @@
     <string name="video_streams_empty">Nie znaleziono strumieni wideo</string>
     <string name="audio_streams_empty">Nie znaleziono strumieni audio</string>
 
-    <string name="preferred_player_share_menu_title">Preferowany odtwarzacz</string>
-    <string name="preferred_player_share_menu_dialog_title">Otwórz za pomocą preferowanego odtwarzacza</string>
-    <string name="preferred_player_settings_title">Preferowany odtwarzacz</string>
-
     <string name="video_player">Odtwarzacz wideo</string>
     <string name="background_player">Odtwarzacz w tle</string>
     <string name="always_ask_player">Pytaj za każdym razem</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -300,9 +300,6 @@ abrir em modo popup</string>
     <string name="video_streams_empty">Nenhum stream de vídeo encontrado</string>
     <string name="audio_streams_empty">Nenhum stream de áudio encontrado</string>
 
-    <string name="preferred_player_share_menu_dialog_title">Abrir com reprodutor padrão</string>
-    <string name="preferred_player_settings_title">Reprodutor padrão</string>
-
     <string name="video_player">Reprodutor de vídeo</string>
     <string name="background_player">Reprodutor em plano de fundo</string>
     <string name="popup_player">Reprodutor popup</string>

app/src/main/res/values-ru/strings.xml

@@ -317,8 +317,6 @@
     <string name="website_encouragement">Для получения более подробной информации и последних новостей о NewPipe посетите наш веб-сайт.</string>
     <string name="drawer_open">Открыть лоток</string>
     <string name="drawer_close">Закрыть лоток</string>
-    <string name="preferred_player_share_menu_dialog_title">Открыть с помощью предпочитаемого проигрывателя</string>
-    <string name="preferred_player_settings_title">Предпочитаемый проигрыватель</string>
 
     <string name="video_player">Проигрыватель видео</string>
     <string name="background_player">Фоновый проигрыватель</string>

app/src/main/res/values-sk/strings.xml

@@ -354,8 +354,6 @@ otvorenie okna na popredí</string>
 
     <string name="drawer_open">Otvoriť zásuvku</string>
     <string name="drawer_close">Zavrieť zásuvku</string>
-    <string name="preferred_player_share_menu_dialog_title">Otvoriť v preferovanom prehrávači</string>
-    <string name="preferred_player_settings_title">Preferovaný prehrávač</string>
 
     <string name="video_player">Prehrávač videa</string>
     <string name="background_player">Prehrávač na pozadí</string>

app/src/main/res/values-tr/strings.xml

@@ -316,9 +316,6 @@
     <string name="video_streams_empty">Video akışı bulunamadı</string>
     <string name="audio_streams_empty">Ses akışı bulunamadı</string>
 
-    <string name="preferred_player_share_menu_dialog_title">Öntanımlı oynatıcıyla aç</string>
-    <string name="preferred_player_settings_title">Öntanımlı oynatıcı</string>
-
     <string name="video_player">Video oynatıcı</string>
     <string name="background_player">Arka plan oynatıcı</string>
     <string name="popup_player">Açılır pencere oynatıcı</string>

app/src/main/res/values-uk/strings.xml

@@ -232,7 +232,6 @@
     <string name="new_and_hot">Новинки</string>
     <string name="play_queue_stream_detail">Деталі</string>
     <string name="play_queue_audio_settings">Налаштування аудіо</string>
-    <string name="preferred_player_settings_title">Улюблений програвач</string>
 
     <string name="video_player">Відео програвач</string>
     <string name="background_player">Фоновий програвач</string>
@@ -349,7 +348,6 @@
     <string name="drawer_header_action_paceholder_text">Ми тут матимемо щось незабаром ;D</string>
 
 
-    <string name="preferred_player_share_menu_dialog_title">Відкрити в улюбленому програвачеві</string>
     <string name="always_ask_open_action">Завжди питати</string>
     
     <string name="create_playlist">Створити новий плейлист</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -308,8 +308,6 @@
     <string name="donation_encouragement">NewPipe 由志願者所開發，他們花費了空閒時間將獲得的最佳體驗帶給您。現在是時候回過頭來，讓我們的開發人員可以能夠在享受一杯 java 的同時，使 NewPipe 更加的美好！</string>
     <string name="drawer_open">打開抽屜</string>
     <string name="drawer_close">關閉抽屜</string>
-    <string name="preferred_player_share_menu_dialog_title">開啟優先的播放器</string>
-    <string name="preferred_player_settings_title">優先播放機</string>
 
     <string name="video_player">影片播放</string>
     <string name="background_player">背景播放</string>

app/src/main/res/values/strings.xml

@@ -387,9 +387,9 @@
 
 
     <!-- Preferred player -->
-    <string name="preferred_player_share_menu_title" translatable="false">NewPipe</string>
+    <string name="preferred_open_action_share_menu_title" translatable="false">NewPipe</string>
-    <string name="preferred_player_share_menu_dialog_title">Open with preferred player</string>
+    <string name="preferred_open_action_settings_title">Preferred open action</string>
-    <string name="preferred_player_settings_title">Preferred player</string>
+    <string name="preferred_open_action_settings_summary">Default action when opening content — %s</string>
 
     <string name="video_player">Video player</string>
     <string name="background_player">Background player</string>

app/src/main/res/xml/video_audio_settings.xml

@@ -79,8 +79,8 @@
             android:entries="@array/preferred_open_action_description_list"
             android:entryValues="@array/preferred_open_action_values_list"
             android:key="@string/preferred_open_action_key"
-            android:summary="%s"
+            android:summary="@string/preferred_open_action_settings_summary"
-            android:title="@string/preferred_player_settings_title"/>
+            android:title="@string/preferred_open_action_settings_title"/>
 
         <SwitchPreference
             android:defaultValue="false"