Merge branch 'gpoddernet' into develop

Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/preferences.xml
	src/de/danoeh/antennapod/activity/PreferenceActivity.java

5 files changed, 59 insertions, 9 deletions

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 534b9df50..b0d6e66f1 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -81,7 +81,7 @@
         <item>3.90</item>
         <item>4.00</item>
     </string-array>
-    
+
     <string-array name="autodl_select_networks_default_entries">
         <item>N/A</item>
     </string-array>
@@ -96,6 +96,4 @@
         <item>0</item>
         <item>1</item>
     </string-array>
-    
-
 </resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 5cf84ec4a..7ce05bc13 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -28,7 +28,7 @@
     <color name="status_playing">#E0EE5F52</color>
     <color name="overlay_dark">#262C31</color>
     <color name="overlay_light">#DDDDDD</color>
-    
+
     <!-- Use Gingerbread-orange -->
     <color name="selection_background_color_dark">#FEBB20</color>
     <color name="selection_background_color_light">#FEBB20</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 3b7e7475a..8dea65a5b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -12,4 +12,5 @@
     <dimen name="text_size_large">22sp</dimen>
     <dimen name="status_indicator_width">36dp</dimen>
 	<dimen name="thumbnail_length_itemlist">80dp</dimen>
+    <dimen name="thumbnail_length_onlinefeedview">110dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/res/values/ids.xml b/res/values/ids.xml
index 4d393e675..5356cd119 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -15,5 +15,9 @@
     <item name="organize_queue_item" type="id"/>
     <item name="drag_handle" type="id"/>
     <item name="skip_episode_item" type="id"/>
+    <item name="image_disk_cache_key" type="id"/>
+    <item name="imageloader_key" type="id"/>
+    <item name="notification_gpodnet_sync_error" type="id"/>
+    <item name="notification_gpodnet_sync_autherror" type="id"/>
 
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5895e7f55..a0da91420 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,6 +17,8 @@
     <string name="cancel_download_label">Cancel Download</string>
     <string name="download_log_label">Download log</string>
     <string name="playback_history_label">Playback history</string>
+    <string name="gpodnet_main_label">gpodder.net</string>
+    <string name="gpodnet_auth_label">gpodder.net login</string>
 
     <!-- Webview actions -->
     <string name="open_in_browser_label">Open in browser</string>
@@ -47,12 +49,14 @@
     <string name="processing_label">Processing</string>
     <string name="loading_label">Loading...</string>
     <string name="image_of_prefix">Image of:\u0020</string>
+    <string name="save_username_password_label">Save username and password</string>
     <string name="close_label">Close</string>
     
 
     <!-- 'Add Feed' Activity labels -->
     <string name="feedurl_label">Feed URL</string>
-    <string name="txtvfeedurl_label">Type in the URL of the Feed here:</string>
+    <string name="txtvfeedurl_label">Add Podcast by URL</string>
+    <string name="podcastdirectories_label">Podcast directories</string>
 
     <!-- Actions on feeds -->
     <string name="mark_all_read_label">Mark all as read</string>
@@ -160,6 +164,8 @@
     <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="flattr_label">Flattr</string>
     <string name="pref_pauseOnHeadsetDisconnect_sum">Pause playback when the headphones are disconnected</string>
     <string name="pref_followQueue_sum">Jump to next queue item when playback completes</string>
     <string name="playback_pref">Playback</string>
@@ -193,9 +199,15 @@
     <string name="pref_theme_title_light">Light</string>
     <string name="pref_theme_title_dark">Dark</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>
-    <string name="pref_update_interval_hours_manual">Manual</string>
+	<string name="pref_update_interval_hours_plural">hours</string>
+	<string name="pref_update_interval_hours_singular">hour</string>
+	<string name="pref_update_interval_hours_manual">Manual</string>
+    <string name="pref_gpodnet_authenticate_title">Login</string>
+    <string name="pref_gpodnet_authenticate_sum">Login with your gpodder.net account in order to sync your subscriptions.</string>
+    <string name="pref_gpodnet_logout_title">Logout</string>
+    <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_playback_speed_title">Playback Speeds</string>
     <string name="pref_playback_speed_sum">Customize the speeds available for variable speed audio playback</string>
    
@@ -248,6 +260,37 @@
     <string name="add_feed_label">Add feed</string>
     <string name="miro_feed_added">Feed is being added</string>
 
+    <!-- gpodder.net -->
+    <string name="gpodnet_taglist_header">CATEGORIES</string>
+    <string name="gpodnet_toplist_header">TOP PODCASTS</string>
+    <string name="gpodnet_suggestions_header">SUGGESTIONS</string>
+    <string name="gpodnet_search_hint">Search gpodder.net</string>
+    <string name="gpodnetauth_login_title">Login</string>
+    <string name="gpodnetauth_login_descr">Welcome to the gpodder.net login process. First, type in your login information:</string>
+    <string name="gpodnetauth_login_butLabel">Login</string>
+    <string name="gpodnetauth_login_register">If you do not have an account yet, you can create one here:\nhttps://gpodder.net/register/</string>
+    <string name="username_label">Username</string>
+    <string name="password_label">Password</string>
+    <string name="gpodnetauth_device_title">Device Selection</string>
+    <string name="gpodnetauth_device_descr">Create a new device to use for your gpodder.net account or choose an existing one:</string>
+    <string name="gpodnetauth_device_deviceID">Device ID</string>
+    <string name="gpodnetauth_device_caption">Caption</string>
+    <string name="gpodnetauth_device_butCreateNewDevice">Create new device</string>
+    <string name="gpodnetauth_device_chooseExistingDevice">Choose existring device:</string>
+    <string name="gpodnetauth_device_errorEmpty">Device ID must not be empty</string>
+    <string name="gpodnetauth_device_errorAlreadyUsed">Device ID already in use</string>
+
+    <string name="gpodnetauth_device_butChoose">Choose</string>
+    <string name="gpodnetauth_finish_title">Login successful!</string>
+    <string name="gpodnetauth_finish_descr">Congratulations! Your gpodder.net account is now linked with your device. AntennaPod will from now on automagically sync subscriptions on your device with your gpodder.net account.</string>
+    <string name="gpodnetauth_finish_butsyncnow">Start sync now</string>
+    <string name="gpodnetauth_finish_butgomainscreen">Go to main screen</string>
+
+    <string name="gpodnetsync_auth_error_title">gpodder.net authentication error</string>
+    <string name="gpodnetsync_auth_error_descr">Wrong username or password</string>
+    <string name="gpodnetsync_error_title">gpodder.net sync error</string>
+    <string name="gpodnetsync_error_descr">An error occurred during syncing:\u0020</string>
+
     <!-- Directory chooser -->
     <string name="selected_folder_label">Selected folder:</string>
     <string name="create_folder_label">Create folder</string>
@@ -261,4 +304,8 @@
     <string name="folder_not_empty_dialog_msg">The folder you have selected is not empty. Media downloads and other files will be placed directly in this folder. Continue anyway?</string>
     <string name="set_to_default_folder">Choose default folder</string>
 
-</resources>
+    <!-- Online feed view -->
+    <string name="subscribe_label">Subscribe</string>
+    <string name="subscribed_label">Subscribed</string>
+    <string name="downloading_label">Downloading...</string>
+</resources>
\ No newline at end of file