From e7cc0ffe05cd568c784431333df56ecae9a03762 Mon Sep 17 00:00:00 2001
From: Daniel <moreno.daniel@gmail.com>
Date: Fri, 26 Aug 2016 12:26:12 -0400
Subject: Enable separate functions for Previous and Rewind hardware buttons.
 Added prefHardwarePreviousButtonRestarts preference.

---
 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 e243776f5..29fa7797f 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -298,6 +298,8 @@
     <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_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>
     <string name="pref_auto_delete_sum">Delete episode when playback completes</string>
     <string name="pref_auto_delete_title">Auto Delete</string>
-- 
cgit v1.2.3


From ba37684d7c1664f638daae87a8b7d9ee519fd235 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Mon, 3 Oct 2016 11:46:02 +0200
Subject: Add option to show number of downloaded episodes as subscription
 counter

---
 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 29fa7797f..c330756f1 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -42,6 +42,7 @@
     <string name="drawer_feed_counter_new_unplayed">Number of new and unplayed episodes</string>
     <string name="drawer_feed_counter_new">Number of new episodes</string>
     <string name="drawer_feed_counter_unplayed">Number of unplayed episodes</string>
+    <string name="drawer_feed_counter_downloaded">Number of downloaded episodes</string>
     <string name="drawer_feed_counter_none">None</string>
 
     <!-- Webview actions -->
-- 
cgit v1.2.3


From 098e89b0c54ce6e8054f6c3893fbdfed54daa1ca Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Mon, 3 Oct 2016 12:53:06 +0200
Subject: Add full sync with gpodder and re-phrase changes sync

---
 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 29fa7797f..892cd1a59 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -366,10 +366,13 @@
     <string name="pref_gpodnet_logout_toast">Logout was successful</string>
     <string name="pref_gpodnet_setlogin_information_title">Change login information</string>
     <string name="pref_gpodnet_setlogin_information_sum">Change the login information for your gpodder.net account.</string>
-    <string name="pref_gpodnet_sync_title">Sync now</string>
-    <string name="pref_gpodnet_sync_sum">Sync subscriptions and episode states with gpodder.net.</string>
+    <string name="pref_gpodnet_sync_changes_title">Sync changes now</string>
+    <string name="pref_gpodnet_sync_changes_sum">Sync subscription and episode state changes with gpodder.net.</string>
+    <string name="pref_gpodnet_full_sync_title">Full sync now</string>
+    <string name="pref_gpodnet_full_sync_sum">Sync all subscriptions and episode states with gpodder.net.</string>
     <string name="pref_gpodnet_sync_sum_last_sync_line">Last sync attempt: %1$s (%2$s)</string>
     <string name="pref_gpodnet_sync_started">Sync started</string>
+    <string name="pref_gpodnet_full_sync_started">Full sync started</string>
     <string name="pref_gpodnet_login_status"><![CDATA[Logged in as <i>%1$s</i> with device <i>%2$s</i>]]></string>
     <string name="pref_gpodnet_notifications_title">Show sync error notifications</string>
     <string name="pref_gpodnet_notifications_sum">This setting does not apply to authentication errors.</string>
-- 
cgit v1.2.3


From 342fea036096663858f533a307a71f9eee767887 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Mon, 3 Oct 2016 13:17:06 +0200
Subject: Show "mark all as seen" confirmation dialog

---
 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 29fa7797f..ef79d4d0b 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -111,6 +111,8 @@
     <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_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="remove_feed_label">Remove Podcast</string>
     <string name="share_label">Share&#8230;</string>
-- 
cgit v1.2.3


From cc675b06be1c6765955910d90fe2eac50105366c Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Mon, 3 Oct 2016 17:21:11 +0200
Subject: Add "has media" filtering to gears dialog

---
 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 29fa7797f..4a56e9e15 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -587,6 +587,8 @@
     <string name="selected_queued_label">Selected queued Episodes</string>
     <string name="not_queued_label">Not queued</string>
     <string name="selected_not_queued_label">Selected not queued Episodes</string>
+    <string name="has_media">Has media</string>
+    <string name="selected_has_media_label">Selected episodes with media</string>
 
     <!-- Sort  -->
     <string name="sort_title_a_z">Title (A \u2192 Z)</string>
-- 
cgit v1.2.3


From 92899affab62873ca855d5dfcdc05bfa5fea47b7 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Mon, 3 Oct 2016 17:21:42 +0200
Subject: Add "has media" filter to episodes filter

