From d9aaceea95c1882179a444cf94a1dfa797639271 Mon Sep 17 00:00:00 2001 From: Mauricio Colli Date: Sat, 7 Apr 2018 15:36:52 -0300 Subject: [PATCH] Fix naming inconsistency --- app/src/main/AndroidManifest.xml | 2 +- app/src/main/java/org/schabi/newpipe/RouterActivity.java | 2 +- app/src/main/res/values-ar/strings.xml | 3 --- app/src/main/res/values-b+ast/strings.xml | 2 -- app/src/main/res/values-cs/strings.xml | 3 --- app/src/main/res/values-de/strings.xml | 2 -- app/src/main/res/values-es/strings.xml | 4 ---- app/src/main/res/values-eu/strings.xml | 3 --- app/src/main/res/values-fr/strings.xml | 3 --- app/src/main/res/values-hi/strings.xml | 3 --- app/src/main/res/values-hr/strings.xml | 3 --- app/src/main/res/values-id/strings.xml | 3 --- app/src/main/res/values-it/strings.xml | 4 ---- app/src/main/res/values-ja/strings.xml | 2 -- app/src/main/res/values-ko/strings.xml | 3 --- app/src/main/res/values-lt/strings.xml | 3 --- app/src/main/res/values-mk/strings.xml | 3 --- app/src/main/res/values-nb-rNO/strings.xml | 3 --- app/src/main/res/values-nl/strings.xml | 4 ---- app/src/main/res/values-pl/strings.xml | 4 ---- app/src/main/res/values-pt-rBR/strings.xml | 3 --- app/src/main/res/values-ru/strings.xml | 2 -- app/src/main/res/values-sk/strings.xml | 2 -- app/src/main/res/values-tr/strings.xml | 3 --- app/src/main/res/values-uk/strings.xml | 2 -- app/src/main/res/values-zh-rTW/strings.xml | 2 -- app/src/main/res/values/strings.xml | 8 ++++---- app/src/main/res/xml/video_audio_settings.xml | 4 ++-- 28 files changed, 8 insertions(+), 77 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1edd67d24..7447c81ed 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -132,7 +132,7 @@ diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java index 4a1d9be57..e50162b9d 100644 --- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java +++ b/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) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index c13e92521..9f20340db 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -305,7 +305,6 @@ مرة واحدة فقط العنوان خاطئ - \@string/preferred_player_settings_title لم يتم العثور على مشغل بث (يمكنك تثبيت VLC لتشغيله) استيراد قاعدة البيانات تصدير قاعدة البيانات @@ -334,8 +333,6 @@ سوف نقوم بإدماج شيء جديد هنا قريبا ;D - قارئ الوسائط المُفضّل - قارئ الفيديوهات أُطلُب دائمًا diff --git a/app/src/main/res/values-b+ast/strings.xml b/app/src/main/res/values-b+ast/strings.xml index 2b0df1389..ff0d96016 100644 --- a/app/src/main/res/values-b+ast/strings.xml +++ b/app/src/main/res/values-b+ast/strings.xml @@ -323,8 +323,6 @@ Abrir caxón Zarrar caxón - Abrir col reproductor preferíu - Reproductor preferíu Reproductor de videu Reproductor en segundu planu diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index ad27b6324..4a5c9023e 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -326,9 +326,6 @@ otevření ve vyskakovacím okně Upozornění: Nelze importovat všechny soubory. Tímto se anuluje vaše aktuální nastavení. - Otevřít preferovaným přehrávačem - Preferovaný přehrávač - Video přehrávač Přehrávač na pozadí Přehrávač v okně diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 10c4bb193..6c5e60798 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -318,8 +318,6 @@ Navigationsleiste öffnen Navigationsleiste schließen - Mit bevorzugtem Player öffnen - Bevorzugter Player Video-Player Hintergrund-Player diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index a05c81804..0c0a39b59 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -320,10 +320,6 @@ abrir en modo popup No se encontraron transmisiones de vídeo No se encontraron transmisiones de audio - \@string/preferred_player_settings_title - Abrir con el reproductor preferido - Reproductor preferido - Reproductor de vídeo Reproductor de fondo Reproductor de popup diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 29ee0a755..50ff50024 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -307,9 +307,6 @@ Ez da bideo jariorik aurkitu Ez da audio jariorik aurkitu - Ireki gogoko erreproduzigailuarekin - Gogoko erreproduzigailua - Bideo erreproduzigailua Bigarren planoko erreproduzigailua Laster-leiho erreproduzigailua diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d75821657..647ee6bc4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -318,9 +318,6 @@ Aucun flux vidéo trouvé Aucun flux audio trouvé - Ouvrir avec le lecteur préféré - Lecteur préféré - Lecteur vidéo Lecteur en arrière-plan Lecteur en fenêtré diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 059b4112e..783390be8 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -332,9 +332,6 @@ जल्द ही यहां पर कुछ आएगा ;D - पसंदीदा प्लेयर से खोलें - पसंदीदा प्लेयर - वीडियो प्लेयर बैकग्राउंड प्लेयर पॉपअप प्लेयर diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index a1b364234..3fd74e7df 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -295,9 +295,6 @@ Nešto će zasigurno doći ovdje :D - Otvoriti sa Vašim reproduktorom - Odabrani reproduktor - Video reprodukcija Pozadinska reprodukcija Skočna reprodukcija diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 5edfce926..98b881b1d 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -344,9 +344,6 @@ membuka di mode popup Sesuatu akan hadir disini nanti ;D - Buka dengan pemutar yg diinginkan - Pemutar yg diinginkan - Pemutar video Pemutar Layar Belakang Pemutar sembulan diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index fa50cc5f3..a9ae2d761 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -325,10 +325,6 @@ Nessun flusso video trovato Nessun flusso audio trovato - Riproduttore preferito - Apri con il riproduttore preferito - Riproduttore preferito - Riproduttore video Riproduttore di fondo Riproduttore a comparsa diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 3438a5ee9..78c71bef8 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -302,8 +302,6 @@ ここからバックグランド再生を開始 ドロワーを開く ドロワーを閉じる - 優先プレーヤーで開く - 優先プレーヤー 動画プレーヤー バックグラウンドプレーヤー diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 424028863..0a47cda28 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -342,9 +342,6 @@ 여기에 무언가가 추가될 거에요~ :D - 선호하는 플레이어로 열기 - 선호하는 플레이어 - 비디오 플레이어 백그라운드 플레이어 팝업 플레이어 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index b9ea91b9f..36482c0d0 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -336,9 +336,6 @@ Kai kas čia greit atsiras ;D - Atidaryti su numatytu grotuvu - Numatytas grotuvas - Video grotuvas Foninis grotuvas Iššokantis grotuvas diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index a2a054036..8acba20ca 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -342,9 +342,6 @@ Нешто спремаме за тука ;D - Отвори со претпочитаниот плеер - Претпочитан плеер - Видео плеер Позадински плеер Пушти во прозорче diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 959fccb25..8366fdbb3 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -314,9 +314,6 @@ Fant ingen videostrømmer Fant ingen lydstrømmer - Åpne med foretrukket avspiller - Foretrukket avpsiller - Videoavspiller Bakgrunnsavspiller Oppsprettsavspiller diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 453f81bb5..19dbc899b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -321,10 +321,6 @@ te openen in pop-upmodus Geen videostreams gevonden Geen audiostreams gevonden - Voorkeursspeler - Openen met voorkeursspeler - Voorkeursspeler - Videospeler Achtergrondspeler Pop-upspeler diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index b8a8a652e..21c02b0f8 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -311,10 +311,6 @@ Nie znaleziono strumieni wideo Nie znaleziono strumieni audio - Preferowany odtwarzacz - Otwórz za pomocą preferowanego odtwarzacza - Preferowany odtwarzacz - Odtwarzacz wideo Odtwarzacz w tle Pytaj za każdym razem diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 161e0263f..2860300a5 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -300,9 +300,6 @@ abrir em modo popup Nenhum stream de vídeo encontrado Nenhum stream de áudio encontrado - Abrir com reprodutor padrão - Reprodutor padrão - Reprodutor de vídeo Reprodutor em plano de fundo Reprodutor popup diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index d2c0f097e..8e5102f9e 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -317,8 +317,6 @@ Для получения более подробной информации и последних новостей о NewPipe посетите наш веб-сайт. Открыть лоток Закрыть лоток - Открыть с помощью предпочитаемого проигрывателя - Предпочитаемый проигрыватель Проигрыватель видео Фоновый проигрыватель diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 17fe26360..fc945f872 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -354,8 +354,6 @@ otvorenie okna na popredí Otvoriť zásuvku Zavrieť zásuvku - Otvoriť v preferovanom prehrávači - Preferovaný prehrávač Prehrávač videa Prehrávač na pozadí diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index f5f541b0a..aec9826e6 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -316,9 +316,6 @@ Video akışı bulunamadı Ses akışı bulunamadı - Öntanımlı oynatıcıyla aç - Öntanımlı oynatıcı - Video oynatıcı Arka plan oynatıcı Açılır pencere oynatıcı diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 6a4ddcfaf..3c810b80d 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -232,7 +232,6 @@ Новинки Деталі Налаштування аудіо - Улюблений програвач Відео програвач Фоновий програвач @@ -349,7 +348,6 @@ Ми тут матимемо щось незабаром ;D - Відкрити в улюбленому програвачеві Завжди питати Створити новий плейлист diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 45af6b88c..8c9dcfd66 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -308,8 +308,6 @@ NewPipe 由志願者所開發,他們花費了空閒時間將獲得的最佳體驗帶給您。現在是時候回過頭來,讓我們的開發人員可以能夠在享受一杯 java 的同時,使 NewPipe 更加的美好! 打開抽屜 關閉抽屜 - 開啟優先的播放器 - 優先播放機 影片播放 背景播放 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3f1193b8d..2419b8084 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -387,15 +387,15 @@ - NewPipe - Open with preferred player - Preferred player + NewPipe + Preferred open action + Default action when opening content — %s Video player Background player Popup player Always ask - + Getting info… "The requested content is loading" diff --git a/app/src/main/res/xml/video_audio_settings.xml b/app/src/main/res/xml/video_audio_settings.xml index e17b46ebc..6a3b7a0b3 100644 --- a/app/src/main/res/xml/video_audio_settings.xml +++ b/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:title="@string/preferred_player_settings_title"/> + android:summary="@string/preferred_open_action_settings_summary" + android:title="@string/preferred_open_action_settings_title"/>