From 116125f7217cdaca96bd910a65ada52558392ab0 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 26 Jan 2020 13:44:30 +0100
Subject: Display splash for all screens

---
 core/src/main/res/values/styles.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'core/src/main/res/values')

diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 2ccd48353..64fe97d4f 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -266,7 +266,11 @@
         <item name="android:windowExitAnimation">@android:anim/fade_out</item>
     </style>
 
-    <style name="Theme.AntennaPod.Dark.Splash" parent="Theme.AppCompat.NoActionBar">
+    <style name="Theme.AntennaPod.Splash" parent="Theme.Base.AntennaPod.Splash">
+        <!-- Room for API dependent attributes -->
+    </style>
+
+    <style name="Theme.Base.AntennaPod.Splash" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowBackground">@drawable/bg_splash</item>
         <item name="colorPrimary">@color/ic_launcher_background</item>
         <item name="colorPrimaryDark">@color/ic_launcher_background</item>
-- 
cgit v1.2.3


From 12288d01a5eadbd5ed015fd59265c9cdef34a889 Mon Sep 17 00:00:00 2001
From: Keunes <11229646+keunes@users.noreply.github.com>
Date: Tue, 4 Feb 2020 22:18:04 +0100
Subject: Update strings.xml

With the removal of the subheading (#3811), it isn't clear anymore when AP will vibrate. This will clarify the function/checkbox.
---
 core/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/src/main/res/values')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index d87afcd09..bd52dfa1e 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -579,7 +579,7 @@
     <string name="sleep_timer_label">Sleep timer</string>
     <string name="time_dialog_invalid_input">Invalid input, time has to be an integer</string>
     <string name="shake_to_reset_label">Shake to reset</string>
-    <string name="timer_vibration_label">Vibrate</string>
+    <string name="timer_vibration_label">Vibrate shortly before end</string>
     <string name="time_seconds">seconds</string>
     <string name="time_minutes">minutes</string>
     <string name="time_hours">hours</string>
-- 
cgit v1.2.3


From 75e0d2d7e1929a617ea21e235d96e0448eea091b Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 5 Feb 2020 00:29:07 +0100
Subject: Verify database version before import

---
 core/src/main/res/values/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'core/src/main/res/values')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index d87afcd09..0b9100075 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -572,6 +572,7 @@
     <string name="opml_import_ask_read_permission">Access to external storage is required to read the OPML file</string>
     <string name="import_select_file">Select file to import</string>
     <string name="import_ok">Import successful.\n\nPlease press OK to restart AntennaPod</string>
+    <string name="import_no_downgrade">This database was exported with a newer version of AntennaPod. Your current installation does not yet know how to handle this file.</string>
 
     <!-- Sleep timer -->
     <string name="set_sleeptimer_label">Set sleep timer</string>
@@ -768,7 +769,6 @@
     <string name="cast_failed_to_play">Failed to start the playback of media</string>
     <string name="cast_failed_to_stop">Failed to stop the playback of media</string>
     <string name="cast_failed_to_pause">Failed to pause the playback of media</string>
-    <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
     <string name="cast_failed_setting_volume">Failed to set the volume</string>
     <string name="cast_failed_no_connection">No connection to the cast device is present</string>
     <string name="cast_failed_no_connection_trans">Connection to the cast device has been lost. Application is trying to re-establish the connection, if possible. Please wait for a few seconds and try again.</string>
@@ -786,7 +786,6 @@
     <string name="notification_channel_playing_description">Allows to control playback. This is the main notification you see while playing a podcast.</string>
     <string name="notification_channel_error">Errors</string>
     <string name="notification_channel_error_description">Shown if something went wrong, for example if download or gpodder sync fails.</string>
-    <string name="import_bad_file">Invalid/corrupt file</string>
 
     <!-- Widget settings -->
     <string name="widget_settings">Widget settings</string>
-- 
cgit v1.2.3


From 3be4f80a5cf466f92eb3844d556ad4ea784b5f06 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 5 Feb 2020 09:55:55 +0100
Subject: Removed search strings

---
 core/src/main/res/values/strings.xml | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'core/src/main/res/values')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index bd52dfa1e..e436285e1 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -536,14 +536,8 @@
     <string name="licenses_summary">AntennaPod uses other great software</string>
 
     <!-- Search -->
-    <string name="search_hint">Search for episodes</string>
-    <string name="found_in_shownotes_label">Found in show notes</string>
-    <string name="found_in_chapters_label">Found in chapters</string>
-    <string name="found_in_authors_label">Found in author(s)</string>
-    <string name="found_in_feeds_label">Found in podcast</string>
     <string name="search_status_no_results">No results were found</string>
     <string name="search_label">Search</string>
-    <string name="found_in_title_label">Found in title</string>
     <string name="no_results_for_query">No results were found for \"%1$s\"</string>
 
     <!-- import and export -->
-- 
cgit v1.2.3