---
 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 4a56e9e15..e995a8040 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -131,6 +131,7 @@
     <string name="hide_not_queued_episodes_label">Not queued</string>
     <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="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 e75d60ef61600571273376674c5d2842314521a7 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Sun, 9 Oct 2016 21:49:23 +0200
Subject: Extract sleep timer preferences into dedicated class

---
 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 c7042708d..9e8ab52b5 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -482,6 +482,7 @@
         <item quantity="one">1 hour</item>
         <item quantity="other">%d hours</item>
     </plurals>
+    <string name="auto_enable">Auto-enable</string>
 
     <!-- gpodder.net -->
     <string name="gpodnet_taglist_header">CATEGORIES</string>
-- 
cgit v1.2.3


From 21799ab22c6c72b263337678a9d5de68957e12b9 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Sun, 9 Oct 2016 22:40:40 +0200
Subject: Add dialog option to auto-enable sleep timer

---
 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 9e8ab52b5..2347ce5f9 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -482,7 +482,9 @@
         <item quantity="one">1 hour</item>
         <item quantity="other">%d hours</item>
     </plurals>
-    <string name="auto_enable">Auto-enable</string>
+    <string name="auto_enable_label">Auto-enable</string>
+    <string name="sleep_timer_enabled_label">Sleep timer enabled</string>
+    <string name="sleep_timer_disabled_label">Sleep timer disabled</string>
 
     <!-- gpodder.net -->
     <string name="gpodnet_taglist_header">CATEGORIES</string>
-- 
cgit v1.2.3


From 695a73c09dbb3aff6a1d7cd27de0708ac7d0c40d Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Sun, 16 Oct 2016 12:40:01 +0200
Subject: Add option to export subscriptions as HTML

---
 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 c7042708d..36f846381 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -451,6 +451,7 @@
     <string name="choose_file_from_filesystem">From local filesystem</string>
     <string name="choose_file_from_external_application">Use external application</string>
     <string name="opml_export_label">OPML export</string>
+    <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>
-- 
cgit v1.2.3


From c3fad9dbe6d112bed6535d447341bef6ff12395a Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Sun, 30 Oct 2016 12:55:37 +0100
Subject: Integrate fyyd podcast search engine

---
 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 c7042708d..6927f88a1 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -102,7 +102,7 @@
     <string name="etxtFeedurlHint">www.example.com/feed</string>
     <string name="txtvfeedurl_label">Add Podcast by URL</string>
     <string name="podcastdirectories_label">Find Podcast in Directory</string>
-    <string name="podcastdirectories_descr">You can search for new podcasts by name, category or popularity in the gpodder.net directory, or search the iTunes store.</string>
+    <string name="podcastdirectories_descr">For new podcasts, you can search iTunes or fyyd, or browse gpodder.net by name, category or popularity.</string>
     <string name="browse_gpoddernet_label">Browse gpodder.net</string>
 
     <!-- Actions on feeds -->
@@ -575,6 +575,8 @@
 
     <string name="search_itunes_label">Search iTunes</string>
     <string name="filter">Filter</string>
+
+    <string name="search_fyyd_label">Search fyyd</string>
     
     <!-- Episodes apply actions -->
     <string name="all_label">All</string>
-- 
cgit v1.2.3


From 8a626faf73070085e2f520247a5f701c4f125c10 Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Tue, 1 Nov 2016 19:35:43 +0100
Subject: Add ability to rename feeds

---
 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 48bd15b13..96350e19f 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -60,6 +60,7 @@
     <string name="cancel_label">Cancel</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
+    <string name="reset">Reset</string>
     <string name="author_label">Author</string>
     <string name="language_label">Language</string>
     <string name="url_label">URL</string>
@@ -115,6 +116,7 @@
     <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="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>
-- 
cgit v1.2.3


From c54878a0f56bf978aa0ca6d901457f666dab51ff Mon Sep 17 00:00:00 2001
From: Martin Fietz <Martin.Fietz@gmail.com>
Date: Sat, 31 Dec 2016 17:29:45 +0100
Subject: Add setting whether or not to enqueue downloaded episodes

---
 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 96350e19f..bed7b443c 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -421,6 +421,8 @@
     <string name="pref_cast_title">Chromecast support</string>
     <string name="pref_cast_message_play_flavor">Enable support for remote media playback on Cast devices (such as Chromecast, Audio Speakers or Android TV)</string>
     <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 Dowloaded</string>
+    <string name="pref_enqueue_downloaded_summary">Add downloaded episodes to the queue</string>
 
     <!-- Auto-Flattr dialog -->
     <string name="auto_flattr_enable">Enable automatic flattring</string>
-- 
cgit v1.2.3