From 52bf5690c08d91cd87ba5a4217c77418b4c44014 Mon Sep 17 00:00:00 2001 From: Christian Schabesberger Date: Fri, 5 Oct 2018 16:19:21 +0200 Subject: [PATCH] add support for content language and content country --- app/build.gradle | 3 +-- app/src/main/java/org/schabi/newpipe/App.java | 17 ++++++++++---- .../java/org/schabi/newpipe/Downloader.java | 7 +++--- .../fragments/list/kiosk/KioskFragment.java | 12 +--------- .../fragments/list/search/SearchFragment.java | 8 +++---- .../schabi/newpipe/util/ExtractorHelper.java | 23 +++++++------------ .../org/schabi/newpipe/util/Localization.java | 15 +++++++++++- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-b+ast/strings.xml | 2 +- app/src/main/res/values-be/strings.xml | 2 +- app/src/main/res/values-bg/strings.xml | 2 +- app/src/main/res/values-bn-rBD/strings.xml | 2 +- app/src/main/res/values-ca/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-eo/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-et/strings.xml | 2 +- app/src/main/res/values-eu/strings.xml | 2 +- app/src/main/res/values-fa/strings.xml | 2 +- app/src/main/res/values-fi/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-he/strings.xml | 2 +- app/src/main/res/values-hi/strings.xml | 2 +- app/src/main/res/values-hr/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-id/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-ko/strings.xml | 2 +- app/src/main/res/values-lt/strings.xml | 2 +- app/src/main/res/values-mk/strings.xml | 2 +- app/src/main/res/values-nb-rNO/strings.xml | 2 +- app/src/main/res/values-nl-rBE/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ro/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sk/strings.xml | 2 +- app/src/main/res/values-sl/strings.xml | 2 +- app/src/main/res/values-sq/strings.xml | 2 +- app/src/main/res/values-sr/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-te/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-vi/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rHK/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/settings_keys.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/xml/content_settings.xml | 6 ++--- build.gradle | 2 +- 57 files changed, 95 insertions(+), 94 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4ae9f0fb7..153c7be4c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion 27 - buildToolsVersion '27.0.3' defaultConfig { applicationId "org.schabi.newpipe" @@ -55,7 +54,7 @@ dependencies { exclude module: 'support-annotations' } - implementation 'com.github.TeamNewPipe:NewPipeExtractor:217d13b1028' + implementation 'com.github.TeamNewPipe:NewPipeExtractor:3a865749e89b' testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.8.9' diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java index dfce8f100..314c95c8d 100644 --- a/app/src/main/java/org/schabi/newpipe/App.java +++ b/app/src/main/java/org/schabi/newpipe/App.java @@ -5,6 +5,7 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.os.Build; +import android.preference.PreferenceManager; import android.support.annotation.Nullable; import android.util.Log; @@ -21,6 +22,7 @@ import org.acra.config.ConfigurationBuilder; import org.acra.sender.ReportSenderFactory; import org.schabi.newpipe.extractor.Downloader; import org.schabi.newpipe.extractor.NewPipe; +import org.schabi.newpipe.extractor.utils.Localization; import org.schabi.newpipe.report.AcraReportSenderFactory; import org.schabi.newpipe.report.ErrorActivity; import org.schabi.newpipe.report.UserAction; @@ -65,7 +67,8 @@ public class App extends Application { private RefWatcher refWatcher; @SuppressWarnings("unchecked") - private static final Class[] reportSenderFactoryClasses = new Class[]{AcraReportSenderFactory.class}; + private static final Class[] + reportSenderFactoryClasses = new Class[]{AcraReportSenderFactory.class}; @Override protected void attachBaseContext(Context base) { @@ -88,7 +91,8 @@ public class App extends Application { // Initialize settings first because others inits can use its values SettingsActivity.initSettings(this); - NewPipe.init(getDownloader()); + NewPipe.init(getDownloader(), + org.schabi.newpipe.util.Localization.getPreferredExtractorLocal(this)); StateSaver.init(this); initNotificationChannel(); @@ -180,7 +184,11 @@ public class App extends Application { ACRA.init(this, acraConfig); } catch (ACRAConfigurationException ace) { ace.printStackTrace(); - ErrorActivity.reportError(this, ace, null, null, ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none", + ErrorActivity.reportError(this, + ace, + null, + null, + ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none", "Could not initialize ACRA crash report", R.string.app_ui_crash)); } } @@ -200,7 +208,8 @@ public class App extends Application { NotificationChannel mChannel = new NotificationChannel(id, name, importance); mChannel.setDescription(description); - NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); + NotificationManager mNotificationManager = + (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); mNotificationManager.createNotificationChannel(mChannel); } diff --git a/app/src/main/java/org/schabi/newpipe/Downloader.java b/app/src/main/java/org/schabi/newpipe/Downloader.java index 68f7e080f..999fb03a3 100644 --- a/app/src/main/java/org/schabi/newpipe/Downloader.java +++ b/app/src/main/java/org/schabi/newpipe/Downloader.java @@ -4,6 +4,7 @@ import android.support.annotation.Nullable; import android.text.TextUtils; import org.schabi.newpipe.extractor.exceptions.ReCaptchaException; +import org.schabi.newpipe.extractor.utils.Localization; import java.io.IOException; import java.io.InputStream; @@ -103,13 +104,13 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader { * but set the HTTP header field "Accept-Language" to the supplied string. * * @param siteUrl the URL of the text file to return the contents of - * @param language the language (usually a 2-character code) to set as the preferred language + * @param localisation the language and country (usually a 2-character code) to set * @return the contents of the specified text file */ @Override - public String download(String siteUrl, String language) throws IOException, ReCaptchaException { + public String download(String siteUrl, Localization localisation) throws IOException, ReCaptchaException { Map requestProperties = new HashMap<>(); - requestProperties.put("Accept-Language", language); + requestProperties.put("Accept-Language", localisation.getLanguage()); return download(siteUrl, requestProperties); } diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java index 92138f7db..7d4500691 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java @@ -128,26 +128,16 @@ public class KioskFragment extends BaseListInfoFragment { @Override public Single loadResult(boolean forceReload) { - String contentCountry = PreferenceManager - .getDefaultSharedPreferences(activity) - .getString(getString(R.string.content_country_key), - getString(R.string.default_country_value)); return ExtractorHelper.getKioskInfo(serviceId, url, - contentCountry, forceReload); } @Override public Single loadMoreItemsLogic() { - String contentCountry = PreferenceManager - .getDefaultSharedPreferences(activity) - .getString(getString(R.string.content_country_key), - getString(R.string.default_country_value)); return ExtractorHelper.getMoreKioskItems(serviceId, url, - currentNextPageUrl, - contentCountry); + currentNextPageUrl); } /*////////////////////////////////////////////////////////////////////////// diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java index 19c7d463e..2833abb8d 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java @@ -626,7 +626,7 @@ public class SearchFragment } final Observable> network = ExtractorHelper - .suggestionsFor(serviceId, query, contentCountry) + .suggestionsFor(serviceId, query) .toObservable() .map(strings -> { List result = new ArrayList<>(); @@ -726,8 +726,7 @@ public class SearchFragment searchDisposable = ExtractorHelper.searchFor(serviceId, searchString, Arrays.asList(contentFilter), - sortFilter, - contentCountry) + sortFilter) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .doOnEvent((searchResult, throwable) -> isLoading.set(false)) @@ -745,8 +744,7 @@ public class SearchFragment searchString, asList(contentFilter), sortFilter, - nextPageUrl, - contentCountry) + nextPageUrl) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .doOnEvent((nextItemsResult, throwable) -> isLoading.set(false)) diff --git a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java index fb9579802..49ee357ad 100644 --- a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java @@ -67,42 +67,37 @@ public final class ExtractorHelper { public static Single searchFor(final int serviceId, final String searchString, final List contentFilter, - final String sortFilter, - final String contentCountry) { + final String sortFilter) { checkServiceId(serviceId); return Single.fromCallable(() -> SearchInfo.getInfo(NewPipe.getService(serviceId), NewPipe.getService(serviceId) .getSearchQHFactory() - .fromQuery(searchString, contentFilter, sortFilter), - contentCountry)); + .fromQuery(searchString, contentFilter, sortFilter))); } public static Single getMoreSearchItems(final int serviceId, final String searchString, final List contentFilter, final String sortFilter, - final String pageUrl, - final String contentCountry) { + final String pageUrl) { checkServiceId(serviceId); return Single.fromCallable(() -> SearchInfo.getMoreItems(NewPipe.getService(serviceId), NewPipe.getService(serviceId) .getSearchQHFactory() .fromQuery(searchString, contentFilter, sortFilter), - contentCountry, pageUrl)); } public static Single> suggestionsFor(final int serviceId, - final String query, - final String contentCountry) { + final String query) { checkServiceId(serviceId); return Single.fromCallable(() -> NewPipe.getService(serviceId) .getSuggestionExtractor() - .suggestionList(query, contentCountry)); + .suggestionList(query)); } public static Single getStreamInfo(final int serviceId, @@ -147,19 +142,17 @@ public final class ExtractorHelper { public static Single getKioskInfo(final int serviceId, final String url, - final String contentCountry, boolean forceLoad) { return checkCache(forceLoad, serviceId, url, Single.fromCallable(() -> - KioskInfo.getInfo(NewPipe.getService(serviceId), url, contentCountry))); + KioskInfo.getInfo(NewPipe.getService(serviceId), url))); } public static Single getMoreKioskItems(final int serviceId, final String url, - final String nextStreamsUrl, - final String contentCountry) { + final String nextStreamsUrl) { return Single.fromCallable(() -> KioskInfo.getMoreItems(NewPipe.getService(serviceId), - url, nextStreamsUrl, contentCountry)); + url, nextStreamsUrl)); } /*////////////////////////////////////////////////////////////////////////// diff --git a/app/src/main/java/org/schabi/newpipe/util/Localization.java b/app/src/main/java/org/schabi/newpipe/util/Localization.java index c1e5c9ed4..eed1a8ae2 100644 --- a/app/src/main/java/org/schabi/newpipe/util/Localization.java +++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java @@ -69,10 +69,23 @@ public class Localization { return stringBuilder.toString(); } + public static org.schabi.newpipe.extractor.utils.Localization getPreferredExtractorLocal(Context context) { + SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context); + + String languageCode = sp.getString(context.getString(R.string.content_language_key), + context.getString(R.string.default_language_value)); + + String countryCode = sp.getString(context.getString(R.string.content_country_key), + context.getString(R.string.default_country_value)); + + return new org.schabi.newpipe.extractor.utils.Localization(countryCode, languageCode); + } + public static Locale getPreferredLocale(Context context) { SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context); - String languageCode = sp.getString(context.getString(R.string.search_language_key), context.getString(R.string.default_language_value)); + String languageCode = sp.getString(context.getString(R.string.content_language_key), + context.getString(R.string.default_language_value)); try { if (languageCode.length() == 2) { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index fdb859609..16dc00dea 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -34,7 +34,7 @@ تشغيل بواسطة Kodi التدوير بحث - اللغة الإفتراضية للمحتوى + اللغة الإفتراضية للمحتوى الإعدادات المظهر اخرى diff --git a/app/src/main/res/values-b+ast/strings.xml b/app/src/main/res/values-b+ast/strings.xml index a8ee6260c..f9834119d 100644 --- a/app/src/main/res/values-b+ast/strings.xml +++ b/app/src/main/res/values-b+ast/strings.xml @@ -41,7 +41,7 @@ Videu siguiente Amosar vídeos siguientes y asemeyaos URL non sofitada - Llingua por defeutu del conteníu + Llingua por defeutu del conteníu Videu y audiu Aspeutu Otru diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 8a1d35df3..d5c27ce48 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -95,7 +95,7 @@ URL не падтрымліваецца Краіна кантэнту па змаўчанні Сэрвіс - Мова кантэнту па змаўчанні + Мова кантэнту па змаўчанні Плэер Павядзенне Відэа і аўдыё diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 5adc10a1d..667c1e265 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -74,7 +74,7 @@ Показвай „следващ“ и „подобни“ Показвай съвет „задръж за добавяне“ Непознат URL - Език на съдържанието по подразбиране + Език на съдържанието по подразбиране Плейър Поведение Видео & Аудио diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml index f9ec7a07a..3fb51af36 100644 --- a/app/src/main/res/values-bn-rBD/strings.xml +++ b/app/src/main/res/values-bn-rBD/strings.xml @@ -57,7 +57,7 @@ পরবর্তী ভিডিও পরবর্তী এবং অনুরূপ ভিডিওগুলি দেখাও URL সমর্থিত নয় - কন্টেন্ট এর জন্য পছন্দসই ভাষা + কন্টেন্ট এর জন্য পছন্দসই ভাষা ভিডিও এবং অডিও পপআপ অ্যাপিয়ারেন্স diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index df5ea0d87..20916ef45 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -177,7 +177,7 @@ Vídeo següent Mostra el vídeo següent i similars País per defecte dels continguts - Llengua per defecte dels continguts + Llengua per defecte dels continguts Emergent S\'està reproduint en segon pla S\'està reproduint en mode emergent diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 5684c4756..37b1645ab 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -40,7 +40,7 @@ Další videa Zobrazovat \'další\' a \'podobná\' videa URL není podporováno - Preferovaný jazyk obsahu + Preferovaný jazyk obsahu Video a zvuk Vzhled Ostatní diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 37f892b4b..387c26cd6 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -29,7 +29,7 @@ \'Nächste\' und \'ähnliche\' Videos anzeigen URL wird nicht unterstützt Video & Audio - Bevorzugte Sprache des Inhalts + Bevorzugte Sprache des Inhalts Video-Vorschaubild Video-Vorschaubild Nutzerbild diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 975ad4025..d6cd66dd6 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -42,7 +42,7 @@ Επόμενο βίντεο Εμφάνιση \"επόμενου\" και \"σχετικών\" βίντεο Δεν υποστηρίζεται η διεύθυνση URL - Προεπιλεγμένη γλώσσα περιεχομένου + Προεπιλεγμένη γλώσσα περιεχομένου Βίντεο & Ήχος Εμφάνιση Άλλα diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 78faeed8f..9ac81757f 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -28,7 +28,7 @@ Elŝuti Sekva video Ligilo ne subtenita - Preferata enhavlingvo + Preferata enhavlingvo Video kaj sono Apero Alia diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 02a9924a5..9c06e228b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -57,7 +57,7 @@ No se pudo descifrar la URL del vídeo No se pudo analizar el sitio web Mostrar vídeos \'siguientes\' y \'similares\' - Idioma del contenido por defecto + Idioma del contenido por defecto Vista previa del vídeo Vista previa del vídeo Me gusta diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index aa3afa7be..aef139cfa 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -92,7 +92,7 @@ URL pole toetatud Sisu vaikimisi riik Teenus - Sisu vaikimisi keel + Sisu vaikimisi keel Pleier Käitumine Heli ja pilt diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 9ea87bd6d..72206774a 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -26,7 +26,7 @@ Hurrengo bideoa Erakutsi \'hurrengo\' eta \'antzeko\' bideoak URLak ez du euskarririk - Edukiaren hizkuntz lehenetsia + Edukiaren hizkuntz lehenetsia Bideoa eta Audioa Erreproduzitu diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 71acd9c69..ef7dc3a23 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -43,7 +43,7 @@ ویدیوی بعدی نماش ویدیوهای بعدی و مشابه نشانی اینترنتی پشتیبانی نمی‌شود - زبان محتوای ترجیحی + زبان محتوای ترجیحی ویدیو و صدا ظاهر دیگر diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index fc9c343b1..31cf1f7bd 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -73,7 +73,7 @@ Seuraava video Näytä seuraavia ja samankaltaisia videoita URL ei tueta - Oletus-sisällon kieli + Oletus-sisällon kieli Soitin Käyttäytyminen Video & Ääni diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ef071c316..89b20a41f 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -35,7 +35,7 @@ Miniature d’aperçu vidéo Je n’aime pas J’aime - Langue du contenu par défaut + Langue du contenu par défaut Miniature de l’avatar de l’utilisateur Utiliser un lecteur vidéo externe Utiliser un lecteur audio externe diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 21e944ea8..3ba9bbd09 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -59,7 +59,7 @@ הסרטון הבא הראה את הסרטונים הבאים וסרטונים דומים כתובת URL לא נתמכת - שפת התוכן המועדפת + שפת התוכן המועדפת סרטים ושמע חלון צץ תצוגה diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 22e90ac25..6d70ce3ef 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -104,7 +104,7 @@ \"संलग्न करने के लिए पकड़ें रहे\" दिखाए जब बैकग्राउंड और पॉपअप बटन विडियो के विवरण पन्ने में दबाई जाए तो tip को दिखाए ये वाला URL इसमें नहीं चलेगा - डिफ़ॉल्ट विषय की भाषा + डिफ़ॉल्ट विषय की भाषा प्लेयर चाल चलन पॉपअप diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 8e73cdf4f..fb5641939 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -77,7 +77,7 @@ Sljedeći videozapis Prikaži sljedeće i slične videozapise URL nije podržan - Zadani jezik sadržaja + Zadani jezik sadržaja Video i zvuk Skočni prozor Izgled diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index f4687149a..5f23ad1f0 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -41,7 +41,7 @@ Lejátszás háttérben Videó és audio Megjelenés - Tartalom preferált nyelve + Tartalom preferált nyelve További beállítások Következő hasonló videók mutatása Sötét diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 467580fd8..1eef0ffca 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -40,7 +40,7 @@ Video berikutnya Tampilkan video \'berikutnya\' dan \'serupa\' URL tidak didukung - Bahasa konten baku + Bahasa konten baku Video & Audio Tampilan Lainnya diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e7c0dc1ee..f5754b5d2 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -28,7 +28,7 @@ Prossimo video Mostra \'prossimi\' video e video \'simili\' URL non supportato - Lingua predefinita per i contenuti + Lingua predefinita per i contenuti Video e Audio Miniatura anteprima video diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ceee62fa9..1e3ded78e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -27,7 +27,7 @@ 次の動画 \"次の動画\"と\"関連動画\"を表示します URLは使用できません - 優先言語 + 優先言語 動画と音楽 %1$s ビュー 動画 プレビュー サムネイル diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index d00ee12ea..c606cc23e 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -28,7 +28,7 @@ 다음 비디오 다음 및 유사한 비디오 표시 지원하지 않는 URL 입니다 - 기본 컨텐츠 언어 + 기본 컨텐츠 언어 비디오 & 오디오 비디오 미리보기 썸네일 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index af2ff5a7a..4ffcd26d6 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -57,7 +57,7 @@ Kitas vaizdo įrašas Rodyti kitus panašius vaizdo įrašus URL nepalaikoma - Numatytoji tūrinio kalba + Numatytoji tūrinio kalba Vaizdas ir garsas Iššokantis langas Išvaizda diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index b6e79dbd4..812bd1534 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -93,7 +93,7 @@ Неподдржана URL врска Земја на прикажани видеа Услуга - Претпочитан јазик на видеата + Претпочитан јазик на видеата Плеер Однесување Видео и Звук diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index da4f099cd..eb1cf8900 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -40,7 +40,7 @@ Neste video Vis \"neste\" og \"lignende\" videoer Nettadressen støttes ikke - Foretrukket innholdsspråk + Foretrukket innholdsspråk Video og lyd Utseende Annet diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml index 18b23120d..9f1d796fd 100644 --- a/app/src/main/res/values-nl-rBE/strings.xml +++ b/app/src/main/res/values-nl-rBE/strings.xml @@ -93,7 +93,7 @@ URL wordt niet ondersteund Standaardinhoudsland Dienst - Standaardtaal voor inhoud + Standaardtaal voor inhoud Speler Gedrag Video & audio diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index c4bb1e7d1..b7b51eee6 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -28,7 +28,7 @@ Volgende video URL wordt niet ondersteund ‘volgende’ en ‘vergelijkbare’ video’s weergeven - Standaardtaal voor inhoud + Standaardtaal voor inhoud Externe videospeler gebruiken Externe audiospeler gebruiken Video & audio diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index fa885e51b..795436f08 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -43,7 +43,7 @@ Następny film Pokaż \'następne\' i \'podobne\' filmy URL nieobsługiwany - Domyślny język zawartości + Domyślny język zawartości Wideo i audio Wygląd Inne diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 4e08f4ee5..d4d3322ff 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -57,7 +57,7 @@ Reportar um erro Tentar novamente Rotação - Idioma de conteúdo preferido + Idioma de conteúdo preferido Configurações Aparência Outros diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index d8ca1a265..7308a08d5 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -30,7 +30,7 @@ Vídeo seguinte Mostrar vídeos \'seguintes\' e \'semelhantes\' URL não suportado - Idioma padrão do conteúdo + Idioma padrão do conteúdo Vídeo e áudio Miniatura de vídeos diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index a45b48199..cf7b5510a 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -41,7 +41,7 @@ Următorul videoclip Arată videoclipurile care urmează URL nesuportat - Limba dorită a conținutului + Limba dorită a conținutului Video & Audio Aspect Altele diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 12de382ea..5e3e180b4 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -30,7 +30,7 @@ Следующее видео URL не поддерживается \"Следующее\" и \"Похожие\" видео - Язык контента по умолчанию + Язык контента по умолчанию Видео и аудио Внешний вид Другое diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 0fefdd04e..498cc25f2 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -40,7 +40,7 @@ Ďalšie video Ukázať \'ďalšie\' a \'podobné\' videá URL nie je podporovaná - Preferovaný jazyk obsahu + Preferovaný jazyk obsahu Video & Zvuk Vzhľad Iné diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index d2d6d4343..4fc43a87e 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -29,7 +29,7 @@ Naslednji video Pokaži naslednji video in podobne posnetke Zapis naslova URL ni podprt. - Privzeti jezik vsebine + Privzeti jezik vsebine Video in Zvok Sličica predogleda videa Sličica predogleda videa diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml index 86d15b020..ec31c4a97 100644 --- a/app/src/main/res/values-sq/strings.xml +++ b/app/src/main/res/values-sq/strings.xml @@ -30,7 +30,7 @@ Shkarko Videoja tjetër Shërbimi - Gjuha e dëshiruar e përmbajtjeve + Gjuha e dëshiruar e përmbajtjeve Aplikacioni për video Sjellja Video & Audio diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 60f99e254..fa3011936 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -28,7 +28,7 @@ Следећи видео УРЛ није подржан Прикажи следећи и слични видео - Подразумевани језик садржаја + Подразумевани језик садржаја Видео и аудио Остало Сличица видео прегледа diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index ed426cc13..49151b282 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -57,7 +57,7 @@ Nästa video Visa \'nästkommande\' och \'liknande\' videor Webbadressen stöds inte - Standard innehållsspråk + Standard innehållsspråk Video & Ljud Popup-ruta Utseende diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml index dc14446e7..b566977d5 100644 --- a/app/src/main/res/values-te/strings.xml +++ b/app/src/main/res/values-te/strings.xml @@ -53,7 +53,7 @@ తదుపరి వీడియో మరియు ఇలాంటి వీడియో చిట్కాను అనుబంధించడానికి హోల్డ్ను చూపు Url మద్దతు లేదు - డిఫాల్ట్ భాష + డిఫాల్ట్ భాష ప్లేయర్ ప్రవర్తన వీడియో & ఆడియో diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index e7715d545..4adb7633c 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -42,7 +42,7 @@ Sonraki video \'Sonraki\' ve \'benzer\' videoları göster URL desteklenmiyor - Öntanımlı içerik dili + Öntanımlı içerik dili Ses Video ve Ses Görünüm diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 084c85920..dd9431b46 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -44,7 +44,7 @@ Наступний відеозапис Являти \"наступні\" й \"схожі\" відео URL не підтримується - Переважна мова контенту + Переважна мова контенту Відео та Авдіо Зовнішній вигляд Інше diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a55f01085..d46610ad1 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -174,7 +174,7 @@ Đọc giấy phép Sự đóng góp Quay - Ngôn ngữ nội dung ưu tiên + Ngôn ngữ nội dung ưu tiên Video & Âm thanh Bật lên Lịch sử diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 39dfefe48..55cfad9ef 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -34,7 +34,7 @@ 即将播放 显示下一部和相似的视频 不支援此网址 - 默认内容语言 + 默认内容语言 视频和音频 外观 其他 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index a8e847694..001d84744 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -30,7 +30,7 @@ 下一部影片 顯示下一部及相關的影片 不支援此網址 - 預設內容語言 + 預設內容語言 影片及聲音 外觀 其他 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 8c4466a2e..bf10ca01c 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -34,7 +34,7 @@ 下一部影片 顯示「下一部」與「相關」的影片 不支援此網址 - 預設內容語言 + 預設內容語言 影片和音訊 外觀 其他 diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml index 9b39fec26..c77501048 100644 --- a/app/src/main/res/values/settings_keys.xml +++ b/app/src/main/res/values/settings_keys.xml @@ -138,7 +138,7 @@ show_hold_to_append en GB - search_language + content_language content_country show_age_restricted_content use_tor diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 04a0be64f..62028f715 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -100,7 +100,7 @@ URL not supported Default content country Service - Default content language + Default content language Player Behavior Video & Audio diff --git a/app/src/main/res/xml/content_settings.xml b/app/src/main/res/xml/content_settings.xml index fcf42b130..c863c37f3 100644 --- a/app/src/main/res/xml/content_settings.xml +++ b/app/src/main/res/xml/content_settings.xml @@ -10,15 +10,13 @@ android:summary="%s" android:title="@string/default_content_country_title"/> - + android:title="@string/content_language_title"/>