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/strings.xml')

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 af33e4c37bdad3151013553dbeafc3bc1e8043b0 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 28 May 2017 12:17:53 +0200
Subject: Import/Export activity

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index a940c031b..545eea228 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -661,6 +661,12 @@
     <string name="proxy_host_invalid_error">Host is not a valid IP address or domain</string>
     <string name="proxy_port_invalid_error">Port not valid</string>
 
+    <!-- Database import/export -->
+    <string name="import_export">Database import/export</string>
+    <string name="import_export_warning">This experimental function can be used to transfer your subscriptions and played episodes to another device.\n\nExported databases can only be imported when using the same version of AntennaPod. Otherwise, this function will lead to unexpected behavior.\n\nAfter importing, episodes might be displayed as downloaded even though they are not. Just press the play button of the episodes to make AntennaPod detect this.</string>
+    <string name="label_import">Import</string>
+    <string name="label_export">Export</string>
+
     <!-- Casting -->
     <string name="cast_media_route_menu_title">Play on&#8230;</string>
     <string name="cast_disconnect_label">Disconnect the cast session</string>
-- 
cgit v1.2.3


From 4cb4a0a0cbb65bc0db58ce24cc665f38a06ee208 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 16 Oct 2017 00:06:17 +0200
Subject: Supporting export using documents store API

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 545eea228..4f79914ee 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -666,6 +666,8 @@
     <string name="import_export_warning">This experimental function can be used to transfer your subscriptions and played episodes to another device.\n\nExported databases can only be imported when using the same version of AntennaPod. Otherwise, this function will lead to unexpected behavior.\n\nAfter importing, episodes might be displayed as downloaded even though they are not. Just press the play button of the episodes to make AntennaPod detect this.</string>
     <string name="label_import">Import</string>
     <string name="label_export">Export</string>
+    <string name="import_select_file">Select file to import</string>
+    <string name="export_ok">Export successful. The database was written to the sd card.</string>
 
     <!-- Casting -->
     <string name="cast_media_route_menu_title">Play on&#8230;</string>
-- 
cgit v1.2.3


From 2e5407370fd9bdcf4646140d6dd9563cbb8cca72 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 21 Oct 2017 20:08:11 +0200
Subject: Showing dialog when import succeeds

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 4f79914ee..eb8c057ee 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -668,6 +668,7 @@
     <string name="label_export">Export</string>
     <string name="import_select_file">Select file to import</string>
     <string name="export_ok">Export successful. The database was written to the sd card.</string>
+    <string name="import_ok">Success.\n\nPlease press OK to restart AntennaPod</string>
 
     <!-- Casting -->
     <string name="cast_media_route_menu_title">Play on&#8230;</string>
-- 
cgit v1.2.3


From d36f4b6a8774d0e49d20fe9fd725f8fb589664cd Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 24 Dec 2017 13:18:05 +0100
Subject: Updated phrasing

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index eb8c057ee..6772c0205 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -668,7 +668,7 @@
     <string name="label_export">Export</string>
     <string name="import_select_file">Select file to import</string>
     <string name="export_ok">Export successful. The database was written to the sd card.</string>
-    <string name="import_ok">Success.\n\nPlease press OK to restart AntennaPod</string>
+    <string name="import_ok">Import successful.\n\nPlease press OK to restart AntennaPod</string>
 
     <!-- Casting -->
     <string name="cast_media_route_menu_title">Play on&#8230;</string>
-- 
cgit v1.2.3


From 3fd3db6c579c0ab4d5388f4796e552e02443c784 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 25 Dec 2017 22:42:41 +0100
Subject: Review changes

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 6772c0205..2ee295997 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -667,7 +667,7 @@
     <string name="label_import">Import</string>
     <string name="label_export">Export</string>
     <string name="import_select_file">Select file to import</string>
-    <string name="export_ok">Export successful. The database was written to the sd card.</string>
+    <string name="export_ok">Export successful. The database was written to the SD card.</string>
     <string name="import_ok">Import successful.\n\nPlease press OK to restart AntennaPod</string>
 
     <!-- Casting -->
-- 
cgit v1.2.3


From c5d1d5408b1a2f31ad697fb0940148801ee0ee1a Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 24 Dec 2017 11:46:59 +0100
Subject: Added Picure in picture

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index a940c031b..fde0256db 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -234,6 +234,7 @@
     <string name="no_media_playing_label">No media playing</string>
     <string name="position_default_label" translate="false">00:00:00</string>
     <string name="player_buffering_msg">Buffering</string>
+    <string name="player_go_to_picture_in_picture">Picture-in-picture mode</string>
     <string name="playbackservice_notification_title">Playing podcast</string>
     <string name="unknown_media_key">AntennaPod - Unknown media key: %1$d</string>
 
-- 
cgit v1.2.3


