From f5dc77b53e8df7d009d8dee508457b5da2d6d740 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe+git@uwetrottmann.com>
Date: Fri, 1 Nov 2024 11:52:47 +0100
Subject: [PATCH 1/5] Connect Trakt: use srcCompat for vector to not crash
 before API 23

- Also in check-in dialog to use compat loading on old versions.
---
 CHANGELOG.md                                                  | 4 ++++
 app/src/main/res/layout/dialog_checkin.xml                    | 3 ++-
 .../main/res/layout/fragment_connect_trakt_credentials.xml    | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c2de80405..54b4cc8429 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,10 @@ Releases marked with 🧪 (or previously with the "beta" suffix) were released o
 * 🔧 Display more options of list items on touch and hold and right click (for example in Samsung
   Dex) as well.
 
+### Unreleased
+
+* 🔨 Trakt: do not crash when opening Connect Trakt screen on Android 6 or older.
+
 ### 2024.4.5 - 2024-10-23
 
 * 🔧 Trakt: use new logo.
diff --git a/app/src/main/res/layout/dialog_checkin.xml b/app/src/main/res/layout/dialog_checkin.xml
index aafbe4cf42..076e5af4e5 100644
--- a/app/src/main/res/layout/dialog_checkin.xml
+++ b/app/src/main/res/layout/dialog_checkin.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -84,7 +85,7 @@
             android:layout_marginLeft="@dimen/default_padding"
             android:layout_marginRight="@dimen/default_padding"
             android:contentDescription="@null"
-            android:src="@drawable/ic_trakt_control_24dp" />
+            app:srcCompat="@drawable/ic_trakt_control_24dp" />
 
         <Button
             android:id="@+id/buttonCheckIn"
diff --git a/app/src/main/res/layout/fragment_connect_trakt_credentials.xml b/app/src/main/res/layout/fragment_connect_trakt_credentials.xml
index 45ffbbe71c..0c22c772a4 100644
--- a/app/src/main/res/layout/fragment_connect_trakt_credentials.xml
+++ b/app/src/main/res/layout/fragment_connect_trakt_credentials.xml
@@ -13,15 +13,16 @@
         android:layout_height="wrap_content"
         android:animateLayoutChanges="true">
 
+        <!-- Use app:srcCompat to use compat loading of vector drawable to support gradient before API 23 -->
         <ImageView
             android:id="@+id/imageViewTraktIcon"
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_marginTop="8dp"
-            android:src="@drawable/ic_trakt_gradient_48dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_trakt_gradient_48dp"
             tools:ignore="ContentDescription" />
 
         <TextView

From cdee842e133f1dbcf74cfadde733aa829447c0da Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe+git@uwetrottmann.com>
Date: Fri, 25 Oct 2024 06:25:33 +0200
Subject: [PATCH 2/5] Gradle: move keystore properties file out of repo

---
 app/build.gradle.kts | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d82575eab7..fc68ea694a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -113,16 +113,18 @@ android {
         }
     }
 
