From 85bee5902fb50b8c9774053c344653e17dabd73c Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Sat, 4 Jun 2016 13:45:45 +0200
Subject: Fix app name (due to flavors)

---
 core/src/main/res/values/strings.xml | 1 -
 1 file changed, 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 e31d60ce8..238a24c81 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -4,7 +4,6 @@
     tools:ignore="MissingTranslation">
 
     <!-- Activitiy and fragment titles -->
-    <string name="app_name" translate="false">AntennaPod</string>
     <string name="feeds_label">Feeds</string>
     <string name="statistics_label">Statistics</string>
     <string name="add_feed_label">Add Podcast</string>
-- 
cgit v1.2.3


From 6e876db9b61ef57312a254af1a6e59877e8a8ea6 Mon Sep 17 00:00:00 2001
From: Koen Glotzbach <11229646+keunes@users.noreply.github.com>
Date: Mon, 14 May 2018 23:34:37 +0200
Subject: Update strings.xml

Improve preference description following https://github.com/AntennaPod/AntennaPod/issues/1560#issuecomment-172252386. Not sure if same change should be applied also to string "pref_hardwarePreviousButtonRestarts_sum"
---
 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 65697be28..9fb1d5d15 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -309,7 +309,7 @@
     <string name="pref_unpauseOnHeadsetReconnect_sum">Resume playback when the headphones are reconnected</string>
     <string name="pref_unpauseOnBluetoothReconnect_sum">Resume playback when bluetooth reconnects</string>
     <string name="pref_hardwareForwardButtonSkips_title">Forward Button Skips</string>
-    <string name="pref_hardwareForwardButtonSkips_sum">When pressing a hardware forward button skip to the next episode instead of fast-forwarding</string>
+    <string name="pref_hardwareForwardButtonSkips_sum">When pressing a forward button on a bluetooth-connected device skip to the next episode instead of fast-forwarding</string>
     <string name="pref_hardwarePreviousButtonRestarts_title">Previous button restarts</string>
     <string name="pref_hardwarePreviousButtonRestarts_sum">When pressing a hardware previous button restart playing the current episode instead of rewinding</string>
     <string name="pref_followQueue_sum">Jump to next queue item when playback completes</string>
-- 
cgit v1.2.3


From df8024bb3eaed2984e5d826b3e7a66816b932125 Mon Sep 17 00:00:00 2001
From: sevenmaster <seven-master@hotmail.de>
Date: Thu, 4 Oct 2018 09:23:17 +0200
Subject: added icons in settings

---
 core/src/main/res/values/attrs.xml  | 3 +++
 core/src/main/res/values/styles.xml | 8 ++++++++
 2 files changed, 11 insertions(+)

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

diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 9d168a1b9..82d0a39bf 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -55,6 +55,9 @@
     <attr name="ic_create_new_folder" format="reference"/>
     <attr name="ic_cast_disconnect" format="reference"/>
     <attr name="ic_swap" format="reference"/>
+    <attr name="ic_question_answer" format="reference" />
+    <attr name="ic_bug" format="reference" />
+    <attr name="ic_known_issues" format="reference" />
     <attr name="master_switch_background" format="color"/>
     <attr name="currently_playing_background" format="color"/>
 
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index cbd1dc88e..b40cc12d9 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -66,8 +66,13 @@
         <item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_grey600_36dp</item>
         <item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_grey600_24dp</item>
         <item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_grey600_36dp</item>
+        <item type="attr" name="ic_question_answer">@drawable/ic_forum_grey600_24dp</item>
+        <item type="attr" name="ic_bug">@drawable/ic_bug_grey600_24dp</item>
+        <item type="attr" name="ic_known_issues">@drawable/ic_format_list_bulleted_grey600_24dp</item>
+
         <item type="attr" name="master_switch_background">@color/master_switch_background_light</item>
         <item type="attr" name="currently_playing_background">@color/highlight_light</item>
+
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
 
         <item type="attr" name="about_screen_background">#e5e5e5</item>
@@ -141,6 +146,9 @@
         <item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_white_36dp</item>
         <item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_white_24dp</item>
         <item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item>
+        <item type="attr" name="ic_question_answer">@drawable/ic_baseline_question_answer_white_24dp</item>
+        <item type="attr" name="ic_bug">@drawable/ic_bug_white_24dp</item>
+        <item type="attr" name="ic_known_issues">@drawable/ic_format_list_bulleted_white_24dp</item>
         <item type="attr" name="master_switch_background">@color/master_switch_background_dark</item>
         <item type="attr" name="currently_playing_background">@color/highlight_dark</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-- 