From 8b041be8aac7f3d6f6f0ece37b4107126c8f3ea2 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 21 Jan 2018 22:58:18 +0100
Subject: Improved export success wording (Closes #2545)

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 2ee295997..f0eed3e38 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -667,7 +667,7 @@
     <string name="label_import">Import</string>
     <string name="label_export">Export</string>
     <string name="import_select_file">Select file to import</string>
-    <string name="export_ok">Export successful. The database was written to the SD card.</string>
+    <string name="export_ok">Export successful.</string>
     <string name="import_ok">Import successful.\n\nPlease press OK to restart AntennaPod</string>
 
     <!-- Casting -->
-- 
cgit v1.2.3


From 05f923ebe256b71636e2369d48450a52ab87f944 Mon Sep 17 00:00:00 2001
From: alifeflow <de_al_m@qq.com>
Date: Sun, 25 Mar 2018 16:00:42 +0900
Subject: [Ture Black] True Black Theme for AMOLED

Add true black themese
Modified code that fails to support three themes
---
 core/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index f0eed3e38..4f558ae56 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -374,6 +374,7 @@
     <string name="pref_episode_cache_title">Episode Cache</string>
     <string name="pref_theme_title_light">Light</string>
     <string name="pref_theme_title_dark">Dark</string>
+    <string name="pref_theme_title_trueblack">True Black</string>
     <string name="pref_episode_cache_unlimited">Unlimited</string>
     <string name="pref_update_interval_hours_plural">hours</string>
     <string name="pref_update_interval_hours_singular">hour</string>
-- 
cgit v1.2.3


From 67b01f6ec802b95732dec999d7dbc35ed9a2f0fa Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Thu, 5 Apr 2018 16:22:45 +0200
Subject: Use generic export message instead of OPML

The same message is shown for HTML and OPML. Fixes #2462.
Additionally, using string formatting now instead of just "+"
---
 core/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index f0eed3e38..fc176dc1a 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -475,8 +475,8 @@
     <string name="html_export_label">HTML export</string>
     <string name="exporting_label">Exporting&#8230;</string>
     <string name="export_error_label">Export error</string>
-    <string name="opml_export_success_title">OPML Export successful.</string>
-    <string name="opml_export_success_sum">The .opml file was written to:\u0020</string>
+    <string name="export_success_title">Export successful</string>
+    <string name="export_success_sum">The exported file was written to:\n\n%1$s</string>
     <string name="opml_import_ask_read_permission">Access to external storage is required to read the OPML file</string>
 
     <!-- Sleep timer -->
-- 
cgit v1.2.3


From e41bc7bd61ba568adec4ff82c636cbbee7556022 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Thu, 5 Apr 2018 18:25:14 +0200
Subject: Showing URL for failed downloads

Closes #1082
---
 core/src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index f0eed3e38..e192598a3 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -182,6 +182,8 @@
     <string name="download_failed">failed</string>
     <string name="download_pending">Download pending</string>
     <string name="download_running">Download running</string>
+    <string name="download_error_details">Details</string>
+    <string name="download_error_details_message">%1$s \n\nFile URL:\n%2$s</string>
     <string name="download_error_device_not_found">Storage Device not found</string>
     <string name="download_error_insufficient_space">Insufficient Space</string>
     <string name="download_error_file_error">File Error</string>
-- 
cgit v1.2.3


From 562bbf21f056e03aa13d5b48a5cdb16031495f2f Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 9 Apr 2018 18:33:03 +0200
Subject: Split up two different uses of the string 'New'

Closes #2348
---
 core/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index aa36eab33..ab8a53cde 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -11,6 +11,7 @@
     <string name="add_feed_label">Add Podcast</string>
     <string name="episodes_label">Episodes</string>
     <string name="all_episodes_short_label">All</string>
+    <string name="new_episodes_label">New</string>
     <string name="favorite_episodes_label">Favorites</string>
     <string name="new_label">New</string>
     <string name="settings_label">Settings</string>
-- 
cgit v1.2.3


From 64221f7f56a422406c2a664e18ad8593e6825ef2 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Mon, 9 Apr 2018 19:43:50 +0200
Subject: Allow to enter PiP automatically

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 5558b97b3..b8286cbd0 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -440,6 +440,9 @@
     <string name="pref_cast_message_free_flavor">Chromecast requires third party proprietary libraries that are disabled in this version of AntennaPod</string>
     <string name="pref_enqueue_downloaded_title">Enqueue Downloaded</string>
     <string name="pref_enqueue_downloaded_summary">Add downloaded episodes to the queue</string>
+    <string name="pref_videoBehavior_title">Video behavior</string>
+    <string name="pref_videoBehavior_sum">Behavior when leaving video playback</string>
+    <string name="stop_playback">Stop playback</string>
 
     <!-- Auto-Flattr dialog -->
     <string name="auto_flattr_enable">Enable automatic flattring</string>
-- 
cgit v1.2.3


From 47909464af8486819ea73b3219374470277a59d0 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 10 Apr 2018 22:14:25 +0200
Subject: Extracted string resources

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index aa36eab33..f7785964a 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -307,6 +307,8 @@
     <string name="queue_label">Queue</string>
     <string name="services_label">Services</string>
     <string name="flattr_label">Flattr</string>
+    <string name="various_pref">Various</string>
+    <string name="import_export_pref">Import/Export</string>
     <string name="pref_episode_cleanup_title">Episode Cleanup</string>
     <string name="pref_episode_cleanup_summary">Episodes that aren\'t in the queue and aren\'t favorites should be eligible for removal if Auto Download needs space for new episodes</string>
     <string name="pref_pauseOnDisconnect_sum">Pause playback when headphones or bluetooth are disconnected</string>
-- 
cgit v1.2.3


From 8ad9ef6c196f2fa5b01aa68edc7624e8628c482d Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 10 Apr 2018 23:33:04 +0200
Subject: Added categories

---
 core/src/main/res/values/strings.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index f7785964a..f2f29eb30 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -23,6 +23,7 @@
     <string name="cancel_download_label">Cancel\nDownload</string>
     <string name="playback_history_label">Playback History</string>
     <string name="gpodnet_main_label">gpodder.net</string>
+    <string name="gpodnet_summary">Synchronize with other devices</string>
     <string name="gpodnet_auth_label">gpodder.net Login</string>
     <string name="free_space_label">%1$s free</string>
     <string name="episode_cache_full_title">Episode cache full</string>
@@ -307,8 +308,16 @@
     <string name="queue_label">Queue</string>
     <string name="services_label">Services</string>
     <string name="flattr_label">Flattr</string>
-    <string name="various_pref">Various</string>
+    <string name="flattr_summary">Micropayment service</string>
+    <string name="miscellaneous_pref">Miscellaneous</string>
+    <string name="data_usage">Data usage</string>
+    <string name="download_pref_details">Details</string>
     <string name="import_export_pref">Import/Export</string>
+    <string name="appearance">Appearance</string>
+    <string name="external_elements">External elements</string>
+    <string name="interruptions">Interruptions</string>
+    <string name="buttons">Buttons</string>
+    <string name="media_player">Media player</string>
     <string name="pref_episode_cleanup_title">Episode Cleanup</string>
     <string name="pref_episode_cleanup_summary">Episodes that aren\'t in the queue and aren\'t favorites should be eligible for removal if Auto Download needs space for new episodes</string>
     <string name="pref_pauseOnDisconnect_sum">Pause playback when headphones or bluetooth are disconnected</string>
-- 
cgit v1.2.3


From 5a2dca284034b6f06313d13ef59bee330133d30e Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Tue, 10 Apr 2018 23:41:41 +0200
Subject: Removed misc settings

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index f2f29eb30..9a8e3f654 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -309,7 +309,6 @@
     <string name="services_label">Services</string>
     <string name="flattr_label">Flattr</string>
     <string name="flattr_summary">Micropayment service</string>
-    <string name="miscellaneous_pref">Miscellaneous</string>
     <string name="data_usage">Data usage</string>
     <string name="download_pref_details">Details</string>
     <string name="import_export_pref">Import/Export</string>
-- 
cgit v1.2.3


From 0f80fac6805bd7b1476aa04a37d6f12f1ba10d92 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 11 Apr 2018 12:15:49 +0200
Subject: Allow to continue playback when leaving player

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index b8286cbd0..7bf547e96 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -443,6 +443,7 @@
     <string name="pref_videoBehavior_title">Video behavior</string>
     <string name="pref_videoBehavior_sum">Behavior when leaving video playback</string>
     <string name="stop_playback">Stop playback</string>
+    <string name="continue_playback">Continue playback</string>
 
     <!-- Auto-Flattr dialog -->
     <string name="auto_flattr_enable">Enable automatic flattring</string>
-- 
cgit v1.2.3


From c5bdf341faa235821ec1d4e8f1621c8e785dc480 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 11 Apr 2018 17:09:12 +0200
Subject: Changed batch edit icon and name

Closes #1146
---
 core/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index aa36eab33..43fc68ee3 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -135,7 +135,7 @@
     <string name="feed_remover_msg">Removing Feed</string>
     <string name="load_complete_feed">Refresh complete Feed</string>
     <string name="hide_episodes_title">Hide Episodes</string>
-    <string name="episode_actions">Apply actions</string>
+    <string name="batch_edit">Batch edit</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


From c9fdc05784b5f8c4eb7ec5be9cbde4a684e64a99 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Fri, 13 Apr 2018 15:39:51 +0200
Subject: Split feed info and settings

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index aa36eab33..d959a5a6f 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -122,6 +122,9 @@
     <string name="mark_all_seen_msg">Marked all Episodes as seen</string>
     <string name="mark_all_seen_confirmation_msg">Please confirm that you want to mark all episodes as seen.</string>
     <string name="show_info_label">Show information</string>
+    <string name="show_feed_settings_label">Show feed settings</string>
+    <string name="feed_info_label">Feed info</string>
+    <string name="feed_settings_label">Feed settings</string>
     <string name="rename_feed_label">Rename Podcast</string>
     <string name="remove_feed_label">Remove Podcast</string>
     <string name="share_label">Share&#8230;</string>
-- 
cgit v1.2.3


From d50dcac96e223f48a218093007130eb7fd5ca0c2 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 21 Apr 2018 17:58:14 +0200
Subject: Added ExoPlayer setting

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index aa36eab33..a558c4e9a 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -426,8 +426,8 @@
     <string name="crash_report_sum">Send the latest crash report via e-mail</string>
     <string name="send_email">Send e-mail</string>
     <string name="experimental_pref">Experimental</string>
-    <string name="pref_sonic_title">Sonic Media Player</string>
-    <string name="pref_sonic_message">Use built-in sonic media player as a replacement for Android\'s native mediaplayer and Prestissimo</string>
+    <string name="pref_media_player_title">Media Player</string>
+    <string name="pref_media_player_message">Select which media player to use to play files</string>
     <string name="pref_current_value">Current value: %1$s</string>
     <string name="pref_proxy_title">Proxy</string>
     <string name="pref_proxy_sum">Set a network proxy</string>
@@ -439,6 +439,9 @@
     <string name="pref_cast_message_free_flavor">Chromecast requires third party proprietary libraries that are disabled in this version of AntennaPod</string>
     <string name="pref_enqueue_downloaded_title">Enqueue Downloaded</string>
     <string name="pref_enqueue_downloaded_summary">Add downloaded episodes to the queue</string>
+    <string name="media_player_builtin">Built-in Android player</string>
+    <string name="media_player_sonic">Sonic Media Player</string>
+    <string name="media_player_exoplayer">Exoplayer</string>
 
     <!-- Auto-Flattr dialog -->
     <string name="auto_flattr_enable">Enable automatic flattring</string>
-- 
cgit v1.2.3


From 33e695b5194a2158e3c03b5a2f6a9b4ae65ed851 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 22 Apr 2018 17:49:20 +0200
Subject: Automation category

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 2997b51b2..d792124c6 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -315,6 +315,7 @@
     <string name="flattr_label">Flattr</string>
     <string name="flattr_summary">Micropayment service</string>
     <string name="data_usage">Data usage</string>
+    <string name="automation">Automation</string>
     <string name="download_pref_details">Details</string>
     <string name="import_export_pref">Import/Export</string>
     <string name="appearance">Appearance</string>
-- 
cgit v1.2.3


From f2ee5d7ff204ec71d5ae06a01a53db3c73c7e15c Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 22 Apr 2018 19:20:11 +0200
Subject: Renamed Services to Integrations

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index d792124c6..2ebc2ad77 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -311,10 +311,9 @@
     <string name="other_pref">Other</string>
     <string name="about_pref">About</string>
     <string name="queue_label">Queue</string>
-    <string name="services_label">Services</string>
+    <string name="integrations_label">Integrations</string>
     <string name="flattr_label">Flattr</string>
     <string name="flattr_summary">Micropayment service</string>
-    <string name="data_usage">Data usage</string>
     <string name="automation">Automation</string>
     <string name="download_pref_details">Details</string>
     <string name="import_export_pref">Import/Export</string>
-- 
cgit v1.2.3


From c977e70106309fe6e070481e2c172798982056c7 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 22 Apr 2018 20:49:41 +0200
Subject: Removed duplicate String

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 63796fae4..4687f250e 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -441,7 +441,6 @@
     <string name="crash_report_sum">Send the latest crash report via e-mail</string>
     <string name="send_email">Send e-mail</string>
     <string name="experimental_pref">Experimental</string>
-    <string name="pref_media_player_title">Media Player</string>
     <string name="pref_media_player_message">Select which media player to use to play files</string>
     <string name="pref_current_value">Current value: %1$s</string>
     <string name="pref_proxy_title">Proxy</string>
-- 
cgit v1.2.3


From 91120d98a461d4050da30f3d039eb9b7db01c23a Mon Sep 17 00:00:00 2001
From: mr-intj <github@scott-smith.us>
Date: Fri, 27 Apr 2018 17:30:40 -0700
Subject: Added "Random" and "Smart Shuffle" items at the bottom of the
 Queue|Sort menu.

Added "Permutor" interface to allow specification of reordering logic to be specified in QueueSorter (vs. DBWriter), similar to the existing sort logic.

Added "Random" and "Smart Shuffle" strings to core/src/main/res/values (did not add translations for non-English languages)

Closes #2366, Closes #2602
---
 core/src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 2ebc2ad77..46bac68c9 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -260,6 +260,8 @@
     <string name="duration">Duration</string>
     <string name="episode_title">Episode title</string>
     <string name="feed_title">Feed title</string>
+    <string name="random">Random</string>
+    <string name="smart_shuffle">Smart Shuffle</string>
     <string name="ascending">Ascending</string>
     <string name="descending">Descending</string>
     <string name="clear_queue_confirmation_msg">Please confirm that you want to clear the queue of ALL of the episodes in it</string>
-- 
cgit v1.2.3


From 9dcbddf371f6ac04fdbddc4415ff079dcd3ea392 Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Wed, 2 May 2018 13:15:14 -0700
Subject: Issue #2580: Expose "Mark as seen" as a context menu item in Episode
 screen, in addition to the existing swipe in Episode > New tab.

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 2ebc2ad77..2ba8a7f40 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -163,6 +163,7 @@
     <string name="delete_label">Delete</string>
     <string name="delete_failed">Unable to delete file. Rebooting the device could help.</string>
     <string name="remove_episode_lable">Remove Episode</string>
+    <string name="mark_as_seen_label">Mark as seen</string>
     <string name="marked_as_seen_label">Marked as seen</string>
     <string name="mark_read_label">Mark as played</string>
     <string name="marked_as_read_label">Marked as played</string>
-- 
cgit v1.2.3


From 7ad176ce299bb2abfa3698ce64ffc69b16cfdc8b Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Wed, 10 Jan 2018 21:50:29 +0100
Subject: Added notification categories

Android treats IMPORTANCE_DEFAULT as IMPORTANCE_HIGH
https://issuetracker.google.com/issues/65108694
---
 core/src/main/res/values/strings.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 46bac68c9..2e7cc7149 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -709,4 +709,14 @@
     <string name="cast_failed_seek">Failed to seek to the new position on the cast device</string>
     <string name="cast_failed_receiver_player_error">Receiver player has encountered a severe error</string>
     <string name="cast_failed_media_error_skipping">Error playing media. Skipping&#8230;</string>
+
+    <!-- Notification channels -->
+    <string name="notification_channel_user_action">Action required</string>
+    <string name="notification_channel_user_action_description">Shown if your action is required</string>
+    <string name="notification_channel_downloading">Downloading</string>
+    <string name="notification_channel_downloading_description">Shown while currently downloading</string>
+    <string name="notification_channel_playing">Currently playing</string>
+    <string name="notification_channel_playing_description">Allows to control playback</string>
+    <string name="notification_channel_error">Errors</string>
+    <string name="notification_channel_error_description">Shown if something went wrong</string>
 </resources>
-- 
cgit v1.2.3


From 3e98ab61ea50b320989c26f6548303fd91447073 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sun, 22 Apr 2018 22:21:46 +0200
Subject: Start PlaybackService lazily to allow using ForegroundService

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 2e7cc7149..5759912d1 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -29,6 +29,7 @@
     <string name="free_space_label">%1$s free</string>
     <string name="episode_cache_full_title">Episode cache full</string>
     <string name="episode_cache_full_message">The episode cache limit has been reached. You can increase the cache size in the Settings.</string>
+    <string name="synchronizing">Synchronizing…</string>
 
     <!-- Statistics fragment -->
     <string name="total_time_listened_to_podcasts">Total time of podcasts played:</string>
@@ -719,4 +720,6 @@
     <string name="notification_channel_playing_description">Allows to control playback</string>
     <string name="notification_channel_error">Errors</string>
     <string name="notification_channel_error_description">Shown if something went wrong</string>
+    <string name="notification_channel_gpodnet">gpodder.net</string>
+    <string name="notification_channel_gpodnet_description">Shown while currently synchronizing</string>
 </resources>
-- 
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/strings.xml')

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 da85e00bd95d8cb252fde42fef93dbd9abb45546 Mon Sep 17 00:00:00 2001
From: orionlee <orionlee@yahoo.com>
Date: Tue, 15 May 2018 15:20:56 -0700
Subject: Give FeedUpdateReceiver a human-friendly label per review feedback.

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 46bac68c9..5c06d34bd 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -6,6 +6,7 @@
     <!-- Activitiy and fragment titles -->
     <string name="app_name" translate="false">AntennaPod</string>
     <string name="provider_authority" translate="false">de.danoeh.antennapod.provider</string>
+    <string name="feed_update_receiver_name">Update Subscriptions</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 badc8398049314451a7c2f51a632e323786d6c7b Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 26 May 2018 23:14:07 +0200
Subject: Gpodder sync does not need a notification anymore

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 5759912d1..3870e2cda 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -720,6 +720,4 @@
     <string name="notification_channel_playing_description">Allows to control playback</string>
     <string name="notification_channel_error">Errors</string>
     <string name="notification_channel_error_description">Shown if something went wrong</string>
-    <string name="notification_channel_gpodnet">gpodder.net</string>
-    <string name="notification_channel_gpodnet_description">Shown while currently synchronizing</string>
 </resources>
-- 
cgit v1.2.3


From aa25ab5ff4a99deff19be05b04eaedbcb7d851ad Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Sat, 26 May 2018 23:17:57 +0200
Subject: Added examples to notification descriptions

---
 core/src/main/res/values/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 3870e2cda..b060d84cd 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -713,11 +713,11 @@
 
     <!-- Notification channels -->
     <string name="notification_channel_user_action">Action required</string>
-    <string name="notification_channel_user_action_description">Shown if your action is required</string>
+    <string name="notification_channel_user_action_description">Shown if your action is required, for example if you need to enter a password.</string>
     <string name="notification_channel_downloading">Downloading</string>
-    <string name="notification_channel_downloading_description">Shown while currently downloading</string>
+    <string name="notification_channel_downloading_description">Shown while currently downloading.</string>
     <string name="notification_channel_playing">Currently playing</string>
-    <string name="notification_channel_playing_description">Allows to control playback</string>
+    <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</string>
+    <string name="notification_channel_error_description">Shown if something went wrong, for example if download or gpodder sync fails.</string>
 </resources>
-- 
cgit v1.2.3


From 626621044f0dcb77080400d86571ca4a46043b06 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Fri, 13 Jul 2018 10:33:01 +0200
Subject: Player names are not translatable

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 6312a5bbd..0cf8f4b46 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -459,8 +459,8 @@
     <string name="pref_enqueue_downloaded_title">Enqueue Downloaded</string>
     <string name="pref_enqueue_downloaded_summary">Add downloaded episodes to the queue</string>
     <string name="media_player_builtin">Built-in Android player</string>
-    <string name="media_player_sonic">Sonic Media Player</string>
-    <string name="media_player_exoplayer">Exoplayer</string>
+    <string name="media_player_sonic" translatable="false">Sonic Media Player</string>
+    <string name="media_player_exoplayer" translatable="false">Exoplayer</string>
     <string name="pref_videoBehavior_title">Video behavior</string>
     <string name="pref_videoBehavior_sum">Behavior when leaving video playback</string>
     <string name="stop_playback">Stop playback</string>
-- 
cgit v1.2.3


From 0d43cc8658d49e45fa9ad94a3e44a15bc8e9dffc Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Fri, 13 Jul 2018 18:29:05 +0200
Subject: Requesting storage permissions for external files

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 704cc077c..236ef97e0 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -77,6 +77,7 @@
     <string name="cover_label">Picture</string>
     <string name="error_label">Error</string>
     <string name="error_msg_prefix">An error occurred:</string>
+    <string name="needs_storage_permission">Storage permission is needed for this operation</string>
     <string name="refresh_label">Refresh</string>
     <string name="external_storage_error_msg">No external storage is available. Please make sure that external storage is mounted so that the app can work properly.</string>
     <string name="chapters_label">Chapters</string>
-- 
cgit v1.2.3


From 0172293a6deab1795cef34cc81d84fea9e2760bc Mon Sep 17 00:00:00 2001
From: Koen Glotzbach <11229646+keunes@users.noreply.github.com>
Date: Sat, 28 Jul 2018 10:39:36 +0200
Subject: Update strings.xml

- improved preferences strings
- improved sharing strings
---
 core/src/main/res/values/strings.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 0c9fb2ad7..f7e5c23c9 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -70,7 +70,7 @@
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="reset">Reset</string>
-    <string name="author_label">Author</string>
+    <string name="author_label">Author(s)</string>
     <string name="language_label">Language</string>
     <string name="url_label">URL</string>
     <string name="podcast_settings_label">Settings</string>
@@ -133,12 +133,12 @@
     <string name="rename_feed_label">Rename Podcast</string>
     <string name="remove_feed_label">Remove Podcast</string>
     <string name="share_label">Share&#8230;</string>
-    <string name="share_link_label">Share Link</string>
+    <string name="share_link_label">Share Episode URL</string>
+    <string name="share_link_with_position_label">Share Episode URL with Position</string>
     <string name="share_file_label">Share File</string>
-    <string name="share_link_with_position_label">Share Link with Position</string>
     <string name="share_feed_url_label">Share Feed URL</string>
-    <string name="share_item_url_label">Share Episode File URL</string>
-    <string name="share_item_url_with_position_label">Share Episode File URL with Position</string>
+    <string name="share_item_url_label">Share Media File URL</string>
+    <string name="share_item_url_with_position_label">Share Media File URL with Position</string>
     <string name="feed_delete_confirmation_msg">Please confirm that you want to delete the feed \"%1$s\" and ALL episodes of this feed that you have downloaded.</string>
     <string name="feed_remover_msg">Removing Feed</string>
     <string name="load_complete_feed">Refresh complete Feed</string>
@@ -325,7 +325,7 @@
     <string name="appearance">Appearance</string>
     <string name="external_elements">External elements</string>
     <string name="interruptions">Interruptions</string>
-    <string name="buttons">Buttons</string>
+    <string name="buttons">Playback control buttons</string>
     <string name="media_player">Media player</string>
     <string name="pref_episode_cleanup_title">Episode Cleanup</string>
     <string name="pref_episode_cleanup_summary">Episodes that aren\'t in the queue and aren\'t favorites should be eligible for removal if Auto Download needs space for new episodes</string>
@@ -382,7 +382,7 @@
     <string name="pref_nav_drawer_feed_order_title">Set Subscription Order</string>
     <string name="pref_nav_drawer_feed_order_sum">Change the order of your subscriptions</string>
     <string name="pref_nav_drawer_feed_counter_title">Set Subscription Counter</string>
-    <string name="pref_nav_drawer_feed_counter_sum">Change the information displayed by the subscription counter</string>
+    <string name="pref_nav_drawer_feed_counter_sum">Change the information displayed by the subscription counter. Also affects the sorting of subscriptions if 'Subscription Order' is set to 'Counter'.</string>
     <string name="pref_set_theme_sum">Change the appearance of AntennaPod.</string>
     <string name="pref_automatic_download_title">Automatic Download</string>
     <string name="pref_automatic_download_sum">Configure the automatic download of episodes.</string>
@@ -396,7 +396,7 @@
     <string name="pref_episode_cache_title">Episode Cache</string>
     <string name="pref_theme_title_light">Light</string>
     <string name="pref_theme_title_dark">Dark</string>
-    <string name="pref_theme_title_trueblack">True Black</string>
+    <string name="pref_theme_title_trueblack">Black (AMOLED ready)</string>
     <string name="pref_episode_cache_unlimited">Unlimited</string>
     <string name="pref_update_interval_hours_plural">hours</string>
     <string name="pref_update_interval_hours_singular">hour</string>
@@ -461,8 +461,8 @@
     <string name="pref_enqueue_downloaded_summary">Add downloaded episodes to the queue</string>
     <string name="media_player_builtin">Built-in Android player</string>
     <string name="media_player_sonic" translatable="false">Sonic Media Player</string>
-    <string name="media_player_exoplayer" translatable="false">Exoplayer</string>
-    <string name="pref_videoBehavior_title">Video behavior</string>
+    <string name="media_player_exoplayer" translatable="false">ExoPlayer</string>
+    <string name="pref_videoBehavior_title">Upon exiting video</string>
     <string name="pref_videoBehavior_sum">Behavior when leaving video playback</string>
     <string name="stop_playback">Stop playback</string>
     <string name="continue_playback">Continue playback</string>
-- 
cgit v1.2.3


From 3bd91238522e444e0921115e3d50cb2e3db81da1 Mon Sep 17 00:00:00 2001
From: Koen Glotzbach <11229646+keunes@users.noreply.github.com>
Date: Sat, 28 Jul 2018 10:56:26 +0200
Subject: Update strings.xml

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index f7e5c23c9..c80a19536 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -382,7 +382,7 @@
     <string name="pref_nav_drawer_feed_order_title">Set Subscription Order</string>
     <string name="pref_nav_drawer_feed_order_sum">Change the order of your subscriptions</string>
     <string name="pref_nav_drawer_feed_counter_title">Set Subscription Counter</string>
-    <string name="pref_nav_drawer_feed_counter_sum">Change the information displayed by the subscription counter. Also affects the sorting of subscriptions if 'Subscription Order' is set to 'Counter'.</string>
+    <string name="pref_nav_drawer_feed_counter_sum">Change the information displayed by the subscription counter. Also affects the sorting of subscriptions if \'Subscription Order\' is set to \'Counter\'.</string>
     <string name="pref_set_theme_sum">Change the appearance of AntennaPod.</string>
     <string name="pref_automatic_download_title">Automatic Download</string>
     <string name="pref_automatic_download_sum">Configure the automatic download of episodes.</string>
-- 
cgit v1.2.3


From 0fbee8f0ca40ad778b0d053f6775f55f61c781f2 Mon Sep 17 00:00:00 2001
From: Koen Glotzbach <11229646+keunes@users.noreply.github.com>
Date: Sun, 29 Jul 2018 15:22:00 +0200
Subject: Update pref strings

Mainly replace all 'feed' mentions by 'podcast'
---
 core/src/main/res/values/strings.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index c80a19536..d3f227d02 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -122,14 +122,14 @@
     <string name="mark_all_read_label">Mark all as played</string>
     <string name="mark_all_read_msg">Marked all Episodes as played</string>
     <string name="mark_all_read_confirmation_msg">Please confirm that you want to mark all episodes as being played.</string>
-    <string name="mark_all_read_feed_confirmation_msg">Please confirm that you want to mark all episodes in this feed as being played.</string>
+    <string name="mark_all_read_feed_confirmation_msg">Please confirm that you want to mark all episodes in this podcast as being played.</string>
     <string name="mark_all_seen_label">Mark all as seen</string>
     <string name="mark_all_seen_msg">Marked all Episodes as seen</string>
     <string name="mark_all_seen_confirmation_msg">Please confirm that you want to mark all episodes as seen.</string>
     <string name="show_info_label">Show information</string>
-    <string name="show_feed_settings_label">Show feed settings</string>
-    <string name="feed_info_label">Feed info</string>
-    <string name="feed_settings_label">Feed settings</string>
+    <string name="show_feed_settings_label">Show podcast settings</string>
+    <string name="feed_info_label">Podcast info</string>
+    <string name="feed_settings_label">Podcast settings</string>
     <string name="rename_feed_label">Rename Podcast</string>
     <string name="remove_feed_label">Remove Podcast</string>
     <string name="share_label">Share&#8230;</string>
@@ -139,9 +139,9 @@
     <string name="share_feed_url_label">Share Feed URL</string>
     <string name="share_item_url_label">Share Media File URL</string>
     <string name="share_item_url_with_position_label">Share Media File URL with Position</string>
-    <string name="feed_delete_confirmation_msg">Please confirm that you want to delete the feed \"%1$s\" and ALL episodes of this feed that you have downloaded.</string>
-    <string name="feed_remover_msg">Removing Feed</string>
-    <string name="load_complete_feed">Refresh complete Feed</string>
+    <string name="feed_delete_confirmation_msg">Please confirm that you want to delete the Podcast \"%1$s\" and ALL episodes of this feed that you have downloaded.</string>
+    <string name="feed_remover_msg">Removing Podcast</string>
+    <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="hide_unplayed_episodes_label">Unplayed</string>
@@ -262,7 +262,7 @@
     <string name="date">Date</string>
     <string name="duration">Duration</string>
     <string name="episode_title">Episode title</string>
-    <string name="feed_title">Feed title</string>
+    <string name="feed_title">Podcast title</string>
     <string name="random">Random</string>
     <string name="smart_shuffle">Smart Shuffle</string>
     <string name="ascending">Ascending</string>
@@ -306,7 +306,7 @@
 
     <!-- Empty list labels -->
     <string name="no_items_label">There are no items in this list.</string>
-    <string name="no_feeds_label">You haven\'t subscribed to any feeds yet.</string>
+    <string name="no_feeds_label">You haven\'t subscribed to any podcasts yet.</string>
     <string name="no_chapters_label">This episode has no chapters.</string>
     <string name="no_shownotes_label">This episode has no shownotes.</string>
 
@@ -465,7 +465,7 @@
     <string name="pref_videoBehavior_title">Upon exiting video</string>
     <string name="pref_videoBehavior_sum">Behavior when leaving video playback</string>
     <string name="stop_playback">Stop playback</string>
-    <string name="continue_playback">Continue playback</string>
+    <string name="continue_playback">Continue audio playback</string>
 
     <!-- Auto-Flattr dialog -->
     <string name="auto_flattr_enable">Enable automatic flattring</string>
@@ -478,7 +478,7 @@
     <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 authors</string>
-    <string name="found_in_feeds_label">Found in feeds</string>
+    <string name="found_in_feeds_label">Found in podcasts</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>
-- 
cgit v1.2.3


From 8379a215835576b41e02fb91184ce45a720e350d Mon Sep 17 00:00:00 2001
From: Koen Glotzbach <11229646+keunes@users.noreply.github.com>
Date: Tue, 4 Sep 2018 23:06:19 +0200
Subject: Lowercase strings

use lowercase for particular strings
---
 core/src/main/res/values/strings.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index d3f227d02..c5049a025 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -124,14 +124,14 @@
     <string name="mark_all_read_confirmation_msg">Please confirm that you want to mark all episodes as being played.</string>
     <string name="mark_all_read_feed_confirmation_msg">Please confirm that you want to mark all episodes in this podcast as being played.</string>
     <string name="mark_all_seen_label">Mark all as seen</string>
-    <string name="mark_all_seen_msg">Marked all Episodes as seen</string>
+    <string name="mark_all_seen_msg">Marked all episodes as seen</string>
     <string name="mark_all_seen_confirmation_msg">Please confirm that you want to mark all episodes as seen.</string>
     <string name="show_info_label">Show information</string>
     <string name="show_feed_settings_label">Show podcast settings</string>
     <string name="feed_info_label">Podcast info</string>
     <string name="feed_settings_label">Podcast settings</string>
-    <string name="rename_feed_label">Rename Podcast</string>
-    <string name="remove_feed_label">Remove Podcast</string>
+    <string name="rename_feed_label">Rename podcast</string>
+    <string name="remove_feed_label">Remove podcast</string>
     <string name="share_label">Share&#8230;</string>
     <string name="share_link_label">Share Episode URL</string>
     <string name="share_link_with_position_label">Share Episode URL with Position</string>
@@ -139,9 +139,9 @@
     <string name="share_feed_url_label">Share Feed URL</string>
     <string name="share_item_url_label">Share Media File URL</string>
     <string name="share_item_url_with_position_label">Share Media File URL with Position</string>
-    <string name="feed_delete_confirmation_msg">Please confirm that you want to delete the Podcast \"%1$s\" and ALL episodes of this feed that you have downloaded.</string>
-    <string name="feed_remover_msg">Removing Podcast</string>
-    <string name="load_complete_feed">Refresh complete Podcast</string>
+    <string name="feed_delete_confirmation_msg">Please confirm that you want to delete the podcast \"%1$s\" and ALL its episodes (including downloaded episodes).</string>
+    <string name="feed_remover_msg">Removing podcast</string>
+    <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="hide_unplayed_episodes_label">Unplayed</string>
-- 
cgit v1.2.3


From b4e875cb0991e24496febd013de9dc57956a5add Mon Sep 17 00:00:00 2001
From: Koen Glotzbach <11229646+keunes@users.noreply.github.com>
Date: Tue, 4 Sep 2018 23:09:46 +0200
Subject: Update strings.xml

Correct plural/singular in search strings
---
 core/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index c5049a025..244a69861 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -477,8 +477,8 @@
     <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 authors</string>
-    <string name="found_in_feeds_label">Found in podcasts</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>
-- 
cgit v1.2.3


From 96145eed11328e2491a5966b205020afffb5d113 Mon Sep 17 00:00:00 2001
From: Martin Fietz <martin.fietz@gmail.com>
Date: Thu, 27 Sep 2018 13:49:30 +0200
Subject: Add feed filter criteria 'is favorite'

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 244a69861..ca7c7e3c4 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -152,6 +152,7 @@
     <string name="hide_downloaded_episodes_label">Downloaded</string>
     <string name="hide_not_downloaded_episodes_label">Not downloaded</string>
     <string name="hide_has_media_label">Has media</string>
+    <string name="hide_is_favorite_label">Is favorite</string>
     <string name="filtered_label">Filtered</string>
     <string name="refresh_failed_msg">{fa-exclamation-circle} Last Refresh failed</string>
     <string name="open_podcast">Open Podcast</string>
-- 
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/strings.xml')

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/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'core/src/main/res/values/strings.xml')

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


