Merge branch 'develop_flattr_queue_autoflattr' of git://github.com/peschmae0/AntennaPod into flattr_queue_autoflattr

Conflicts:
	src/de/danoeh/antennapod/storage/DBReader.java
	src/de/danoeh/antennapod/storage/PodDBAdapter.java

1 files changed, 15 insertions, 2 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8c05e42b5..2bc90f475 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -154,9 +154,20 @@
     <string name="action_forbidden_msg">AntennaPod has no permission for this action. The reason for this could be that the access token of AntennaPod to your account has been revoked. You can either re-reauthenticate or visit the website of the thing instead.</string>
     <string name="access_revoked_title">Access revoked</string>
     <string name="access_revoked_info">You have successfully revoked AntennaPod\'s access token to your account. In order to complete the process, you have to remove this app from the list of approved applications in your account settings on the flattr website.</string>
-    <string name="flattr_click_success">Successfully flattred this thing!</string>
-    <string name="flattring_label">Flattring</string>
     
+    <!-- Flattr -->
+    <string name="flattr_click_success">Flattred one thing!</string>
+    <string name="flattr_click_success_count">Flattred %d things!</string>
+    <string name="flattr_click_success_queue">Flattred: %s.</string>
+    <string name="flattr_click_failure_count">Failed to flattr %d things!</string>
+    <string name="flattr_click_failure">Not flattred: %s.</string>
+    <string name="flattr_click_enqueued">Added thing to flattr queue!</string>
+    <string name="flattring_thing">Flattring %s</string>
+    <string name="flattring_label">AntennaPod is flattring</string>
+    <string name="flattrd_label">AntennaPod has flattrd</string>
+    <string name="flattrd_failed_label">AntennaPod flattr failed</string>
+    <string name="flattr_retrieving_status">Retrieving flattred things</string>
+
     <!--  Variable Speed -->
     <string name="download_plugin_label">Download Plugin</string>
     <string name="no_playback_plugin_title">Plugin Not Installed</string>
@@ -193,6 +204,8 @@
     <string name="pref_flattr_this_app_sum">Support the development of AntennaPod by flattring it. Thanks!</string>
     <string name="pref_revokeAccess_title">Revoke access</string>
     <string name="pref_revokeAccess_sum">Revoke the access permission to your flattr account for this app.</string>
+	<string name="pref_auto_flattr_title">Automatic Flattr</string>
+    <string name="pref_auto_flattr_sum">Flattr episodes of which 80% have been played.</string>
     <string name="pref_display_only_episodes_title">Display only episodes</string>
     <string name="pref_display_only_episodes_sum">Display only items which also have an episode.</string>
     <string name="user_interface_label">User Interface</string>