+    val keystoreConfigFile = rootProject.file("../upload-keystore-uwe-trottmann.properties")
+    val hasKeystoreConfig = keystoreConfigFile.exists()
     signingConfigs {
         create("release") {
-            if (rootProject.file("keystore.properties").exists()) {
+            if (hasKeystoreConfig) {
                 val props = Properties()
-                props.load(FileInputStream(rootProject.file("keystore.properties")))
+                props.load(FileInputStream(keystoreConfigFile))
 
-                storeFile = file(props["storeFile"]!!)
-                storePassword = props["storePassword"]!!.toString()
-                keyAlias = props["keyAlias"]!!.toString()
-                keyPassword = props["keyPassword"]!!.toString()
+                storeFile = file(props["storeFile"] as String)
+                storePassword = props["storePassword"] as String
+                keyAlias = props["keyAlias"] as String
+                keyPassword = props["keyPassword"] as String
             }
         }
     }
@@ -133,7 +135,7 @@ android {
             isMinifyEnabled = true
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
 
-            if (rootProject.file("keystore.properties").exists()) {
+            if (hasKeystoreConfig) {
                 signingConfig = signingConfigs.getByName("release")
             }
         }

From f285f18ac268e783a222553cee811508af33687f Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe+git@uwetrottmann.com>
Date: Fri, 25 Oct 2024 16:43:45 +0200
Subject: [PATCH 3/5] Translations: in Danish use Android's term notifikationer

---
 app/src/main/res/values-da/strings.xml | 30 +++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 95c8da45eb..35d694881c 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -142,8 +142,8 @@
     <string name="context_unfavorite">Fjern fra Foretrukne</string>
     <string name="favorited">Føjet til Foretrukne</string>
     <string name="unfavorited">Fjernet fra Foretrukne</string>
-    <string name="action_episode_notifications_on">Slå episodemeddelelser til</string>
-    <string name="action_episode_notifications_off">Slå episodemeddelelser fra</string>
+    <string name="action_episode_notifications_on">Slå episodenotifikationer til</string>
+    <string name="action_episode_notifications_off">Slå episodenotifikationer fra</string>
     <string name="context_hide">Skjul</string>
     <string name="context_unhide">Skjul ikke</string>
     <string name="hidden">Flyttet til skjulte</string>
@@ -482,27 +482,27 @@
     <!-- Notifications -->
     <string name="upcoming_episodes_number">%s nye episoder</string>
     <string name="upcoming_display">Vælg for at vise kommende serier</string>
-    <string name="pref_notifications">Meddelelser</string>
+    <string name="pref_notifications">Notifikationer</string>
     <string name="pref_notificationssummary">Underret om nye episoder</string>
-    <string name="pref_notifications_settings">Meddelelsesindstillinger</string>
+    <string name="pref_notifications_settings">Notifikationsindstillinger</string>
     <string name="pref_notifications_settings_summary">Konfigurer om og hvordan notifikationer vises</string>
     <string name="pref_ringtone">Lyd</string>
     <string name="pref_vibrate">Vibrér</string>
-    <string name="pref_vibratesummary">Vibrér også ved visning af meddelelse</string>
-    <string name="pref_notifications_treshold">Meddelelsesfrekvens</string>
+    <string name="pref_vibratesummary">Vibrer også ved visning en notifikation</string>
+    <string name="pref_notifications_treshold">Hvornår der skal gives notifikation</string>
     <string name="pref_notifications_select_shows">Vælg serier</string>
-    <string name="pref_notifications_select_shows_summary">Serier med episodemeddelelser slået til (%d)</string>
+    <string name="pref_notifications_select_shows_summary">Serier med notifikationer slået til (%d)</string>
     <string name="pref_notifications_hidden">Ignorér skjulte serier</string>
-    <string name="pref_notifications_hidden_summary">Underret ikke om skjulte serier, heller ikke hvis meddelelser er slået til.</string>
+    <string name="pref_notifications_hidden_summary">Selv hvis notifikationer er aktiveret, giv ikke besked om skjulte serier</string>
     <string name="pref_notification_channel_errors">Fejl</string>
-    <string name="pref_notifications_next_episodes_only">Kun for efterfølgende episoder på afspilningslisten</string>
-    <string name="pref_notifications_next_episodes_only_summary">Underret mig kun, hvis den nye episode er den næste på afspilningslisten</string>
+    <string name="pref_notifications_next_episodes_only">Kun for episoder at se næste</string>
+    <string name="pref_notifications_next_episodes_only_summary">Giv kun besked, hvis den nye episode er den næste til at se</string>
     <string name="pref_notifications_battery_settings">Batteriindstillinger</string>
-    <string name="pref_notifications_battery_settings_summary">Gå til Batteriindstillinger for at deaktivere batterioptimeringer for pålidelige meddelelser</string>
-    <string name="notifications_allow">Tillad meddelelser</string>
-    <string name="notifications_allow_reason">Gå til Indstillinger for at tillade modtagelse af episode- og fejlmeddelelser.</string>
-    <string name="precise_notifications_allow">Tillad præcise meddelelser</string>
-    <string name="precise_notifications_allow_reason">Gå til Indstillinger for at tillade præcise episodemeddelelser.</string>
+    <string name="pref_notifications_battery_settings_summary">Gå til Batteriindstillinger for at deaktivere batterioptimeringer for pålidelige notifikationer</string>
+    <string name="notifications_allow">Tillad notifikationer</string>
+    <string name="notifications_allow_reason">For at modtage notifikationer for episoder og fejl, gå til Indstillinger for at tillade dem</string>
+    <string name="precise_notifications_allow">Tillad rettidige notifikationer</string>
+    <string name="precise_notifications_allow_reason">For at modtage rettidige notifikationer skal du gå til Indstillinger og tillade indstilling af påmindelser</string>
     <!-- List Widget -->
     <string name="hide_watched">Skjul sete episoder</string>
     <string name="pref_widget_opacity">Widget-baggrund</string>

From 5b0886f0beb77b963ec5cfcd4a9b72c551f65c38 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe+git@uwetrottmann.com>
Date: Tue, 29 Oct 2024 16:59:23 +0100
Subject: [PATCH 4/5] More: refer to Community instead of Forum again

---
 app/src/main/res/values/donottranslate.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 0254fe04b4..3ee2bf78f0 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -65,7 +65,7 @@
 
     <!-- Settings -->
     <string name="pref_key_notifications_hidden">com.battlelancer.seriesguide.notifications.hidden</string>
-    <string name="pref_community">Forum</string>
+    <string name="pref_community">Community</string>
     <string name="pref_category_danger">Danger Zone</string>
     <string name="pref_user_debug_mode">Debug mode</string>
     <string name="pref_user_debug_mode_summary">Allows to diagnose errors, but slows down the app.</string>

From d801ab91d143b5c20b252e3b571ca02c7624c1b6 Mon Sep 17 00:00:00 2001
From: Uwe Trottmann <uwe+git@uwetrottmann.com>
Date: Fri, 1 Nov 2024 12:05:25 +0100
Subject: [PATCH 5/5] Prepare version 2024.4.6 (21240407)

---
 CHANGELOG.md     | 3 ++-
 build.gradle.kts | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54b4cc8429..e07e54b8c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,9 +17,10 @@ Releases marked with 🧪 (or previously with the "beta" suffix) were released o
 * 🔧 Display more options of list items on touch and hold and right click (for example in Samsung
   Dex) as well.
 
-### Unreleased
+### 2024.4.6 - 2024-11-01
 
 * 🔨 Trakt: do not crash when opening Connect Trakt screen on Android 6 or older.
+* 📝 Latest user interface translations from Crowdin.
 
 ### 2024.4.5 - 2024-10-23
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 73854b9163..d9b3c4d795 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -21,9 +21,9 @@ buildscript {
     // YYYY.<release-of-year>.<build> - like 2024.1.0
     // - allows to more easily judge how old a release is
     // - allows multiple releases per month (though currently unlikely)
-    val sgVersionName by extra("2024.4.5")
+    val sgVersionName by extra("2024.4.6")
     // version 21yyrrbb -> min SDK 21, year yy, release rr, build bb
-    val sgVersionCode by extra(21240406)
+    val sgVersionCode by extra(21240407)
 
     val isCiBuild by extra { System.getenv("CI") == "true" }