From b3fbb0ec7574cf1090bfb410589753ba8ef51bbb Mon Sep 17 00:00:00 2001
From: Petar Kukolj <petarkukolj3@yahoo.com>
Date: Wed, 14 Nov 2018 16:18:58 +0100
Subject: Add configurable behavior of the back button

This PR allows users to change how the back button functions. Closes #2196

Possible choices are following:

 - **Default** - back button functions how it currently functions (closes the app if there is nowhere to go back to)

 - **Open navigation drawer** - back button always opens the navigation drawer instead of closing the app

 - **Double tap to exit** - like default, but requires two taps to close the app

 - **Confirm to exit** - like default, but prompts user if they really want to exit
---
 core/src/main/res/values/strings.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index ad91ecc76..fd5535462 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -470,6 +470,15 @@
     <string name="pref_videoBehavior_sum">Behavior when leaving video playback</string>
     <string name="stop_playback">Stop playback</string>
     <string name="continue_playback">Continue audio playback</string>
+    <string name="behavior">Behavior</string>
+    <string name="pref_back_button_behavior_title">Back button behavior</string>
+    <string name="pref_back_button_behavior_sum">Change behavior of the back button.</string>
+    <string name="back_button_default">Default</string>
+    <string name="back_button_open_drawer">Open navigation drawer</string>
+    <string name="back_button_double_tap">Double tap to exit</string>
+    <string name="back_button_show_prompt">Confirm to exit</string>
+    <string name="close_prompt">Are you sure you want to close AntennaPod?</string>
+    <string name="double_tap_toast">Tap back button again to exit</string>
 
     <!-- Auto-Flattr dialog -->
     <string name="auto_flattr_enable">Enable automatic flattring</string>
