Merge branch 'newgui' into develop. closes #407

Conflicts:
	res/layout/feedinfo.xml

1 files changed, 24 insertions, 5 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8639b4503..5da95cb94 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4,22 +4,35 @@
     tools:ignore="MissingTranslation"
     >
 
-    <!-- Activitiy titles -->
+    <!-- Activitiy and fragment titles -->
     <string name="app_name">AntennaPod</string>
     <string name="feeds_label">Feeds</string>
     <string name="podcasts_label">PODCASTS</string>
     <string name="episodes_label">EPISODES</string>
+    <string name="new_episodes_label">New episodes</string>
+    <string name="all_episodes_label">All episodes</string>
     <string name="new_label">New</string>
     <string name="waiting_list_label">Waiting list</string>
     <string name="settings_label">Settings</string>
     <string name="add_new_feed_label">Add podcast</string>
     <string name="downloads_label">Downloads</string>
+    <string name="downloads_running_label">Running</string>
+    <string name="downloads_completed_label">Completed</string>
+    <string name="downloads_log_label">Log</string>
     <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>
 
+    <!-- New episodes fragment -->
+    <string name="recently_published_episodes_label">Recently published</string>
+    <string name="episode_filter_label">Show only new episodes</string>
+
+    <!-- Main activity -->
+    <string name="drawer_open">Open menu</string>
+    <string name="drawer_close">Close menu</string>
+
     <!-- Webview actions -->
     <string name="open_in_browser_label">Open in browser</string>
     <string name="copy_url_label">Copy URL</string>
@@ -59,12 +72,15 @@
     <!-- 'Add Feed' Activity labels -->
     <string name="feedurl_label">Feed URL</string>
     <string name="txtvfeedurl_label">Add Podcast by URL</string>
-    <string name="podcastdirectories_label">Podcast directories</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.</string>
+    <string name="browse_gpoddernet_label">Browse gpodder.net</string>
 
     <!-- Actions on feeds -->
     <string name="mark_all_read_label">Mark all as read</string>
+    <string name="mark_all_read_msg">Marked all episodes as read</string>
     <string name="show_info_label">Show information</string>
-    <string name="remove_feed_label">Remove Feed</string>
+    <string name="remove_feed_label">Remove podcast</string>
     <string name="share_link_label">Share website link</string>
     <string name="share_source_label">Share feed link</string>
     <string name="feed_delete_confirmation_msg">Please confirm that you want to delete this feed and ALL episodes of this feed that you have downloaded.</string>
@@ -76,6 +92,7 @@
     <string name="pause_label">Pause</string>
     <string name="stream_label">Stream</string>
     <string name="remove_label">Remove</string>
+    <string name="remove_episode_lable">Remove episode</string>
     <string name="mark_read_label">Mark as read</string>
     <string name="mark_unread_label">Mark as unread</string>
     <string name="add_to_queue_label">Add to Queue</string>
@@ -87,8 +104,8 @@
     <string name="skip_episode_label">Skip episode</string>
 
     <!-- Download messages and labels -->
-    <string name="download_successful">Download successful</string>
-    <string name="download_failed">Download failed</string>
+    <string name="download_successful">successful</string>
+    <string name="download_failed">failed</string>
     <string name="download_pending">Download pending</string>
     <string name="download_running">Download running</string>
     <string name="download_error_device_not_found">Storage device not found</string>
@@ -353,10 +370,12 @@
     <string name="status_playing_label">Episode is being played</string>
     <string name="status_downloading_label">Episode is being downloaded</string>
     <string name="status_downloaded_label">Episode is downloaded</string>
+    <string name="status_not_downloaded_label">Episode has not been downloaded yet</string>
     <string name="status_unread_label">Item is new</string>
     <string name="in_queue_label">Episode is in the queue</string>
     <string name="new_episodes_count_label">Number of new episodes</string>
     <string name="in_progress_episodes_count_label">Number of episodes you have started listening to</string>
+    <string name="drag_handle_content_description">Drag to change the position of this item</string>
 
     <!-- Feed information screen -->
     <string name="authentication_label">Authentication</string>