cgit v1.2.3


From 1094ec9a56d0bd14db074681c9c23110d7ed3917 Mon Sep 17 00:00:00 2001
From: sevenmaster <seven-master@hotmail.de>
Date: Thu, 4 Oct 2018 11:50:32 +0200
Subject: made icons available throughout the whole project

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

(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 b40cc12d9..7bc27aa6a 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -246,6 +246,9 @@
         <item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_grey600_36dp</item>
         <item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_grey600_24dp</item>
         <item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_grey600_36dp</item>
+        <item type="attr" name="ic_question_answer">@drawable/ic_forum_grey600_24dp</item>
+        <item type="attr" name="ic_bug">@drawable/ic_bug_grey600_24dp</item>
+        <item type="attr" name="ic_known_issues">@drawable/ic_format_list_bulleted_grey600_24dp</item>
         <item type="attr" name="master_switch_background">@color/master_switch_background_light</item>
         <item type="attr" name="currently_playing_background">@color/highlight_light</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
@@ -322,6 +325,9 @@
         <item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_white_36dp</item>
         <item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_white_24dp</item>
         <item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item>
+        <item type="attr" name="ic_question_answer">@drawable/ic_baseline_question_answer_white_24dp</item>
+        <item type="attr" name="ic_bug">@drawable/ic_bug_white_24dp</item>
+        <item type="attr" name="ic_known_issues">@drawable/ic_format_list_bulleted_white_24dp</item>
         <item type="attr" name="master_switch_background">@color/master_switch_background_dark</item>
         <item type="attr" name="currently_playing_background">@color/highlight_dark</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-- 
cgit v1.2.3


From 221de87c04fe6f865e81d5f28a56ac64e62cd030 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 15 Oct 2018 15:31:14 +0200
Subject: Hiding expand notification preference on API 26

---
 core/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 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 8ae9957cb..20bd7aa05 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -427,8 +427,8 @@
     <string name="pref_rewind_sum">Customize the number of seconds to jump backwards when the rewind button is clicked</string>
     <string name="pref_gpodnet_sethostname_title">Set hostname</string>
     <string name="pref_gpodnet_sethostname_use_default_host">Use default host</string>
-    <string name="pref_expandNotify_title">Expand Notification</string>
-    <string name="pref_expandNotify_sum">Always expand the notification to show playback buttons.</string>
+    <string name="pref_expandNotify_title">High Notification priority</string>
+    <string name="pref_expandNotify_sum">This usually expands the notification to show playback buttons.</string>
     <string name="pref_persistNotify_title">Persistent Playback Controls</string>
     <string name="pref_persistNotify_sum">Keep notification and lockscreen controls when playback is paused.</string>
     <string name="pref_compact_notification_buttons_title">Set Lockscreen Buttons</string>
-- 
cgit v1.2.3


From 8ebb9854e6b371c8b8d6a013d13cb583040ac64a Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 16 Oct 2018 14:31:49 +0200
Subject: Allow to select all above in batch editor

---
 core/src/main/res/values/arrays.xml  | 5 +++++
 core/src/main/res/values/strings.xml | 2 ++
 2 files changed, 7 insertions(+)

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

diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml
index c02b700e4..7e2fed054 100644
--- a/core/src/main/res/values/arrays.xml
+++ b/core/src/main/res/values/arrays.xml
@@ -272,4 +272,9 @@
         <item>stop</item>
         <item>continue</item>
     </string-array>
+
+    <string-array name="batch_long_press_options">
+        <item>@string/select_all_above</item>
+        <item>@string/select_all_below</item>
+    </string-array>
 </resources>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 8ae9957cb..7037020bc 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -144,6 +144,8 @@
     <string name="load_complete_feed">Refresh complete podcast</string>
     <string name="hide_episodes_title">Hide Episodes</string>
     <string name="batch_edit">Batch edit</string>
+    <string name="select_all_above">Select all above</string>
+    <string name="select_all_below">Select all below</string>
     <string name="hide_unplayed_episodes_label">Unplayed</string>
     <string name="hide_paused_episodes_label">Paused</string>
     <string name="hide_played_episodes_label">Played</string>
-- 
cgit v1.2.3