-- 
cgit v1.2.3


From 6262f98e39badde997d3e5793411a398cc062e09 Mon Sep 17 00:00:00 2001
From: Petar Kukolj <petarkukolj3@yahoo.com>
Date: Thu, 15 Nov 2018 20:54:40 +0100
Subject: Add go to page option

---
 core/src/main/res/values/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index fd5535462..1a3c2373c 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -471,7 +471,7 @@
     <string name="stop_playback">Stop playback</string>
     <string name="continue_playback">Continue audio playback</string>
     <string name="behavior">Behavior</string>
-    <string name="pref_back_button_behavior_title">Back button behavior</string>
+    <string name="pref_back_button_behavior_title">Back Button Behavior</string>
     <string name="pref_back_button_behavior_sum">Change behavior of the back button.</string>
     <string name="back_button_default">Default</string>
     <string name="back_button_open_drawer">Open navigation drawer</string>
@@ -479,6 +479,8 @@
     <string name="back_button_show_prompt">Confirm to exit</string>
     <string name="close_prompt">Are you sure you want to close AntennaPod?</string>
     <string name="double_tap_toast">Tap back button again to exit</string>
+    <string name="back_button_go_to_page">Go to page</string>
+    <string name="back_button_go_to_page_title">Select page</string>
 
     <!-- Auto-Flattr dialog -->
     <string name="auto_flattr_enable">Enable automatic flattring</string>
-- 
cgit v1.2.3


From 3ca230ce604e312e7705fdb8f64e637438524c86 Mon Sep 17 00:00:00 2001
From: ByteHamster <info@bytehamster.com>
Date: Fri, 30 Nov 2018 22:11:45 +0100
Subject: Made it easier to see that 'go to page' has a submenu

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

(limited to 'core/src/main/res/values/strings.xml')

diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 1a3c2373c..9dd928311 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -479,7 +479,7 @@
     <string name="back_button_show_prompt">Confirm to exit</string>
     <string name="close_prompt">Are you sure you want to close AntennaPod?</string>
     <string name="double_tap_toast">Tap back button again to exit</string>
-    <string name="back_button_go_to_page">Go to page</string>
+    <string name="back_button_go_to_page">Go to page…</string>
     <string name="back_button_go_to_page_title">Select page</string>
 
     <!-- Auto-Flattr dialog -->
-- 
cgit v1.2.3