diff --git a/app/build.gradle b/app/build.gradle index 2c2a1c42..2609418d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ plugins { def properties = new Properties() def versionMajor = 1 def versionMinor = 6 -def versionPatch = 5 -def versionBuild = 4 // bump for dogfood builds, public betas, etc. +def versionPatch = 6 +def versionBuild = 0 // bump for dogfood builds, public betas, etc. def versionExt = "" if (versionBuild > 0){ diff --git a/app/src/main/java/com/deniscerri/ytdlnis/util/InfoUtil.kt b/app/src/main/java/com/deniscerri/ytdlnis/util/InfoUtil.kt index 10b75b7a..5aae813b 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/util/InfoUtil.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/util/InfoUtil.kt @@ -1286,7 +1286,7 @@ class InfoUtil(private val context: Context) { request.addOption("--write-subs") request.addOption("--write-auto-subs") request.addOption("--sub-format", "${subFormat}/best") - request.addOption("--convert-subtitles", "srt") + request.addOption("--convert-subtitles", subFormat ?: "srt") if (!downloadItem.videoPreferences.embedSubs) { request.addOption("--sub-langs", downloadItem.videoPreferences.subsLanguages.ifEmpty { "en.*,.*-orig" }) } diff --git a/app/src/main/res/drawable/baseline_draw_24.xml b/app/src/main/res/drawable/baseline_draw_24.xml new file mode 100644 index 00000000..1ecb8e26 --- /dev/null +++ b/app/src/main/res/drawable/baseline_draw_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/baseline_security_24.xml b/app/src/main/res/drawable/baseline_security_24.xml new file mode 100644 index 00000000..1adcf488 --- /dev/null +++ b/app/src/main/res/drawable/baseline_security_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 5f318230..88f01753 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -113,6 +113,8 @@ es fa fr + hi + hr in it ja @@ -120,6 +122,7 @@ lv ms nb + nn pa pl pt @@ -127,6 +130,9 @@ ru ro sq + ta + te + th tr ta uk diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml index 247076fb..b2867ef4 100644 --- a/app/src/main/res/xml/locales_config.xml +++ b/app/src/main/res/xml/locales_config.xml @@ -10,6 +10,8 @@ + + @@ -17,6 +19,7 @@ + @@ -24,6 +27,9 @@ + + + diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml index b717e833..7b1d918c 100644 --- a/app/src/main/res/xml/root_preferences.xml +++ b/app/src/main/res/xml/root_preferences.xml @@ -69,6 +69,26 @@ android:data="https://hosted.weblate.org/projects/ytdlnis/" /> + + + + + + + +