Merge branch 'develop' into fix-2359

236 files changed, 5311 insertions, 3817 deletions

diff --git a/core/src/main/java/android/support/v4/app/SafeJobIntentService.java b/core/src/main/java/android/support/v4/app/SafeJobIntentService.java
new file mode 100644
index 000000000..c07c409ee
--- /dev/null
+++ b/core/src/main/java/android/support/v4/app/SafeJobIntentService.java
@@ -0,0 +1,118 @@
+package android.support.v4.app;
+
+import android.app.job.JobParameters;
+import android.app.job.JobServiceEngine;
+import android.app.job.JobWorkItem;
+import android.content.Intent;
+import android.os.Build;
+import android.os.IBinder;
+import android.support.annotation.RequiresApi;
+import android.util.Log;
+
+
+public abstract class SafeJobIntentService extends JobIntentService {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        if (Build.VERSION.SDK_INT >= 26) {
+            mJobImpl = new SafeJobServiceEngineImpl(this);
+        }
+    }
+
+    /**
+     * Implementation of a safe JobServiceEngine for interaction with JobIntentService.
+     */
+    @RequiresApi(26)
+    static final class SafeJobServiceEngineImpl extends JobServiceEngine
+            implements JobIntentService.CompatJobEngine {
+        static final String TAG = "JobServiceEngineImpl";
+
+        static final boolean DEBUG = false;
+
+        final JobIntentService mService;
+        final Object mLock = new Object();
+        JobParameters mParams;
+
+        final class WrapperWorkItem implements JobIntentService.GenericWorkItem {
+            final JobWorkItem mJobWork;
+
+            WrapperWorkItem(JobWorkItem jobWork) {
+                mJobWork = jobWork;
+            }
+
+            @Override
+            public Intent getIntent() {
+                return mJobWork.getIntent();
+            }
+
+            @Override
+            public void complete() {
+                synchronized (mLock) {
+                    if (mParams != null) {
+                        try {
+                            mParams.completeWork(mJobWork);
+                        } catch (SecurityException e) {
+                            Log.e(TAG, Log.getStackTraceString(e));
+                        }
+                    }
+                }
+            }
+        }
+
+        SafeJobServiceEngineImpl(JobIntentService service) {
+            super(service);
+            mService = service;
+        }
+
+        @Override
+        public IBinder compatGetBinder() {
+            return getBinder();
+        }
+
+        @Override
+        public boolean onStartJob(JobParameters params) {
+            if (DEBUG) Log.d(TAG, "onStartJob: " + params);
+            mParams = params;
+            // We can now start dequeuing work!
+            mService.ensureProcessorRunningLocked(false);
+            return true;
+        }
+
+        @Override
+        public boolean onStopJob(JobParameters params) {
+            if (DEBUG) Log.d(TAG, "onStartJob: " + params);
+            boolean result = mService.doStopCurrentWork();
+            synchronized (mLock) {
+                // Once we return, the job is stopped, so its JobParameters are no
+                // longer valid and we should not be doing anything with them.
+                mParams = null;
+            }
+            return result;
+        }
+
+        /**
+         * Dequeue some work.
+         */
+        @Override
+        public JobIntentService.GenericWorkItem dequeueWork() {
+            JobWorkItem work = null;
+            synchronized (mLock) {
+                if (mParams == null) {
+                    return null;
+                }
+                try {
+                    work = mParams.dequeueWork();
+                } catch (SecurityException e) {
+                    Log.e(TAG, Log.getStackTraceString(e));
+                }
+            }
+            if (work != null) {
+                work.getIntent().setExtrasClassLoader(mService.getClassLoader());
+                return new WrapperWorkItem(work);
+            } else {
+                return null;
+            }
+        }
+    }
+}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/UpdateManager.java b/core/src/main/java/de/danoeh/antennapod/core/UpdateManager.java
index 96e3a77be..1b4cbc0ea 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/UpdateManager.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/UpdateManager.java
@@ -10,21 +10,15 @@ import android.util.Log;
 
 import org.antennapod.audio.MediaPlayer;
 
-import java.io.File;
-import java.util.List;
-
-import de.danoeh.antennapod.core.feed.Feed;
-import de.danoeh.antennapod.core.feed.FeedImage;
-import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
-import de.danoeh.antennapod.core.storage.DBReader;
-import de.danoeh.antennapod.core.storage.DBWriter;
 
 /*
  * This class's job is do perform maintenance tasks whenever the app has been updated
  */
 class UpdateManager {
 
+    private UpdateManager(){}
+
     private static final String TAG = UpdateManager.class.getSimpleName();
 
     private static final String PREF_NAME = "app_version";
@@ -64,32 +58,22 @@ class UpdateManager {
     }
 
     private static void onUpgrade(final int oldVersionCode, final int newVersionCode) {
-        if(oldVersionCode < 1030099) {
-            // delete the now obsolete image cache
-            // from now on, Glide will handle caching images
-            new Thread() {
-                public void run() {
-                    List<Feed> feeds = DBReader.getFeedList();
-                    for (Feed podcast : feeds) {
-                        List<FeedItem> episodes = DBReader.getFeedItemList(podcast);
-                        for (FeedItem episode : episodes) {
-                            FeedImage image = episode.getImage();
-                            if (image != null && image.isDownloaded() && image.getFile_url() != null) {
-                                File imageFile = new File(image.getFile_url());
-                                if (imageFile.exists()) {
-                                    imageFile.delete();
-                                }
-                                image.setFile_url(null); // calls setDownloaded(false)
-                                DBWriter.setFeedImage(image);
-                            }
-                        }
-                    }
-                }
-            }.start();
-        }
-        if(oldVersionCode < 1050004) {
+        if (oldVersionCode < 1050004) {
             if(MediaPlayer.isPrestoLibraryInstalled(context) && Build.VERSION.SDK_INT >= 16) {
-                UserPreferences.enableSonic(true);
+                UserPreferences.enableSonic();
+            }
+        }
+
+        if (oldVersionCode < 1070196) {
+            // migrate episode cleanup value (unit changed from days to hours)
+            int oldValueInDays = UserPreferences.getEpisodeCleanupValue();
+            if (oldValueInDays > 0) {
+                UserPreferences.setEpisodeCleanupValue(oldValueInDays * 24);
+            } // else 0 or special negative values, no change needed
+        }
+        if (oldVersionCode < 1070197) {
+            if (prefs.getBoolean("prefMobileUpdate", false)) {
+                prefs.edit().putString(UserPreferences.PREF_MOBILE_UPDATE, "everything").apply();
             }
         }
     }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/asynctask/DBTaskLoader.java b/core/src/main/java/de/danoeh/antennapod/core/asynctask/DBTaskLoader.java
deleted file mode 100644
index 1b4aafeaa..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/asynctask/DBTaskLoader.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package de.danoeh.antennapod.core.asynctask;
-
-import android.content.Context;
-import android.support.v4.content.AsyncTaskLoader;
-
-/**
- * Subclass of AsyncTaskLoader that is made for loading data with one of the DB*-classes.
- * This class will provide a useful default implementation that would otherwise always be necessary when interacting
- * with the DB*-classes with an AsyncTaskLoader.
- */
-abstract class DBTaskLoader<D> extends AsyncTaskLoader<D> {
-
-    public DBTaskLoader(Context context) {
-        super(context);
-    }
-
-    @Override
-    protected void onStopLoading() {
-        super.onStopLoading();
-        cancelLoad();
-    }
-
-    @Override
-    protected void onStartLoading() {
-        super.onStartLoading();
-        // according to https://code.google.com/p/android/issues/detail?id=14944, this has to be called manually
-        forceLoad();
-    }
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/asynctask/FeedRemover.java b/core/src/main/java/de/danoeh/antennapod/core/asynctask/FeedRemover.java
index 1e0c07b01..4504b2e7f 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/asynctask/FeedRemover.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/asynctask/FeedRemover.java
@@ -2,7 +2,6 @@ package de.danoeh.antennapod.core.asynctask;
 
 import android.app.ProgressDialog;
 import android.content.Context;
-import android.content.Intent;
 import android.os.AsyncTask;
 
 import java.util.concurrent.ExecutionException;
@@ -11,6 +10,7 @@ import de.danoeh.antennapod.core.R;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.storage.DBWriter;
+import de.danoeh.antennapod.core.util.IntentUtils;
 
 /** Removes a feed in the background. */
 public class FeedRemover extends AsyncTask<Void, Void, Void> {
@@ -41,7 +41,7 @@ public class FeedRemover extends AsyncTask<Void, Void, Void> {
             dialog.dismiss();
         }
 		if(skipOnCompletion) {
-			context.sendBroadcast(new Intent(PlaybackService.ACTION_SKIP_CURRENT_EPISODE));
+			IntentUtils.sendLocalBroadcast(context, PlaybackService.ACTION_SKIP_CURRENT_EPISODE);
 		}
 	}
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrClickWorker.java b/core/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrClickWorker.java
index f4c99011a..318e404c8 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrClickWorker.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrClickWorker.java
@@ -10,7 +10,6 @@ import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 import android.widget.Toast;
 
-import de.danoeh.antennapod.core.util.gui.NotificationUtils;
 import org.shredzone.flattr4j.exception.FlattrException;
 
 import java.util.LinkedList;
@@ -27,6 +26,7 @@ import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.NetworkUtils;
 import de.danoeh.antennapod.core.util.flattr.FlattrThing;
 import de.danoeh.antennapod.core.util.flattr.FlattrUtils;
+import de.danoeh.antennapod.core.util.gui.NotificationUtils;
 
 /**
  * Performs a click action in a background thread.
diff --git a/core/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrStatusFetcher.java b/core/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrStatusFetcher.java
index 420a60469..6d9ab2bd3 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrStatusFetcher.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrStatusFetcher.java
@@ -19,11 +19,9 @@ import de.danoeh.antennapod.core.util.flattr.FlattrUtils;
 
 public class FlattrStatusFetcher extends Thread {
     private static final String TAG = "FlattrStatusFetcher";
-    private final Context context;
 
     public FlattrStatusFetcher(Context context) {
         super();
-        this.context = context;
     }
 
     @Override
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java b/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java
index 78df74ee7..3395653f3 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java
@@ -44,7 +44,7 @@ public class Feed extends FeedFile implements FlattrThing, ImageResource {
      * Name of the author
      */
     private String author;
-    private FeedImage image;
+    private String imageUrl;
     private List<FeedItem> items;
 
     /**
@@ -96,7 +96,7 @@ public class Feed extends FeedFile implements FlattrThing, ImageResource {
      * This constructor is used for restoring a feed from the database.
      */
     public Feed(long id, String lastUpdate, String title, String customTitle, String link, String description, String paymentLink,
-                String author, String language, String type, String feedIdentifier, FeedImage image, String fileUrl,
+                String author, String language, String type, String feedIdentifier, String imageUrl, String fileUrl,
                 String downloadUrl, boolean downloaded, FlattrStatus status, boolean paged, String nextPageLink,
                 String filter, boolean lastUpdateFailed) {
         super(fileUrl, downloadUrl, downloaded);
@@ -111,7 +111,7 @@ public class Feed extends FeedFile implements FlattrThing, ImageResource {
         this.language = language;
         this.type = type;
         this.feedIdentifier = feedIdentifier;
-        this.image = image;
+        this.imageUrl = imageUrl;
         this.flattrStatus = status;
         this.paged = paged;
         this.nextPageLink = nextPageLink;
@@ -128,9 +128,9 @@ public class Feed extends FeedFile implements FlattrThing, ImageResource {
      * This constructor is used for test purposes and uses a default flattr status object.
      */
     public Feed(long id, String lastUpdate, String title, String link, String description, String paymentLink,
-                String author, String language, String type, String feedIdentifier, FeedImage image, String fileUrl,
+                String author, String language, String type, String feedIdentifier, String imageUrl, String fileUrl,
                 String downloadUrl, boolean downloaded) {
-        this(id, lastUpdate, title, null, link, description, paymentLink, author, language, type, feedIdentifier, image,
+        this(id, lastUpdate, title, null, link, description, paymentLink, author, language, type, feedIdentifier, imageUrl,
                 fileUrl, downloadUrl, downloaded, new FlattrStatus(), false, null, null, false);
     }
 
@@ -191,6 +191,7 @@ public class Feed extends FeedFile implements FlattrThing, ImageResource {
         int indexNextPageLink = cursor.getColumnIndex(PodDBAdapter.KEY_NEXT_PAGE_LINK);
         int indexHide = cursor.getColumnIndex(PodDBAdapter.KEY_HIDE);
         int indexLastUpdateFailed = cursor.getColumnIndex(PodDBAdapter.KEY_LAST_UPDATE_FAILED);
+        int indexImageUrl = cursor.getColumnIndex(PodDBAdapter.KEY_IMAGE_URL);
 
         Feed feed = new Feed(
                 cursor.getLong(indexId),
@@ -204,7 +205,7 @@ public class Feed extends FeedFile implements FlattrThing, ImageResource {
                 cursor.getString(indexLanguage),
                 cursor.getString(indexType),
                 cursor.getString(indexFeedIdentifier),
-                null,
+                cursor.getString(indexImageUrl),
                 cursor.getString(indexFileUrl),
                 cursor.getString(indexDownloadUrl),
                 cursor.getInt(indexDownloaded) > 0,
@@ -266,8 +267,8 @@ public class Feed extends FeedFile implements FlattrThing, ImageResource {
     public void updateFromOther(Feed other) {
         // don't update feed's download_url, we do that manually if redirected
         // see AntennapodHttpClient
-        if (other.image != null) {
-            this.image = other.image;
+        if (other.imageUrl != null) {
+            this.imageUrl = other.imageUrl;
         }
         if (other.feedTitle != null) {
             feedTitle = other.feedTitle;
@@ -305,8 +306,8 @@ public class Feed extends FeedFile implements FlattrThing, ImageResource {
         if (super.compareWithOther(other)) {
             return true;
         }
-        if (other.image != null) {
-            if (image == null || !TextUtils.equals(image.download_url, other.image.download_url)) {
+        if (other.imageUrl != null) {
+            if (imageUrl == null || !TextUtils.equals(imageUrl, other.imageUrl)) {
                 return true;
             }
         }
@@ -411,12 +412,12 @@ public class Feed extends FeedFile implements FlattrThing, ImageResource {
         this.description = description;
     }
 
-    public FeedImage getImage() {
-        return image;
+    public String getImageUrl() {
+        return imageUrl;
     }
 
-    public void setImage(FeedImage image) {
-        this.image = image;
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl;
     }
 
     public List<FeedItem> getItems() {
@@ -505,11 +506,7 @@ public class Feed extends FeedFile implements FlattrThing, ImageResource {
 
     @Override
     public String getImageLocation() {
-        if (image != null) {
-            return image.getImageLocation();
-        } else {
-            return null;
-        }
+        return imageUrl;
     }
 
     public int getPageNr() {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedComponent.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedComponent.java
index a3f91b1c9..2610d253f 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedComponent.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedComponent.java
@@ -50,7 +50,7 @@ public abstract class FeedComponent {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (o == null || !(o instanceof FeedComponent)) return false;
 
         FeedComponent that = (FeedComponent) o;
 
@@ -62,4 +62,4 @@ public abstract class FeedComponent {
     public int hashCode() {
         return (int) (id ^ (id >>> 32));
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedImage.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedImage.java
deleted file mode 100644
index 45bd2ad31..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedImage.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package de.danoeh.antennapod.core.feed;
-
-import android.database.Cursor;
-
-import java.io.File;
-
-import de.danoeh.antennapod.core.asynctask.ImageResource;
-import de.danoeh.antennapod.core.storage.PodDBAdapter;
-
-
-public class FeedImage extends FeedFile implements ImageResource {
-	public static final int FEEDFILETYPE_FEEDIMAGE = 1;
-
-	private String title;
-	private FeedComponent owner;
-
-	public FeedImage(FeedComponent owner, String download_url, String title) {
-		super(null, download_url, false);
-		this.download_url = download_url;
-		this.title = title;
-        this.owner = owner;
-	}
-
-	public FeedImage(long id, String title, String file_url,
-			String download_url, boolean downloaded) {
-		super(file_url, download_url, downloaded);
-		this.id = id;
-		this.title = title;
-	}
-
-    public FeedImage() {
-        super();
-    }
-
-	public static FeedImage fromCursor(Cursor cursor) {
-		int indexId = cursor.getColumnIndex(PodDBAdapter.KEY_ID);
-		int indexTitle = cursor.getColumnIndex(PodDBAdapter.KEY_TITLE);
-		int indexFileUrl = cursor.getColumnIndex(PodDBAdapter.KEY_FILE_URL);
-		int indexDownloadUrl = cursor.getColumnIndex(PodDBAdapter.KEY_DOWNLOAD_URL);
-		int indexDownloaded = cursor.getColumnIndex(PodDBAdapter.KEY_DOWNLOADED);
-
-		return new FeedImage(
-				cursor.getLong(indexId),
-				cursor.getString(indexTitle),
-				cursor.getString(indexFileUrl),
-				cursor.getString(indexDownloadUrl),
-				cursor.getInt(indexDownloaded) > 0
-		);
-	}
-
-
-	@Override
-	public String getHumanReadableIdentifier() {
-		if (owner != null && owner.getHumanReadableIdentifier() != null) {
-			return owner.getHumanReadableIdentifier();
-		} else {
-			return download_url;
-		}
-	}
-
-	@Override
-	public int getTypeAsInt() {
-		return FEEDFILETYPE_FEEDIMAGE;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public FeedComponent getOwner() {
-		return owner;
-	}
-
-	public void setOwner(FeedComponent owner) {
-		this.owner = owner;
-	}
-
-    @Override
-    public String getImageLocation() {
-        if (file_url != null && downloaded) {
-            return new File(file_url).getAbsolutePath();
-        } else if(download_url != null) {
-            return download_url;
-        } else {
-            return null;
-        }
-    }
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
index 87298d4c3..0f0343f25 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
@@ -2,8 +2,8 @@ package de.danoeh.antennapod.core.feed;
 
 import android.database.Cursor;
 import android.support.annotation.Nullable;
-
 import android.text.TextUtils;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -75,7 +75,7 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
      * in the database. The 'hasChapters' attribute should be used to check if this item has any chapters.
      * */
     private List<Chapter> chapters;
-    private FeedImage image;
+    private String imageUrl;
 
     /*
      *   0: auto download disabled
@@ -100,7 +100,7 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
      * This constructor is used by DBReader.
      * */
     public FeedItem(long id, String title, String link, Date pubDate, String paymentLink, long feedId,
-                    FlattrStatus flattrStatus, boolean hasChapters, FeedImage image, int state,
+                    FlattrStatus flattrStatus, boolean hasChapters, String imageUrl, int state,
                     String itemIdentifier, long autoDownload) {
         this.id = id;
         this.title = title;
@@ -110,7 +110,7 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
         this.feedId = feedId;
         this.flattrStatus = flattrStatus;
         this.hasChapters = hasChapters;
-        this.image = image;
+        this.imageUrl = imageUrl;
         this.state = state;
         this.itemIdentifier = itemIdentifier;
         this.autoDownload = autoDownload;
@@ -158,6 +158,7 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
         int indexRead = cursor.getColumnIndex(PodDBAdapter.KEY_READ);
         int indexItemIdentifier = cursor.getColumnIndex(PodDBAdapter.KEY_ITEM_IDENTIFIER);
         int indexAutoDownload = cursor.getColumnIndex(PodDBAdapter.KEY_AUTO_DOWNLOAD);
+        int indexImageUrl = cursor.getColumnIndex(PodDBAdapter.KEY_IMAGE_URL);
 
         long id = cursor.getInt(indexId);
         String title = cursor.getString(indexTitle);
@@ -170,15 +171,16 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
         int state = cursor.getInt(indexRead);
         String itemIdentifier = cursor.getString(indexItemIdentifier);
         long autoDownload = cursor.getLong(indexAutoDownload);
+        String imageUrl = cursor.getString(indexImageUrl);
 
         return new FeedItem(id, title, link, pubDate, paymentLink, feedId, flattrStatus,
-                hasChapters, null, state, itemIdentifier, autoDownload);
+                hasChapters, imageUrl, state, itemIdentifier, autoDownload);
     }
 
     public void updateFromOther(FeedItem other) {
         super.updateFromOther(other);
-        if (other.image != null) {
-            this.image = other.image;
+        if (other.imageUrl != null) {
+            this.imageUrl = other.imageUrl;
         }
         if (other.title != null) {
             title = other.title;
@@ -192,7 +194,7 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
         if (other.link != null) {
             link = other.link;
         }
-        if (other.pubDate != null && other.pubDate != pubDate) {
+        if (other.pubDate != null && other.pubDate.equals(pubDate)) {
             pubDate = other.pubDate;
         }
         if (other.media != null) {
@@ -212,9 +214,6 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
                 chapters = other.chapters;
             }
         }
-        if (image == null) {
-            image = other.image;
-        }
     }
 
     /**
@@ -389,8 +388,8 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
     public String getImageLocation() {
         if(media != null && media.hasEmbeddedPicture()) {
             return media.getImageLocation();
-        } else if (image != null) {
-           return image.getImageLocation();
+        } else if (imageUrl != null) {
+           return imageUrl;
         } else if (feed != null) {
             return feed.getImageLocation();
         } else {
@@ -426,29 +425,12 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
      * Returns the image of this item or the image of the feed if this item does
      * not have its own image.
      */
-    public FeedImage getImage() {
-        return (hasItemImage()) ? image : feed.getImage();
-    }
-
-    public void setImage(FeedImage image) {
-        this.image = image;
-        if (image != null) {
-            image.setOwner(this);
-        }
-    }
-
-    /**
-     * Returns true if this FeedItem has its own image, false otherwise.
-     */
-    public boolean hasItemImage() {
-        return image != null;
+    public String getImageUrl() {
+        return (imageUrl != null) ? imageUrl : feed.getImageUrl();
     }
 
-    /**
-     * Returns true if this FeedItem has its own image and the image has been downloaded.
-     */
-    public boolean hasItemImageDownloaded() {
-        return image != null && image.isDownloaded();
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl;
     }
 
     @Override
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilter.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilter.java
index 200153876..719383d23 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItemFilter.java
@@ -8,6 +8,8 @@ import java.util.List;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.util.LongList;
 
+import static de.danoeh.antennapod.core.feed.FeedItem.TAG_FAVORITE;
+
 public class FeedItemFilter {
     private final String[] mProperties;
 
@@ -19,6 +21,7 @@ public class FeedItemFilter {
     private boolean showDownloaded = false;
     private boolean showNotDownloaded = false;
     private boolean showHasMedia = false;
+    private boolean showIsFavorite = false;
 
     public FeedItemFilter(String properties) {
         this(TextUtils.split(properties, ","));
@@ -53,6 +56,9 @@ public class FeedItemFilter {
                 case "has_media":
                     showHasMedia = true;
                     break;
+                case "is_favorite":
+                    showIsFavorite = true;
+                    break;
             }
         }
     }
@@ -88,6 +94,8 @@ public class FeedItemFilter {
 
             if (showHasMedia && !item.hasMedia()) continue;
 
+            if (showIsFavorite && !item.isTagged(TAG_FAVORITE)) continue;
+
             // If the item reaches here, it meets all criteria
             result.add(item);
         }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java
index a22422596..f3a43e2d0 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java
@@ -19,6 +19,7 @@ import de.danoeh.antennapod.core.gpoddernet.model.GpodnetEpisodeAction;
 import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
 import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
@@ -218,7 +219,7 @@ public class FeedMedia extends FeedFile implements Playable {
      * currently being played and the current player status is playing.
      */
     public boolean isCurrentlyPlaying() {
-        return isPlaying() &&
+        return isPlaying() && PlaybackService.isRunning &&
                 ((PlaybackPreferences.getCurrentPlayerStatus() == PlaybackPreferences.PLAYER_STATUS_PLAYING));
     }
 
@@ -531,8 +532,8 @@ public class FeedMedia extends FeedFile implements Playable {
                     UserPreferences.isAutoFlattr() &&
                     item.getPaymentLink() != null &&
                     item.getFlattrStatus().getUnflattred() &&
-                    (completed && autoFlattrThreshold <= 1.0f ||
-                            played_duration >= autoFlattrThreshold * duration)) {
+                    ((completed && autoFlattrThreshold <= 1.0f) ||
+                            (played_duration >= autoFlattrThreshold * duration))) {
                 DBTasks.flattrItemIfLoggedIn(context, item);
             }
         }
@@ -593,7 +594,7 @@ public class FeedMedia extends FeedFile implements Playable {
     @Override
     public void setDownloaded(boolean downloaded) {
         super.setDownloaded(downloaded);
-        if(item != null && downloaded) {
+        if(item != null && downloaded && item.isNew()) {
             item.setPlayed(false);
         }
     }
@@ -625,6 +626,9 @@ public class FeedMedia extends FeedFile implements Playable {
 
     @Override
     public boolean equals(Object o) {
+        if (o == null) {
+            return false;
+        }
         if (FeedMediaFlavorHelper.instanceOfRemoteMedia(o)) {
             return o.equals(this);
         }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/glide/ApGlideModule.java b/core/src/main/java/de/danoeh/antennapod/core/glide/ApGlideModule.java
index 835dee735..552c1b691 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/glide/ApGlideModule.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/glide/ApGlideModule.java
@@ -2,31 +2,35 @@ package de.danoeh.antennapod.core.glide;
 
 import android.content.Context;
 
+import android.support.annotation.NonNull;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.GlideBuilder;
+import com.bumptech.glide.Registry;
+import com.bumptech.glide.annotation.GlideModule;
 import com.bumptech.glide.load.DecodeFormat;
 import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory;
-import com.bumptech.glide.module.GlideModule;
+import com.bumptech.glide.module.AppGlideModule;
 
 import java.io.InputStream;
 
+import com.bumptech.glide.request.RequestOptions;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 /**
  * {@see com.bumptech.glide.integration.okhttp.OkHttpGlideModule}
  */
-public class ApGlideModule implements GlideModule {
+@GlideModule
+public class ApGlideModule extends AppGlideModule {
 
     @Override
-    public void applyOptions(Context context, GlideBuilder builder) {
-        builder.setDecodeFormat(DecodeFormat.PREFER_ARGB_8888);
+    public void applyOptions(@NonNull Context context, @NonNull GlideBuilder builder) {
+        builder.setDefaultRequestOptions(new RequestOptions().format(DecodeFormat.PREFER_ARGB_8888));
         builder.setDiskCache(new InternalCacheDiskCacheFactory(context,
                 UserPreferences.getImageCacheSize()));
     }
 
     @Override
-    public void registerComponents(Context context, Glide glide) {
-        glide.register(String.class, InputStream.class, new ApOkHttpUrlLoader.Factory());
+    public void registerComponents(@NonNull Context context, @NonNull Glide glide, @NonNull Registry registry) {
+        registry.replace(String.class, InputStream.class, new ApOkHttpUrlLoader.Factory());
     }
-
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/glide/ApGlideSettings.java b/core/src/main/java/de/danoeh/antennapod/core/glide/ApGlideSettings.java
index fc1acd0e1..d0061af99 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/glide/ApGlideSettings.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/glide/ApGlideSettings.java
@@ -6,6 +6,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
  * The settings that AntennaPod will use for various Glide options
  */
 public class ApGlideSettings {
+    private ApGlideSettings(){}
 
     public static final DiskCacheStrategy AP_DISK_CACHE_STRATEGY = DiskCacheStrategy.ALL;
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java b/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java
index 3e4f06a12..2e742e979 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java
@@ -1,12 +1,12 @@
 package de.danoeh.antennapod.core.glide;
 
-import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 
 import com.bumptech.glide.integration.okhttp3.OkHttpStreamFetcher;
-import com.bumptech.glide.load.data.DataFetcher;
-import com.bumptech.glide.load.model.GenericLoaderFactory;
+import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.load.model.ModelLoader;
 import com.bumptech.glide.load.model.ModelLoaderFactory;
@@ -15,14 +15,14 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 
+import com.bumptech.glide.load.model.MultiModelLoaderFactory;
+import com.bumptech.glide.signature.ObjectKey;
 import de.danoeh.antennapod.core.service.download.AntennapodHttpClient;
 import de.danoeh.antennapod.core.service.download.HttpDownloader;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.util.NetworkUtils;
-import okhttp3.Interceptor;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
+import okhttp3.*;
+import okhttp3.internal.http.RealResponseBody;
 
 /**
  * @see com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader
@@ -56,19 +56,20 @@ class ApOkHttpUrlLoader implements ModelLoader<String, InputStream> {
         /**
          * Constructor for a new Factory that runs requests using a static singleton client.
          */
-        public Factory() {
+        Factory() {
             this(getInternalClient());
         }
 
         /**
          * Constructor for a new Factory that runs requests using given client.
          */
-        public Factory(OkHttpClient client) {
+        Factory(OkHttpClient client) {
             this.client = client;
         }
 
+        @NonNull
         @Override
-        public ModelLoader<String, InputStream> build(Context context, GenericLoaderFactory factories) {
+        public ModelLoader<String, InputStream> build(@NonNull MultiModelLoaderFactory multiFactory) {
             return new ApOkHttpUrlLoader(client);
         }
 
@@ -84,28 +85,40 @@ class ApOkHttpUrlLoader implements ModelLoader<String, InputStream> {
         this.client = client;
     }
 
+    @Nullable
     @Override
-    public DataFetcher<InputStream> getResourceFetcher(String model, int width, int height) {
-        Log.d(TAG, "getResourceFetcher() called with: " + "model = [" + model + "], width = ["
+    public LoadData<InputStream> buildLoadData(@NonNull String model, int width, int height, @NonNull Options options) {
+        Log.d(TAG, "buildLoadData() called with: " + "model = [" + model + "], width = ["
                 + width + "], height = [" + height + "]");
         if(TextUtils.isEmpty(model)) {
             return null;
         } else if(model.startsWith("/")) {
-            return new AudioCoverFetcher(model);
+            return new LoadData<>(new ObjectKey(model), new AudioCoverFetcher(model));
         } else {
             GlideUrl url = new GlideUrl(model);
-            return new OkHttpStreamFetcher(client, url);
+            return new LoadData<>(new ObjectKey(model), new OkHttpStreamFetcher(client, url));
         }
     }
 
+    @Override
+    public boolean handles(@NonNull String s) {
+        return true;
+    }
+
     private static class NetworkAllowanceInterceptor implements Interceptor {
 
         @Override
         public Response intercept(Chain chain) throws IOException {
-            if (NetworkUtils.isDownloadAllowed()) {
+            if (NetworkUtils.isImageAllowed()) {
                 return chain.proceed(chain.request());
             } else {
-                return null;
+                return new Response.Builder()
+                        .protocol(Protocol.HTTP_2)
+                        .code(420)
+                        .message("Policy Not Fulfilled")
+                        .body(ResponseBody.create(null, new byte[0]))
+                        .request(chain.request())
+                        .build();
             }
         }
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/glide/AudioCoverFetcher.java b/core/src/main/java/de/danoeh/antennapod/core/glide/AudioCoverFetcher.java
index 8159a1b3e..479846655 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/glide/AudioCoverFetcher.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/glide/AudioCoverFetcher.java
@@ -2,7 +2,9 @@ package de.danoeh.antennapod.core.glide;
 
 import android.media.MediaMetadataRetriever;
 
+import android.support.annotation.NonNull;
 import com.bumptech.glide.Priority;
+import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.data.DataFetcher;
 
 import java.io.ByteArrayInputStream;
@@ -20,22 +22,20 @@ class AudioCoverFetcher implements DataFetcher<InputStream> {
         this.path = path;
     }
 
-    @Override public String getId() {
-        return path;
-    }
-
-    @Override public InputStream loadData(Priority priority) throws Exception {
+    @Override
+    public void loadData(@NonNull Priority priority, @NonNull DataCallback<? super InputStream> callback) {
         MediaMetadataRetriever retriever = new MediaMetadataRetriever();
         try {
             retriever.setDataSource(path);
             byte[] picture = retriever.getEmbeddedPicture();
             if (picture != null) {
-                return new ByteArrayInputStream(picture);
+                callback.onDataReady(new ByteArrayInputStream(picture));
+                return;
             }
         } finally {
             retriever.release();
         }
-        throw new IOException("Loading embedded cover did not work");
+        callback.onLoadFailed(new IOException("Loading embedded cover did not work"));
     }
 
     @Override public void cleanup() {
@@ -44,4 +44,16 @@ class AudioCoverFetcher implements DataFetcher<InputStream> {
     @Override public void cancel() {
         // cannot cancel
     }
+
+    @NonNull
+    @Override
+    public Class<InputStream> getDataClass() {
+        return InputStream.class;
+    }
+
+    @NonNull
+    @Override
+    public DataSource getDataSource() {
+        return DataSource.LOCAL;
+    }
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/glide/FastBlurTransformation.java b/core/src/main/java/de/danoeh/antennapod/core/glide/FastBlurTransformation.java
index ee58c2f39..a740782d6 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/glide/FastBlurTransformation.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/glide/FastBlurTransformation.java
@@ -1,13 +1,15 @@
 package de.danoeh.antennapod.core.glide;
 
-import android.content.Context;
 import android.graphics.Bitmap;
 import android.media.ThumbnailUtils;
+import android.support.annotation.NonNull;
 import android.util.Log;
 
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
 
+import java.security.MessageDigest;
+
 public class FastBlurTransformation extends BitmapTransformation {
 
     private static final String TAG = FastBlurTransformation.class.getSimpleName();
@@ -15,8 +17,8 @@ public class FastBlurTransformation extends BitmapTransformation {
     private static final int STACK_BLUR_RADIUS = 1;
     private static final int BLUR_IMAGE_WIDTH = 150;
 
-    public FastBlurTransformation(Context context) {
-        super(context);
+    public FastBlurTransformation() {
+        super();
     }
 
     @Override
@@ -33,11 +35,6 @@ public class FastBlurTransformation extends BitmapTransformation {
         return result;
     }
 
-    @Override
-    public String getId() {
-        return "FastBlurTransformation[width=" + BLUR_IMAGE_WIDTH + "px,radius=" + STACK_BLUR_RADIUS +"]";
-    }
-
     private static Bitmap fastBlur(Bitmap bitmap, int radius) {
 
         // Stack Blur v1.0 from
@@ -264,4 +261,8 @@ public class FastBlurTransformation extends BitmapTransformation {
         return bitmap;
     }
 
+    @Override
+    public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
+        messageDigest.update(TAG.getBytes());
+    }
 }
\ No newline at end of file
diff --git a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetService.java b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetService.java
index 3af5e9080..2588cfdee 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/GpodnetService.java
@@ -14,6 +14,7 @@ import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -587,7 +588,7 @@ public class GpodnetService {
         String result = null;
         ResponseBody body = null;
         try {
-            String credential = Credentials.basic(username, password);
+            String credential = Credentials.basic(username, password, Charset.forName("UTF-8"));
             Request authRequest = request.newBuilder().header("Authorization", credential).build();
             Response response = httpClient.newCall(authRequest).execute();
             checkStatusCode(response);
diff --git a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeAction.java b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeAction.java
index b76988fd8..330cde525 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeAction.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeAction.java
@@ -169,7 +169,7 @@ public class GpodnetEpisodeAction {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (o == null || !(o instanceof GpodnetEpisodeAction)) return false;
 
         GpodnetEpisodeAction that = (GpodnetEpisodeAction) o;
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/GpodnetPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/GpodnetPreferences.java
index b51b8d996..5b17dd338 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/preferences/GpodnetPreferences.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/GpodnetPreferences.java
@@ -24,6 +24,8 @@ import de.danoeh.antennapod.core.service.GpodnetSyncService;
  */
 public class GpodnetPreferences {
 
+    private GpodnetPreferences(){}
+
     private static final String TAG = "GpodnetPreferences";
 
     private static final String PREF_NAME = "gpodder.net";
diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/SleepTimerPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/SleepTimerPreferences.java
index b7ed890f5..0f3a9fcb3 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/preferences/SleepTimerPreferences.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/SleepTimerPreferences.java
@@ -23,7 +23,6 @@ public class SleepTimerPreferences {
     private static final String DEFAULT_VALUE = "15";
     private static final int DEFAULT_TIME_UNIT = 1;
 
-    private static Context context;
     private static SharedPreferences prefs;
 
     /**
diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
index 44b2fa2b2..805f0c1b6 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
@@ -8,14 +8,7 @@ import android.support.annotation.NonNull;
 import android.support.v4.app.NotificationCompat;
 import android.text.TextUtils;
 import android.util.Log;
-import de.danoeh.antennapod.core.R;
-import de.danoeh.antennapod.core.service.download.ProxyConfig;
-import de.danoeh.antennapod.core.storage.APCleanupAlgorithm;
-import de.danoeh.antennapod.core.storage.APNullCleanupAlgorithm;
-import de.danoeh.antennapod.core.storage.APQueueCleanupAlgorithm;
-import de.danoeh.antennapod.core.storage.EpisodeCleanupAlgorithm;
-import de.danoeh.antennapod.core.util.Converter;
-import de.danoeh.antennapod.core.util.download.AutoUpdateManager;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 
@@ -27,6 +20,15 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import de.danoeh.antennapod.core.R;
+import de.danoeh.antennapod.core.service.download.ProxyConfig;
+import de.danoeh.antennapod.core.storage.APCleanupAlgorithm;
+import de.danoeh.antennapod.core.storage.APNullCleanupAlgorithm;
+import de.danoeh.antennapod.core.storage.APQueueCleanupAlgorithm;
+import de.danoeh.antennapod.core.storage.EpisodeCleanupAlgorithm;
+import de.danoeh.antennapod.core.util.Converter;
+import de.danoeh.antennapod.core.util.download.AutoUpdateManager;
+
 /**
  * Provides access to preferences set by the user in the settings screen. A
  * private instance of this class must first be instantiated via
@@ -34,6 +36,7 @@ import java.util.concurrent.TimeUnit;
  * when called.
  */
 public class UserPreferences {
+    private UserPreferences(){}
 
     private static final String IMPORT_DIR = "import/";
 
@@ -44,11 +47,13 @@ public class UserPreferences {
     public static final String PREF_HIDDEN_DRAWER_ITEMS = "prefHiddenDrawerItems";
     private static final String PREF_DRAWER_FEED_ORDER = "prefDrawerFeedOrder";
     private static final String PREF_DRAWER_FEED_COUNTER = "prefDrawerFeedIndicator";
-    private static final String PREF_EXPANDED_NOTIFICATION = "prefExpandNotify";
+    public static final String PREF_EXPANDED_NOTIFICATION = "prefExpandNotify";
     private static final String PREF_PERSISTENT_NOTIFICATION = "prefPersistNotify";
     public static final String PREF_COMPACT_NOTIFICATION_BUTTONS = "prefCompactNotificationButtons";
     public static final String PREF_LOCKSCREEN_BACKGROUND = "prefLockscreenBackground";
     private static final String PREF_SHOW_DOWNLOAD_REPORT = "prefShowDownloadReport";
+    public static final String PREF_BACK_BUTTON_BEHAVIOR = "prefBackButtonBehavior";
+    private static final String PREF_BACK_BUTTON_GO_TO_PAGE = "prefBackButtonGoToPage";
 
     // Queue
     private static final String PREF_QUEUE_ADD_TO_FRONT = "prefQueueAddToFront";
@@ -72,7 +77,7 @@ public class UserPreferences {
     // Network
     private static final String PREF_ENQUEUE_DOWNLOADED = "prefEnqueueDownloaded";
     public static final String PREF_UPDATE_INTERVAL = "prefAutoUpdateIntervall";
-    private static final String PREF_MOBILE_UPDATE = "prefMobileUpdate";
+    public static final String PREF_MOBILE_UPDATE = "prefMobileUpdateAllowed";
     public static final String PREF_EPISODE_CLEANUP = "prefEpisodeCleanup";
     public static final String PREF_PARALLEL_DOWNLOADS = "prefParallelDownloads";
     public static final String PREF_EPISODE_CACHE_SIZE = "prefEpisodeCacheSize";
@@ -95,9 +100,13 @@ public class UserPreferences {
     // Other
     private static final String PREF_DATA_FOLDER = "prefDataFolder";
     public static final String PREF_IMAGE_CACHE_SIZE = "prefImageCacheSize";
+    public static final String PREF_DELETE_REMOVES_FROM_QUEUE = "prefDeleteRemovesFromQueue";
 
     // Mediaplayer
+    public static final String PREF_MEDIA_PLAYER = "prefMediaPlayer";
+    public static final String PREF_MEDIA_PLAYER_EXOPLAYER = "exoplayer";
     private static final String PREF_PLAYBACK_SPEED = "prefPlaybackSpeed";
+    public static final String PREF_PLAYBACK_SKIP_SILENCE = "prefSkipSilence";
     private static final String PREF_FAST_FORWARD_SECS = "prefFastForwardSecs";
     private static final String PREF_REWIND_SECS = "prefRewindSecs";
     private static final String PREF_QUEUE_LOCKED = "prefQueueLocked";
@@ -107,9 +116,7 @@ public class UserPreferences {
     private static final String PREF_RIGHT_VOLUME = "prefRightVolume";
 
     // Experimental
-    public static final String PREF_SONIC = "prefSonic";
     private static final String PREF_STEREO_TO_MONO = "PrefStereoToMono";
-    public static final String PREF_NORMALIZER = "prefNormalizer";
     public static final String PREF_CAST_ENABLED = "prefCast"; //Used for enabling Chromecast support
     public static final int EPISODE_CLEANUP_QUEUE = -1;
     public static final int EPISODE_CLEANUP_NULL = -2;
@@ -122,7 +129,6 @@ public class UserPreferences {
     private static final int EPISODE_CACHE_SIZE_UNLIMITED = -1;
     public static final int FEED_ORDER_COUNTER = 0;
     public static final int FEED_ORDER_ALPHABETICAL = 1;
-    public static final int FEED_ORDER_LAST_UPDATE = 2;
     public static final int FEED_ORDER_MOST_PLAYED = 3;
     public static final int FEED_COUNTER_SHOW_NEW_UNPLAYED_SUM = 0;
     public static final int FEED_COUNTER_SHOW_NEW = 1;
@@ -161,6 +167,8 @@ public class UserPreferences {
         int theme = getTheme();
         if (theme == R.style.Theme_AntennaPod_Dark) {
             return R.style.Theme_AntennaPod_Dark_NoTitle;
+        } else if (theme == R.style.Theme_AntennaPod_TrueBlack) {
+            return R.style.Theme_AntennaPod_TrueBlack_NoTitle;
         } else {
             return R.style.Theme_AntennaPod_Light_NoTitle;
         }
@@ -304,6 +312,10 @@ public class UserPreferences {
         return Integer.parseInt(prefs.getString(PREF_SMART_MARK_AS_PLAYED_SECS, "30"));
     }
 
+    public static boolean shouldDeleteRemoveFromQueue() {
+        return prefs.getBoolean(PREF_DELETE_REMOVES_FROM_QUEUE, false);
+    }
+
     public static boolean isAutoFlattr() {
         return prefs.getBoolean(PREF_AUTO_FLATTR, false);
     }
@@ -312,6 +324,10 @@ public class UserPreferences {
         return prefs.getString(PREF_PLAYBACK_SPEED, "1.00");
     }
 
+    public static boolean isSkipSilence() {
+        return prefs.getBoolean(PREF_PLAYBACK_SKIP_SILENCE, false);
+    }
+
     public static String[] getPlaybackSpeedArray() {
         return readPlaybackSpeedArray(prefs.getString(PREF_PLAYBACK_SPEED_ARRAY, null));
     }
@@ -364,8 +380,16 @@ public class UserPreferences {
         }
     }
 
+    public static String getMobileUpdatesEnabled() {
+        return prefs.getString(PREF_MOBILE_UPDATE, "images");
+    }
+
     public static boolean isAllowMobileUpdate() {
-        return prefs.getBoolean(PREF_MOBILE_UPDATE, false);
+        return getMobileUpdatesEnabled().equals("everything");
+    }
+
+    public static boolean isAllowMobileImages() {
+        return isAllowMobileUpdate() || getMobileUpdatesEnabled().equals("images");
     }
 
     public static int getParallelDownloads() {
@@ -498,6 +522,12 @@ public class UserPreferences {
              .apply();
     }
 
+    public static void setSkipSilence(boolean skipSilence) {
+        prefs.edit()
+                .putBoolean(PREF_PLAYBACK_SKIP_SILENCE, skipSilence)
+                .apply();
+    }
+
     public static void setPlaybackSpeedArray(String[] speeds) {
         JSONArray jsonArray = new JSONArray();
         for (String speed : speeds) {
@@ -597,6 +627,8 @@ public class UserPreferences {
                 return R.style.Theme_AntennaPod_Light;
             case 1:
                 return R.style.Theme_AntennaPod_Dark;
+            case 2:
+                return R.style.Theme_AntennaPod_TrueBlack;
             default:
                 return R.style.Theme_AntennaPod_Light;
         }
@@ -636,13 +668,15 @@ public class UserPreferences {
     }
 
     public static boolean useSonic() {
-        return prefs.getBoolean(PREF_SONIC, false);
+        return prefs.getString(PREF_MEDIA_PLAYER, "sonic").equals("sonic");
     }
 
-    public static void enableSonic(boolean enable) {
-        prefs.edit()
-            .putBoolean(PREF_SONIC, enable)
-            .apply();
+    public static boolean useExoplayer() {
+        return prefs.getString(PREF_MEDIA_PLAYER, "sonic").equals(PREF_MEDIA_PLAYER_EXOPLAYER);
+    }
+
+    public static void enableSonic() {
+        prefs.edit().putString(PREF_MEDIA_PLAYER, "sonic").apply();
     }
 
     public static boolean stereoToMono() {
@@ -665,7 +699,7 @@ public class UserPreferences {
     }
 
     public static EpisodeCleanupAlgorithm getEpisodeCleanupAlgorithm() {
-        int cleanupValue = Integer.parseInt(prefs.getString(PREF_EPISODE_CLEANUP, "-1"));
+        int cleanupValue = getEpisodeCleanupValue();
         if (cleanupValue == EPISODE_CLEANUP_QUEUE) {
             return new APQueueCleanupAlgorithm();
         } else if (cleanupValue == EPISODE_CLEANUP_NULL) {
@@ -675,6 +709,16 @@ public class UserPreferences {
         }
     }
 
+    public static int getEpisodeCleanupValue() {
+        return Integer.parseInt(prefs.getString(PREF_EPISODE_CLEANUP, "-1"));
+    }
+
+    public static void setEpisodeCleanupValue(int episodeCleanupValue) {
+        prefs.edit()
+                .putString(PREF_EPISODE_CLEANUP, Integer.toString(episodeCleanupValue))
+                .apply();
+    }
+
     /**
      * Return the folder where the app stores all of its data. This method will
      * return the standard data folder if none has been set by the user.
@@ -802,4 +846,29 @@ public class UserPreferences {
     public enum VideoBackgroundBehavior {
         STOP, PICTURE_IN_PICTURE, CONTINUE_PLAYING
     }
+
+    public enum BackButtonBehavior {
+        DEFAULT, OPEN_DRAWER, DOUBLE_TAP, SHOW_PROMPT, GO_TO_PAGE
+    }
+
+    public static BackButtonBehavior getBackButtonBehavior() {
+        switch (prefs.getString(PREF_BACK_BUTTON_BEHAVIOR, "default")) {
+            case "default": return BackButtonBehavior.DEFAULT;
+            case "drawer": return BackButtonBehavior.OPEN_DRAWER;
+            case "doubletap": return BackButtonBehavior.DOUBLE_TAP;
+            case "prompt": return BackButtonBehavior.SHOW_PROMPT;
+            case "page": return BackButtonBehavior.GO_TO_PAGE;
+            default: return BackButtonBehavior.DEFAULT;
+        }
+    }
+
+    public static String getBackButtonGoToPage() {
+        return prefs.getString(PREF_BACK_BUTTON_GO_TO_PAGE, "QueueFragment");
+    }
+
+    public static void setBackButtonGoToPage(String tag) {
+        prefs.edit()
+                .putString(PREF_BACK_BUTTON_GO_TO_PAGE, tag)
+                .apply();
+    }
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/receiver/PlayerWidget.java b/core/src/main/java/de/danoeh/antennapod/core/receiver/PlayerWidget.java
index edc2ea3e0..7663cdbe4 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/receiver/PlayerWidget.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/receiver/PlayerWidget.java
@@ -6,10 +6,11 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.util.Log;
-import de.danoeh.antennapod.core.service.PlayerWidgetJobService;
 
 import java.util.Arrays;
 
+import de.danoeh.antennapod.core.service.PlayerWidgetJobService;
+
 
 public class PlayerWidget extends AppWidgetProvider {
     private static final String TAG = "PlayerWidget";
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/FeedUpdateJobService.java b/core/src/main/java/de/danoeh/antennapod/core/service/FeedUpdateJobService.java
index 55a8d6b86..7d80d4e7c 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/FeedUpdateJobService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/FeedUpdateJobService.java
@@ -5,6 +5,7 @@ import android.app.job.JobService;
 import android.os.Build;
 import android.support.annotation.RequiresApi;
 import android.util.Log;
+
 import de.danoeh.antennapod.core.ClientConfig;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.util.FeedUpdateUtils;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java b/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
index de040603d..5584991ca 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
@@ -6,8 +6,8 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.support.annotation.NonNull;
-import android.support.v4.app.JobIntentService;
 import android.support.v4.app.NotificationCompat;
+import android.support.v4.app.SafeJobIntentService;
 import android.support.v4.util.ArrayMap;
 import android.util.Log;
 import android.util.Pair;
@@ -44,7 +44,8 @@ import de.danoeh.antennapod.core.util.gui.NotificationUtils;
  * Synchronizes local subscriptions with gpodder.net service. The service should be started with ACTION_SYNC as an action argument.
  * This class also provides static methods for starting the GpodnetSyncService.
  */
-public class GpodnetSyncService extends JobIntentService {
+public class GpodnetSyncService extends SafeJobIntentService {
+
     private static final String TAG = "GpodnetSyncService";
 
     private static final long WAIT_INTERVAL = 5000L;
@@ -61,8 +62,10 @@ public class GpodnetSyncService extends JobIntentService {
     private static boolean syncSubscriptions = false;
     private static boolean syncActions = false;
 
+    private static final int JOB_ID = -17000;
+
     private static void enqueueWork(Context context, Intent intent) {
-        enqueueWork(context, GpodnetSyncService.class, 0, intent);
+        enqueueWork(context, GpodnetSyncService.class, JOB_ID, intent);
     }
 
     @Override
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java b/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java
index 4948912ca..dbf80cf37 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java
@@ -10,7 +10,7 @@ import android.graphics.Bitmap;
 import android.os.Build;
 import android.os.IBinder;
 import android.support.annotation.NonNull;
-import android.support.v4.app.JobIntentService;
+import android.support.v4.app.SafeJobIntentService;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
@@ -21,23 +21,26 @@ import com.bumptech.glide.Glide;
 import de.danoeh.antennapod.core.R;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import de.danoeh.antennapod.core.receiver.MediaButtonReceiver;
+import de.danoeh.antennapod.core.receiver.PlayerWidget;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.core.service.playback.PlayerStatus;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.playback.Playable;
-import de.danoeh.antennapod.core.receiver.PlayerWidget;
 
 /**
  * Updates the state of the player widget
  */
-public class PlayerWidgetJobService extends JobIntentService {
+public class PlayerWidgetJobService extends SafeJobIntentService {
+
     private static final String TAG = "PlayerWidgetJobService";
 
     private PlaybackService playbackService;
     private final Object waitForService = new Object();
 
+    private static final int JOB_ID = -17001;
+
     public static void updateWidget(Context context) {
-        enqueueWork(context, PlayerWidgetJobService.class, 0, new Intent(context, PlayerWidgetJobService.class));
+        enqueueWork(context, PlayerWidgetJobService.class, JOB_ID, new Intent(context, PlayerWidgetJobService.class));
     }
 
     @Override
@@ -46,8 +49,8 @@ public class PlayerWidgetJobService extends JobIntentService {
             return;
         }
 
-        if (PlaybackService.isRunning && playbackService == null) {
-            synchronized (waitForService) {
+        synchronized (waitForService) {
+            if (PlaybackService.isRunning && playbackService == null) {
                 bindService(new Intent(this, PlaybackService.class), mConnection, 0);
                 while (playbackService == null) {
                     try {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
index 57d099dfc..97007a214 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
@@ -40,6 +40,9 @@ import okhttp3.internal.http.StatusLine;
  * Provides access to a HttpClient singleton.
  */
 public class AntennapodHttpClient {
+
+    private AntennapodHttpClient(){}
+
     private static final String TAG = "AntennapodHttpClient";
 
     private static final int CONNECTION_TIMEOUT = 30000;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java
index 9a64bebf7..48234c387 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java
@@ -124,7 +124,7 @@ public class DownloadRequest implements Parcelable {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (o == null || !(o instanceof DownloadRequest)) return false;
 
         DownloadRequest that = (DownloadRequest) o;
 
@@ -211,10 +211,6 @@ public class DownloadRequest implements Parcelable {
         this.size = size;
     }
 
-    public int getStatusMsg() {
-        return statusMsg;
-    }
-
     public void setStatusMsg(int statusMsg) {
         this.statusMsg = statusMsg;
     }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
index 9c2266622..ae1e9de86 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
@@ -13,14 +13,12 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
 import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
 import android.support.v4.app.NotificationCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
 import android.webkit.URLUtil;
 
-import de.danoeh.antennapod.core.util.gui.NotificationUtils;
 import org.apache.commons.io.FileUtils;
 import org.xml.sax.SAXException;
 
@@ -30,10 +28,8 @@ import java.net.HttpURLConnection;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletionService;
@@ -55,7 +51,6 @@ import de.danoeh.antennapod.core.R;
 import de.danoeh.antennapod.core.event.DownloadEvent;
 import de.danoeh.antennapod.core.event.FeedItemEvent;
 import de.danoeh.antennapod.core.feed.Feed;
-import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.feed.FeedPreferences;
@@ -75,6 +70,7 @@ import de.danoeh.antennapod.core.syndication.handler.UnsupportedFeedtypeExceptio
 import de.danoeh.antennapod.core.util.ChapterUtils;
 import de.danoeh.antennapod.core.util.DownloadError;
 import de.danoeh.antennapod.core.util.InvalidFeedException;
+import de.danoeh.antennapod.core.util.gui.NotificationUtils;
 import de.greenrobot.event.EventBus;
 
 /**
@@ -117,11 +113,6 @@ public class DownloadService extends Service {
     private CompletionService<Downloader> downloadExecutor;
     private FeedSyncThread feedSyncThread;
 
-    /**
-     * Number of threads of downloadExecutor.
-     */
-    private static final int NUM_PARALLEL_DOWNLOADS = 6;
-
     private DownloadRequester requester;
 
 
@@ -489,9 +480,7 @@ public class DownloadService extends Service {
             if (status.isSuccessful()) {
                 successfulDownloads++;
             } else if (!status.isCancelled()) {
-                if (status.getFeedfileType() != FeedImage.FEEDFILETYPE_FEEDIMAGE) {
-                    createReport = true;
-                }
+                createReport = true;
                 failedDownloads++;
             }
         }
@@ -688,10 +677,6 @@ public class DownloadService extends Service {
 
                 Log.d(TAG, "Bundling " + results.size() + " feeds");
 
-                for (Pair<DownloadRequest, FeedHandlerResult> result : results) {
-                    removeDuplicateImages(result.second.feed); // duplicate images have to removed because the DownloadRequester does not accept two downloads with the same download URL yet.
-                }
-
                 // Save information of feed in DB
                 if (dbUpdateFuture != null) {
                     try {
@@ -866,22 +851,6 @@ public class DownloadService extends Service {
             return true;
         }
 
-        /**
-         * Delete files that aren't needed anymore
-         */
-        private void cleanup(Feed feed) {
-            if (feed.getFile_url() != null) {
-                if (new File(feed.getFile_url()).delete()) {
-                    Log.d(TAG, "Successfully deleted cache file.");
-                } else {
-                    Log.e(TAG, "Failed to delete cache file.");
-                }
-                feed.setFile_url(null);
-            } else {
-                Log.d(TAG, "Didn't delete cache file: File url is not set.");
-            }
-        }
-
         public void shutdown() {
             isActive = false;
             if (isCollectingRequests) {
@@ -1101,26 +1070,6 @@ public class DownloadService extends Service {
         }
     }
 
-    /**
-     * Checks if the FeedItems of this feed have images that point to the same URL. If two FeedItems
-     * have an image that points to the same URL, the reference of the second item is removed, so
-     * that every image reference is unique.
-     */
-    @VisibleForTesting
-    static void removeDuplicateImages(Feed feed) {
-        Set<String> known = new HashSet<>();
-        for (FeedItem item : feed.getItems()) {
-            String url = item.hasItemImage() ? item.getImage().getDownload_url() : null;
-            if (url != null) {
-                if (known.contains(url)) {
-                    item.setImage(null);
-                } else {
-                    known.add(url);
-                }
-            }
-        }
-    }
-
     private static String compileNotificationString(List<Downloader> downloads) {
         List<String> lines = new ArrayList<>(downloads.size());
         for (Downloader downloader : downloads) {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/Downloader.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/Downloader.java
index 445210d3a..38b93eab8 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/Downloader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/Downloader.java
@@ -2,6 +2,7 @@ package de.danoeh.antennapod.core.service.download;
 
 import android.content.Context;
 import android.net.wifi.WifiManager;
+import android.support.annotation.NonNull;
 
 import java.util.concurrent.Callable;
 
@@ -18,10 +19,12 @@ public abstract class Downloader implements Callable<Downloader> {
 
     volatile boolean cancelled;
 
+    @NonNull
     final DownloadRequest request;
+    @NonNull
     final DownloadStatus result;
 
-    Downloader(DownloadRequest request) {
+    Downloader(@NonNull DownloadRequest request) {
         super();
         this.request = request;
         this.request.setStatusMsg(R.string.download_pending);
@@ -54,10 +57,12 @@ public abstract class Downloader implements Callable<Downloader> {
         return this;
     }
 
+    @NonNull
     public DownloadRequest getDownloadRequest() {
         return request;
     }
 
+    @NonNull
     public DownloadStatus getResult() {
         return result;
     }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloaderCallback.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloaderCallback.java
deleted file mode 100644
index b0829f084..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloaderCallback.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package de.danoeh.antennapod.core.service.download;
-
-/**
- * Callback used by the Downloader-classes to notify the requester that the
- * download has completed.
- */
-public interface DownloaderCallback {
-
-	void onDownloadCompleted(Downloader downloader);
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
index 7ab0931d6..c27cefc10 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
@@ -1,5 +1,6 @@
 package de.danoeh.antennapod.core.service.download;
 
+import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -20,7 +21,6 @@ import java.util.Date;
 
 import de.danoeh.antennapod.core.ClientConfig;
 import de.danoeh.antennapod.core.R;
-import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.util.DateUtils;
 import de.danoeh.antennapod.core.util.DownloadError;
@@ -39,7 +39,7 @@ public class HttpDownloader extends Downloader {
 
     private static final int BUFFER_SIZE = 8 * 1024;
 
-    public HttpDownloader(DownloadRequest request) {
+    public HttpDownloader(@NonNull DownloadRequest request) {
         super(request);
     }
 
@@ -50,13 +50,8 @@ public class HttpDownloader extends Downloader {
 
         if (request.isDeleteOnFailure() && fileExists) {
             Log.w(TAG, "File already exists");
-            if (request.getFeedfileType() != FeedImage.FEEDFILETYPE_FEEDIMAGE) {
-                onFail(DownloadError.ERROR_FILE_EXISTS, null);
-                return;
-            } else {
-                onSuccess();
-                return;
-            }
+            onSuccess();
+            return;
         }
 
         OkHttpClient.Builder httpClientBuilder = AntennapodHttpClient.newBuilder();
@@ -310,7 +305,7 @@ public class HttpDownloader extends Downloader {
             String encoded = ByteString.of(bytes).base64();
             return "Basic " + encoded;
         } catch (UnsupportedEncodingException e) {
-            throw new AssertionError();
+            throw new AssertionError(e);
         }
     }
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java
new file mode 100644
index 000000000..281bd064b
--- /dev/null
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java
@@ -0,0 +1,249 @@
+package de.danoeh.antennapod.core.service.playback;
+
+import android.content.Context;
+import android.net.Uri;
+import android.view.SurfaceHolder;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.DefaultLoadControl;
+import com.google.android.exoplayer2.DefaultRenderersFactory;
+import com.google.android.exoplayer2.ExoPlaybackException;
+import com.google.android.exoplayer2.ExoPlayerFactory;
+import com.google.android.exoplayer2.PlaybackParameters;
+import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.SeekParameters;
+import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.audio.AudioAttributes;
+import com.google.android.exoplayer2.source.ExtractorMediaSource;
+import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
+import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
+import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
+import com.google.android.exoplayer2.util.Util;
+
+import org.antennapod.audio.MediaPlayer;
+import de.danoeh.antennapod.core.util.playback.IPlayer;
+
+
+public class ExoPlayerWrapper implements IPlayer {
+    private final Context mContext;
+    private SimpleExoPlayer mExoPlayer;
+    private MediaSource mediaSource;
+    private MediaPlayer.OnSeekCompleteListener audioSeekCompleteListener;
+    private MediaPlayer.OnCompletionListener audioCompletionListener;
+    private MediaPlayer.OnErrorListener audioErrorListener;
+
+    ExoPlayerWrapper(Context context) {
+        mContext = context;
+        mExoPlayer = createPlayer();
+    }
+
+    private SimpleExoPlayer createPlayer() {
+        SimpleExoPlayer p = ExoPlayerFactory.newSimpleInstance(mContext, new DefaultRenderersFactory(mContext),
+                new DefaultTrackSelector(), new DefaultLoadControl());
+        p.setSeekParameters(SeekParameters.PREVIOUS_SYNC);
+        p.addListener(new Player.EventListener() {
+            @Override
+            public void onTimelineChanged(Timeline timeline, Object manifest, int reason) {
+
+            }
+
+            @Override
+            public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
+
+            }
+
+            @Override
+            public void onLoadingChanged(boolean isLoading) {
+
+            }
+
+            @Override
+            public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
+                if (playbackState == Player.STATE_ENDED) {
+                    audioCompletionListener.onCompletion(null);
+                }
+            }
+
+            @Override
+            public void onRepeatModeChanged(int repeatMode) {
+
+            }
+
+            @Override
+            public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
+
+            }
+
+            @Override
+            public void onPlayerError(ExoPlaybackException error) {
+                if (audioErrorListener != null) {
+                    audioErrorListener.onError(null, 0, 0);
+                }
+            }
+
+            @Override
+            public void onPositionDiscontinuity(int reason) {
+
+            }
+
+            @Override
+            public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
+
+            }
+
+            @Override
+            public void onSeekProcessed() {
+                audioSeekCompleteListener.onSeekComplete(null);
+            }
+        });
+        return p;
+    }
+
+    @Override
+    public boolean canSetSpeed() {
+        return true;
+    }
+
+    @Override
+    public boolean canDownmix() {
+        return false;
+    }
+
+    @Override
+    public int getCurrentPosition() {
+        return (int) mExoPlayer.getCurrentPosition();
+    }
+
+    @Override
+    public float getCurrentSpeedMultiplier() {
+        return mExoPlayer.getPlaybackParameters().speed;
+    }
+
+    @Override
+    public int getDuration() {
+        if (mExoPlayer.getDuration() == C.TIME_UNSET) {
+            return PlaybackServiceMediaPlayer.INVALID_TIME;
+        }
+        return (int) mExoPlayer.getDuration();
+    }
+
+    @Override
+    public boolean isPlaying() {
+        return mExoPlayer.getPlayWhenReady();
+    }
+
+    @Override
+    public void pause() {
+        mExoPlayer.setPlayWhenReady(false);
+    }
+
+    @Override
+    public void prepare() throws IllegalStateException {
+        mExoPlayer.prepare(mediaSource);
+    }
+
+    @Override
+    public void release() {
+        if (mExoPlayer != null) {
+            mExoPlayer.release();
+        }
+        audioSeekCompleteListener = null;
+        audioCompletionListener = null;
+        audioErrorListener = null;
+    }
+
+    @Override
+    public void reset() {
+        mExoPlayer.release();
+        mExoPlayer = createPlayer();
+    }
+
+    @Override
+    public void seekTo(int i) throws IllegalStateException {
+        mExoPlayer.seekTo(i);
+    }
+
+    @Override
+    public void setAudioStreamType(int i) {
+        AudioAttributes a = mExoPlayer.getAudioAttributes();
+        AudioAttributes.Builder b = new AudioAttributes.Builder();
+        b.setContentType(i);
+        b.setFlags(a.flags);
+        b.setUsage(a.usage);
+        mExoPlayer.setAudioAttributes(b.build());
+    }
+
+    @Override
+    public void setDataSource(String s) throws IllegalArgumentException, IllegalStateException {
+        DataSource.Factory dataSourceFactory =
+                new DefaultDataSourceFactory(mContext, Util.getUserAgent(mContext, mContext.getPackageName()), null);
+        ExtractorMediaSource.Factory f = new ExtractorMediaSource.Factory(dataSourceFactory);
+        mediaSource = f.createMediaSource(Uri.parse(s));
+    }
+
+    @Override
+    public void setDisplay(SurfaceHolder sh) {
+        mExoPlayer.setVideoSurfaceHolder(sh);
+    }
+
+    @Override
+    public void setPlaybackParams(float speed, boolean skipSilence) {
+        PlaybackParameters params = mExoPlayer.getPlaybackParameters();
+        mExoPlayer.setPlaybackParameters(new PlaybackParameters(speed, params.pitch, skipSilence));
+    }
+
+    @Override
+    public void setDownmix(boolean b) {
+
+    }
+
+    @Override
+    public void setVolume(float v, float v1) {
+        mExoPlayer.setVolume(v);
+    }
+
+    @Override
+    public void setWakeMode(Context context, int i) {
+
+    }
+
+    @Override
+    public void start() {
+        mExoPlayer.setPlayWhenReady(true);
+    }
+
+    @Override
+    public void stop() {
+        mExoPlayer.stop();
+    }
+
+    void setOnCompletionListener(MediaPlayer.OnCompletionListener audioCompletionListener) {
+        this.audioCompletionListener = audioCompletionListener;
+    }
+
+    void setOnSeekCompleteListener(MediaPlayer.OnSeekCompleteListener audioSeekCompleteListener) {
+        this.audioSeekCompleteListener = audioSeekCompleteListener;
+    }
+
+    void setOnErrorListener(MediaPlayer.OnErrorListener audioErrorListener) {
+        this.audioErrorListener = audioErrorListener;
+    }
+
+    int getVideoWidth() {
+        if (mExoPlayer.getVideoFormat() == null) {
+            return 0;
+        }
+        return mExoPlayer.getVideoFormat().width;
+    }
+
+    int getVideoHeight() {
+        if (mExoPlayer.getVideoFormat() == null) {
+            return 0;
+        }
+        return mExoPlayer.getVideoFormat().height;
+    }
+}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java
index 0e64f484f..9274b9a49 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java
@@ -1,7 +1,10 @@
 package de.danoeh.antennapod.core.service.playback;
 
 import android.content.Context;
+import android.media.AudioAttributes;
+import android.media.AudioFocusRequest;
 import android.media.AudioManager;
+import android.os.Build;
 import android.os.PowerManager;
 import android.support.annotation.NonNull;
 import android.telephony.TelephonyManager;
@@ -202,9 +205,26 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer {
 
     private void resumeSync() {
         if (playerStatus == PlayerStatus.PAUSED || playerStatus == PlayerStatus.PREPARED) {
-            int focusGained = audioManager.requestAudioFocus(
-                    audioFocusChangeListener, AudioManager.STREAM_MUSIC,
-                    AudioManager.AUDIOFOCUS_GAIN);
+            int focusGained;
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                AudioAttributes audioAttributes = new AudioAttributes.Builder()
+                        .setUsage(AudioAttributes.USAGE_MEDIA)
+                        .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+                        .build();
+                AudioFocusRequest audioFocusRequest = new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
+                        .setAudioAttributes(audioAttributes)
+                        .setOnAudioFocusChangeListener(audioFocusChangeListener)
+                        .setAcceptsDelayedFocusGain(true)
+                        .setWillPauseWhenDucked(true)
+                        .build();
+                focusGained = audioManager.requestAudioFocus(audioFocusRequest);
+            } else {
+                focusGained = audioManager.requestAudioFocus(
+                        audioFocusChangeListener, AudioManager.STREAM_MUSIC,
+                        AudioManager.AUDIOFOCUS_GAIN);
+            }
+
             if (focusGained == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
                 Log.d(TAG, "Audiofocus successfully requested");
                 Log.d(TAG, "Resuming/Starting playback");
@@ -216,7 +236,7 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer {
                     Log.e(TAG, Log.getStackTraceString(e));
                     UserPreferences.setPlaybackSpeed(String.valueOf(speed));
                 }
-                setSpeed(speed);
+                setPlaybackParams(speed, UserPreferences.isSkipSilence());
                 setVolume(UserPreferences.getLeftVolume(), UserPreferences.getRightVolume());
 
                 if (playerStatus == PlayerStatus.PREPARED && media.getPosition() > 0) {
@@ -259,7 +279,13 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer {
                 setPlayerStatus(PlayerStatus.PAUSED, media, getPosition());
 
                 if (abandonFocus) {
-                    audioManager.abandonAudioFocus(audioFocusChangeListener);
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        AudioFocusRequest.Builder builder = new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
+                                .setOnAudioFocusChangeListener(audioFocusChangeListener);
+                        audioManager.abandonAudioFocusRequest(builder.build());
+                    } else {
+                        audioManager.abandonAudioFocus(audioFocusChangeListener);
+                    }
                     pausedBecauseOfTransientAudiofocusLoss = false;
                 }
                 if (stream && reinit) {
@@ -313,7 +339,10 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer {
 
         Log.d(TAG, "Resource prepared");
 
-        if (mediaType == MediaType.VIDEO) {
+        if (mediaType == MediaType.VIDEO && mediaPlayer instanceof ExoPlayerWrapper) {
+            ExoPlayerWrapper vp = (ExoPlayerWrapper) mediaPlayer;
+            videoSize = new Pair<>(vp.getVideoWidth(), vp.getVideoHeight());
+        } else if(mediaType == MediaType.VIDEO && mediaPlayer instanceof VideoPlayer) {
             VideoPlayer vp = (VideoPlayer) mediaPlayer;
             videoSize = new Pair<>(vp.getVideoWidth(), vp.getVideoHeight());
         }
@@ -447,7 +476,8 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer {
                 || playerStatus == PlayerStatus.PAUSED
                 || playerStatus == PlayerStatus.PREPARED) {
             retVal = mediaPlayer.getDuration();
-        } else if (media != null && media.getDuration() > 0) {
+        }
+        if (retVal <= 0 && media != null && media.getDuration() > 0) {
             retVal = media.getDuration();
         }
 
@@ -507,14 +537,14 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer {
      * Sets the playback speed.
      * This method is executed on the caller's thread.
      */
-    private void setSpeedSync(float speed) {
+    private void setSpeedSyncAndSkipSilence(float speed, boolean skipSilence) {
         playerLock.lock();
         if (media != null && media.getMediaType() == MediaType.AUDIO) {
             if (mediaPlayer.canSetSpeed()) {
-                mediaPlayer.setPlaybackSpeed(speed);
                 Log.d(TAG, "Playback speed was set to " + speed);
                 callback.playbackSpeedChanged(speed);
             }
+            mediaPlayer.setPlaybackParams(speed, skipSilence);
         }
         playerLock.unlock();
     }
@@ -524,8 +554,8 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer {
      * This method is executed on an internal executor service.
      */
     @Override
-    public void setSpeed(final float speed) {
-        executor.submit(() -> setSpeedSync(speed));
+    public void setPlaybackParams(final float speed, final boolean skipSilence) {
+        executor.submit(() -> setSpeedSyncAndSkipSilence(speed, skipSilence));
     }
 
     /**
@@ -610,13 +640,29 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer {
         executor.shutdown();
         if (mediaPlayer != null) {
             try {
-                mediaPlayer.stop();
+                removeMediaPlayerErrorListener();
+                if (mediaPlayer.isPlaying()) {
+                    mediaPlayer.stop();
+                }
             } catch (Exception ignore) { }
             mediaPlayer.release();
         }
         releaseWifiLockIfNecessary();
     }
 
+    private void removeMediaPlayerErrorListener() {
+        if (mediaPlayer instanceof VideoPlayer) {
+            VideoPlayer vp = (VideoPlayer) mediaPlayer;
+            vp.setOnErrorListener((mp, what, extra) -> true);
+        } else if (mediaPlayer instanceof AudioPlayer) {
+            AudioPlayer ap = (AudioPlayer) mediaPlayer;
+            ap.setOnErrorListener((mediaPlayer, i, i1) -> true);
+        } else if (mediaPlayer instanceof ExoPlayerWrapper) {
+            ExoPlayerWrapper ap = (ExoPlayerWrapper) mediaPlayer;
+            ap.setOnErrorListener((mediaPlayer, i, i1) -> true);
+        }
+    }
+
     /**
      * Releases internally used resources. This method should only be called when the object is not used anymore.
      * This method is executed on an internal executor service.
@@ -669,6 +715,10 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer {
         Pair<Integer, Integer> res;
         if (mediaPlayer == null || playerStatus == PlayerStatus.ERROR || mediaType != MediaType.VIDEO) {
             res = null;
+        } else if (mediaPlayer instanceof ExoPlayerWrapper) {
+            ExoPlayerWrapper vp = (ExoPlayerWrapper) mediaPlayer;
+            videoSize = new Pair<>(vp.getVideoWidth(), vp.getVideoHeight());
+            res = videoSize;
         } else {
             VideoPlayer vp = (VideoPlayer) mediaPlayer;
             videoSize = new Pair<>(vp.getVideoWidth(), vp.getVideoHeight());
@@ -698,15 +748,19 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer {
         if (mediaPlayer != null) {
             mediaPlayer.release();
         }
-        if(media == null) {
+        if (media == null) {
             mediaPlayer = null;
             return;
         }
-        if (media.getMediaType() == MediaType.VIDEO) {
+
+        if (UserPreferences.useExoplayer()) {
+            mediaPlayer = new ExoPlayerWrapper(context);
+        } else if (media.getMediaType() == MediaType.VIDEO) {
             mediaPlayer = new VideoPlayer();
         } else {
             mediaPlayer = new AudioPlayer(context);
         }
+
         mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
         mediaPlayer.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK);
         setMediaPlayerListeners(mediaPlayer);
@@ -787,7 +841,14 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer {
             if (mediaPlayer != null) {
                 mediaPlayer.reset();
             }
-            audioManager.abandonAudioFocus(audioFocusChangeListener);
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                AudioFocusRequest.Builder builder = new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
+                        .setOnAudioFocusChangeListener(audioFocusChangeListener);
+                audioManager.abandonAudioFocusRequest(builder.build());
+            } else {
+                audioManager.abandonAudioFocus(audioFocusChangeListener);
+            }
 
             final Playable currentMedia = media;
             Playable nextMedia = null;
@@ -883,6 +944,11 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer {
             ap.setOnBufferingUpdateListener(audioBufferingUpdateListener);
             ap.setOnInfoListener(audioInfoListener);
             ap.setOnSpeedAdjustmentAvailableChangedListener(audioSetSpeedAbilityListener);
+        } else if (mp instanceof ExoPlayerWrapper) {
+            ExoPlayerWrapper ap = (ExoPlayerWrapper) mp;
+            ap.setOnCompletionListener(audioCompletionListener);
+            ap.setOnSeekCompleteListener(audioSeekCompleteListener);
+            ap.setOnErrorListener(audioErrorListener);
         } else {
             Log.w(TAG, "Unknown media player: " + mp);
         }
@@ -925,7 +991,7 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer {
 
     private final MediaPlayer.OnErrorListener audioErrorListener =
             (mp, what, extra) -> {
-                if(mp.canFallback()) {
+                if(mp != null && mp.canFallback()) {
                     mp.fallback();
                     return true;
                 } else {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
index be6cb346d..7fe93a162 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
@@ -24,13 +24,14 @@ import android.os.Vibrator;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
+import android.support.v4.app.NotificationCompat;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.media.MediaBrowserCompat;
 import android.support.v4.media.MediaBrowserServiceCompat;
 import android.support.v4.media.MediaDescriptionCompat;
 import android.support.v4.media.MediaMetadataCompat;
 import android.support.v4.media.session.MediaSessionCompat;
 import android.support.v4.media.session.PlaybackStateCompat;
-import android.support.v4.app.NotificationCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
@@ -39,6 +40,7 @@ import android.view.SurfaceHolder;
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
 
 import java.util.ArrayList;
@@ -65,14 +67,20 @@ import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.storage.FeedSearcher;
 import de.danoeh.antennapod.core.util.IntList;
-import de.danoeh.antennapod.core.util.gui.NotificationUtils;
+import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.QueueAccess;
+import de.danoeh.antennapod.core.util.gui.NotificationUtils;
 import de.danoeh.antennapod.core.util.playback.ExternalMedia;
 import de.danoeh.antennapod.core.util.playback.Playable;
 import de.greenrobot.event.EventBus;
 
 /**
  * Controls the MediaPlayer that plays a FeedMedia-file
+ *
+ * Callers should connect to the service with either:
+ * - .bindService()
+ * - ContextCompat.startForegroundService(), optionally with arguments, such as media to be played, in intent extras
+ *
  */
 public class PlaybackService extends MediaBrowserServiceCompat {
     /**
@@ -191,10 +199,6 @@ public class PlaybackService extends MediaBrowserServiceCompat {
      */
     public static boolean isRunning = false;
     /**
-     * Is true if service has received a valid start command.
-     */
-    public static boolean started = false;
-    /**
      * Is true if the service was running, but paused due to headphone disconnect
      */
     private static boolean transientPause = false;
@@ -310,15 +314,9 @@ public class PlaybackService extends MediaBrowserServiceCompat {
         }
 
         flavorHelper.initializeMediaPlayer(PlaybackService.this);
-
         mediaSession.setActive(true);
 
-        NotificationCompat.Builder notificationBuilder = createBasicNotification();
-        startForeground(NOTIFICATION_ID, notificationBuilder.build());
         EventBus.getDefault().post(new ServiceEvent(ServiceEvent.Action.SERVICE_STARTED));
-
-
-        setupNotification(Playable.PlayableUtils.createInstanceFromPreferences(getApplicationContext()));
     }
 
     private NotificationCompat.Builder createBasicNotification() {
@@ -343,8 +341,8 @@ public class PlaybackService extends MediaBrowserServiceCompat {
     public void onDestroy() {
         super.onDestroy();
         Log.d(TAG, "Service is about to be destroyed");
+        stopForeground(true);
         isRunning = false;
-        started = false;
         currentMediaType = MediaType.UNKNOWN;
 
         PreferenceManager.getDefaultSharedPreferences(this)
@@ -365,7 +363,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
         mediaPlayer.shutdown();
         taskManager.shutdown();
     }
-
+    
     @Override
     public BrowserRoot onGetRoot(@NonNull String clientPackageName, int clientUid, Bundle rootHints) {
         Log.d(TAG, "OnGetRoot: clientPackageName=" + clientPackageName +
@@ -459,33 +457,32 @@ public class PlaybackService extends MediaBrowserServiceCompat {
         final boolean castDisconnect = intent.getBooleanExtra(EXTRA_CAST_DISCONNECT, false);
         Playable playable = intent.getParcelableExtra(EXTRA_PLAYABLE);
         if (keycode == -1 && playable == null && !castDisconnect) {
-            Log.e(TAG, "PlaybackService was started with no arguments");
-            stopSelf();
+            // Typical cases when the service was started with no argument
+            // - when it is first bound, and then moved to startedState, as in <code>serviceManager.moveServiceToStartedState()</code>
+            // - callers (e.g., Controller) explicitly
+            Log.d(TAG, "PlaybackService was started with no arguments.");
             return Service.START_NOT_STICKY;
         }
 
-        if ((flags & Service.START_FLAG_REDELIVERY) != 0) {
-            Log.d(TAG, "onStartCommand is a redelivered intent, calling stopForeground now.");
-            stopForeground(true);
-        } else {
-
-            if (keycode != -1) {
-                Log.d(TAG, "Received media button event");
-                handleKeycode(keycode, true);
-            } else if (!flavorHelper.castDisconnect(castDisconnect) && playable != null) {
-                started = true;
-                boolean stream = intent.getBooleanExtra(EXTRA_SHOULD_STREAM,
-                        true);
-                boolean startWhenPrepared = intent.getBooleanExtra(EXTRA_START_WHEN_PREPARED, false);
-                boolean prepareImmediately = intent.getBooleanExtra(EXTRA_PREPARE_IMMEDIATELY, false);
-                sendNotificationBroadcast(NOTIFICATION_TYPE_RELOAD, 0);
-                //If the user asks to play External Media, the casting session, if on, should end.
-                flavorHelper.castDisconnect(playable instanceof ExternalMedia);
-                if (playable instanceof FeedMedia) {
-                    playable = DBReader.getFeedMedia(((FeedMedia) playable).getId());
-                }
-                mediaPlayer.playMediaObject(playable, stream, startWhenPrepared, prepareImmediately);
+        if (keycode != -1) {
+            Log.d(TAG, "Received media button event");
+            boolean handled = handleKeycode(keycode, true);
+            if (!handled) {
+                // Just silently ignores unsupported keycode. Whether the service will
+                // continue to run is solely dependent on whether it is playing some media.
+                return Service.START_NOT_STICKY;
+            }
+        } else if (!flavorHelper.castDisconnect(castDisconnect) && playable != null) {
+            boolean stream = intent.getBooleanExtra(EXTRA_SHOULD_STREAM, true);
+            boolean startWhenPrepared = intent.getBooleanExtra(EXTRA_START_WHEN_PREPARED, false);
+            boolean prepareImmediately = intent.getBooleanExtra(EXTRA_PREPARE_IMMEDIATELY, false);
+            sendNotificationBroadcast(NOTIFICATION_TYPE_RELOAD, 0);
+            //If the user asks to play External Media, the casting session, if on, should end.
+            flavorHelper.castDisconnect(playable instanceof ExternalMedia);
+            if (playable instanceof FeedMedia) {
+                playable = DBReader.getFeedMedia(((FeedMedia) playable).getId());
             }
+            mediaPlayer.playMediaObject(playable, stream, startWhenPrepared, prepareImmediately);
         }
 
         return Service.START_NOT_STICKY;
@@ -559,12 +556,23 @@ public class PlaybackService extends MediaBrowserServiceCompat {
                 mediaPlayer.seekDelta(-UserPreferences.getRewindSecs() * 1000);
                 return true;
             case KeyEvent.KEYCODE_MEDIA_STOP:
+                // The logic gives UI illusion of stop by removing notification
+                // In the UI within AntennaPod, including widgets, it is seen as PAUSE, e.g.,
+                // users can still user on-screen widget to resume playing.
                 if (status == PlayerStatus.PLAYING) {
+                    // Implementation note: Use of a state in serviceManager to tell it to
+                    // show stop state UI (i.e., stopForeground(true)) is a bit awkward.
+                    //
+                    // More intuitive API would be for mediaPlayer.pause() returns a Future that
+                    // returns after pause, including the related async notification work completes.
+                    // However, it has its own complication, that mediaPlayer.pause() does not
+                    // really know when all the related work completes, as they are buried into
+                    // (asynchronous) callbacks.
+                    serviceManager.treatNextPauseAsStopOnUI();
                     mediaPlayer.pause(true, true);
-                    started = false;
+                } else {
+                    serviceManager.showUIForStopState();
                 }
-
-                stopForeground(true); // gets rid of persistent notification
                 return true;
             default:
                 Log.d(TAG, "Unhandled key code: " + keycode);
@@ -580,7 +588,6 @@ public class PlaybackService extends MediaBrowserServiceCompat {
         Playable playable = Playable.PlayableUtils.createInstanceFromPreferences(getApplicationContext());
         if (playable != null) {
             mediaPlayer.playMediaObject(playable, false, true, true);
-            started = true;
             PlaybackService.this.updateMediaSessionMetadata(playable);
         }
     }
@@ -594,19 +601,10 @@ public class PlaybackService extends MediaBrowserServiceCompat {
         mediaPlayer.setVideoSurface(sh);
     }
 
-    /**
-     * Called when the surface holder of the mediaplayer has to be changed.
-     */
-    private void resetVideoSurface() {
-        taskManager.cancelPositionSaver();
-        mediaPlayer.resetVideoSurface();
-    }
-
     public void notifyVideoSurfaceAbandoned() {
+        Log.v(TAG, "notifyVideoSurfaceAbandoned()");
         mediaPlayer.pause(true, false);
         mediaPlayer.resetVideoSurface();
-        setupNotification(getPlayable());
-        stopForeground(!UserPreferences.isPersistNotify());
     }
 
     private final PlaybackServiceTaskManager.PSTMCallback taskManagerCallback = new PlaybackServiceTaskManager.PSTMCallback() {
@@ -652,7 +650,12 @@ public class PlaybackService extends MediaBrowserServiceCompat {
     private final PlaybackServiceMediaPlayer.PSMPCallback mediaPlayerCallback = new PlaybackServiceMediaPlayer.PSMPCallback() {
         @Override
         public void statusChanged(PlaybackServiceMediaPlayer.PSMPInfo newInfo) {
-            currentMediaType = mediaPlayer.getCurrentMediaType();
+            if (mediaPlayer != null) {
+                currentMediaType = mediaPlayer.getCurrentMediaType();
+            } else {
+                currentMediaType = MediaType.UNKNOWN;
+            }
+
             updateMediaSession(newInfo.playerStatus);
             switch (newInfo.playerStatus) {
                 case INITIALIZED:
@@ -664,27 +667,15 @@ public class PlaybackService extends MediaBrowserServiceCompat {
                     break;
 
                 case PAUSED:
-                    if ((UserPreferences.isPersistNotify() || isCasting) &&
-                            android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-                        // do not remove notification on pause based on user pref and whether android version supports expanded notifications
-                        // Change [Play] button to [Pause]
-                        setupNotification(newInfo);
-                    } else if (!UserPreferences.isPersistNotify() && !isCasting) {
-                        // remove notification on pause
-                        stopForeground(true);
-                    }
                     writePlayerStatusPlaybackPreferences();
                     break;
 
                 case STOPPED:
-                    //setCurrentlyPlayingMedia(PlaybackPreferences.NO_MEDIA_PLAYING);
-                    //stopSelf();
+                    //writePlaybackPreferencesNoMediaPlaying();
                     break;
 
                 case PLAYING:
                     writePlayerStatusPlaybackPreferences();
-                    setupNotification(newInfo);
-                    started = true;
                     // set sleep timer if auto-enabled
                     if (newInfo.oldPlayerStatus != null && newInfo.oldPlayerStatus != PlayerStatus.SEEKING &&
                             SleepTimerPreferences.autoEnable() && !sleepTimerActive()) {
@@ -699,9 +690,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
 
             }
 
-            Intent statusUpdate = new Intent(ACTION_PLAYER_STATUS_CHANGED);
-            // statusUpdate.putExtra(EXTRA_NEW_PLAYER_STATUS, newInfo.playerStatus.ordinal());
-            sendBroadcast(statusUpdate);
+            IntentUtils.sendLocalBroadcast(getApplicationContext(), ACTION_PLAYER_STATUS_CHANGED);
             PlayerWidgetJobService.updateWidget(getBaseContext());
             bluetoothNotifyChange(newInfo, AVRCP_ACTION_PLAYER_STATUS_CHANGED);
             bluetoothNotifyChange(newInfo, AVRCP_ACTION_META_CHANGED);
@@ -709,7 +698,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
 
         @Override
         public void shouldStop() {
-            stopSelf();
+            serviceManager.stopService();
         }
 
         @Override
@@ -758,7 +747,6 @@ public class PlaybackService extends MediaBrowserServiceCompat {
             }
             sendNotificationBroadcast(NOTIFICATION_TYPE_ERROR, what);
             writePlaybackPreferencesNoMediaPlaying();
-            stopSelf();
             return true;
         }
 
@@ -842,9 +830,6 @@ public class PlaybackService extends MediaBrowserServiceCompat {
         if (stopPlaying) {
             taskManager.cancelPositionSaver();
             writePlaybackPreferencesNoMediaPlaying();
-            if (!isCasting) {
-                stopForeground(true);
-            }
         }
         if (mediaType == null) {
             sendNotificationBroadcast(NOTIFICATION_TYPE_PLAYBACK_END, 0);
@@ -913,7 +898,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
                     final List<FeedItem> queue = taskManager.getQueue();
                     if (QueueAccess.ItemListAccess(queue).contains(item.getId())) {
                         // don't know if it actually matters to not autodownload when smart mark as played is triggered
-                        DBWriter.removeQueueItem(PlaybackService.this, item, ended);
+                        DBWriter.removeQueueItem(PlaybackService.this, ended, item);
                     }
                 } catch (InterruptedException e) {
                     e.printStackTrace();
@@ -1042,17 +1027,11 @@ public class PlaybackService extends MediaBrowserServiceCompat {
         editor.commit();
     }
 
-    /**
-     * Send ACTION_PLAYER_STATUS_CHANGED without changing the status attribute.
-     */
-    private void postStatusUpdateIntent() {
-        sendBroadcast(new Intent(ACTION_PLAYER_STATUS_CHANGED));
-    }
-
     private void sendNotificationBroadcast(int type, int code) {
         Intent intent = new Intent(ACTION_PLAYER_NOTIFICATION);
         intent.putExtra(EXTRA_NOTIFICATION_TYPE, type);
         intent.putExtra(EXTRA_NOTIFICATION_CODE, code);
+        intent.setPackage(getPackageName());
         sendBroadcast(intent);
     }
 
@@ -1064,6 +1043,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
     private void updateMediaSession(final PlayerStatus playerStatus) {
         PlaybackStateCompat.Builder sessionState = new PlaybackStateCompat.Builder();
 
+        @PlaybackStateCompat.State
         int state;
         if (playerStatus != null) {
             switch (playerStatus) {
@@ -1098,7 +1078,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
         } else {
             state = PlaybackStateCompat.STATE_NONE;
         }
-        sessionState.setState(state, mediaPlayer.getPosition(), mediaPlayer.getPlaybackSpeed());
+        sessionState.setState(state, getCurrentPosition(), getCurrentPlaybackSpeed());
         long capabilities = PlaybackStateCompat.ACTION_PLAY_PAUSE
                 | PlaybackStateCompat.ACTION_REWIND
                 | PlaybackStateCompat.ACTION_FAST_FORWARD
@@ -1127,7 +1107,9 @@ public class PlaybackService extends MediaBrowserServiceCompat {
 
         flavorHelper.mediaSessionSetExtraForWear(mediaSession);
 
-        mediaSession.setPlaybackState(sessionState.build());
+        final PlaybackStateCompat sessionStateBuilt = sessionState.build();
+        mediaSession.setPlaybackState(sessionStateBuilt);
+        serviceManager.onPlaybackStateChange(sessionStateBuilt);
     }
 
     private static boolean useSkipToPreviousForRewindInLockscreen() {
@@ -1167,10 +1149,10 @@ public class PlaybackService extends MediaBrowserServiceCompat {
                     builder.putString(MediaMetadataCompat.METADATA_KEY_ART_URI, imageLocation);
                     try {
                         Bitmap art = Glide.with(this)
-                                .load(imageLocation)
                                 .asBitmap()
-                                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                                .into(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
+                                .load(imageLocation)
+                                .apply(RequestOptions.diskCacheStrategyOf(ApGlideSettings.AP_DISK_CACHE_STRATEGY))
+                                .submit(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
                                 .get();
                         builder.putBitmap(MediaMetadataCompat.METADATA_KEY_ART, art);
                     } catch (Throwable tr) {
@@ -1181,7 +1163,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
                     builder.putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON_URI, imageLocation);
                 }
             }
-            if (!Thread.currentThread().isInterrupted() && started) {
+            if (!Thread.currentThread().isInterrupted() && isStarted()) {
                 mediaSession.setSessionActivity(PendingIntent.getActivity(this, 0,
                         PlaybackService.getPlayerActivityIntent(this),
                         PendingIntent.FLAG_UPDATE_CURRENT));
@@ -1204,49 +1186,55 @@ public class PlaybackService extends MediaBrowserServiceCompat {
      */
     private Thread notificationSetupThread;
 
-    /**
-     * Prepares notification and starts the service in the foreground.
-     */
-    private void setupNotification(final PlaybackServiceMediaPlayer.PSMPInfo info) {
-        setupNotification(info.playable);
-    }
-
-    private synchronized void setupNotification(final Playable playable) {
+    private synchronized void setupNotification(final Playable playable, boolean treatPauseAsStop) {
         if (notificationSetupThread != null) {
             notificationSetupThread.interrupt();
         }
+        if (playable == null) {
+            Log.d(TAG, "setupNotification: playable is null");
+            if (!isStarted()) {
+                serviceManager.stopService();
+            }
+            return;
+        }
         Runnable notificationSetupTask = new Runnable() {
             Bitmap icon = null;
 
             @Override
             public void run() {
-                Log.d(TAG, "Starting background work");
-                if (playable != null) {
-                    int iconSize = getResources().getDimensionPixelSize(
-                            android.R.dimen.notification_large_icon_width);
-                    try {
-                        icon = Glide.with(PlaybackService.this)
-                                .load(playable.getImageLocation())
-                                .asBitmap()
-                                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                                .centerCrop()
-                                .into(iconSize, iconSize)
-                                .get();
-                    } catch (Throwable tr) {
-                        Log.e(TAG, "Error loading the media icon for the notification", tr);
+                Log.d(TAG, "notificationSetupTask: Starting background work");
+
+                if (mediaPlayer == null) {
+                    Log.d(TAG, "notificationSetupTask: mediaPlayer is null");
+                    if (!isStarted()) {
+                        serviceManager.stopService();
                     }
+                    return;
+                }
+
+                int iconSize = getResources().getDimensionPixelSize(
+                        android.R.dimen.notification_large_icon_width);
+                try {
+                    icon = Glide.with(PlaybackService.this)
+                            .asBitmap()
+                            .load(playable.getImageLocation())
+                            .apply(RequestOptions.diskCacheStrategyOf(ApGlideSettings.AP_DISK_CACHE_STRATEGY))
+                            .apply(new RequestOptions().centerCrop())
+                            .submit(iconSize, iconSize)
+                            .get();
+                } catch (Throwable tr) {
+                    Log.e(TAG, "Error loading the media icon for the notification", tr);
                 }
+
                 if (icon == null) {
                     icon = BitmapFactory.decodeResource(getApplicationContext().getResources(),
                             ClientConfig.playbackServiceCallbacks.getNotificationIconResource(getApplicationContext()));
                 }
 
-                if (mediaPlayer == null) {
-                    return;
-                }
                 PlayerStatus playerStatus = mediaPlayer.getPlayerStatus();
+                Log.v(TAG, "notificationSetupTask: playerStatus=" + playerStatus);
 
-                if (!Thread.currentThread().isInterrupted() && started && playable != null) {
+                if (!Thread.currentThread().isInterrupted() && isStarted()) {
                     String contentText = playable.getEpisodeTitle();
                     String contentTitle = playable.getFeedTitle();
                     Notification notification;
@@ -1338,15 +1326,33 @@ public class PlaybackService extends MediaBrowserServiceCompat {
                             playerStatus == PlayerStatus.PREPARING ||
                             playerStatus == PlayerStatus.SEEKING ||
                             isCasting) {
+                        Log.v(TAG, "notificationSetupTask: make service foreground");
                         startForeground(NOTIFICATION_ID, notification);
+                    } else if (playerStatus == PlayerStatus.PAUSED) {
+                        if (treatPauseAsStop) {
+                            stopForeground(true);
+                        } else if ((UserPreferences.isPersistNotify() || isCasting) &&
+                                android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+                            // do not remove notification on pause based on user pref and whether android version supports expanded notifications
+                            // Change [Play] button to [Pause]
+                            leaveNotificationAsBackground(notification);
+                        } else if (!UserPreferences.isPersistNotify() && !isCasting) {
+                            // remove notification on pause
+                            stopForeground(true);
+                        }
                     } else {
-                        stopForeground(false);
-                        NotificationManager mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
-                        mNotificationManager.notify(NOTIFICATION_ID, notification);
+                        leaveNotificationAsBackground(notification);
                     }
                     Log.d(TAG, "Notification set up");
                 }
             }
+
+            private void leaveNotificationAsBackground(@NonNull Notification notification) {
+                stopForeground(false);
+                NotificationManager mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+                mNotificationManager.notify(NOTIFICATION_ID, notification);
+            }
+
         };
         notificationSetupThread = new Thread(notificationSetupTask);
         notificationSetupThread.start();
@@ -1541,7 +1547,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
         @Override
         public void onReceive(Context context, Intent intent) {
             if (TextUtils.equals(intent.getAction(), ACTION_SHUTDOWN_PLAYBACK_SERVICE)) {
-                stopSelf();
+                serviceManager.stopService();
             }
         }
 
@@ -1618,7 +1624,11 @@ public class PlaybackService extends MediaBrowserServiceCompat {
     }
 
     public void setSpeed(float speed) {
-        mediaPlayer.setSpeed(speed);
+        mediaPlayer.setPlaybackParams(speed, UserPreferences.isSkipSilence());
+    }
+
+    public void skipSilence(boolean skipSilence) {
+        mediaPlayer.setPlaybackParams(getCurrentPlaybackSpeed(), skipSilence);
     }
 
     public void setVolume(float leftVolume, float rightVolume) {
@@ -1626,6 +1636,9 @@ public class PlaybackService extends MediaBrowserServiceCompat {
     }
 
     public float getCurrentPlaybackSpeed() {
+        if(mediaPlayer == null) {
+            return 1.0f;
+        }
         return mediaPlayer.getPlaybackSpeed();
     }
 
@@ -1667,6 +1680,9 @@ public class PlaybackService extends MediaBrowserServiceCompat {
      * an invalid state.
      */
     public int getDuration() {
+        if (mediaPlayer == null) {
+            return INVALID_TIME;
+        }
         return mediaPlayer.getDuration();
     }
 
@@ -1675,6 +1691,9 @@ public class PlaybackService extends MediaBrowserServiceCompat {
      * is in an invalid state.
      */
     public int getCurrentPosition() {
+        if (mediaPlayer == null) {
+            return INVALID_TIME;
+        }
         return mediaPlayer.getPosition();
     }
 
@@ -1783,7 +1802,7 @@ public class PlaybackService extends MediaBrowserServiceCompat {
         public boolean onMediaButtonEvent(final Intent mediaButton) {
             Log.d(TAG, "onMediaButtonEvent(" + mediaButton + ")");
             if (mediaButton != null) {
-                KeyEvent keyEvent = (KeyEvent) mediaButton.getParcelableExtra(Intent.EXTRA_KEY_EVENT);
+                KeyEvent keyEvent = mediaButton.getParcelableExtra(Intent.EXTRA_KEY_EVENT);
                 if (keyEvent != null &&
                         keyEvent.getAction() == KeyEvent.ACTION_DOWN &&
                         keyEvent.getRepeatCount() == 0) {
@@ -1826,8 +1845,6 @@ public class PlaybackService extends MediaBrowserServiceCompat {
 
         void saveCurrentPosition(boolean fromMediaPlayer, Playable playable, int position);
 
-        void setupNotification(boolean connected, PlaybackServiceMediaPlayer.PSMPInfo info);
-
         MediaSessionCompat getMediaSession();
 
         Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter);
@@ -1867,24 +1884,6 @@ public class PlaybackService extends MediaBrowserServiceCompat {
         }
 
         @Override
-        public void setupNotification(boolean connected, PlaybackServiceMediaPlayer.PSMPInfo info) {
-            if (connected) {
-                PlaybackService.this.setupNotification(info);
-            } else {
-                PlayerStatus status = info.playerStatus;
-                if ((status == PlayerStatus.PLAYING ||
-                        status == PlayerStatus.SEEKING ||
-                        status == PlayerStatus.PREPARING ||
-                        UserPreferences.isPersistNotify()) &&
-                        android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-                    PlaybackService.this.setupNotification(info);
-                } else if (!UserPreferences.isPersistNotify()) {
-                    PlaybackService.this.stopForeground(true);
-                }
-            }
-        }
-
-        @Override
         public MediaSessionCompat getMediaSession() {
             return PlaybackService.this.mediaSession;
         }
@@ -1899,4 +1898,116 @@ public class PlaybackService extends MediaBrowserServiceCompat {
             PlaybackService.this.unregisterReceiver(receiver);
         }
     };
+
+    private boolean isStarted() {
+        return serviceManager.serviceInStartedState;
+    }
+
+    /**
+     * The helper that manages PlaybackService's foreground service life cycle and the associated
+     * notification control.
+     *
+     * The logic is adapted from a sample app from The Android Open Source Project.
+     * See https://github.com/googlesamples/android-MediaBrowserService/blob/6cf01be9ef82ca2dd653f03e2a4af0b075cc0021/Application/src/main/java/com/example/android/mediasession/service/MusicService.java#L211
+     *
+     */
+    private class ServiceManager {
+        private boolean serviceInStartedState;
+        private boolean toTreatNextPauseAsStopOnUI = false;
+
+        /**
+         *
+         * Entry point method for callers. Upon PlaybackState changes,
+         * the manager start/stop the PlaybackService as well as relevant notification
+         */
+        void onPlaybackStateChange(PlaybackStateCompat state) {
+            // Report the state to the MediaSession.
+
+            Log.v(TAG, "onPlaybackStateChange(" + (state != null ? state.getState() : "null") + ")");
+            try {
+                // Manage the started state of this service.
+                switch (state.getState()) {
+                    case PlaybackStateCompat.STATE_CONNECTING:
+                        // move the service to started, aka, making it foreground
+                        // upon STATE_CONNECTING, i.e., in preparing to play a media.
+                        // This is done so that in case the preparation takes a long time, e.g.,
+                        // streaming over a slow network,
+                        // the service won't be killed by the system prematurely.
+                        moveServiceToStartedState(state);
+                        break;
+                    case PlaybackStateCompat.STATE_PLAYING:
+                        moveServiceToStartedState(state);
+                        break;
+                    case PlaybackStateCompat.STATE_PAUSED:
+                        updateNotificationForPause(state);
+                        break;
+                    case PlaybackStateCompat.STATE_STOPPED:
+                        moveServiceOutOfStartedState(state);
+                        break;
+                    case PlaybackStateCompat.STATE_ERROR:
+                        moveServiceOutOfStartedState(state);
+                        break;
+                }
+            } finally {
+                if (toTreatNextPauseAsStopOnUI) {
+                    Log.v(TAG, "onPlaybackStateChange() - toTreatNextPauseAsStopOnUI enabled. The actual state (should be PAUSED, aka 2): " + state.getState());
+                    toTreatNextPauseAsStopOnUI = false;
+                }
+            }
+        }
+
+        /**
+         * Tell service manager that on the next state change, if the state is STATE_PAUSED,
+         * give UI treatment as if it is stopped.
+         *
+         * @see #handleKeycode(int, boolean) the use case
+         */
+        public void treatNextPauseAsStopOnUI() {
+            this.toTreatNextPauseAsStopOnUI = true;
+        }
+
+        public void showUIForStopState() {
+            Log.v(TAG, "serviceManager.showUIForStopState()");
+            stopForeground(true); // gets rid of persistent notification, to give the UI illusion of STOP
+        }
+
+        public void stopService() {
+            stopForeground(true);
+            stopSelf();
+            serviceInStartedState = false;
+        }
+
+        private void moveServiceToStartedState(PlaybackStateCompat state) {
+            if (!serviceInStartedState) {
+                ContextCompat.startForegroundService(
+                        PlaybackService.this,
+                        new Intent(PlaybackService.this, PlaybackService.class));
+                serviceInStartedState = true;
+            }
+
+            doSetupNotification();
+        }
+
+        private void updateNotificationForPause(PlaybackStateCompat state) {
+            doSetupNotification();
+        }
+
+        private void moveServiceOutOfStartedState(PlaybackStateCompat state) {
+            stopService();
+        }
+
+        private void doSetupNotification() {
+            if (mediaPlayer != null && mediaPlayer.getPlayable() != null) {
+                // it updates notification and set foreground status
+                // based on player status (similar to PlaybackState)
+                setupNotification(mediaPlayer.getPlayable(), toTreatNextPauseAsStopOnUI);
+            } else {
+                // should not happen unless there are bugs.
+                Log.e(TAG, "doSetupNotification() - unexpectedly there is no playable. No notification setup done. mediaPlayer." + mediaPlayer);
+            }
+        }
+    }
+
+    private final ServiceManager serviceManager = new ServiceManager();
+
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
index a2481b801..b8198fa63 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
@@ -148,10 +148,12 @@ public abstract class PlaybackServiceMediaPlayer {
     public abstract boolean canSetSpeed();
 
     /**
-     * Sets the playback speed.
+     * Sets the playback parameters.
+     * - Speed
+     * - SkipSilence (ExoPlayer only)
      * This method is executed on an internal executor service.
      */
-    public abstract void setSpeed(float speed);
+    public abstract void  setPlaybackParams(final float speed, final boolean skipSilence);
 
     /**
      * Returns the current playback speed. If the playback speed could not be retrieved, 1 is returned.
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlayerStatus.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlayerStatus.java
index 8a222d7ec..4f2ae34f8 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlayerStatus.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlayerStatus.java
@@ -12,7 +12,7 @@ public enum PlayerStatus {
 	INITIALIZING(9),			// playback service is loading the Playable's metadata
 	INITIALIZED(10);	// playback service was started, data source of media player was set.
 
-	private int statusValue;
+	private final int statusValue;
     private static final PlayerStatus[] fromOrdinalLookup;
 
     static {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/APCleanupAlgorithm.java b/core/src/main/java/de/danoeh/antennapod/core/storage/APCleanupAlgorithm.java
index e94874453..c63ac4416 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/APCleanupAlgorithm.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/APCleanupAlgorithm.java
@@ -2,6 +2,7 @@ package de.danoeh.antennapod.core.storage;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 
 import java.util.ArrayList;
@@ -20,11 +21,12 @@ import de.danoeh.antennapod.core.feed.FeedMedia;
 public class APCleanupAlgorithm extends EpisodeCleanupAlgorithm {
 
     private static final String TAG = "APCleanupAlgorithm";
-    /** the number of days after playback to wait before an item is eligible to be cleaned up */
-    private final int numberOfDaysAfterPlayback;
+    /** the number of days after playback to wait before an item is eligible to be cleaned up.
+        Fractional for number of hours, e.g., 0.5 = 12 hours, 0.0416 = 1 hour.  */
+    private final int numberOfHoursAfterPlayback;
 
-    public APCleanupAlgorithm(int numberOfDaysAfterPlayback) {
-        this.numberOfDaysAfterPlayback = numberOfDaysAfterPlayback;
+    public APCleanupAlgorithm(int numberOfHoursAfterPlayback) {
+        this.numberOfHoursAfterPlayback = numberOfHoursAfterPlayback;
     }
 
     /**
@@ -77,13 +79,17 @@ public class APCleanupAlgorithm extends EpisodeCleanupAlgorithm {
         return counter;
     }
 
+    @VisibleForTesting
+    Date calcMostRecentDateForDeletion(@NonNull Date currentDate) {
+        return minusHours(currentDate, numberOfHoursAfterPlayback);
+    }
+
     @NonNull
     private List<FeedItem> getCandidates() {
         List<FeedItem> candidates = new ArrayList<>();
         List<FeedItem> downloadedItems = DBReader.getDownloadedItems();
-        Calendar cal = Calendar.getInstance();
-        cal.add(Calendar.DAY_OF_MONTH, -1 * numberOfDaysAfterPlayback);
-        Date mostRecentDateForDeletion = cal.getTime();
+
+        Date mostRecentDateForDeletion = calcMostRecentDateForDeletion(new Date());
         for (FeedItem item : downloadedItems) {
             if (item.hasMedia()
                     && item.getMedia().isDownloaded()
@@ -108,5 +114,16 @@ public class APCleanupAlgorithm extends EpisodeCleanupAlgorithm {
         return getNumEpisodesToCleanup(0);
     }
 
-    public int getNumberOfDaysAfterPlayback() { return numberOfDaysAfterPlayback; }
+    @VisibleForTesting
+    public int getNumberOfHoursAfterPlayback() { return numberOfHoursAfterPlayback; }
+
+    private static Date minusHours(Date baseDate, int numberOfHours) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(baseDate);
+
+        cal.add(Calendar.HOUR_OF_DAY, -1 * numberOfHours);
+
+        return cal.getTime();
+    }
+
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
index fa87cc216..1b579f99a 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
@@ -1,7 +1,10 @@
 package de.danoeh.antennapod.core.storage;
 
 import android.database.Cursor;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v4.util.ArrayMap;
+import android.text.TextUtils;
 import android.util.Log;
 
 import java.util.ArrayList;
@@ -13,7 +16,6 @@ import java.util.Map;
 
 import de.danoeh.antennapod.core.feed.Chapter;
 import de.danoeh.antennapod.core.feed.Feed;
-import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.feed.FeedPreferences;
@@ -57,6 +59,7 @@ public final class DBReader {
      * of the returned list does NOT have its list of FeedItems yet. The FeedItem-list
      * can be loaded separately with {@link #getFeedItemList(Feed)}.
      */
+    @NonNull
     public static List<Feed> getFeedList() {
         Log.d(TAG, "Extracting Feedlist");
 
@@ -69,13 +72,14 @@ public final class DBReader {
         }
     }
 
+    @NonNull
     private static List<Feed> getFeedList(PodDBAdapter adapter) {
         Cursor cursor = null;
         try {
             cursor = adapter.getAllFeedsCursor();
             List<Feed> feeds = new ArrayList<>(cursor.getCount());
             while (cursor.moveToNext()) {
-                Feed feed = extractFeedFromCursorRow(adapter, cursor);
+                Feed feed = extractFeedFromCursorRow(cursor);
                 feeds.add(feed);
             }
             return feeds;
@@ -198,28 +202,19 @@ public final class DBReader {
         }
     }
 
+    @NonNull
     private static List<FeedItem> extractItemlistFromCursor(PodDBAdapter adapter, Cursor cursor) {
         List<FeedItem> result = new ArrayList<>(cursor.getCount());
 
-        LongList imageIds = new LongList(cursor.getCount());
         LongList itemIds = new LongList(cursor.getCount());
         if (cursor.moveToFirst()) {
             do {
-                int indexImage = cursor.getColumnIndex(PodDBAdapter.KEY_IMAGE);
-                long imageId = cursor.getLong(indexImage);
-                imageIds.add(imageId);
-
                 FeedItem item = FeedItem.fromCursor(cursor);
                 result.add(item);
                 itemIds.add(item.getId());
             } while (cursor.moveToNext());
-            Map<Long, FeedImage> images = getFeedImages(adapter, imageIds.toArray());
             Map<Long, FeedMedia> medias = getFeedMedia(adapter, itemIds);
-            for (int i = 0; i < result.size(); i++) {
-                FeedItem item = result.get(i);
-                long imageId = imageIds.get(i);
-                FeedImage image = images.get(imageId);
-                item.setImage(image);
+            for (FeedItem item : result) {
                 FeedMedia media = medias.get(item.getId());
                 item.setMedia(media);
                 if (media != null) {
@@ -253,28 +248,14 @@ public final class DBReader {
         return result;
     }
 
-    private static Feed extractFeedFromCursorRow(PodDBAdapter adapter, Cursor cursor) {
-        final FeedImage image;
-        int indexImage = cursor.getColumnIndex(PodDBAdapter.KEY_IMAGE);
-        long imageId = cursor.getLong(indexImage);
-        if (imageId != 0) {
-            image = getFeedImage(adapter, imageId);
-        } else {
-            image = null;
-        }
-
+    private static Feed extractFeedFromCursorRow(Cursor cursor) {
         Feed feed = Feed.fromCursor(cursor);
-        if (image != null) {
-            feed.setImage(image);
-            image.setOwner(feed);
-        }
-
         FeedPreferences preferences = FeedPreferences.fromCursor(cursor);
         feed.setPreferences(preferences);
-
         return feed;
     }
 
+    @NonNull
     static List<FeedItem> getQueue(PodDBAdapter adapter) {
         Log.d(TAG, "getQueue()");
         Cursor cursor = null;
@@ -331,6 +312,7 @@ public final class DBReader {
      * @return A list of FeedItems sorted by the same order as the queue. The caller can wrap the returned
      * list in a {@link de.danoeh.antennapod.core.util.QueueAccess} object for easier access to the queue's properties.
      */
+    @NonNull
     public static List<FeedItem> getQueue() {
         Log.d(TAG, "getQueue() called");
 
@@ -348,6 +330,7 @@ public final class DBReader {
      *
      * @return A list of FeedItems whose episdoe has been downloaded.
      */
+    @NonNull
     public static List<FeedItem> getDownloadedItems() {
         Log.d(TAG, "getDownloadedItems() called");
 
@@ -438,6 +421,7 @@ public final class DBReader {
      *
      * @param limit The maximum number of episodes that should be loaded.
      */
+    @NonNull
     public static List<FeedItem> getRecentlyPublishedEpisodes(int limit) {
         Log.d(TAG, "getRecentlyPublishedEpisodes() called with: " + "limit = [" + limit + "]");
 
@@ -464,6 +448,7 @@ public final class DBReader {
      * @return The playback history. The FeedItems are sorted by their media's playbackCompletionDate in descending order.
      * The size of the returned list is limited by {@link #PLAYBACK_HISTORY_SIZE}.
      */
+    @NonNull
     public static List<FeedItem> getPlaybackHistory() {
         Log.d(TAG, "getPlaybackHistory() called");
 
@@ -599,13 +584,14 @@ public final class DBReader {
         }
     }
 
+    @Nullable
     static Feed getFeed(final long feedId, PodDBAdapter adapter) {
         Feed feed = null;
         Cursor cursor = null;
         try {
             cursor = adapter.getFeedCursor(feedId);
             if (cursor.moveToNext()) {
-                feed = extractFeedFromCursorRow(adapter, cursor);
+                feed = extractFeedFromCursorRow(cursor);
                 feed.setItems(getFeedItemList(feed));
             } else {
                 Log.e(TAG, "getFeed could not find feed with id " + feedId);
@@ -618,6 +604,7 @@ public final class DBReader {
         }
     }
 
+    @Nullable
     private static FeedItem getFeedItem(final long itemId, PodDBAdapter adapter) {
         Log.d(TAG, "Loading feeditem with id " + itemId);
 
@@ -651,6 +638,7 @@ public final class DBReader {
      * @return The FeedItem or null if the FeedItem could not be found. All FeedComponent-attributes
      * as well as chapter marks of the FeedItem will also be loaded from the database.
      */
+    @Nullable
     public static FeedItem getFeedItem(final long itemId) {
         Log.d(TAG, "getFeedItem() called with: " + "itemId = [" + itemId + "]");
 
@@ -663,6 +651,7 @@ public final class DBReader {
         }
     }
 
+    @Nullable
     private static FeedItem getFeedItem(final String podcastUrl, final String episodeUrl, PodDBAdapter adapter) {
         Log.d(TAG, "Loading feeditem with podcast url " + podcastUrl + " and episode url " + episodeUrl);
         Cursor cursor = null;
@@ -714,7 +703,7 @@ public final class DBReader {
             if (cursor.moveToFirst()) {
                 String username = cursor.getString(0);
                 String password = cursor.getString(1);
-                if (username != null && password != null) {
+                if (!TextUtils.isEmpty(username) && password != null) {
                     credentials = username + ":" + password;
                 } else {
                     credentials = "";
@@ -839,62 +828,6 @@ public final class DBReader {
     }
 
     /**
-     * Searches the DB for a FeedImage of the given id.
-     *
-     * @param imageId The id of the object
-     * @return The found object
-     */
-    public static FeedImage getFeedImage(final long imageId) {
-        Log.d(TAG, "getFeedImage() called with: " + "imageId = [" + imageId + "]");
-        PodDBAdapter adapter = PodDBAdapter.getInstance();
-        adapter.open();
-        try {
-            return getFeedImage(adapter, imageId);
-        } finally {
-            adapter.close();
-        }
-    }
-
-    /**
-     * Searches the DB for a FeedImage of the given id.
-     *
-     * @param imageId The id of the object
-     * @return The found object
-     */
-    private static FeedImage getFeedImage(PodDBAdapter adapter, final long imageId) {
-        return getFeedImages(adapter, imageId).get(imageId);
-    }
-
-    /**
-     * Searches the DB for a FeedImage of the given id.
-     *
-     * @param imageIds The ids of the images
-     * @return Map that associates the id of an image with the image itself
-     */
-    private static Map<Long, FeedImage> getFeedImages(PodDBAdapter adapter, final long... imageIds) {
-        String[] ids = new String[imageIds.length];
-        for (int i = 0, len = imageIds.length; i < len; i++) {
-            ids[i] = String.valueOf(imageIds[i]);
-        }
-        Cursor cursor = adapter.getImageCursor(ids);
-        int imageCount = cursor.getCount();
-        if (imageCount == 0) {
-            cursor.close();
-            return Collections.emptyMap();
-        }
-        Map<Long, FeedImage> result = new ArrayMap<>(imageCount);
-        try {
-            while (cursor.moveToNext()) {
-                FeedImage image = FeedImage.fromCursor(cursor);
-                result.put(image.getId(), image);
-            }
-        } finally {
-            cursor.close();
-        }
-        return result;
-    }
-
-    /**
      * Searches the DB for a FeedMedia of the given id.
      *
      * @param mediaId The id of the object
@@ -938,6 +871,7 @@ public final class DBReader {
      *                       countAll calculation time
      * @return The StatisticsInfo object
      */
+    @NonNull
     public static StatisticsData getStatistics(boolean sortByCountAll) {
         PodDBAdapter adapter = PodDBAdapter.getInstance();
         adapter.open();
@@ -961,10 +895,6 @@ public final class DBReader {
                     continue;
                 }
 
-                // played duration used to be reset when the item is added to the playback history
-                if (media.getPlaybackCompletionDate() != null) {
-                    feedPlayedTime += media.getDuration() / 1000;
-                }
                 feedPlayedTime += media.getPlayedDuration() / 1000;
 
                 if (item.isPlayed()) {
@@ -1088,7 +1018,7 @@ public final class DBReader {
         Cursor feedCursor = adapter.getFeedsInFlattrQueueCursor();
         if (feedCursor.moveToFirst()) {
             do {
-                result.add(extractFeedFromCursorRow(adapter, feedCursor));
+                result.add(extractFeedFromCursorRow(feedCursor));
             } while (feedCursor.moveToNext());
         }
         feedCursor.close();
@@ -1108,6 +1038,7 @@ public final class DBReader {
      * the list of subscriptions, the number of items in the queue and the number of unread
      * items.
      */
+    @NonNull
     public static NavDrawerData getNavDrawerData() {
         Log.d(TAG, "getNavDrawerData() called with: " + "");
         PodDBAdapter adapter = PodDBAdapter.getInstance();
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
index da500fd3e..dab8e19b5 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
@@ -1,11 +1,9 @@
 package de.danoeh.antennapod.core.storage;
 
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
 import android.util.Log;
 
 import java.util.ArrayList;
@@ -19,7 +17,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import de.danoeh.antennapod.core.ClientConfig;
@@ -30,12 +27,11 @@ import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.feed.FeedPreferences;
-import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.GpodnetSyncService;
 import de.danoeh.antennapod.core.service.download.DownloadStatus;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
-import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.DownloadError;
+import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.LongList;
 import de.danoeh.antennapod.core.util.comparator.FeedItemPubdateComparator;
 import de.danoeh.antennapod.core.util.exception.MediaFileNotFoundException;
@@ -142,8 +138,7 @@ public final class DBTasks {
         } catch (MediaFileNotFoundException e) {
             e.printStackTrace();
             if (media.isPlaying()) {
-                context.sendBroadcast(new Intent(
-                        PlaybackService.ACTION_SHUTDOWN_PLAYBACK_SERVICE));
+                IntentUtils.sendLocalBroadcast(context, PlaybackService.ACTION_SHUTDOWN_PLAYBACK_SERVICE);
             }
             notifyMissingFeedMediaFile(context, media);
         }
@@ -198,8 +193,10 @@ public final class DBTasks {
             if (ClientConfig.gpodnetCallbacks.gpodnetEnabled()) {
                 GpodnetSyncService.sendSyncIntent(context);
             }
-            Log.d(TAG, "refreshAllFeeds autodownload");
-            autodownloadUndownloadedItems(context);
+            // Note: automatic download of episodes will be done but not here.
+            // Instead it is done after all feeds have been refreshed (asynchronously),
+            // in DownloadService.onDestroy()
+            // See Issue #2577 for the details of the rationale
 
             if (callback != null) {
                 callback.run();
@@ -207,6 +204,11 @@ public final class DBTasks {
         }).start();
     }
 
+    public static long getLastRefreshAllFeedsTimeMillis(final Context context) {
+        SharedPreferences prefs = context.getSharedPreferences(DBTasks.PREF_NAME, MODE_PRIVATE);
+        return  prefs.getLong(DBTasks.PREF_LAST_REFRESH, 0);
+    }
+
     /**
      * @param context
      * @param feedList the list of feeds to refresh
@@ -237,27 +239,6 @@ public final class DBTasks {
     }
 
     /**
-     * Downloads all pages of the given feed.
-     *
-     * @param context Used for requesting the download.
-     * @param feed    The Feed object.
-     */
-    public static void refreshCompleteFeed(final Context context, final Feed feed) {
-        try {
-            refreshFeed(context, feed, true, false);
-        } catch (DownloadRequestException e) {
-            e.printStackTrace();
-            DBWriter.addDownloadStatus(
-                    new DownloadStatus(feed, feed
-                            .getHumanReadableIdentifier(),
-                            DownloadError.ERROR_REQUEST_ERROR, false, e
-                            .getMessage()
-                    )
-            );
-        }
-    }
-
-    /**
      * Downloads all pages of the given feed even if feed has not been modified since last refresh
      *
      * @param context Used for requesting the download.
@@ -338,31 +319,6 @@ public final class DBTasks {
         DownloadRequester.getInstance().downloadFeed(context, f, loadAllPages, force);
     }
 
-    /*
-     *  Checks if the app should refresh all feeds, i.e. if the last auto refresh failed.
-     *
-     *  The feeds are only refreshed if an update interval or time of day is set and the last
-     *  (successful) refresh was before the last interval or more than a day ago, respectively.
-     */
-    public static void checkShouldRefreshFeeds(Context context) {
-        long interval = 0;
-        if(UserPreferences.getUpdateInterval() > 0) {
-            interval = UserPreferences.getUpdateInterval();
-        } else if(UserPreferences.getUpdateTimeOfDay().length > 0){
-            interval = TimeUnit.DAYS.toMillis(1);
-        }
-        if(interval == 0) { // auto refresh is disabled
-            return;
-        }
-        SharedPreferences prefs = context.getSharedPreferences(PREF_NAME, MODE_PRIVATE);
-        long lastRefresh = prefs.getLong(PREF_LAST_REFRESH, 0);
-        Log.d(TAG, "last refresh: " + Converter.getDurationStringLocalized(context,
-                System.currentTimeMillis() - lastRefresh) + " ago");
-        if(lastRefresh <= System.currentTimeMillis() - interval) {
-            DBTasks.refreshAllFeeds(context, null);
-        }
-    }
-
     /**
      * Notifies the database about a missing FeedMedia file. This method will correct the FeedMedia object's values in the
      * DB and send a FeedUpdateBroadcast.
@@ -378,27 +334,6 @@ public final class DBTasks {
     }
 
     /**
-     * Request the download of all objects in the queue. from a separate Thread.
-     *
-     * @param context Used for requesting the download an accessing the database.
-     */
-    public static void downloadAllItemsInQueue(final Context context) {
-        new Thread() {
-            public void run() {
-                List<FeedItem> queue = DBReader.getQueue();
-                if (!queue.isEmpty()) {
-                    try {
-                        downloadFeedItems(context,
-                                queue.toArray(new FeedItem[queue.size()]));
-                    } catch (DownloadRequestException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-        }.start();
-    }
-
-    /**
      * Requests the download of a list of FeedItem objects.
      *
      * @param context Used for requesting the download and accessing the DB.
@@ -817,10 +752,8 @@ public final class DBTasks {
      */
     abstract static class QueryTask<T> implements Callable<T> {
         private T result;
-        private final Context context;
 
         public QueryTask(Context context) {
-            this.context = context;
         }
 
         @Override
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBUpgrader.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBUpgrader.java
new file mode 100644
index 000000000..0beb765e7
--- /dev/null
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBUpgrader.java
@@ -0,0 +1,293 @@
+package de.danoeh.antennapod.core.storage;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.media.MediaMetadataRetriever;
+import android.util.Log;
+
+import de.danoeh.antennapod.core.feed.FeedItem;
+
+class DBUpgrader {
+    /**
+     * Upgrades the given database to a new schema version
+     */
+    static void upgrade(final SQLiteDatabase db, final int oldVersion, final int newVersion) {
+        if (oldVersion <= 1) {
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS + " ADD COLUMN "
+                    + PodDBAdapter.KEY_TYPE + " TEXT");
+        }
+        if (oldVersion <= 2) {
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_SIMPLECHAPTERS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_LINK + " TEXT");
+        }
+        if (oldVersion <= 3) {
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_ITEM_IDENTIFIER + " TEXT");
+        }
+        if (oldVersion <= 4) {
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS + " ADD COLUMN "
+                    + PodDBAdapter.KEY_FEED_IDENTIFIER + " TEXT");
+        }
+        if (oldVersion <= 5) {
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_DOWNLOAD_LOG
+                    + " ADD COLUMN " + PodDBAdapter.KEY_REASON_DETAILED + " TEXT");
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_DOWNLOAD_LOG
+                    + " ADD COLUMN " + PodDBAdapter.KEY_DOWNLOADSTATUS_TITLE + " TEXT");
+        }
+        if (oldVersion <= 6) {
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_SIMPLECHAPTERS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_CHAPTER_TYPE + " INTEGER");
+        }
+        if (oldVersion <= 7) {
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
+                    + " ADD COLUMN " + PodDBAdapter.KEY_PLAYBACK_COMPLETION_DATE
+                    + " INTEGER");
+        }
+        if (oldVersion <= 8) {
+            final int KEY_ID_POSITION = 0;
+            final int KEY_MEDIA_POSITION = 1;
+
+            // Add feeditem column to feedmedia table
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
+                    + " ADD COLUMN " + PodDBAdapter.KEY_FEEDITEM
+                    + " INTEGER");
+            Cursor feeditemCursor = db.query(PodDBAdapter.TABLE_NAME_FEED_ITEMS,
+                    new String[]{PodDBAdapter.KEY_ID, PodDBAdapter.KEY_MEDIA}, "? > 0",
+                    new String[]{PodDBAdapter.KEY_MEDIA}, null, null, null);
+            if (feeditemCursor.moveToFirst()) {
+                db.beginTransaction();
+                ContentValues contentValues = new ContentValues();
+                do {
+                    long mediaId = feeditemCursor.getLong(KEY_MEDIA_POSITION);
+                    contentValues.put(PodDBAdapter.KEY_FEEDITEM, feeditemCursor.getLong(KEY_ID_POSITION));
+                    db.update(PodDBAdapter.TABLE_NAME_FEED_MEDIA, contentValues, PodDBAdapter.KEY_ID + "=?", new String[]{String.valueOf(mediaId)});
+                    contentValues.clear();
+                } while (feeditemCursor.moveToNext());
+                db.setTransactionSuccessful();
+                db.endTransaction();
+            }
+            feeditemCursor.close();
+        }
+        if (oldVersion <= 9) {
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_AUTO_DOWNLOAD
+                    + " INTEGER DEFAULT 1");
+        }
+        if (oldVersion <= 10) {
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_FLATTR_STATUS
+                    + " INTEGER");
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_FLATTR_STATUS
+                    + " INTEGER");
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
+                    + " ADD COLUMN " + PodDBAdapter.KEY_PLAYED_DURATION
+                    + " INTEGER");
+        }
+        if (oldVersion <= 11) {
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_USERNAME
+                    + " TEXT");
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_PASSWORD
+                    + " TEXT");
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_IMAGE
+                    + " INTEGER");
+        }
+        if (oldVersion <= 12) {
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_IS_PAGED + " INTEGER DEFAULT 0");
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_NEXT_PAGE_LINK + " TEXT");
+        }
+        if (oldVersion <= 13) {
+            // remove duplicate rows in "Chapters" table that were created because of a bug.
+            db.execSQL(String.format("DELETE FROM %s WHERE %s NOT IN " +
+                            "(SELECT MIN(%s) as %s FROM %s GROUP BY %s,%s,%s,%s,%s)",
+                    PodDBAdapter.TABLE_NAME_SIMPLECHAPTERS,
+                    PodDBAdapter.KEY_ID,
+                    PodDBAdapter.KEY_ID,
+                    PodDBAdapter.KEY_ID,
+                    PodDBAdapter.TABLE_NAME_SIMPLECHAPTERS,
+                    PodDBAdapter.KEY_TITLE,
+                    PodDBAdapter.KEY_START,
+                    PodDBAdapter.KEY_FEEDITEM,
+                    PodDBAdapter.KEY_LINK,
+                    PodDBAdapter.KEY_CHAPTER_TYPE));
+        }
+        if (oldVersion <= 14) {
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_AUTO_DOWNLOAD + " INTEGER");
+            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
+                    + " SET " + PodDBAdapter.KEY_AUTO_DOWNLOAD + " = "
+                    + "(SELECT " + PodDBAdapter.KEY_AUTO_DOWNLOAD
+                    + " FROM " + PodDBAdapter.TABLE_NAME_FEEDS
+                    + " WHERE " + PodDBAdapter.TABLE_NAME_FEEDS + "." + PodDBAdapter.KEY_ID
+                    + " = " + PodDBAdapter.TABLE_NAME_FEED_ITEMS + "." + PodDBAdapter.KEY_FEED + ")");
+
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_HIDE + " TEXT");
+
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_LAST_UPDATE_FAILED + " INTEGER DEFAULT 0");
+
+            // create indexes
+            db.execSQL(PodDBAdapter.CREATE_INDEX_FEEDITEMS_FEED);
+            db.execSQL(PodDBAdapter.CREATE_INDEX_FEEDMEDIA_FEEDITEM);
+            db.execSQL(PodDBAdapter.CREATE_INDEX_QUEUE_FEEDITEM);
+            db.execSQL(PodDBAdapter.CREATE_INDEX_SIMPLECHAPTERS_FEEDITEM);
+        }
+        if (oldVersion <= 15) {
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
+                    + " ADD COLUMN " + PodDBAdapter.KEY_HAS_EMBEDDED_PICTURE + " INTEGER DEFAULT -1");
+            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
+                    + " SET " + PodDBAdapter.KEY_HAS_EMBEDDED_PICTURE + "=0"
+                    + " WHERE " + PodDBAdapter.KEY_DOWNLOADED + "=0");
+            Cursor c = db.rawQuery("SELECT " + PodDBAdapter.KEY_FILE_URL
+                    + " FROM " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
+                    + " WHERE " + PodDBAdapter.KEY_DOWNLOADED + "=1 "
+                    + " AND " + PodDBAdapter.KEY_HAS_EMBEDDED_PICTURE + "=-1", null);
+            if (c.moveToFirst()) {
+                MediaMetadataRetriever mmr = new MediaMetadataRetriever();
+                do {
+                    String fileUrl = c.getString(0);
+                    try {
+                        mmr.setDataSource(fileUrl);
+                        byte[] image = mmr.getEmbeddedPicture();
+                        if (image != null) {
+                            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
+                                    + " SET " + PodDBAdapter.KEY_HAS_EMBEDDED_PICTURE + "=1"
+                                    + " WHERE " + PodDBAdapter.KEY_FILE_URL + "='" + fileUrl + "'");
+                        } else {
+                            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
+                                    + " SET " + PodDBAdapter.KEY_HAS_EMBEDDED_PICTURE + "=0"
+                                    + " WHERE " + PodDBAdapter.KEY_FILE_URL + "='" + fileUrl + "'");
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                } while (c.moveToNext());
+            }
+            c.close();
+        }
+        if (oldVersion <= 16) {
+            String selectNew = "SELECT " + PodDBAdapter.TABLE_NAME_FEED_ITEMS + "." + PodDBAdapter.KEY_ID
+                    + " FROM " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
+                    + " INNER JOIN " + PodDBAdapter.TABLE_NAME_FEED_MEDIA + " ON "
+                    + PodDBAdapter.TABLE_NAME_FEED_ITEMS + "." + PodDBAdapter.KEY_ID + "="
+                    + PodDBAdapter.TABLE_NAME_FEED_MEDIA + "." + PodDBAdapter.KEY_FEEDITEM
+                    + " LEFT OUTER JOIN " + PodDBAdapter.TABLE_NAME_QUEUE + " ON "
+                    + PodDBAdapter.TABLE_NAME_FEED_ITEMS + "." + PodDBAdapter.KEY_ID + "="
+                    + PodDBAdapter.TABLE_NAME_QUEUE + "." + PodDBAdapter.KEY_FEEDITEM
+                    + " WHERE "
+                    + PodDBAdapter.TABLE_NAME_FEED_ITEMS + "." + PodDBAdapter.KEY_READ + " = 0 AND " // unplayed
+                    + PodDBAdapter.TABLE_NAME_FEED_MEDIA + "." + PodDBAdapter.KEY_DOWNLOADED + " = 0 AND " // undownloaded
+                    + PodDBAdapter.TABLE_NAME_FEED_MEDIA + "." + PodDBAdapter.KEY_POSITION + " = 0 AND " // not partially played
+                    + PodDBAdapter.TABLE_NAME_QUEUE + "." + PodDBAdapter.KEY_ID + " IS NULL"; // not in queue
+            String sql = "UPDATE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
+                    + " SET " + PodDBAdapter.KEY_READ + "=" + FeedItem.NEW
+                    + " WHERE " + PodDBAdapter.KEY_ID + " IN (" + selectNew + ")";
+            Log.d("Migration", "SQL: " + sql);
+            db.execSQL(sql);
+        }
+        if (oldVersion <= 17) {
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_AUTO_DELETE_ACTION + " INTEGER DEFAULT 0");
+        }
+        if (oldVersion < 1030005) {
+            db.execSQL("UPDATE FeedItems SET auto_download=0 WHERE " +
+                    "(read=1 OR id IN (SELECT feeditem FROM FeedMedia WHERE position>0 OR downloaded=1)) " +
+                    "AND id NOT IN (SELECT feeditem FROM Queue)");
+        }
+        if (oldVersion < 1040001) {
+            db.execSQL(PodDBAdapter.CREATE_TABLE_FAVORITES);
+        }
+        if (oldVersion < 1040002) {
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
+                    + " ADD COLUMN " + PodDBAdapter.KEY_LAST_PLAYED_TIME + " INTEGER DEFAULT 0");
+        }
+        if (oldVersion < 1040013) {
+            db.execSQL(PodDBAdapter.CREATE_INDEX_FEEDITEMS_PUBDATE);
+            db.execSQL(PodDBAdapter.CREATE_INDEX_FEEDITEMS_READ);
+        }
+        if (oldVersion < 1050003) {
+            // Migrates feed list filter data
+
+            db.beginTransaction();
+
+            // Change to intermediate values to avoid overwriting in the following find/replace
+            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEEDS + "\n" +
+                    "SET " + PodDBAdapter.KEY_HIDE + " = replace(" + PodDBAdapter.KEY_HIDE + ", 'unplayed', 'noplay')");
+            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEEDS + "\n" +
+                    "SET " + PodDBAdapter.KEY_HIDE + " = replace(" + PodDBAdapter.KEY_HIDE + ", 'not_queued', 'noqueue')");
+            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEEDS + "\n" +
+                    "SET " + PodDBAdapter.KEY_HIDE + " = replace(" + PodDBAdapter.KEY_HIDE + ", 'not_downloaded', 'nodl')");
+
+            // Replace played, queued, and downloaded with their opposites
+            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEEDS + "\n" +
+                    "SET " + PodDBAdapter.KEY_HIDE + " = replace(" + PodDBAdapter.KEY_HIDE + ", 'played', 'unplayed')");
+            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEEDS + "\n" +
+                    "SET " + PodDBAdapter.KEY_HIDE + " = replace(" + PodDBAdapter.KEY_HIDE + ", 'queued', 'not_queued')");
+            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEEDS + "\n" +
+                    "SET " + PodDBAdapter.KEY_HIDE + " = replace(" + PodDBAdapter.KEY_HIDE + ", 'downloaded', 'not_downloaded')");
+
+            // Now replace intermediates for unplayed, not queued, etc. with their opposites
+            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEEDS + "\n" +
+                    "SET " + PodDBAdapter.KEY_HIDE + " = replace(" + PodDBAdapter.KEY_HIDE + ", 'noplay', 'played')");
+            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEEDS + "\n" +
+                    "SET " + PodDBAdapter.KEY_HIDE + " = replace(" + PodDBAdapter.KEY_HIDE + ", 'noqueue', 'queued')");
+            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEEDS + "\n" +
+                    "SET " + PodDBAdapter.KEY_HIDE + " = replace(" + PodDBAdapter.KEY_HIDE + ", 'nodl', 'downloaded')");
+
+            // Paused doesn't have an opposite, so unplayed is the next best option
+            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEEDS + "\n" +
+                    "SET " + PodDBAdapter.KEY_HIDE + " = replace(" + PodDBAdapter.KEY_HIDE + ", 'paused', 'unplayed')");
+
+            db.setTransactionSuccessful();
+            db.endTransaction();
+
+            // and now get ready for autodownload filters
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_INCLUDE_FILTER + " TEXT DEFAULT ''");
+
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_EXCLUDE_FILTER + " TEXT DEFAULT ''");
+
+            // and now auto refresh
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_KEEP_UPDATED + " INTEGER DEFAULT 1");
+        }
+        if (oldVersion < 1050004) {
+            // prevent old timestamps to be misinterpreted as ETags
+            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEEDS
+                    + " SET " + PodDBAdapter.KEY_LASTUPDATE + "=NULL");
+        }
+        if (oldVersion < 1060200) {
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_CUSTOM_TITLE + " TEXT");
+        }
+        if (oldVersion < 1060596) {
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_IMAGE_URL + " TEXT");
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
+                    + " ADD COLUMN " + PodDBAdapter.KEY_IMAGE_URL + " TEXT");
+
+            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS + " SET " + PodDBAdapter.KEY_IMAGE_URL + "  = ("
+                    + " SELECT " + PodDBAdapter.KEY_DOWNLOAD_URL
+                    + " FROM " + PodDBAdapter.TABLE_NAME_FEED_IMAGES
+                    + " WHERE " + PodDBAdapter.TABLE_NAME_FEED_IMAGES + "." + PodDBAdapter.KEY_ID
+                    + " = " + PodDBAdapter.TABLE_NAME_FEED_ITEMS + "." + PodDBAdapter.KEY_IMAGE + ")");
+
+            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEEDS + " SET " + PodDBAdapter.KEY_IMAGE_URL + " = ("
+                    + " SELECT " + PodDBAdapter.KEY_DOWNLOAD_URL
+                    + " FROM " + PodDBAdapter.TABLE_NAME_FEED_IMAGES
+                    + " WHERE " + PodDBAdapter.TABLE_NAME_FEED_IMAGES + "." + PodDBAdapter.KEY_ID
+                    + " = " + PodDBAdapter.TABLE_NAME_FEEDS + "." + PodDBAdapter.KEY_IMAGE + ")");
+
+            db.execSQL("DROP TABLE " + PodDBAdapter.TABLE_NAME_FEED_IMAGES);
+        }
+    }
+
+}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
index 8cdf82e15..f7226729a 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
 import android.util.Log;
 
 import org.shredzone.flattr4j.model.Flattr;
@@ -32,7 +33,6 @@ import de.danoeh.antennapod.core.event.QueueEvent;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedEvent;
-import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.feed.FeedPreferences;
@@ -42,6 +42,7 @@ import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.download.DownloadStatus;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
+import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.LongList;
 import de.danoeh.antennapod.core.util.Permutor;
 import de.danoeh.antennapod.core.util.flattr.FlattrStatus;
@@ -80,65 +81,72 @@ public class DBWriter {
      * @param context A context that is used for opening a database connection.
      * @param mediaId ID of the FeedMedia object whose downloaded file should be deleted.
      */
-    public static Future<?> deleteFeedMediaOfItem(final Context context,
+    public static Future<?> deleteFeedMediaOfItem(@NonNull final Context context,
                                                   final long mediaId) {
         return dbExec.submit(() -> {
             final FeedMedia media = DBReader.getFeedMedia(mediaId);
             if (media != null) {
-                Log.i(TAG, String.format("Requested to delete FeedMedia [id=%d, title=%s, downloaded=%s",
-                        media.getId(), media.getEpisodeTitle(), String.valueOf(media.isDownloaded())));
-                if (media.isDownloaded()) {
-                    // delete downloaded media file
-                    File mediaFile = new File(media.getFile_url());
-                    if (mediaFile.exists() && !mediaFile.delete()) {
-                        MessageEvent evt = new MessageEvent(context.getString(R.string.delete_failed));
-                        EventBus.getDefault().post(evt);
-                        return;
-                    }
-                    media.setDownloaded(false);
-                    media.setFile_url(null);
-                    media.setHasEmbeddedPicture(false);
-                    PodDBAdapter adapter = PodDBAdapter.getInstance();
-                    adapter.open();
-                    adapter.setMedia(media);
-                    adapter.close();
-
-                    // If media is currently being played, change playback
-                    // type to 'stream' and shutdown playback service
-                    SharedPreferences prefs = PreferenceManager
-                            .getDefaultSharedPreferences(context);
-                    if (PlaybackPreferences.getCurrentlyPlayingMedia() == FeedMedia.PLAYABLE_TYPE_FEEDMEDIA) {
-                        if (media.getId() == PlaybackPreferences
-                                .getCurrentlyPlayingFeedMediaId()) {
-                            SharedPreferences.Editor editor = prefs.edit();
-                            editor.putBoolean(
-                                    PlaybackPreferences.PREF_CURRENT_EPISODE_IS_STREAM,
-                                    true);
-                            editor.commit();
-                        }
-                        if (PlaybackPreferences
-                                .getCurrentlyPlayingFeedMediaId() == media
-                                .getId()) {
-                            context.sendBroadcast(new Intent(
-                                    PlaybackService.ACTION_SHUTDOWN_PLAYBACK_SERVICE));
-                        }
-                    }
-                    // Gpodder: queue delete action for synchronization
-                    if(GpodnetPreferences.loggedIn()) {
-                        FeedItem item = media.getItem();
-                        GpodnetEpisodeAction action = new GpodnetEpisodeAction.Builder(item, GpodnetEpisodeAction.Action.DELETE)
-                                .currentDeviceId()
-                                .currentTimestamp()
-                                .build();
-                        GpodnetPreferences.enqueueEpisodeAction(action);
-                    }
+                boolean result = deleteFeedMediaSynchronous(context, media);
+
+                if (result && UserPreferences.shouldDeleteRemoveFromQueue()) {
+                    DBWriter.removeQueueItemSynchronous(context, false, media.getItem().getId());
                 }
-                EventBus.getDefault().post(FeedItemEvent.deletedMedia(Collections.singletonList(media.getItem())));
-                EventDistributor.getInstance().sendUnreadItemsUpdateBroadcast();
             }
         });
     }
 
+    private static boolean deleteFeedMediaSynchronous(@NonNull Context context, @NonNull FeedMedia media) {
+        Log.i(TAG, String.format("Requested to delete FeedMedia [id=%d, title=%s, downloaded=%s",
+                media.getId(), media.getEpisodeTitle(), String.valueOf(media.isDownloaded())));
+        if (media.isDownloaded()) {
+            // delete downloaded media file
+            File mediaFile = new File(media.getFile_url());
+            if (mediaFile.exists() && !mediaFile.delete()) {
+                MessageEvent evt = new MessageEvent(context.getString(R.string.delete_failed));
+                EventBus.getDefault().post(evt);
+                return false;
+            }
+            media.setDownloaded(false);
+            media.setFile_url(null);
+            media.setHasEmbeddedPicture(false);
+            PodDBAdapter adapter = PodDBAdapter.getInstance();
+            adapter.open();
+            adapter.setMedia(media);
+            adapter.close();
+
+            // If media is currently being played, change playback
+            // type to 'stream' and shutdown playback service
+            SharedPreferences prefs = PreferenceManager
+                    .getDefaultSharedPreferences(context);
+            if (PlaybackPreferences.getCurrentlyPlayingMedia() == FeedMedia.PLAYABLE_TYPE_FEEDMEDIA) {
+                if (media.getId() == PlaybackPreferences
+                        .getCurrentlyPlayingFeedMediaId()) {
+                    SharedPreferences.Editor editor = prefs.edit();
+                    editor.putBoolean(
+                            PlaybackPreferences.PREF_CURRENT_EPISODE_IS_STREAM,
+                            true);
+                    editor.commit();
+                }
+                if (PlaybackPreferences.getCurrentlyPlayingFeedMediaId() == media.getId()) {
+                    IntentUtils.sendLocalBroadcast(context, PlaybackService.ACTION_SHUTDOWN_PLAYBACK_SERVICE);
+                }
+            }
+            // Gpodder: queue delete action for synchronization
+            if(GpodnetPreferences.loggedIn()) {
+                FeedItem item = media.getItem();
+                GpodnetEpisodeAction action = new GpodnetEpisodeAction.Builder(item, GpodnetEpisodeAction.Action.DELETE)
+                        .currentDeviceId()
+                        .currentTimestamp()
+                        .build();
+                GpodnetPreferences.enqueueEpisodeAction(action);
+            }
+        }
+        EventBus.getDefault().post(FeedItemEvent.deletedMedia(Collections.singletonList(media.getItem())));
+        EventDistributor.getInstance().sendUnreadItemsUpdateBroadcast();
+
+        return true;
+    }
+
     /**
      * Deletes a Feed and all downloaded files of its components like images and downloaded episodes.
      *
@@ -157,8 +165,7 @@ public class DBWriter {
                 if (PlaybackPreferences.getCurrentlyPlayingMedia() == FeedMedia.PLAYABLE_TYPE_FEEDMEDIA
                         && PlaybackPreferences.getLastPlayedFeedId() == feed
                         .getId()) {
-                    context.sendBroadcast(new Intent(
-                            PlaybackService.ACTION_SHUTDOWN_PLAYBACK_SERVICE));
+                    IntentUtils.sendLocalBroadcast(context, PlaybackService.ACTION_SHUTDOWN_PLAYBACK_SERVICE);
                     SharedPreferences.Editor editor = prefs.edit();
                     editor.putLong(
                             PlaybackPreferences.PREF_CURRENTLY_PLAYING_FEED_ID,
@@ -166,17 +173,6 @@ public class DBWriter {
                     editor.commit();
                 }
 
-                // delete image file
-                if (feed.getImage() != null) {
-                    if (feed.getImage().isDownloaded()
-                            && feed.getImage().getFile_url() != null) {
-                        File imageFile = new File(feed.getImage()
-                                .getFile_url());
-                        imageFile.delete();
-                    } else if (requester.isDownloadingFile(feed.getImage())) {
-                        requester.cancelDownload(context, feed.getImage());
-                    }
-                }
                 // delete stored media files and mark them as read
                 List<FeedItem> queue = DBReader.getQueue();
                 List<FeedItem> removed = new ArrayList<>();
@@ -200,16 +196,6 @@ public class DBWriter {
                             && requester.isDownloadingFile(item.getMedia())) {
                         requester.cancelDownload(context, item.getMedia());
                     }
-
-                    if (item.hasItemImage()) {
-                        FeedImage image = item.getImage();
-                        if (image.isDownloaded() && image.getFile_url() != null) {
-                            File imgFile = new File(image.getFile_url());
-                            imgFile.delete();
-                        } else if (requester.isDownloadingFile(image)) {
-                            requester.cancelDownload(context, item.getImage());
-                        }
-                    }
                 }
                 PodDBAdapter adapter = PodDBAdapter.getInstance();
                 adapter.open();
@@ -437,38 +423,68 @@ public class DBWriter {
 
     /**
      * Removes a FeedItem object from the queue.
-     *
-     * @param context             A context that is used for opening a database connection.
-     * @param item                FeedItem that should be removed.
+     *  @param context             A context that is used for opening a database connection.
      * @param performAutoDownload true if an auto-download process should be started after the operation.
+     * @param item                FeedItem that should be removed.
      */
     public static Future<?> removeQueueItem(final Context context,
-                                            final FeedItem item, final boolean performAutoDownload) {
-        return dbExec.submit(() -> {
-            final PodDBAdapter adapter = PodDBAdapter.getInstance();
-            adapter.open();
-            final List<FeedItem> queue = DBReader.getQueue(adapter);
+                                            final boolean performAutoDownload, final FeedItem item) {
+        return dbExec.submit(() -> removeQueueItemSynchronous(context, performAutoDownload, item.getId()));
+    }
 
-            if (queue != null) {
-                int position = queue.indexOf(item);
+    public static Future<?> removeQueueItem(final Context context, final boolean performAutoDownload,
+                                            final long... itemIds) {
+        return dbExec.submit(() -> removeQueueItemSynchronous(context, performAutoDownload, itemIds));
+    }
+
+    private static void removeQueueItemSynchronous(final Context context,
+                                                   final boolean performAutoDownload,
+                                                   final long... itemIds) {
+        if (itemIds.length < 1) {
+            return;
+        }
+        final PodDBAdapter adapter = PodDBAdapter.getInstance();
+        adapter.open();
+        final List<FeedItem> queue = DBReader.getQueue(adapter);
+
+        if (queue != null) {
+            boolean queueModified = false;
+            List<QueueEvent> events = new ArrayList<>();
+            List<FeedItem> updatedItems = new ArrayList<>();
+            for (long itemId : itemIds) {
+                int position = indexInItemList(queue, itemId);
                 if (position >= 0) {
+                    final FeedItem item = DBReader.getFeedItem(itemId);
+                    if (item == null) {
+                        Log.e(TAG, "removeQueueItem - item in queue but somehow cannot be loaded." +
+                                " Item ignored. It should never happen. id:" + itemId);
+                        continue;
+                    }
                     queue.remove(position);
-                    adapter.setQueue(queue);
                     item.removeTag(FeedItem.TAG_QUEUE);
-                    EventBus.getDefault().post(QueueEvent.removed(item));
-                    EventBus.getDefault().post(FeedItemEvent.updated(item));
+                    events.add(QueueEvent.removed(item));
+                    updatedItems.add(item);
+                    queueModified = true;
                 } else {
-                    Log.w(TAG, "Queue was not modified by call to removeQueueItem");
+                    Log.v(TAG, "removeQueueItem - item  not in queue:" + itemId);
                 }
-            } else {
-                Log.e(TAG, "removeQueueItem: Could not load queue");
             }
-            adapter.close();
-            if (performAutoDownload) {
-                DBTasks.autodownloadUndownloadedItems(context);
+            if (queueModified) {
+                adapter.setQueue(queue);
+                for (QueueEvent event : events) {
+                    EventBus.getDefault().post(event);
+                }
+                EventBus.getDefault().post(FeedItemEvent.updated(updatedItems));
+            } else {
+                Log.w(TAG, "Queue was not modified by call to removeQueueItem");
             }
-        });
-
+        } else {
+            Log.e(TAG, "removeQueueItem: Could not load queue");
+        }
+        adapter.close();
+        if (performAutoDownload) {
+            DBTasks.autodownloadUndownloadedItems(context);
+        }
     }
 
     public static Future<?> addFavoriteItem(final FeedItem item) {
@@ -482,22 +498,6 @@ public class DBWriter {
         });
     }
 
-    public static Future<?> addFavoriteItemById(final long itemId) {
-        return dbExec.submit(() -> {
-            final FeedItem item = DBReader.getFeedItem(itemId);
-            if (item == null) {
-                Log.d(TAG, "Can't find item for itemId " + itemId);
-                return;
-            }
-            final PodDBAdapter adapter = PodDBAdapter.getInstance().open();
-            adapter.addFavoriteItem(item);
-            adapter.close();
-            item.addTag(FeedItem.TAG_FAVORITE);
-            EventBus.getDefault().post(FavoritesEvent.added(item));
-            EventBus.getDefault().post(FeedItemEvent.updated(item));
-        });
-    }
-
     public static Future<?> removeFavoriteItem(final FeedItem item) {
         return dbExec.submit(() -> {
             final PodDBAdapter adapter = PodDBAdapter.getInstance().open();
@@ -633,11 +633,13 @@ public class DBWriter {
      *                           FeedItem.NEW, FeedItem.UNPLAYED
      * @param resetMediaPosition true if this method should also reset the position of the FeedItem's FeedMedia object.
      */
+    @NonNull
     public static Future<?> markItemPlayed(FeedItem item, int played, boolean resetMediaPosition) {
         long mediaId = (item.hasMedia()) ? item.getMedia().getId() : 0;
         return markItemPlayed(item.getId(), played, mediaId, resetMediaPosition);
     }
 
+    @NonNull
     private static Future<?> markItemPlayed(final long itemId,
                                             final int played,
                                             final long mediaId,
@@ -786,21 +788,6 @@ public class DBWriter {
     }
 
     /**
-     * Saves a FeedImage object in the database. This method will save all attributes of the FeedImage object. The
-     * contents of FeedComponent-attributes (e.g. the FeedImages's 'feed'-attribute) will not be saved.
-     *
-     * @param image   The FeedImage object.
-     */
-    public static Future<?> setFeedImage(final FeedImage image) {
-        return dbExec.submit(() -> {
-            PodDBAdapter adapter = PodDBAdapter.getInstance();
-            adapter.open();
-            adapter.setImage(image);
-            adapter.close();
-        });
-    }
-
-    /**
      * Updates download URL of a feed
      */
     public static Future<?> updateFeedDownloadURL(final String original, final String updated) {
@@ -829,12 +816,17 @@ public class DBWriter {
     }
 
     private static boolean itemListContains(List<FeedItem> items, long itemId) {
-        for (FeedItem item : items) {
+        return  indexInItemList(items, itemId) >= 0;
+    }
+
+    private static int indexInItemList(List<FeedItem> items, long itemId) {
+        for (int i = 0; i < items.size(); i ++) {
+            FeedItem item = items.get(i);
             if (item.getId() == itemId) {
-                return true;
+                return i;
             }
         }
-        return false;
+        return -1;
     }
 
     /**
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequester.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequester.java
index 7d4b737db..892a4675a 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequester.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequester.java
@@ -23,6 +23,7 @@ import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.download.DownloadRequest;
 import de.danoeh.antennapod.core.service.download.DownloadService;
 import de.danoeh.antennapod.core.util.FileNameGenerator;
+import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.URLChecker;
 
 
@@ -242,6 +243,7 @@ public class DownloadRequester {
             Log.d(TAG, "Cancelling download with url " + downloadUrl);
         Intent cancelIntent = new Intent(DownloadService.ACTION_CANCEL_DOWNLOAD);
         cancelIntent.putExtra(DownloadService.EXTRA_DOWNLOAD_URL, downloadUrl);
+        cancelIntent.setPackage(context.getPackageName());
         context.sendBroadcast(cancelIntent);
     }
 
@@ -250,8 +252,7 @@ public class DownloadRequester {
      */
     public synchronized void cancelAllDownloads(Context context) {
         Log.d(TAG, "Cancelling all running downloads");
-        context.sendBroadcast(new Intent(
-                DownloadService.ACTION_CANCEL_ALL_DOWNLOADS));
+        IntentUtils.sendLocalBroadcast(context, DownloadService.ACTION_CANCEL_ALL_DOWNLOADS);
     }
 
     /**
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/FeedSearcher.java b/core/src/main/java/de/danoeh/antennapod/core/storage/FeedSearcher.java
index aa5706ad0..4093c41a5 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/FeedSearcher.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/FeedSearcher.java
@@ -1,6 +1,7 @@
 package de.danoeh.antennapod.core.storage;
 
 import android.content.Context;
+import android.support.annotation.NonNull;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -19,6 +20,8 @@ import de.danoeh.antennapod.core.util.comparator.SearchResultValueComparator;
  * Performs search on Feeds and FeedItems
  */
 public class FeedSearcher {
+    private FeedSearcher(){}
+
     private static final String TAG = "FeedSearcher";
 
 
@@ -33,6 +36,7 @@ public class FeedSearcher {
      * @param selectedFeed feed to search, 0 to search through all feeds
      * @return list of episodes containing the query
      */
+    @NonNull
     public static List<SearchResult> performSearch(final Context context,
                                                    final String query, final long selectedFeed) {
         final int values[] = {2, 1, 0, 0, 0, 0};
@@ -43,7 +47,7 @@ public class FeedSearcher {
                 context.getString(R.string.found_in_authors_label),
                 context.getString(R.string.found_in_feeds_label)};
 
-        List<SearchResult> result = new ArrayList<>();
+        final List<SearchResult> result = new ArrayList<>();
 
         List<FutureTask<List<FeedItem>>> tasks = new ArrayList<>();
         tasks.add(DBTasks.searchFeedItemTitle(context, selectedFeed, query));
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
index e82252310..1daa43025 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
@@ -1,5 +1,6 @@
 package de.danoeh.antennapod.core.storage;
 
+import android.annotation.SuppressLint;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -12,9 +13,14 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteDatabase.CursorFactory;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.media.MediaMetadataRetriever;
+import android.os.Build;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 
+import org.apache.commons.io.FileUtils;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
@@ -26,8 +32,6 @@ import de.danoeh.antennapod.core.R;
 import de.danoeh.antennapod.core.event.ProgressEvent;
 import de.danoeh.antennapod.core.feed.Chapter;
 import de.danoeh.antennapod.core.feed.Feed;
-import de.danoeh.antennapod.core.feed.FeedComponent;
-import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.feed.FeedPreferences;
@@ -36,7 +40,6 @@ import de.danoeh.antennapod.core.service.download.DownloadStatus;
 import de.danoeh.antennapod.core.util.LongIntMap;
 import de.danoeh.antennapod.core.util.flattr.FlattrStatus;
 import de.greenrobot.event.EventBus;
-import org.apache.commons.io.FileUtils;
 
 // TODO Remove media column from feeditem table
 
@@ -74,8 +77,9 @@ public class PodDBAdapter {
     public static final String KEY_SIZE = "filesize";
     public static final String KEY_MIME_TYPE = "mime_type";
     public static final String KEY_IMAGE = "image";
+    public static final String KEY_IMAGE_URL = "image_url";
     public static final String KEY_FEED = "feed";
-    private static final String KEY_MEDIA = "media";
+    public static final String KEY_MEDIA = "media";
     public static final String KEY_DOWNLOADED = "downloaded";
     public static final String KEY_LASTUPDATE = "last_update";
     public static final String KEY_FEEDFILE = "feedfile";
@@ -114,14 +118,14 @@ public class PodDBAdapter {
     public static final String KEY_EXCLUDE_FILTER = "exclude_filter";
 
     // Table names
-    private static final String TABLE_NAME_FEEDS = "Feeds";
-    private static final String TABLE_NAME_FEED_ITEMS = "FeedItems";
-    private static final String TABLE_NAME_FEED_IMAGES = "FeedImages";
-    private static final String TABLE_NAME_FEED_MEDIA = "FeedMedia";
-    private static final String TABLE_NAME_DOWNLOAD_LOG = "DownloadLog";
-    private static final String TABLE_NAME_QUEUE = "Queue";
-    private static final String TABLE_NAME_SIMPLECHAPTERS = "SimpleChapters";
-    private static final String TABLE_NAME_FAVORITES = "Favorites";
+    static final String TABLE_NAME_FEEDS = "Feeds";
+    static final String TABLE_NAME_FEED_ITEMS = "FeedItems";
+    static final String TABLE_NAME_FEED_IMAGES = "FeedImages";
+    static final String TABLE_NAME_FEED_MEDIA = "FeedMedia";
+    static final String TABLE_NAME_DOWNLOAD_LOG = "DownloadLog";
+    static final String TABLE_NAME_QUEUE = "Queue";
+    static final String TABLE_NAME_SIMPLECHAPTERS = "SimpleChapters";
+    static final String TABLE_NAME_FAVORITES = "Favorites";
 
     // SQL Statements for creating new tables
     private static final String TABLE_PRIMARY_KEY = KEY_ID
@@ -133,7 +137,7 @@ public class PodDBAdapter {
             + KEY_DOWNLOADED + " INTEGER," + KEY_LINK + " TEXT,"
             + KEY_DESCRIPTION + " TEXT," + KEY_PAYMENT_LINK + " TEXT,"
             + KEY_LASTUPDATE + " TEXT," + KEY_LANGUAGE + " TEXT," + KEY_AUTHOR
-            + " TEXT," + KEY_IMAGE + " INTEGER," + KEY_TYPE + " TEXT,"
+            + " TEXT," + KEY_IMAGE_URL + " TEXT," + KEY_TYPE + " TEXT,"
             + KEY_FEED_IDENTIFIER + " TEXT," + KEY_AUTO_DOWNLOAD + " INTEGER DEFAULT 1,"
             + KEY_FLATTR_STATUS + " INTEGER,"
             + KEY_USERNAME + " TEXT,"
@@ -155,14 +159,9 @@ public class PodDBAdapter {
             + KEY_MEDIA + " INTEGER," + KEY_FEED + " INTEGER,"
             + KEY_HAS_CHAPTERS + " INTEGER," + KEY_ITEM_IDENTIFIER + " TEXT,"
             + KEY_FLATTR_STATUS + " INTEGER,"
-            + KEY_IMAGE + " INTEGER,"
+            + KEY_IMAGE_URL + " TEXT,"
             + KEY_AUTO_DOWNLOAD + " INTEGER)";
 
-    private static final String CREATE_TABLE_FEED_IMAGES = "CREATE TABLE "
-            + TABLE_NAME_FEED_IMAGES + " (" + TABLE_PRIMARY_KEY + KEY_TITLE
-            + " TEXT," + KEY_FILE_URL + " TEXT," + KEY_DOWNLOAD_URL + " TEXT,"
-            + KEY_DOWNLOADED + " INTEGER)";
-
     private static final String CREATE_TABLE_FEED_MEDIA = "CREATE TABLE "
             + TABLE_NAME_FEED_MEDIA + " (" + TABLE_PRIMARY_KEY + KEY_DURATION
             + " INTEGER," + KEY_FILE_URL + " TEXT," + KEY_DOWNLOAD_URL
@@ -191,36 +190,31 @@ public class PodDBAdapter {
             + KEY_LINK + " TEXT," + KEY_CHAPTER_TYPE + " INTEGER)";
 
     // SQL Statements for creating indexes
-    private static final String CREATE_INDEX_FEEDITEMS_FEED = "CREATE INDEX "
+    static final String CREATE_INDEX_FEEDITEMS_FEED = "CREATE INDEX "
             + TABLE_NAME_FEED_ITEMS + "_" + KEY_FEED + " ON " + TABLE_NAME_FEED_ITEMS + " ("
             + KEY_FEED + ")";
 
-    private static final String CREATE_INDEX_FEEDITEMS_IMAGE = "CREATE INDEX "
-            + TABLE_NAME_FEED_ITEMS + "_" + KEY_IMAGE + " ON " + TABLE_NAME_FEED_ITEMS + " ("
-            + KEY_IMAGE + ")";
-
-    private static final String CREATE_INDEX_FEEDITEMS_PUBDATE = "CREATE INDEX IF NOT EXISTS "
+    static final String CREATE_INDEX_FEEDITEMS_PUBDATE = "CREATE INDEX IF NOT EXISTS "
             + TABLE_NAME_FEED_ITEMS + "_" + KEY_PUBDATE + " ON " + TABLE_NAME_FEED_ITEMS + " ("
             + KEY_PUBDATE + ")";
 
-    private static final String CREATE_INDEX_FEEDITEMS_READ = "CREATE INDEX IF NOT EXISTS "
+    static final String CREATE_INDEX_FEEDITEMS_READ = "CREATE INDEX IF NOT EXISTS "
             + TABLE_NAME_FEED_ITEMS + "_" + KEY_READ + " ON " + TABLE_NAME_FEED_ITEMS + " ("
             + KEY_READ + ")";
 
-
-    private static final String CREATE_INDEX_QUEUE_FEEDITEM = "CREATE INDEX "
+    static final String CREATE_INDEX_QUEUE_FEEDITEM = "CREATE INDEX "
             + TABLE_NAME_QUEUE + "_" + KEY_FEEDITEM + " ON " + TABLE_NAME_QUEUE + " ("
             + KEY_FEEDITEM + ")";
 
-    private static final String CREATE_INDEX_FEEDMEDIA_FEEDITEM = "CREATE INDEX "
+    static final String CREATE_INDEX_FEEDMEDIA_FEEDITEM = "CREATE INDEX "
             + TABLE_NAME_FEED_MEDIA + "_" + KEY_FEEDITEM + " ON " + TABLE_NAME_FEED_MEDIA + " ("
             + KEY_FEEDITEM + ")";
 
-    private static final String CREATE_INDEX_SIMPLECHAPTERS_FEEDITEM = "CREATE INDEX "
+    static final String CREATE_INDEX_SIMPLECHAPTERS_FEEDITEM = "CREATE INDEX "
             + TABLE_NAME_SIMPLECHAPTERS + "_" + KEY_FEEDITEM + " ON " + TABLE_NAME_SIMPLECHAPTERS + " ("
             + KEY_FEEDITEM + ")";
 
-    private static final String CREATE_TABLE_FAVORITES = "CREATE TABLE "
+    static final String CREATE_TABLE_FAVORITES = "CREATE TABLE "
             + TABLE_NAME_FAVORITES + "(" + KEY_ID + " INTEGER PRIMARY KEY,"
             + KEY_FEEDITEM + " INTEGER," + KEY_FEED + " INTEGER)";
 
@@ -240,7 +234,7 @@ public class PodDBAdapter {
             TABLE_NAME_FEEDS + "." + KEY_LASTUPDATE,
             TABLE_NAME_FEEDS + "." + KEY_LANGUAGE,
             TABLE_NAME_FEEDS + "." + KEY_AUTHOR,
-            TABLE_NAME_FEEDS + "." + KEY_IMAGE,
+            TABLE_NAME_FEEDS + "." + KEY_IMAGE_URL,
             TABLE_NAME_FEEDS + "." + KEY_TYPE,
             TABLE_NAME_FEEDS + "." + KEY_FEED_IDENTIFIER,
             TABLE_NAME_FEEDS + "." + KEY_AUTO_DOWNLOAD,
@@ -273,7 +267,7 @@ public class PodDBAdapter {
             TABLE_NAME_FEED_ITEMS + "." + KEY_HAS_CHAPTERS,
             TABLE_NAME_FEED_ITEMS + "." + KEY_ITEM_IDENTIFIER,
             TABLE_NAME_FEED_ITEMS + "." + KEY_FLATTR_STATUS,
-            TABLE_NAME_FEED_ITEMS + "." + KEY_IMAGE,
+            TABLE_NAME_FEED_ITEMS + "." + KEY_IMAGE_URL,
             TABLE_NAME_FEED_ITEMS + "." + KEY_AUTO_DOWNLOAD
     };
 
@@ -283,7 +277,6 @@ public class PodDBAdapter {
     private static final String[] ALL_TABLES = {
             TABLE_NAME_FEEDS,
             TABLE_NAME_FEED_ITEMS,
-            TABLE_NAME_FEED_IMAGES,
             TABLE_NAME_FEED_MEDIA,
             TABLE_NAME_DOWNLOAD_LOG,
             TABLE_NAME_QUEUE,
@@ -310,7 +303,6 @@ public class PodDBAdapter {
     private static Context context;
 
     private static volatile SQLiteDatabase db;
-    private static int counter = 0;
 
     public static void init(Context context) {
         PodDBAdapter.context = context.getApplicationContext();
@@ -330,20 +322,20 @@ public class PodDBAdapter {
     }
 
     public synchronized PodDBAdapter open() {
-        counter++;
-        Log.v(TAG, "Opening DB #" + counter);
-
         if (db == null || !db.isOpen() || db.isReadOnly()) {
             db = openDb();
         }
         return this;
     }
 
+    @SuppressLint("NewApi")
     private SQLiteDatabase openDb() {
         SQLiteDatabase newDb;
         try {
             newDb = SingletonHolder.dbHelper.getWritableDatabase();
-            newDb.enableWriteAheadLogging();
+            if (Build.VERSION.SDK_INT >= 16) {
+                newDb.disableWriteAheadLogging();
+            }
         } catch (SQLException ex) {
             Log.e(TAG, Log.getStackTraceString(ex));
             newDb = SingletonHolder.dbHelper.getReadableDatabase();
@@ -352,14 +344,7 @@ public class PodDBAdapter {
     }
 
     public synchronized void close() {
-        counter--;
-        Log.v(TAG, "Closing DB #" + counter);
-
-        if (counter == 0) {
-            Log.v(TAG, "Closing DB, really");
-            db.close();
-            db = null;
-        }
+        // do nothing
     }
 
     public static boolean deleteDatabase() {
@@ -388,12 +373,7 @@ public class PodDBAdapter {
         values.put(KEY_PAYMENT_LINK, feed.getPaymentLink());
         values.put(KEY_AUTHOR, feed.getAuthor());
         values.put(KEY_LANGUAGE, feed.getLanguage());
-        if (feed.getImage() != null) {
-            if (feed.getImage().getId() == 0) {
-                setImage(feed.getImage());
-            }
-            values.put(KEY_IMAGE, feed.getImage().getId());
-        }
+        values.put(KEY_IMAGE_URL, feed.getImageUrl());
 
         values.put(KEY_FILE_URL, feed.getFile_url());
         values.put(KEY_DOWNLOAD_URL, feed.getDownload_url());
@@ -450,54 +430,7 @@ public class PodDBAdapter {
     }
 
     /**
-     * Inserts or updates an image entry
-     *
-     * @return the id of the entry
-     */
-    public long setImage(FeedImage image) {
-        boolean startedTransaction = false;
-
-        try {
-            if (!db.inTransaction()) {
-                db.beginTransactionNonExclusive();
-                startedTransaction = true;
-            }
-
-            ContentValues values = new ContentValues();
-            values.put(KEY_TITLE, image.getTitle());
-            values.put(KEY_DOWNLOAD_URL, image.getDownload_url());
-            values.put(KEY_DOWNLOADED, image.isDownloaded());
-            values.put(KEY_FILE_URL, image.getFile_url());
-            if (image.getId() == 0) {
-                image.setId(db.insert(TABLE_NAME_FEED_IMAGES, null, values));
-            } else {
-                db.update(TABLE_NAME_FEED_IMAGES, values, KEY_ID + "=?",
-                        new String[]{String.valueOf(image.getId())});
-            }
-
-            final FeedComponent owner = image.getOwner();
-            if (owner != null && owner.getId() != 0) {
-                values.clear();
-                values.put(KEY_IMAGE, image.getId());
-                if (owner instanceof Feed) {
-                    db.update(TABLE_NAME_FEEDS, values, KEY_ID + "=?", new String[]{String.valueOf(image.getOwner().getId())});
-                }
-            }
-            if (startedTransaction) {
-                db.setTransactionSuccessful();
-            }
-        } catch (SQLException e) {
-            Log.e(TAG, Log.getStackTraceString(e));
-        } finally {
-            if (startedTransaction) {
-                db.endTransaction();
-            }
-        }
-        return image.getId();
-    }
-
-    /**
-     * Inserts or updates an image entry
+     * Inserts or updates a media entry
      *
      * @return the id of the entry
      */
@@ -608,31 +541,6 @@ public class PodDBAdapter {
     }
 
     /**
-     * Counts feeds and feed items in the flattr queue
-     */
-    public int getFlattrQueueSize() {
-        int res = 0;
-        Cursor c = db.rawQuery(String.format("SELECT count(*) FROM %s WHERE %s=%s",
-                TABLE_NAME_FEEDS, KEY_FLATTR_STATUS, String.valueOf(FlattrStatus.STATUS_QUEUE)), null);
-        if (c.moveToFirst()) {
-            res = c.getInt(0);
-            c.close();
-        } else {
-            Log.e(TAG, "Unable to determine size of flattr queue: Could not count number of feeds");
-        }
-        c = db.rawQuery(String.format("SELECT count(*) FROM %s WHERE %s=%s",
-                TABLE_NAME_FEED_ITEMS, KEY_FLATTR_STATUS, String.valueOf(FlattrStatus.STATUS_QUEUE)), null);
-        if (c.moveToFirst()) {
-            res += c.getInt(0);
-            c.close();
-        } else {
-            Log.e(TAG, "Unable to determine size of flattr queue: Could not count number of feed items");
-        }
-
-        return res;
-    }
-
-    /**
      * Updates the download URL of a Feed.
      */
     public void setFeedDownloadUrl(String original, String updated) {
@@ -759,12 +667,7 @@ public class PodDBAdapter {
         values.put(KEY_ITEM_IDENTIFIER, item.getItemIdentifier());
         values.put(KEY_FLATTR_STATUS, item.getFlattrStatus().toLong());
         values.put(KEY_AUTO_DOWNLOAD, item.getAutoDownload());
-        if (item.hasItemImage()) {
-            if (item.getImage().getId() == 0) {
-                setImage(item.getImage());
-            }
-            values.put(KEY_IMAGE, item.getImage().getId());
-        }
+        values.put(KEY_IMAGE_URL, item.getImageUrl());
 
         if (item.getId() == 0) {
             item.setId(db.insert(TABLE_NAME_FEED_ITEMS, null, values));
@@ -944,17 +847,6 @@ public class PodDBAdapter {
         return count > 0;
     }
 
-    public long getDownloadLogSize() {
-        final String query = String.format("SELECT COUNT(%s) FROM %s", KEY_ID, TABLE_NAME_DOWNLOAD_LOG);
-        Cursor result = db.rawQuery(query, null);
-        long count = 0;
-        if (result.moveToFirst()) {
-            count = result.getLong(0);
-        }
-        result.close();
-        return count;
-    }
-
     public void setQueue(List<FeedItem> queue) {
         ContentValues values = new ContentValues();
         try {
@@ -993,11 +885,6 @@ public class PodDBAdapter {
                 new String[]{String.valueOf(item.getId())});
     }
 
-    private void removeFeedImage(FeedImage image) {
-        db.delete(TABLE_NAME_FEED_IMAGES, KEY_ID + "=?",
-                new String[]{String.valueOf(image.getId())});
-    }
-
     /**
      * Remove a FeedItem and its FeedMedia entry.
      */
@@ -1008,9 +895,6 @@ public class PodDBAdapter {
         if (item.hasChapters() || item.getChapters() != null) {
             removeChaptersOfItem(item);
         }
-        if (item.hasItemImage()) {
-            removeFeedImage(item.getImage());
-        }
         db.delete(TABLE_NAME_FEED_ITEMS, KEY_ID + "=?",
                 new String[]{String.valueOf(item.getId())});
     }
@@ -1021,9 +905,6 @@ public class PodDBAdapter {
     public void removeFeed(Feed feed) {
         try {
             db.beginTransactionNonExclusive();
-            if (feed.getImage() != null) {
-                removeFeedImage(feed.getImage());
-            }
             if (feed.getItems() != null) {
                 for (FeedItem item : feed.getItems()) {
                     removeFeedItem(item);
@@ -1094,18 +975,6 @@ public class PodDBAdapter {
     }
 
     /**
-     * Returns a cursor for a DB query in the FeedMedia table for a given ID.
-     *
-     * @param item The item you want to get the FeedMedia from
-     * @return The cursor of the query
-     */
-    public final Cursor getFeedMediaOfItemCursor(final FeedItem item) {
-        return db.query(TABLE_NAME_FEED_MEDIA, null, KEY_ID + "=?",
-                new String[]{String.valueOf(item.getMedia().getId())}, null,
-                null, null);
-    }
-
-    /**
      * Returns a cursor for a DB query in the FeedImages table for given IDs.
      *
      * @param imageIds IDs of the images
@@ -1363,17 +1232,12 @@ public class PodDBAdapter {
     public Cursor getImageAuthenticationCursor(final String imageUrl) {
         String downloadUrl = DatabaseUtils.sqlEscapeString(imageUrl);
         final String query = ""
-                + "SELECT " + KEY_USERNAME + "," + KEY_PASSWORD + " FROM " + TABLE_NAME_FEED_IMAGES
+                + "SELECT " + KEY_USERNAME + "," + KEY_PASSWORD + " FROM " + TABLE_NAME_FEED_ITEMS
                 + " INNER JOIN " + TABLE_NAME_FEEDS
-                + " ON " + TABLE_NAME_FEED_IMAGES + "." + KEY_ID + "=" + TABLE_NAME_FEEDS + "." + KEY_IMAGE
-                + " WHERE " + TABLE_NAME_FEED_IMAGES + "." + KEY_DOWNLOAD_URL + "=" + downloadUrl
-                + " UNION SELECT " + KEY_USERNAME + "," + KEY_PASSWORD
-                + " FROM " + TABLE_NAME_FEED_IMAGES
-                + " INNER JOIN " + TABLE_NAME_FEED_ITEMS
-                + " ON " + TABLE_NAME_FEED_IMAGES + "." + KEY_ID + "=" + TABLE_NAME_FEED_ITEMS + "." + KEY_IMAGE
-                + " INNER JOIN " + TABLE_NAME_FEEDS
-                + " ON " + TABLE_NAME_FEED_ITEMS + "." + KEY_FEED + "=" + TABLE_NAME_FEEDS + "." + KEY_ID
-                + " WHERE " + TABLE_NAME_FEED_IMAGES + "." + KEY_DOWNLOAD_URL + "=" + downloadUrl;
+                + " ON " + TABLE_NAME_FEED_ITEMS + "." + KEY_FEED + " = " + TABLE_NAME_FEEDS + "." + KEY_ID
+                + " WHERE " + TABLE_NAME_FEED_ITEMS + "." + KEY_IMAGE_URL + "=" + downloadUrl
+                + " UNION SELECT " + KEY_USERNAME + "," + KEY_PASSWORD + " FROM " + TABLE_NAME_FEEDS
+                + " WHERE " + TABLE_NAME_FEEDS + "." + KEY_IMAGE_URL + "=" + downloadUrl;
         return db.rawQuery(query, null);
     }
 
@@ -1389,9 +1253,15 @@ public class PodDBAdapter {
     }
 
     public final int getNumberOfNewItems() {
-        final String query = "SELECT COUNT(" + KEY_ID + ")"
-                + " FROM " + TABLE_NAME_FEED_ITEMS
-                + " WHERE " + KEY_READ + "=" + FeedItem.NEW;
+        Object[] args = new String[]{
+                TABLE_NAME_FEED_ITEMS + "." + KEY_ID,
+                TABLE_NAME_FEED_ITEMS,
+                TABLE_NAME_FEEDS,
+                TABLE_NAME_FEED_ITEMS + "." + KEY_FEED + "=" + TABLE_NAME_FEEDS + "." + KEY_ID,
+                TABLE_NAME_FEED_ITEMS + "." + KEY_READ + "=" + FeedItem.NEW
+                        + " AND " + TABLE_NAME_FEEDS + "." + KEY_KEEP_UPDATED + " > 0"
+        };
+        final String query = String.format("SELECT COUNT(%s) FROM %s INNER JOIN %s ON %s WHERE %s", args);
         Cursor c = db.rawQuery(query, null);
         int result = 0;
         if (c.moveToFirst()) {
@@ -1672,7 +1542,7 @@ public class PodDBAdapter {
      */
     private static class PodDBHelper extends SQLiteOpenHelper {
 
-        private static final int VERSION = 1060200;
+        private static final int VERSION = 1060596;
 
         private final Context context;
 
@@ -1693,7 +1563,6 @@ public class PodDBAdapter {
         public void onCreate(final SQLiteDatabase db) {
             db.execSQL(CREATE_TABLE_FEEDS);
             db.execSQL(CREATE_TABLE_FEED_ITEMS);
-            db.execSQL(CREATE_TABLE_FEED_IMAGES);
             db.execSQL(CREATE_TABLE_FEED_MEDIA);
             db.execSQL(CREATE_TABLE_DOWNLOAD_LOG);
             db.execSQL(CREATE_TABLE_QUEUE);
@@ -1701,7 +1570,6 @@ public class PodDBAdapter {
             db.execSQL(CREATE_TABLE_FAVORITES);
 
             db.execSQL(CREATE_INDEX_FEEDITEMS_FEED);
-            db.execSQL(CREATE_INDEX_FEEDITEMS_IMAGE);
             db.execSQL(CREATE_INDEX_FEEDITEMS_PUBDATE);
             db.execSQL(CREATE_INDEX_FEEDITEMS_READ);
             db.execSQL(CREATE_INDEX_FEEDMEDIA_FEEDITEM);
@@ -1716,263 +1584,7 @@ public class PodDBAdapter {
             EventBus.getDefault().post(ProgressEvent.start(context.getString(R.string.progress_upgrading_database)));
             Log.w("DBAdapter", "Upgrading from version " + oldVersion + " to "
                     + newVersion + ".");
-            if (oldVersion <= 1) {
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS + " ADD COLUMN "
-                        + KEY_TYPE + " TEXT");
-            }
-            if (oldVersion <= 2) {
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_SIMPLECHAPTERS
-                        + " ADD COLUMN " + KEY_LINK + " TEXT");
-            }
-            if (oldVersion <= 3) {
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
-                        + " ADD COLUMN " + KEY_ITEM_IDENTIFIER + " TEXT");
-            }
-            if (oldVersion <= 4) {
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS + " ADD COLUMN "
-                        + KEY_FEED_IDENTIFIER + " TEXT");
-            }
-            if (oldVersion <= 5) {
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_DOWNLOAD_LOG
-                        + " ADD COLUMN " + KEY_REASON_DETAILED + " TEXT");
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_DOWNLOAD_LOG
-                        + " ADD COLUMN " + KEY_DOWNLOADSTATUS_TITLE + " TEXT");
-            }
-            if (oldVersion <= 6) {
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_SIMPLECHAPTERS
-                        + " ADD COLUMN " + KEY_CHAPTER_TYPE + " INTEGER");
-            }
-            if (oldVersion <= 7) {
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
-                        + " ADD COLUMN " + KEY_PLAYBACK_COMPLETION_DATE
-                        + " INTEGER");
-            }
-            if (oldVersion <= 8) {
-                final int KEY_ID_POSITION = 0;
-                final int KEY_MEDIA_POSITION = 1;
-
-                // Add feeditem column to feedmedia table
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
-                        + " ADD COLUMN " + KEY_FEEDITEM
-                        + " INTEGER");
-                Cursor feeditemCursor = db.query(PodDBAdapter.TABLE_NAME_FEED_ITEMS,
-                        new String[]{KEY_ID, KEY_MEDIA}, "? > 0",
-                        new String[]{KEY_MEDIA}, null, null, null);
-                if (feeditemCursor.moveToFirst()) {
-                    db.beginTransaction();
-                    ContentValues contentValues = new ContentValues();
-                    do {
-                        long mediaId = feeditemCursor.getLong(KEY_MEDIA_POSITION);
-                        contentValues.put(KEY_FEEDITEM, feeditemCursor.getLong(KEY_ID_POSITION));
-                        db.update(PodDBAdapter.TABLE_NAME_FEED_MEDIA, contentValues, KEY_ID + "=?", new String[]{String.valueOf(mediaId)});
-                        contentValues.clear();
-                    } while (feeditemCursor.moveToNext());
-                    db.setTransactionSuccessful();
-                    db.endTransaction();
-                }
-                feeditemCursor.close();
-            }
-            if (oldVersion <= 9) {
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                        + " ADD COLUMN " + KEY_AUTO_DOWNLOAD
-                        + " INTEGER DEFAULT 1");
-            }
-            if (oldVersion <= 10) {
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                        + " ADD COLUMN " + KEY_FLATTR_STATUS
-                        + " INTEGER");
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
-                        + " ADD COLUMN " + KEY_FLATTR_STATUS
-                        + " INTEGER");
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
-                        + " ADD COLUMN " + KEY_PLAYED_DURATION
-                        + " INTEGER");
-            }
-            if (oldVersion <= 11) {
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                        + " ADD COLUMN " + KEY_USERNAME
-                        + " TEXT");
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                        + " ADD COLUMN " + KEY_PASSWORD
-                        + " TEXT");
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
-                        + " ADD COLUMN " + KEY_IMAGE
-                        + " INTEGER");
-            }
-            if (oldVersion <= 12) {
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                        + " ADD COLUMN " + KEY_IS_PAGED + " INTEGER DEFAULT 0");
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                        + " ADD COLUMN " + KEY_NEXT_PAGE_LINK + " TEXT");
-            }
-            if (oldVersion <= 13) {
-                // remove duplicate rows in "Chapters" table that were created because of a bug.
-                db.execSQL(String.format("DELETE FROM %s WHERE %s NOT IN " +
-                                "(SELECT MIN(%s) as %s FROM %s GROUP BY %s,%s,%s,%s,%s)",
-                        PodDBAdapter.TABLE_NAME_SIMPLECHAPTERS,
-                        KEY_ID,
-                        KEY_ID,
-                        KEY_ID,
-                        PodDBAdapter.TABLE_NAME_SIMPLECHAPTERS,
-                        KEY_TITLE,
-                        KEY_START,
-                        KEY_FEEDITEM,
-                        KEY_LINK,
-                        KEY_CHAPTER_TYPE));
-            }
-            if (oldVersion <= 14) {
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
-                        + " ADD COLUMN " + KEY_AUTO_DOWNLOAD + " INTEGER");
-                db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
-                        + " SET " + KEY_AUTO_DOWNLOAD + " = "
-                        + "(SELECT " + KEY_AUTO_DOWNLOAD
-                        + " FROM " + PodDBAdapter.TABLE_NAME_FEEDS
-                        + " WHERE " + PodDBAdapter.TABLE_NAME_FEEDS + "." + KEY_ID
-                        + " = " + PodDBAdapter.TABLE_NAME_FEED_ITEMS + "." + KEY_FEED + ")");
-
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                        + " ADD COLUMN " + KEY_HIDE + " TEXT");
-
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                        + " ADD COLUMN " + KEY_LAST_UPDATE_FAILED + " INTEGER DEFAULT 0");
-
-                // create indexes
-                db.execSQL(PodDBAdapter.CREATE_INDEX_FEEDITEMS_FEED);
-                db.execSQL(PodDBAdapter.CREATE_INDEX_FEEDITEMS_IMAGE);
-                db.execSQL(PodDBAdapter.CREATE_INDEX_FEEDMEDIA_FEEDITEM);
-                db.execSQL(PodDBAdapter.CREATE_INDEX_QUEUE_FEEDITEM);
-                db.execSQL(PodDBAdapter.CREATE_INDEX_SIMPLECHAPTERS_FEEDITEM);
-            }
-            if (oldVersion <= 15) {
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
-                        + " ADD COLUMN " + KEY_HAS_EMBEDDED_PICTURE + " INTEGER DEFAULT -1");
-                db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
-                        + " SET " + KEY_HAS_EMBEDDED_PICTURE + "=0"
-                        + " WHERE " + KEY_DOWNLOADED + "=0");
-                Cursor c = db.rawQuery("SELECT " + KEY_FILE_URL
-                        + " FROM " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
-                        + " WHERE " + KEY_DOWNLOADED + "=1 "
-                        + " AND " + KEY_HAS_EMBEDDED_PICTURE + "=-1", null);
-                if (c.moveToFirst()) {
-                    MediaMetadataRetriever mmr = new MediaMetadataRetriever();
-                    do {
-                        String fileUrl = c.getString(0);
-                        try {
-                            mmr.setDataSource(fileUrl);
-                            byte[] image = mmr.getEmbeddedPicture();
-                            if (image != null) {
-                                db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
-                                        + " SET " + KEY_HAS_EMBEDDED_PICTURE + "=1"
-                                        + " WHERE " + KEY_FILE_URL + "='" + fileUrl + "'");
-                            } else {
-                                db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
-                                        + " SET " + KEY_HAS_EMBEDDED_PICTURE + "=0"
-                                        + " WHERE " + KEY_FILE_URL + "='" + fileUrl + "'");
-                            }
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                    } while (c.moveToNext());
-                }
-                c.close();
-            }
-            if (oldVersion <= 16) {
-                String selectNew = "SELECT " + PodDBAdapter.TABLE_NAME_FEED_ITEMS + "." + KEY_ID
-                        + " FROM " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
-                        + " INNER JOIN " + PodDBAdapter.TABLE_NAME_FEED_MEDIA + " ON "
-                        + PodDBAdapter.TABLE_NAME_FEED_ITEMS + "." + KEY_ID + "="
-                        + PodDBAdapter.TABLE_NAME_FEED_MEDIA + "." + KEY_FEEDITEM
-                        + " LEFT OUTER JOIN " + PodDBAdapter.TABLE_NAME_QUEUE + " ON "
-                        + PodDBAdapter.TABLE_NAME_FEED_ITEMS + "." + KEY_ID + "="
-                        + PodDBAdapter.TABLE_NAME_QUEUE + "." + KEY_FEEDITEM
-                        + " WHERE "
-                        + PodDBAdapter.TABLE_NAME_FEED_ITEMS + "." + KEY_READ + " = 0 AND " // unplayed
-                        + PodDBAdapter.TABLE_NAME_FEED_MEDIA + "." + KEY_DOWNLOADED + " = 0 AND " // undownloaded
-                        + PodDBAdapter.TABLE_NAME_FEED_MEDIA + "." + KEY_POSITION + " = 0 AND " // not partially played
-                        + PodDBAdapter.TABLE_NAME_QUEUE + "." + KEY_ID + " IS NULL"; // not in queue
-                String sql = "UPDATE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
-                        + " SET " + KEY_READ + "=" + FeedItem.NEW
-                        + " WHERE " + KEY_ID + " IN (" + selectNew + ")";
-                Log.d("Migration", "SQL: " + sql);
-                db.execSQL(sql);
-            }
-            if (oldVersion <= 17) {
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                        + " ADD COLUMN " + PodDBAdapter.KEY_AUTO_DELETE_ACTION + " INTEGER DEFAULT 0");
-            }
-            if (oldVersion < 1030005) {
-                db.execSQL("UPDATE FeedItems SET auto_download=0 WHERE " +
-                        "(read=1 OR id IN (SELECT feeditem FROM FeedMedia WHERE position>0 OR downloaded=1)) " +
-                        "AND id NOT IN (SELECT feeditem FROM Queue)");
-            }
-            if (oldVersion < 1040001) {
-                db.execSQL(CREATE_TABLE_FAVORITES);
-            }
-            if (oldVersion < 1040002) {
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
-                        + " ADD COLUMN " + PodDBAdapter.KEY_LAST_PLAYED_TIME + " INTEGER DEFAULT 0");
-            }
-            if (oldVersion < 1040013) {
-                db.execSQL(PodDBAdapter.CREATE_INDEX_FEEDITEMS_PUBDATE);
-                db.execSQL(PodDBAdapter.CREATE_INDEX_FEEDITEMS_READ);
-            }
-            if (oldVersion < 1050003) {
-                // Migrates feed list filter data
-
-                db.beginTransaction();
-
-                // Change to intermediate values to avoid overwriting in the following find/replace
-                db.execSQL("UPDATE " + TABLE_NAME_FEEDS + "\n" +
-                        "SET " + KEY_HIDE + " = replace(" + KEY_HIDE + ", 'unplayed', 'noplay')");
-                db.execSQL("UPDATE " + TABLE_NAME_FEEDS + "\n" +
-                        "SET " + KEY_HIDE + " = replace(" + KEY_HIDE + ", 'not_queued', 'noqueue')");
-                db.execSQL("UPDATE " + TABLE_NAME_FEEDS + "\n" +
-                        "SET " + KEY_HIDE + " = replace(" + KEY_HIDE + ", 'not_downloaded', 'nodl')");
-
-                // Replace played, queued, and downloaded with their opposites
-                db.execSQL("UPDATE " + TABLE_NAME_FEEDS + "\n" +
-                        "SET " + KEY_HIDE + " = replace(" + KEY_HIDE + ", 'played', 'unplayed')");
-                db.execSQL("UPDATE " + TABLE_NAME_FEEDS + "\n" +
-                        "SET " + KEY_HIDE + " = replace(" + KEY_HIDE + ", 'queued', 'not_queued')");
-                db.execSQL("UPDATE " + TABLE_NAME_FEEDS + "\n" +
-                        "SET " + KEY_HIDE + " = replace(" + KEY_HIDE + ", 'downloaded', 'not_downloaded')");
-
-                // Now replace intermediates for unplayed, not queued, etc. with their opposites
-                db.execSQL("UPDATE " + TABLE_NAME_FEEDS + "\n" +
-                        "SET " + KEY_HIDE + " = replace(" + KEY_HIDE + ", 'noplay', 'played')");
-                db.execSQL("UPDATE " + TABLE_NAME_FEEDS + "\n" +
-                        "SET " + KEY_HIDE + " = replace(" + KEY_HIDE + ", 'noqueue', 'queued')");
-                db.execSQL("UPDATE " + TABLE_NAME_FEEDS + "\n" +
-                        "SET " + KEY_HIDE + " = replace(" + KEY_HIDE + ", 'nodl', 'downloaded')");
-
-                // Paused doesn't have an opposite, so unplayed is the next best option
-                db.execSQL("UPDATE " + TABLE_NAME_FEEDS + "\n" +
-                        "SET " + KEY_HIDE + " = replace(" + KEY_HIDE + ", 'paused', 'unplayed')");
-
-                db.setTransactionSuccessful();
-                db.endTransaction();
-
-                // and now get ready for autodownload filters
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                        + " ADD COLUMN " + PodDBAdapter.KEY_INCLUDE_FILTER + " TEXT DEFAULT ''");
-
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                        + " ADD COLUMN " + PodDBAdapter.KEY_EXCLUDE_FILTER + " TEXT DEFAULT ''");
-
-                // and now auto refresh
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                        + " ADD COLUMN " + PodDBAdapter.KEY_KEEP_UPDATED + " INTEGER DEFAULT 1");
-            }
-            if (oldVersion < 1050004) {
-                // prevent old timestamps to be misinterpreted as ETags
-                db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEEDS
-                        + " SET " + PodDBAdapter.KEY_LASTUPDATE + "=NULL");
-            }
-            if (oldVersion < 1060200) {
-                db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
-                        + " ADD COLUMN " + PodDBAdapter.KEY_CUSTOM_TITLE + " TEXT");
-            }
-
+            DBUpgrader.upgrade(db, oldVersion, newVersion);
             EventBus.getDefault().post(ProgressEvent.end());
         }
     }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/TypeGetter.java b/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/TypeGetter.java
index ee0a71f30..b4c77e58d 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/TypeGetter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/TypeGetter.java
@@ -54,18 +54,19 @@ public class TypeGetter {
 								return Type.ATOM;
 							case RSS_ROOT:
 								String strVersion = xpp.getAttributeValue(null, "version");
-								if (strVersion != null) {
-									if (strVersion.equals("2.0")) {
-										feed.setType(Feed.TYPE_RSS2);
-										Log.d(TAG, "Recognized type RSS 2.0");
-										return Type.RSS20;
-									} else if (strVersion.equals("0.91")
-											|| strVersion.equals("0.92")) {
-										Log.d(TAG, "Recognized type RSS 0.91/0.92");
-										return Type.RSS091;
-									}
+								if (strVersion == null) {
+									feed.setType(Feed.TYPE_RSS2);
+									Log.d(TAG, "Assuming type RSS 2.0");
+									return Type.RSS20;
+								} else if (strVersion.equals("2.0")) {
+									feed.setType(Feed.TYPE_RSS2);
+									Log.d(TAG, "Recognized type RSS 2.0");
+									return Type.RSS20;
+								} else if (strVersion.equals("0.91") || strVersion.equals("0.92")) {
+									Log.d(TAG, "Recognized type RSS 0.91/0.92");
+									return Type.RSS091;
 								}
-								throw new UnsupportedFeedtypeException(Type.INVALID);
+								throw new UnsupportedFeedtypeException("Unsupported rss version");
 							default:
 								Log.d(TAG, "Type is invalid");
 								throw new UnsupportedFeedtypeException(Type.INVALID, tag);
diff --git a/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/UnsupportedFeedtypeException.java b/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/UnsupportedFeedtypeException.java
index 606f93faf..fd7d0a4e1 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/UnsupportedFeedtypeException.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/syndication/handler/UnsupportedFeedtypeException.java
@@ -5,7 +5,8 @@ import de.danoeh.antennapod.core.syndication.handler.TypeGetter.Type;
 public class UnsupportedFeedtypeException extends Exception {
 	private static final long serialVersionUID = 9105878964928170669L;
 	private final TypeGetter.Type type;
-    private String rootElement;
+	private String rootElement;
+	private String message = null;
 	
 	public UnsupportedFeedtypeException(Type type) {
 		super();
@@ -17,6 +18,11 @@ public class UnsupportedFeedtypeException extends Exception {
         this.rootElement = rootElement;
     }
 
+	public UnsupportedFeedtypeException(String message) {
+		this.message = message;
+		type = Type.INVALID;
+	}
+
     public TypeGetter.Type getType() {
 		return type;
 	}
@@ -27,7 +33,9 @@ public class UnsupportedFeedtypeException extends Exception {
 
     @Override
 	public String getMessage() {
-		if (type == TypeGetter.Type.INVALID) {
+		if (message != null) {
+			return message;
+		} else if (type == TypeGetter.Type.INVALID) {
 			return "Invalid type";
 		} else {
 			return "Type " + type + " not supported";
diff --git a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSITunes.java b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSITunes.java
index 670e99fce..b3b8a40ce 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSITunes.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSITunes.java
@@ -7,7 +7,6 @@ import org.xml.sax.Attributes;
 
 import java.util.concurrent.TimeUnit;
 
-import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.syndication.handler.HandlerState;
 
 public class NSITunes extends Namespace {
@@ -16,7 +15,6 @@ public class NSITunes extends Namespace {
     public static final String NSURI = "http://www.itunes.com/dtds/podcast-1.0.dtd";
 
     private static final String IMAGE = "image";
-    private static final String IMAGE_TITLE = "image";
     private static final String IMAGE_HREF = "href";
 
     private static final String AUTHOR = "author";
@@ -29,21 +27,15 @@ public class NSITunes extends Namespace {
     public SyndElement handleElementStart(String localName, HandlerState state,
                                           Attributes attributes) {
         if (IMAGE.equals(localName)) {
-            FeedImage image = new FeedImage();
-            image.setTitle(IMAGE_TITLE);
-            image.setDownload_url(attributes.getValue(IMAGE_HREF));
+            String url = attributes.getValue(IMAGE_HREF);
 
             if (state.getCurrentItem() != null) {
-                // this is an items image
-                image.setTitle(state.getCurrentItem().getTitle() + IMAGE_TITLE);
-                image.setOwner(state.getCurrentItem());
-                state.getCurrentItem().setImage(image);
+                state.getCurrentItem().setImageUrl(url);
             } else {
                 // this is the feed image
                 // prefer to all other images
-                if (!TextUtils.isEmpty(image.getDownload_url())) {
-                    image.setOwner(state.getFeed());
-                    state.getFeed().setImage(image);
+                if (!TextUtils.isEmpty(url)) {
+                    state.getFeed().setImageUrl(url);
                 }
             }
         }
@@ -55,6 +47,9 @@ public class NSITunes extends Namespace {
         if(state.getContentBuf() == null) {
             return;
         }
+        SyndElement secondElement = state.getSecondTag();
+        String second = secondElement.getName();
+
         if (AUTHOR.equals(localName)) {
             if (state.getFeed() != null) {
                 String author = state.getContentBuf().toString();
@@ -103,10 +98,9 @@ public class NSITunes extends Namespace {
             }
             if (state.getCurrentItem() != null &&
                     (TextUtils.isEmpty(state.getCurrentItem().getDescription()) ||
-                            state.getCurrentItem().getDescription().length() * 1.25 < summary.length())
-            ) {
+                            state.getCurrentItem().getDescription().length() * 1.25 < summary.length())) {
                 state.getCurrentItem().setDescription(summary);
-            } else if (state.getFeed() != null) {
+            } else if (NSRSS20.CHANNEL.equals(second) && state.getFeed() != null) {
                 state.getFeed().setDescription(summary);
             }
         }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSMedia.java b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSMedia.java
index f2cfc2e57..638383223 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSMedia.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSMedia.java
@@ -7,7 +7,6 @@ import org.xml.sax.Attributes;
 
 import java.util.concurrent.TimeUnit;
 
-import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.syndication.handler.HandlerState;
 import de.danoeh.antennapod.core.syndication.namespace.atom.AtomText;
@@ -94,25 +93,16 @@ public class NSMedia extends Namespace {
 				}
 				state.getCurrentItem().setMedia(media);
 			} else if (state.getCurrentItem() != null && url != null && validTypeImage) {
-				FeedImage image = new FeedImage();
-				image.setDownload_url(url);
-				image.setOwner(state.getCurrentItem());
-
-				state.getCurrentItem().setImage(image);
+				state.getCurrentItem().setImageUrl(url);
 			}
 		} else if (IMAGE.equals(localName)) {
 			String url = attributes.getValue(IMAGE_URL);
 			if (url != null) {
-				FeedImage image = new FeedImage();
-				image.setDownload_url(url);
-
 				if (state.getCurrentItem() != null) {
-					image.setOwner(state.getCurrentItem());
-					state.getCurrentItem().setImage(image);
+					state.getCurrentItem().setImageUrl(url);
 				} else {
-					if (state.getFeed().getImage() == null) {
-						image.setOwner(state.getFeed());
-						state.getFeed().setImage(image);
+					if (state.getFeed().getImageUrl() == null) {
+						state.getFeed().setImageUrl(url);
 					}
 				}
 			}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSRSS20.java b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSRSS20.java
index 3d752df76..e391af1b2 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSRSS20.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSRSS20.java
@@ -5,8 +5,6 @@ import android.util.Log;
 
 import org.xml.sax.Attributes;
 
-import de.danoeh.antennapod.core.feed.Feed;
-import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.syndication.handler.HandlerState;
@@ -23,9 +21,6 @@ public class NSRSS20 extends Namespace {
 
     private static final String TAG = "NSRSS20";
 
-    private static final String NSTAG = "rss";
-	private static final String NSURI = "";
-
     public static final String CHANNEL = "channel";
 	public static final String ITEM = "item";
     private static final String GUID = "guid";
@@ -77,17 +72,6 @@ public class NSRSS20 extends Namespace {
 				state.getCurrentItem().setMedia(media);
 			}
 
-		} else if (IMAGE.equals(localName)) {
-			if (state.getTagstack().size() >= 1) {
-				String parent = state.getTagstack().peek().getName();
-				if (CHANNEL.equals(parent)) {
-					Feed feed = state.getFeed();
-					if(feed != null && feed.getImage() == null) {
-						feed.setImage(new FeedImage());
-						feed.getImage().setOwner(state.getFeed());
-					}
-				}
-			}
 		}
 		return new SyndElement(localName, this);
 	}
@@ -134,11 +118,6 @@ public class NSRSS20 extends Namespace {
 					state.getCurrentItem().setTitle(title);
 				} else if (CHANNEL.equals(second) && state.getFeed() != null) {
 					state.getFeed().setTitle(title);
-				} else if (IMAGE.equals(second) && CHANNEL.equals(third)) {
-					if(state.getFeed() != null && state.getFeed().getImage() != null &&
-						state.getFeed().getImage().getTitle() == null) {
-						state.getFeed().getImage().setTitle(title);
-					}
 				}
 			} else if (LINK.equals(top)) {
 				if (CHANNEL.equals(second) && state.getFeed() != null) {
@@ -150,9 +129,8 @@ public class NSRSS20 extends Namespace {
 				state.getCurrentItem().setPubDate(DateUtils.parse(content));
 			} else if (URL.equals(top) && IMAGE.equals(second) && CHANNEL.equals(third)) {
 				// prefer itunes:image
-				if(state.getFeed() != null && state.getFeed().getImage() != null &&
-					state.getFeed().getImage().getDownload_url() == null) {
-					state.getFeed().getImage().setDownload_url(content);
+				if (state.getFeed() != null) {
+					state.getFeed().setImageUrl(content);
 				}
 			} else if (DESCR.equals(localName)) {
 				if (CHANNEL.equals(second) && state.getFeed() != null) {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/Namespace.java b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/Namespace.java
index 1836bbec1..e5fbdb9bb 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/Namespace.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/Namespace.java
@@ -15,7 +15,6 @@ public abstract class Namespace {
 	public abstract SyndElement handleElementStart(String localName, HandlerState state, Attributes attributes);
 	
 	/** Called by a Feedhandler when in endElement and it detects a namespace element 
-	 * 	@return true if namespace handled the element, false if it ignored it
 	 * */
 	public abstract void handleElementEnd(String localName, HandlerState state);
 	
diff --git a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/NSAtom.java b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/NSAtom.java
index 1fe388d9d..83957456a 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/NSAtom.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/atom/NSAtom.java
@@ -5,7 +5,6 @@ import android.util.Log;
 
 import org.xml.sax.Attributes;
 
-import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.syndication.handler.HandlerState;
@@ -48,8 +47,6 @@ public class NSAtom extends Namespace {
     private static final String LINK_REL_ARCHIVES = "archives";
     private static final String LINK_REL_ENCLOSURE = "enclosure";
     private static final String LINK_REL_PAYMENT = "payment";
-    private static final String LINK_REL_RELATED = "related";
-    private static final String LINK_REL_SELF = "self";
     private static final String LINK_REL_NEXT = "next";
     // type-values
     private static final String LINK_TYPE_ATOM = "application/atom+xml";
@@ -210,10 +207,10 @@ public class NSAtom extends Namespace {
                 state.getCurrentItem().setPubDate(DateUtils.parse(content));
             } else if (PUBLISHED.equals(top) && ENTRY.equals(second) && state.getCurrentItem() != null) {
                 state.getCurrentItem().setPubDate(DateUtils.parse(content));
-            } else if (IMAGE_LOGO.equals(top) && state.getFeed() != null && state.getFeed().getImage() == null) {
-                state.getFeed().setImage(new FeedImage(state.getFeed(), content, null));
+            } else if (IMAGE_LOGO.equals(top) && state.getFeed() != null && state.getFeed().getImageUrl() == null) {
+                state.getFeed().setImageUrl(content);
             } else if (IMAGE_ICON.equals(top) && state.getFeed() != null) {
-                state.getFeed().setImage(new FeedImage(state.getFeed(), content, null));
+                state.getFeed().setImageUrl(content);
             } else if (AUTHOR_NAME.equals(top) && AUTHOR.equals(second) &&
                     state.getFeed() != null && state.getCurrentItem() == null) {
                 String currentName = state.getFeed().getAuthor();
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/Consumer.java b/core/src/main/java/de/danoeh/antennapod/core/util/Consumer.java
new file mode 100644
index 000000000..13a87af0d
--- /dev/null
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/Consumer.java
@@ -0,0 +1,5 @@
+package de.danoeh.antennapod.core.util;
+
+public interface Consumer<T> {
+    void accept(T t);
+}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java b/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java
index b513fbe99..6ecca941a 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java
@@ -28,7 +28,6 @@ public final class Converter {
     /** Determines the length of the number for best readability.*/
     private static final int NUM_LENGTH = 1024;
     
-    private static final int DAYS_MIL = 86400000;
     private static final int HOURS_MIL = 3600000;
 	private static final int MINUTES_MIL = 60000;
 	private static final int SECONDS_MIL = 1000;
@@ -75,13 +74,14 @@ public final class Converter {
     	return String.format(Locale.getDefault(), "%02d:%02d:%02d", h, m, s);
     }
     
-    /** Converts milliseconds to a string containing hours and minutes */
-    public static String getDurationStringShort(int duration) {
-    	int h = duration / HOURS_MIL;
-    	int rest = duration - h * HOURS_MIL;
-    	int m = rest / MINUTES_MIL;
-    	
-    	return String.format(Locale.getDefault(), "%02d:%02d", h, m);
+    /** Converts milliseconds to a string containing hours and minutes or minutes and seconds*/
+    public static String getDurationStringShort(int duration, boolean durationIsInHours) {
+        int firstPartBase = durationIsInHours ?  HOURS_MIL : MINUTES_MIL;
+        int firstPart = duration / firstPartBase;
+        int leftoverFromFirstPart = duration - firstPart * firstPartBase;
+        int secondPart = leftoverFromFirstPart / (durationIsInHours ? MINUTES_MIL : SECONDS_MIL);
+
+    	return String.format(Locale.getDefault(), "%02d:%02d", firstPart, secondPart);
     }
 
     /** Converts long duration string (HH:MM:SS) to milliseconds. */
@@ -95,14 +95,20 @@ public final class Converter {
                 Integer.parseInt(parts[2]) * 1000;
     }
 
-    /** Converts short duration string (HH:MM) to milliseconds. */
-    public static int durationStringShortToMs(String input) {
+    /**
+     * Converts short duration string (XX:YY) to milliseconds. If durationIsInHours is true then the
+     * format is HH:MM, otherwise it's MM:SS.
+     * */
+    public static int durationStringShortToMs(String input, boolean durationIsInHours) {
         String[] parts = input.split(":");
         if (parts.length != 2) {
             return 0;
         }
-        return Integer.parseInt(parts[0]) * 3600 * 1000 +
-                Integer.parseInt(parts[1]) * 1000 * 60;
+
+        int modifier = durationIsInHours ? 60 : 1;
+
+        return Integer.parseInt(parts[0]) * 60 * 1000 * modifier+
+                Integer.parseInt(parts[1]) * 1000 * modifier;
     }
 
     /** Converts milliseconds to a localized string containing hours and minutes */
@@ -131,6 +137,7 @@ public final class Converter {
         return String.format(Locale.getDefault(), "%.1f ", hours) + context.getString(R.string.time_hours);
     }
 
+
     /**
      * Converts the volume as read as the progress from a SeekBar scaled to 100 and as saved in
      * UserPreferences to the format taken by setVolume methods.
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java
index 5056ea274..5141e3a78 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java
@@ -17,7 +17,9 @@ import java.util.TimeZone;
  */
 public class DateUtils {
 
-    private static final String TAG = "DateUtils";
+    private DateUtils(){}
+
+	private static final String TAG = "DateUtils";
 
     private static final TimeZone defaultTimezone = TimeZone.getTimeZone("GMT");
 
@@ -85,7 +87,8 @@ public class DateUtils {
                 "yyyy-MM-dd'T'HH:mm:ss'Z'",
                 "yyyy-MM-dd'T'HH:mm:ss.SSSZ",
                 "yyyy-MM-ddZ",
-                "yyyy-MM-dd"
+                "yyyy-MM-dd",
+                "EEE d MMM yyyy HH:mm:ss 'GMT'Z (z)"
         };
 
         SimpleDateFormat parser = new SimpleDateFormat("", Locale.US);
@@ -134,7 +137,7 @@ public class DateUtils {
         if (parts.length >= 2) {
             result += Integer.parseInt(parts[idx]) * 60000L;
             idx++;
-            result += (Float.parseFloat(parts[idx])) * 1000L;
+            result += (long) (Float.parseFloat(parts[idx]) * 1000L);
         }
         return result;
     }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/EpisodeFilter.java b/core/src/main/java/de/danoeh/antennapod/core/util/EpisodeFilter.java
deleted file mode 100644
index fb1b0dc8f..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/util/EpisodeFilter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package de.danoeh.antennapod.core.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import de.danoeh.antennapod.core.feed.FeedItem;
-
-class EpisodeFilter {
-
-	private EpisodeFilter() {
-
-	}
-
-	/** Return a copy of the itemlist without items which have no media. */
-	public static ArrayList<FeedItem> getEpisodeList(List<FeedItem> items) {
-		ArrayList<FeedItem> episodes = new ArrayList<>(items);
-		for (FeedItem item : items) {
-			if (item.getMedia() == null) {
-				episodes.remove(item);
-			}
-		}
-		return episodes;
-	}
-
-	public static int countItemsWithEpisodes(List<FeedItem> items) {
-		int count = 0;
-		for (FeedItem item : items) {
-			if (item.getMedia() != null) {
-				count++;
-			}
-		}
-		return count;
-	}
-
-	public static FeedItem accessEpisodeByIndex(List<FeedItem> items,
-			int position) {
-		int count = 0;
-		for (FeedItem item : items) {
-
-			if (item.getMedia() != null) {
-				if (count == position) {
-					return item;
-				} else {
-					count++;
-				}
-			}
-		}
-		return null;
-	}
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/FeedItemUtil.java b/core/src/main/java/de/danoeh/antennapod/core/util/FeedItemUtil.java
index 76a6549ae..826c06822 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/FeedItemUtil.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/FeedItemUtil.java
@@ -5,6 +5,7 @@ import java.util.List;
 import de.danoeh.antennapod.core.feed.FeedItem;
 
 public class FeedItemUtil {
+    private FeedItemUtil(){}
 
     public static int indexOfItemWithDownloadUrl(List<FeedItem> items, String downloadUrl) {
         if(items == null) {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/FeedUpdateUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/FeedUpdateUtils.java
index 24e0da9ed..afaf13390 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/FeedUpdateUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/FeedUpdateUtils.java
@@ -2,20 +2,30 @@ package de.danoeh.antennapod.core.util;
 
 import android.content.Context;
 import android.util.Log;
+
+import org.awaitility.core.ConditionTimeoutException;
+
+import java.util.concurrent.TimeUnit;
+
 import de.danoeh.antennapod.core.storage.DBTasks;
 
+import static org.awaitility.Awaitility.with;
+
 public class FeedUpdateUtils {
     private static final String TAG = "FeedUpdateUtils";
 
-    private FeedUpdateUtils() {
-
-    }
+    private FeedUpdateUtils() {}
 
     public static void startAutoUpdate(Context context, Runnable callback) {
-        if (NetworkUtils.networkAvailable() && NetworkUtils.isDownloadAllowed()) {
+        try {
+            with().pollInterval(1, TimeUnit.SECONDS)
+                    .await()
+                    .atMost(10, TimeUnit.SECONDS)
+                    .until(() -> NetworkUtils.networkAvailable() && NetworkUtils.isDownloadAllowed());
             DBTasks.refreshAllFeeds(context, null, callback);
-        } else {
+        } catch (ConditionTimeoutException ignore) {
             Log.d(TAG, "Blocking automatic update: no wifi available / no mobile updates allowed");
         }
     }
+
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/Function.java b/core/src/main/java/de/danoeh/antennapod/core/util/Function.java
new file mode 100644
index 000000000..c4f4ad68a
--- /dev/null
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/Function.java
@@ -0,0 +1,7 @@
+package de.danoeh.antennapod.core.util;
+
+import io.reactivex.annotations.NonNull;
+
+public interface Function<T, R> {
+    R apply(@NonNull T t);
+}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/IntentUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/IntentUtils.java
index 1571b71c2..e81ab47ed 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/IntentUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/IntentUtils.java
@@ -8,6 +8,7 @@ import android.content.pm.ResolveInfo;
 import java.util.List;
 
 public class IntentUtils {
+    private IntentUtils(){}
 
     /*
      *  Checks if there is at least one exported activity that can be performed for the intent
@@ -23,4 +24,8 @@ public class IntentUtils {
         return false;
     }
 
+    public static void sendLocalBroadcast(Context context, String action) {
+        context.sendBroadcast(new Intent(action).setPackage(context.getPackageName()));
+    }
+
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/LangUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/LangUtils.java
index 7ec7f84c4..90e0b0981 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/LangUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/LangUtils.java
@@ -5,6 +5,9 @@ import android.support.v4.util.ArrayMap;
 import java.nio.charset.Charset;
 
 public class LangUtils {
+
+	private LangUtils(){}
+
 	public static final Charset UTF_8 = Charset.forName("UTF-8");
 
 	private static final ArrayMap<String, String> languages;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java
index cbda583fa..9bdd375ce 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java
@@ -18,15 +18,16 @@ import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.download.AntennapodHttpClient;
 import de.danoeh.antennapod.core.storage.DBWriter;
+import io.reactivex.Single;
+import io.reactivex.SingleOnSubscribe;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import rx.Observable;
-import rx.Subscriber;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
 
 public class NetworkUtils {
+    private NetworkUtils(){}
 
 	private static final String TAG = NetworkUtils.class.getSimpleName();
 
@@ -89,9 +90,13 @@ public class NetworkUtils {
         return info != null && info.isConnected();
     }
 
-	public static boolean isDownloadAllowed() {
-		return UserPreferences.isAllowMobileUpdate() || !NetworkUtils.isNetworkMetered();
-	}
+    public static boolean isDownloadAllowed() {
+        return UserPreferences.isAllowMobileUpdate() || !NetworkUtils.isNetworkMetered();
+    }
+
+    public static boolean isImageAllowed() {
+        return UserPreferences.isAllowMobileImages() || !NetworkUtils.isNetworkMetered();
+    }
 
 	private static boolean isNetworkMetered() {
 		ConnectivityManager connManager = (ConnectivityManager) context
@@ -111,11 +116,10 @@ public class NetworkUtils {
         return null;
     }
 
-	public static Observable<Long> getFeedMediaSizeObservable(FeedMedia media) {
-        return Observable.create((Observable.OnSubscribe<Long>) subscriber -> {
+	public static Single<Long> getFeedMediaSizeObservable(FeedMedia media) {
+        return Single.create((SingleOnSubscribe<Long>) emitter -> {
             if (!NetworkUtils.isDownloadAllowed()) {
-                subscriber.onNext(0L);
-                subscriber.onCompleted();
+                emitter.onSuccess(0L);
                 return;
             }
             long size = Integer.MIN_VALUE;
@@ -129,8 +133,7 @@ public class NetworkUtils {
 
                 String url = media.getDownload_url();
                 if(TextUtils.isEmpty(url)) {
-                    subscriber.onNext(0L);
-                    subscriber.onCompleted();
+                    emitter.onSuccess(0L);
                     return;
                 }
 
@@ -150,8 +153,7 @@ public class NetworkUtils {
                         }
                     }
                 } catch (IOException e) {
-                    subscriber.onNext(0L);
-                    subscriber.onCompleted();
+                    emitter.onSuccess(0L);
                     Log.e(TAG, Log.getStackTraceString(e));
                     return; // better luck next time
                 }
@@ -163,11 +165,10 @@ public class NetworkUtils {
             } else {
                 media.setSize(size);
             }
-            subscriber.onNext(size);
-            subscriber.onCompleted();
+            emitter.onSuccess(size);
             DBWriter.setFeedMedia(media);
         })
-                .subscribeOn(Schedulers.newThread())
+                .subscribeOn(Schedulers.io())
 				.observeOn(AndroidSchedulers.mainThread());
     }
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/Optional.java b/core/src/main/java/de/danoeh/antennapod/core/util/Optional.java
new file mode 100644
index 000000000..0fe11ec53
--- /dev/null
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/Optional.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package de.danoeh.antennapod.core.util;
+
+import java.util.NoSuchElementException;
+import java.util.Objects;
+
+// AntennaPod's stripped-down version of Java/Android platform's java.util.Optional
+// so that it can be used on lower API level (API level 14)
+
+// Android-changed: removed ValueBased paragraph.
+/**
+ * A container object which may or may not contain a non-null value.
+ * If a value is present, {@code isPresent()} will return {@code true} and
+ * {@code get()} will return the value.
+ *
+ * <p>Additional methods that depend on the presence or absence of a contained
+ * value are provided, such as {@link #orElse(java.lang.Object) orElse()}
+ * (return a default value if value not present) and
+ * {@link #ifPresent(java.util.function.Consumer) ifPresent()} (execute a block
+ * of code if the value is present).
+ *
+ * @since 1.8
+ */
+public final class Optional<T> {
+    /**
+     * Common instance for {@code empty()}.
+     */
+    private static final Optional<?> EMPTY = new Optional<>();
+
+    /**
+     * If non-null, the value; if null, indicates no value is present
+     */
+    private final T value;
+
+    /**
+     * Constructs an empty instance.
+     *
+     * @implNote Generally only one empty instance, {@link Optional#EMPTY},
+     * should exist per VM.
+     */
+    private Optional() {
+        this.value = null;
+    }
+
+    /**
+     * Returns an empty {@code Optional} instance.  No value is present for this
+     * Optional.
+     *
+     * @apiNote Though it may be tempting to do so, avoid testing if an object
+     * is empty by comparing with {@code ==} against instances returned by
+     * {@code Option.empty()}. There is no guarantee that it is a singleton.
+     * Instead, use {@link #isPresent()}.
+     *
+     * @param <T> Type of the non-existent value
+     * @return an empty {@code Optional}
+     */
+    public static<T> Optional<T> empty() {
+        @SuppressWarnings("unchecked")
+        Optional<T> t = (Optional<T>) EMPTY;
+        return t;
+    }
+
+    /**
+     * Constructs an instance with the value present.
+     *
+     * @param value the non-null value to be present
+     * @throws NullPointerException if value is null
+     */
+    private Optional(T value) {
+        this.value = Objects.requireNonNull(value);
+    }
+
+    /**
+     * Returns an {@code Optional} with the specified present non-null value.
+     *
+     * @param <T> the class of the value
+     * @param value the value to be present, which must be non-null
+     * @return an {@code Optional} with the value present
+     * @throws NullPointerException if value is null
+     */
+    public static <T> Optional<T> of(T value) {
+        return new Optional<>(value);
+    }
+
+    /**
+     * Returns an {@code Optional} describing the specified value, if non-null,
+     * otherwise returns an empty {@code Optional}.
+     *
+     * @param <T> the class of the value
+     * @param value the possibly-null value to describe
+     * @return an {@code Optional} with a present value if the specified value
+     * is non-null, otherwise an empty {@code Optional}
+     */
+    public static <T> Optional<T> ofNullable(T value) {
+        return value == null ? empty() : of(value);
+    }
+
+    /**
+     * If a value is present in this {@code Optional}, returns the value,
+     * otherwise throws {@code NoSuchElementException}.
+     *
+     * @return the non-null value held by this {@code Optional}
+     * @throws NoSuchElementException if there is no value present
+     *
+     * @see Optional#isPresent()
+     */
+    public T get() {
+        if (value == null) {
+            throw new NoSuchElementException("No value present");
+        }
+        return value;
+    }
+
+    /**
+     * Return {@code true} if there is a value present, otherwise {@code false}.
+     *
+     * @return {@code true} if there is a value present, otherwise {@code false}
+     */
+    public boolean isPresent() {
+        return value != null;
+    }
+
+
+    /**
+     * Return the value if present, otherwise return {@code other}.
+     *
+     * @param other the value to be returned if there is no value present, may
+     * be null
+     * @return the value, if present, otherwise {@code other}
+     */
+    public T orElse(T other) {
+        return value != null ? value : other;
+    }
+
+    /**
+     * Indicates whether some other object is "equal to" this Optional. The
+     * other object is considered equal if:
+     * <ul>
+     * <li>it is also an {@code Optional} and;
+     * <li>both instances have no value present or;
+     * <li>the present values are "equal to" each other via {@code equals()}.
+     * </ul>
+     *
+     * @param obj an object to be tested for equality
+     * @return {code true} if the other object is "equal to" this object
+     * otherwise {@code false}
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+
+        if (!(obj instanceof Optional)) {
+            return false;
+        }
+
+        Optional<?> other = (Optional<?>) obj;
+        return (value == other.value) || (value != null && value.equals(other.value));
+    }
+
+    /**
+     * Returns the hash code value of the present value, if any, or 0 (zero) if
+     * no value is present.
+     *
+     * @return hash code value of the present value or 0 if no value is present
+     */
+    @Override
+    public int hashCode() {
+        return value != null ? value.hashCode() : 0;
+    }
+
+    /**
+     * Returns a non-empty string representation of this Optional suitable for
+     * debugging. The exact presentation format is unspecified and may vary
+     * between implementations and versions.
+     *
+     * @implSpec If a value is present the result must include its string
+     * representation in the result. Empty and present Optionals must be
+     * unambiguously differentiable.
+     *
+     * @return the string representation of this instance
+     */
+    @Override
+    public String toString() {
+        return value != null
+                ? String.format("Optional[%s]", value)
+                : "Optional.empty";
+    }
+}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/QueueAccess.java b/core/src/main/java/de/danoeh/antennapod/core/util/QueueAccess.java
index 7377b202d..9408be348 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/QueueAccess.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/QueueAccess.java
@@ -58,19 +58,4 @@ public abstract class QueueAccess {
         };
     }
 
-    public static QueueAccess NotInQueueAccess() {
-        return new QueueAccess() {
-            @Override
-            public boolean contains(long id) {
-                return false;
-            }
-
-            @Override
-            public boolean remove(long id) {
-                return false;
-            }
-        };
-
-    }
-
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/RewindAfterPauseUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/RewindAfterPauseUtils.java
index ee306a401..d1818aeef 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/RewindAfterPauseUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/RewindAfterPauseUtils.java
@@ -9,6 +9,7 @@ import java.util.concurrent.TimeUnit;
  * Media file should be "rewinded" x seconds after user resumes the playback.
  */
 public class RewindAfterPauseUtils {
+    private RewindAfterPauseUtils(){}
 
     public static final long ELAPSED_TIME_FOR_SHORT_REWIND = TimeUnit.MINUTES.toMillis(1);
     public static final long ELAPSED_TIME_FOR_MEDIUM_REWIND = TimeUnit.HOURS.toMillis(1);
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/StorageUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/StorageUtils.java
index 1ef81bf64..3a6bf5755 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/StorageUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/StorageUtils.java
@@ -14,6 +14,8 @@ import de.danoeh.antennapod.core.preferences.UserPreferences;
  * Utility functions for handling storage errors
  */
 public class StorageUtils {
+    private StorageUtils(){}
+
     private static final String TAG = "StorageUtils";
 
     public static boolean storageAvailable() {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java
index f67367643..14f091249 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/ThemeUtils.java
@@ -1,17 +1,25 @@
 package de.danoeh.antennapod.core.util;
 
+import android.content.Context;
+import android.support.annotation.AttrRes;
+import android.support.annotation.ColorInt;
 import android.util.Log;
+import android.util.TypedValue;
 
 import de.danoeh.antennapod.core.R;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 public class ThemeUtils {
+    private ThemeUtils(){}
+
     private static final String TAG = "ThemeUtils";
 
     public static int getSelectionBackgroundColor() {
         int theme = UserPreferences.getTheme();
         if (theme == R.style.Theme_AntennaPod_Dark) {
             return R.color.selection_background_color_dark;
+        } else if (theme == R.style.Theme_AntennaPod_TrueBlack){
+            return R.color.selection_background_color_trueblack;
         } else if (theme == R.style.Theme_AntennaPod_Light) {
             return R.color.selection_background_color_light;
         } else {
@@ -20,4 +28,10 @@ public class ThemeUtils {
             return R.color.selection_background_color_light;
         }
     }
+
+    public static @ColorInt int getColorFromAttr(Context context, @AttrRes int attr) {
+        TypedValue typedValue = new TypedValue();
+        context.getTheme().resolveAttribute(attr, typedValue, true);
+        return typedValue.data;
+    }
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/URLChecker.java b/core/src/main/java/de/danoeh/antennapod/core/util/URLChecker.java
index 40faa1dd2..ffc6a6e28 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/URLChecker.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/URLChecker.java
@@ -1,6 +1,7 @@
 package de.danoeh.antennapod.core.util;
 
 import android.net.Uri;
+import android.support.annotation.NonNull;
 import android.util.Log;
 
 import de.danoeh.antennapod.core.BuildConfig;
@@ -29,7 +30,7 @@ public final class URLChecker {
      * @param url The url which is going to be prepared
      * @return The prepared url
      */
-    public static String prepareURL(String url) {
+    public static String prepareURL(@NonNull String url) {
         url = url.trim();
         if (url.startsWith("feed://")) {
             if (BuildConfig.DEBUG) Log.d(TAG, "Replacing feed:// with http://");
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/download/AutoUpdateManager.java b/core/src/main/java/de/danoeh/antennapod/core/util/download/AutoUpdateManager.java
index ad723c685..1629f4aaf 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/download/AutoUpdateManager.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/download/AutoUpdateManager.java
@@ -11,12 +11,17 @@ import android.os.Build;
 import android.os.SystemClock;
 import android.support.annotation.RequiresApi;
 import android.util.Log;
-import de.danoeh.antennapod.core.receiver.FeedUpdateReceiver;
-import de.danoeh.antennapod.core.service.FeedUpdateJobService;
 
 import java.util.Calendar;
 import java.util.concurrent.TimeUnit;
 
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.receiver.FeedUpdateReceiver;
+import de.danoeh.antennapod.core.service.FeedUpdateJobService;
+import de.danoeh.antennapod.core.storage.DBTasks;
+import de.danoeh.antennapod.core.util.Converter;
+import de.danoeh.antennapod.core.util.FeedUpdateUtils;
+
 public class AutoUpdateManager {
     private static final int JOB_ID_FEED_UPDATE = 42;
     private static final String TAG = "AutoUpdateManager";
@@ -152,4 +157,29 @@ public class AutoUpdateManager {
                 updateIntent);
         Log.d(TAG, "Changed alarm to new time of day " + alarm.get(Calendar.HOUR_OF_DAY) + ":" + alarm.get(Calendar.MINUTE));
     }
+
+    /*
+     *  Checks if the app should refresh all feeds, i.e. if the last auto refresh failed.
+     *
+     *  The feeds are only refreshed if an update interval or time of day is set and the last
+     *  (successful) refresh was before the last interval or more than a day ago, respectively.
+     *
+     */
+    public static void checkShouldRefreshFeeds(Context context) {
+        long interval = 0;
+        if(UserPreferences.getUpdateInterval() > 0) {
+            interval = UserPreferences.getUpdateInterval();
+        } else if(UserPreferences.getUpdateTimeOfDay().length > 0){
+            interval = TimeUnit.DAYS.toMillis(1);
+        }
+        if(interval == 0) { // auto refresh is disabled
+            return;
+        }
+        long lastRefresh = DBTasks.getLastRefreshAllFeedsTimeMillis(context);
+        Log.d(TAG, "last refresh: " + Converter.getDurationStringLocalized(context,
+                System.currentTimeMillis() - lastRefresh) + " ago");
+        if(lastRefresh <= System.currentTimeMillis() - interval) {
+            FeedUpdateUtils.startAutoUpdate(context, null);
+        }
+    }
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/exception/MediaFileNotFoundException.java b/core/src/main/java/de/danoeh/antennapod/core/util/exception/MediaFileNotFoundException.java
index ecb641dad..3000e2fa4 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/exception/MediaFileNotFoundException.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/exception/MediaFileNotFoundException.java
@@ -12,11 +12,6 @@ public class MediaFileNotFoundException extends Exception {
 		this.media = media;
 	}
 
-	public MediaFileNotFoundException(FeedMedia media) {
-		super();
-		this.media = media;
-	}
-
 	public FeedMedia getMedia() {
 		return media;
 	}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/flattr/FlattrServiceCreator.java b/core/src/main/java/de/danoeh/antennapod/core/util/flattr/FlattrServiceCreator.java
index 45cb56988..d4d5843d2 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/flattr/FlattrServiceCreator.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/flattr/FlattrServiceCreator.java
@@ -11,7 +11,9 @@ import de.danoeh.antennapod.core.BuildConfig;
 /** Ensures that only one instance of the FlattrService class exists at a time */
 
 class FlattrServiceCreator {
-	private static final String TAG = "FlattrServiceCreator";
+	private FlattrServiceCreator(){}
+
+	public static final String TAG = "FlattrServiceCreator";
 	
 	private static volatile FlattrService flattrService;
 	
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/flattr/FlattrUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/flattr/FlattrUtils.java
index 313d1c2f2..919fc82f2 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/flattr/FlattrUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/flattr/FlattrUtils.java
@@ -1,8 +1,6 @@
 package de.danoeh.antennapod.core.util.flattr;
 
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
@@ -36,6 +34,8 @@ import de.danoeh.antennapod.core.storage.DBWriter;
  */
 
 public class FlattrUtils {
+    private FlattrUtils(){}
+
     private static final String TAG = "FlattrUtils";
 
     private static final String HOST_NAME = "de.danoeh.antennapod";
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/gui/MoreContentListFooterUtil.java b/core/src/main/java/de/danoeh/antennapod/core/util/gui/MoreContentListFooterUtil.java
index 386f46724..6e5c3e84b 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/gui/MoreContentListFooterUtil.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/gui/MoreContentListFooterUtil.java
@@ -27,8 +27,8 @@ public class MoreContentListFooterUtil {
     }
 
     public void setLoadingState(boolean newState) {
-        final ImageView imageView = (ImageView) root.findViewById(R.id.imgExpand);
-        final ProgressBar progressBar = (ProgressBar) root.findViewById(R.id.progBar);
+        final ImageView imageView = root.findViewById(R.id.imgExpand);
+        final ProgressBar progressBar = root.findViewById(R.id.progBar);
         if (newState) {
             imageView.setVisibility(View.GONE);
             progressBar.setVisibility(View.VISIBLE);
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/gui/NotificationUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/gui/NotificationUtils.java
index 1c42364ea..52a43aab2 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/gui/NotificationUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/gui/NotificationUtils.java
@@ -6,6 +6,7 @@ import android.app.NotificationManager;
 import android.content.Context;
 import android.os.Build;
 import android.support.annotation.RequiresApi;
+
 import de.danoeh.antennapod.core.R;
 
 public class NotificationUtils {
@@ -41,6 +42,7 @@ public class NotificationUtils {
         NotificationChannel mChannel = new NotificationChannel(CHANNEL_ID_DOWNLOADING,
                 c.getString(R.string.notification_channel_downloading), NotificationManager.IMPORTANCE_LOW);
         mChannel.setDescription(c.getString(R.string.notification_channel_downloading_description));
+        mChannel.setShowBadge(false);
         return mChannel;
     }
 
@@ -49,6 +51,7 @@ public class NotificationUtils {
         NotificationChannel mChannel = new NotificationChannel(CHANNEL_ID_PLAYING,
                 c.getString(R.string.notification_channel_playing), NotificationManager.IMPORTANCE_LOW);
         mChannel.setDescription(c.getString(R.string.notification_channel_playing_description));
+        mChannel.setShowBadge(false);
         return mChannel;
     }
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/AudioPlayer.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/AudioPlayer.java
index 846733882..2b3f38841 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/AudioPlayer.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/AudioPlayer.java
@@ -21,18 +21,12 @@ public class AudioPlayer extends MediaPlayer implements IPlayer {
 
 	private final SharedPreferences.OnSharedPreferenceChangeListener sonicListener =
 			(sharedPreferences, key) -> {
-				if (key.equals(UserPreferences.PREF_SONIC)) {
+				if (key.equals(UserPreferences.PREF_MEDIA_PLAYER)) {
 					checkMpi();
 				}
 			};
 
 	@Override
-	public void setScreenOnWhilePlaying(boolean screenOn) {
-		Log.e(TAG, "Setting screen on while playing not supported in Audio Player");
-		throw new UnsupportedOperationException("Setting screen on while playing not supported in Audio Player");
-	}
-
-	@Override
 	public void setDisplay(SurfaceHolder sh) {
 		if (sh != null) {
 			Log.e(TAG, "Setting display not supported in Audio Player");
@@ -40,10 +34,13 @@ public class AudioPlayer extends MediaPlayer implements IPlayer {
 		}
 	}
 
-    @Override
-    public void setVideoScalingMode(int mode) {
-        throw new UnsupportedOperationException("Setting scaling mode is not supported in Audio Player");
-    }
+	@Override
+	public void setPlaybackParams(float speed, boolean skipSilence) {
+		if(canSetSpeed()) {
+			setPlaybackSpeed(speed);
+		}
+		//Default player does not support silence skipping
+	}
 
 	@Override
 	protected boolean useSonic() {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/IPlayer.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/IPlayer.java
index aba395ec1..c2b768ea8 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/IPlayer.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/IPlayer.java
@@ -6,13 +6,11 @@ import android.view.SurfaceHolder;
 import java.io.IOException;
 
 public interface IPlayer {
-	boolean canSetPitch();
 
 	boolean canSetSpeed();
 
 	boolean canDownmix();
 
-	float getCurrentPitchStepsAdjustment();
 
 	int getCurrentPosition();
 
@@ -20,20 +18,12 @@ public interface IPlayer {
 
 	int getDuration();
 
-	float getMaxSpeedMultiplier();
-
-	float getMinSpeedMultiplier();
-
-	boolean isLooping();
-
 	boolean isPlaying();
 
 	void pause();
 
 	void prepare() throws IllegalStateException, IOException;
 
-	void prepareAsync();
-
 	void release();
 
 	void reset();
@@ -42,22 +32,12 @@ public interface IPlayer {
 
 	void setAudioStreamType(int streamtype);
 
-	void setScreenOnWhilePlaying(boolean screenOn);
-
 	void setDataSource(String path) throws IllegalStateException, IOException,
             IllegalArgumentException, SecurityException;
 
 	void setDisplay(SurfaceHolder sh);
 
-	void setEnableSpeedAdjustment(boolean enableSpeedAdjustment);
-
-	void setLooping(boolean looping);
-
-	void setPitchStepsAdjustment(float pitchSteps);
-
-	void setPlaybackPitch(float f);
-
-	void setPlaybackSpeed(float f);
+	void setPlaybackParams(float speed, boolean skipSilence);
 
 	void setDownmix(boolean enable);
 
@@ -67,7 +47,5 @@ public interface IPlayer {
 
 	void stop();
 
-    void setVideoScalingMode(int mode);
-
     void setWakeMode(Context context, int mode);
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/MediaPlayerError.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/MediaPlayerError.java
index a576dd497..b04c02075 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/MediaPlayerError.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/MediaPlayerError.java
@@ -7,6 +7,7 @@ import de.danoeh.antennapod.core.R;
 
 /** Utility class for MediaPlayer errors. */
 public class MediaPlayerError {
+	private MediaPlayerError(){}
 
 	/** Get a human-readable string for a specific error code. */
 	public static String getErrorString(Context context, int code) {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/Playable.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/Playable.java
index ff7f5b79d..da9b96430 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/Playable.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/Playable.java
@@ -176,6 +176,8 @@ public interface Playable extends Parcelable,
      * Provides utility methods for Playable objects.
      */
     class PlayableUtils {
+        private PlayableUtils(){}
+
         private static final String TAG = "PlayableUtils";
 
         /**
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
index a3f02d5cc..6498b9ff1 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
@@ -7,15 +7,11 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
-import android.content.SharedPreferences;
 import android.content.res.TypedArray;
 import android.media.MediaPlayer;
 import android.os.Build;
 import android.os.IBinder;
-import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
@@ -24,10 +20,8 @@ import android.widget.ImageButton;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 import de.danoeh.antennapod.core.R;
@@ -41,11 +35,14 @@ import de.danoeh.antennapod.core.service.playback.PlaybackServiceMediaPlayer;
 import de.danoeh.antennapod.core.service.playback.PlayerStatus;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.util.Converter;
+import de.danoeh.antennapod.core.util.Optional;
 import de.danoeh.antennapod.core.util.playback.Playable.PlayableUtils;
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.Maybe;
+import io.reactivex.MaybeOnSubscribe;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Communicates with the playback service. GUI classes should use this class to
@@ -73,7 +70,8 @@ public abstract class PlaybackController {
     private boolean released = false;
     private boolean initialized = false;
 
-    private Subscription serviceBinder;
+    private Disposable serviceBinder;
+    private Disposable mediaLoader;
 
     /**
      * True if controller should reinit playback service if 'pause' button is
@@ -106,6 +104,7 @@ public abstract class PlaybackController {
     }
 
     private synchronized void initServiceRunning() {
+        Log.v(TAG, "initServiceRunning()");
         if (initialized) {
             return;
         }
@@ -148,7 +147,7 @@ public abstract class PlaybackController {
         }
 
         if(serviceBinder != null) {
-            serviceBinder.unsubscribe();
+            serviceBinder.dispose();
         }
         try {
             activity.unbindService(mConnection);
@@ -183,27 +182,20 @@ public abstract class PlaybackController {
     private void bindToService() {
         Log.d(TAG, "Trying to connect to service");
         if (serviceBinder != null) {
-            serviceBinder.unsubscribe();
+            serviceBinder.dispose();
         }
         serviceBinder = Observable.fromCallable(this::getPlayLastPlayedMediaIntent)
-                .subscribeOn(Schedulers.newThread())
+                .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(intent -> {
+                .subscribe(optionalIntent -> {
                     boolean bound = false;
-                    if (!PlaybackService.started) {
-                        if (intent != null) {
-                            Log.d(TAG, "Calling start service");
-                            ContextCompat.startForegroundService(activity, intent);
-                            bound = activity.bindService(intent, mConnection, 0);
-                        } else {
-                            status = PlayerStatus.STOPPED;
-                            setupGUI();
-                            handleStatus();
-                        }
+                    if (optionalIntent.isPresent()) {
+                        Log.d(TAG, "Calling bind service");
+                        bound = activity.bindService(optionalIntent.get(), mConnection, 0);
                     } else {
-                        Log.d(TAG, "PlaybackService is running, trying to connect without start command.");
-                        bound = activity.bindService(new Intent(activity, PlaybackService.class),
-                                mConnection, 0);
+                        status = PlayerStatus.STOPPED;
+                        setupGUI();
+                        handleStatus();
                     }
                     Log.d(TAG, "Result for service binding: " + bound);
                 }, error -> Log.e(TAG, Log.getStackTraceString(error)));
@@ -213,24 +205,26 @@ public abstract class PlaybackController {
      * Returns an intent that starts the PlaybackService and plays the last
      * played media or null if no last played media could be found.
      */
-    @Nullable private Intent getPlayLastPlayedMediaIntent() {
+    @NonNull
+    private Optional<Intent> getPlayLastPlayedMediaIntent() {
         Log.d(TAG, "Trying to restore last played media");
         Playable media = PlayableUtils.createInstanceFromPreferences(activity);
         if (media == null) {
             Log.d(TAG, "No last played media found");
-            return null;
+            return Optional.empty();
         }
 
+
         boolean fileExists = media.localFileAvailable();
         boolean lastIsStream = PlaybackPreferences.getCurrentEpisodeIsStream();
         if (!fileExists && !lastIsStream && media instanceof FeedMedia) {
             DBTasks.notifyMissingFeedMediaFile(activity, (FeedMedia) media);
         }
 
-        return new PlaybackServiceStarter(activity, media)
+        return Optional.of(new PlaybackServiceStarter(activity, media)
                 .startWhenPrepared(false)
                 .shouldStream(lastIsStream || !fileExists)
-                .getIntent();
+                .getIntent());
     }
 
 
@@ -413,8 +407,8 @@ public abstract class PlaybackController {
             pauseResource = res.getResourceId(1, R.drawable.ic_pause_grey600_36dp);
             res.recycle();
         } else {
-            playResource = R.drawable.ic_av_play_circle_outline_80dp;
-            pauseResource = R.drawable.ic_av_pause_circle_outline_80dp;
+            playResource = R.drawable.ic_av_play_white_80dp;
+            pauseResource = R.drawable.ic_av_pause_white_80dp;
         }
 
         Log.d(TAG, "status: " + status.toString());
@@ -588,7 +582,8 @@ public abstract class PlaybackController {
                     .startWhenPrepared(true)
                     .streamIfLastWasStream()
                     .start();
-            Log.w(TAG, "Play/Pause button was pressed, but playbackservice was null!");
+            Log.d(TAG, "Play/Pause button was pressed, but playbackservice was null - " +
+                    "it is likely to have been released by Android system. Restarting it.");
             return;
         }
         switch (status) {
@@ -699,7 +694,7 @@ public abstract class PlaybackController {
         return org.antennapod.audio.MediaPlayer.isPrestoLibraryInstalled(activity.getApplicationContext())
                 || UserPreferences.useSonic()
                 || Build.VERSION.SDK_INT >= 23
-                || playbackService != null && playbackService.canSetSpeed();
+                || (playbackService != null && playbackService.canSetSpeed());
     }
 
     public void setPlaybackSpeed(float speed) {
@@ -707,6 +702,11 @@ public abstract class PlaybackController {
             playbackService.setSpeed(speed);
         }
     }
+    public void setSkipSilence(boolean skipSilence) {
+        if (playbackService != null) {
+            playbackService.skipSilence(skipSilence);
+        }
+    }
 
     public void setVolume(float leftVolume, float rightVolume) {
         if (playbackService != null) {
@@ -760,6 +760,7 @@ public abstract class PlaybackController {
     }
 
     public void notifyVideoSurfaceAbandoned() {
+        Log.v(TAG, "notifyVideoSurfaceAbandoned() - hasPlaybackService=" + (playbackService != null));
         if (playbackService != null) {
             playbackService.notifyVideoSurfaceAbandoned();
         }
@@ -780,18 +781,28 @@ public abstract class PlaybackController {
     }
 
     private void initServiceNotRunning() {
-        if (getMedia() == null) {
-            return;
-        }
-        if (getMedia().getMediaType() == MediaType.AUDIO) {
-            TypedArray res = activity.obtainStyledAttributes(new int[]{
-                    de.danoeh.antennapod.core.R.attr.av_play_big});
-            getPlayButton().setImageResource(
-                    res.getResourceId(0, de.danoeh.antennapod.core.R.drawable.ic_play_arrow_grey600_36dp));
-            res.recycle();
-        } else {
-            getPlayButton().setImageResource(R.drawable.ic_av_play_circle_outline_80dp);
-        }
+        Log.v(TAG, "initServiceNotRunning()");
+        mediaLoader = Maybe.create((MaybeOnSubscribe<Playable>) emitter -> {
+            Playable media = getMedia();
+            if (media != null) {
+                emitter.onSuccess(media);
+            } else {
+                emitter.onComplete();
+            }
+        })
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(media -> {
+                if (media.getMediaType() == MediaType.AUDIO) {
+                    TypedArray res = activity.obtainStyledAttributes(new int[]{
+                            de.danoeh.antennapod.core.R.attr.av_play_big});
+                    getPlayButton().setImageResource(
+                            res.getResourceId(0, de.danoeh.antennapod.core.R.drawable.ic_play_arrow_grey600_36dp));
+                    res.recycle();
+                } else {
+                    getPlayButton().setImageResource(R.drawable.ic_av_play_white_80dp);
+                }
+            }, error -> Log.e(TAG, Log.getStackTraceString(error)));
     }
 
     /**
@@ -799,7 +810,7 @@ public abstract class PlaybackController {
      */
     public class MediaPositionObserver implements Runnable {
 
-        public static final int WAITING_INTERVALL = 1000;
+        static final int WAITING_INTERVALL = 1000;
 
         @Override
         public void run() {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackServiceStarter.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackServiceStarter.java
index 3ba553d12..64cf61457 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackServiceStarter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackServiceStarter.java
@@ -2,12 +2,15 @@ package de.danoeh.antennapod.core.util.playback;
 
 import android.content.Context;
 import android.content.Intent;
-import android.media.MediaPlayer;
 import android.support.v4.content.ContextCompat;
+import android.util.Log;
+
 import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 
 public class PlaybackServiceStarter {
+    private static final String TAG = "PlaybackServiceStarter";
+
     private final Context context;
     private final Playable media;
     private boolean startWhenPrepared = false;
@@ -64,6 +67,10 @@ public class PlaybackServiceStarter {
         launchIntent.putExtra(PlaybackService.EXTRA_SHOULD_STREAM, shouldStream);
         launchIntent.putExtra(PlaybackService.EXTRA_PREPARE_IMMEDIATELY, prepareImmediately);
 
+        if (media == null) {
+            Log.e(TAG, "getIntent() - media is unexpectedly null. intent:" + launchIntent);
+        }
+
         return launchIntent;
     }
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java
index 34cfe6d05..75229b9cf 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java
@@ -7,6 +7,7 @@ import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.Pair;
 import android.util.TypedValue;
 
 import org.jsoup.Jsoup;
@@ -14,6 +15,7 @@ import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
+import java.util.ArrayList;
 import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -68,7 +70,7 @@ public class Timeline {
 
     private static final Pattern TIMECODE_LINK_REGEX = Pattern.compile("antennapod://timecode/((\\d+))");
     private static final String TIMECODE_LINK = "<a class=\"timecode\" href=\"antennapod://timecode/%d\">%s</a>";
-    private static final Pattern TIMECODE_REGEX = Pattern.compile("\\b(?:(?:(([0-9][0-9])):))?(([0-9][0-9])):(([0-9][0-9]))\\b");
+    private static final Pattern TIMECODE_REGEX = Pattern.compile("\\b((\\d+):)?(\\d+):(\\d{2})\\b");
     private static final Pattern LINE_BREAK_REGEX = Pattern.compile("<br */?>");
 
 
@@ -81,6 +83,7 @@ public class Timeline {
      * @param addTimecodes True if this method should add timecode links
      * @return The processed HTML string.
      */
+    @NonNull
     public String processShownotes(final boolean addTimecodes) {
         final Playable playable = (shownotesProvider instanceof Playable) ? (Playable) shownotesProvider : null;
 
@@ -90,8 +93,8 @@ public class Timeline {
         try {
             shownotes = shownotesProvider.loadShownotes().call();
         } catch (Exception e) {
-            e.printStackTrace();
-            return null;
+            Log.e(TAG, "processShownotes() - encounters exceptions unexpectedly in load, treat as if no shownotes.", e);
+            shownotes = "";
         }
 
         if (TextUtils.isEmpty(shownotes)) {
@@ -127,35 +130,12 @@ public class Timeline {
 
         // apply timecode links
         if (addTimecodes) {
-            Elements elementsWithTimeCodes = document.body().getElementsMatchingOwnText(TIMECODE_REGEX);
-            Log.d(TAG, "Recognized " + elementsWithTimeCodes.size() + " timecodes");
-            for (Element element : elementsWithTimeCodes) {
-                Matcher matcherLong = TIMECODE_REGEX.matcher(element.html());
-                StringBuffer buffer = new StringBuffer();
-                while (matcherLong.find()) {
-                    String h = matcherLong.group(1);
-                    String group = matcherLong.group(0);
-                    int time = (h != null) ? Converter.durationStringLongToMs(group) :
-                            Converter.durationStringShortToMs(group);
-
-                    String rep;
-                    if (playable == null || playable.getDuration() > time) {
-                        rep = String.format(Locale.getDefault(), TIMECODE_LINK, time, group);
-                    } else {
-                        rep = group;
-                    }
-                    matcherLong.appendReplacement(buffer, rep);
-                }
-                matcherLong.appendTail(buffer);
-
-                element.html(buffer.toString());
-            }
+            addTimecodes(document, playable);
         }
 
         return document.toString();
     }
 
-
     /**
      * Returns true if the given link is a timecode link.
      */
@@ -186,4 +166,69 @@ public class Timeline {
     public void setShownotesProvider(@NonNull ShownotesProvider shownotesProvider) {
         this.shownotesProvider = shownotesProvider;
     }
+
+    private void addTimecodes(Document document, final Playable playable) {
+        Elements elementsWithTimeCodes = document.body().getElementsMatchingOwnText(TIMECODE_REGEX);
+        Log.d(TAG, "Recognized " + elementsWithTimeCodes.size() + " timecodes");
+
+        if (elementsWithTimeCodes.size() == 0) {
+            // No elements with timecodes
+            return;
+        }
+
+        int playableDuration = playable == null ? Integer.MAX_VALUE : playable.getDuration();
+        boolean useHourFormat = true;
+
+        if (playableDuration != Integer.MAX_VALUE) {
+
+            // We need to decide if we are going to treat short timecodes as HH:MM or MM:SS. To do
+            // so we will parse all the short timecodes and see if they fit in the duration. If one
+            // does not we will use MM:SS, otherwise all will be parsed as HH:MM.
+            for (Element element : elementsWithTimeCodes) {
+                Matcher matcherForElement = TIMECODE_REGEX.matcher(element.html());
+                while (matcherForElement.find()) {
+
+                    // We only want short timecodes right now.
+                    if (matcherForElement.group(1) == null) {
+                        int time = Converter.durationStringShortToMs(matcherForElement.group(0), true);
+
+                        // If the parsed timecode is greater then the duration then we know we need to
+                        // use the minute format so we are done.
+                        if (time > playableDuration) {
+                            useHourFormat = false;
+                            break;
+                        }
+                    }
+                }
+
+                if (!useHourFormat) {
+                    break;
+                }
+            }
+        }
+
+        for (Element element : elementsWithTimeCodes) {
+
+            Matcher matcherForElement = TIMECODE_REGEX.matcher(element.html());
+            StringBuffer buffer = new StringBuffer();
+
+            while (matcherForElement.find()) {
+                String group = matcherForElement.group(0);
+
+                int time = matcherForElement.group(1) != null
+                                        ? Converter.durationStringLongToMs(group)
+                                        : Converter.durationStringShortToMs(group, useHourFormat);
+
+                String replacementText = group;
+                if (time < playableDuration) {
+                    replacementText = String.format(Locale.getDefault(), TIMECODE_LINK, time, group);
+                }
+
+                matcherForElement.appendReplacement(buffer, replacementText);
+            }
+
+            matcherForElement.appendTail(buffer);
+            element.html(buffer.toString());
+        }
+    }
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/VideoPlayer.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/VideoPlayer.java
index 368379509..f3c1c4f59 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/VideoPlayer.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/VideoPlayer.java
@@ -7,11 +7,6 @@ public class VideoPlayer extends MediaPlayer implements IPlayer {
 	private static final String TAG = "VideoPlayer";
 
 	@Override
-	public boolean canSetPitch() {
-		return false;
-	}
-
-	@Override
 	public boolean canSetSpeed() {
 		return false;
 	}
@@ -22,47 +17,13 @@ public class VideoPlayer extends MediaPlayer implements IPlayer {
 	}
 
 	@Override
-	public float getCurrentPitchStepsAdjustment() {
-		return 1;
-	}
-
-	@Override
 	public float getCurrentSpeedMultiplier() {
 		return 1;
 	}
 
 	@Override
-	public float getMaxSpeedMultiplier() {
-		return 1;
-	}
-
-	@Override
-	public float getMinSpeedMultiplier() {
-		return 1;
-	}
-
-	@Override
-	public void setEnableSpeedAdjustment(boolean enableSpeedAdjustment) throws UnsupportedOperationException {
-		Log.e(TAG, "Setting enable speed adjustment unsupported in video player");
-		throw new UnsupportedOperationException("Setting enable speed adjustment unsupported in video player");
-	}
-
-	@Override
-	public void setPitchStepsAdjustment(float pitchSteps) {
-		Log.e(TAG, "Setting pitch steps adjustment unsupported in video player");
-		throw new UnsupportedOperationException("Setting pitch steps adjustment unsupported in video player");
-	}
-
-	@Override
-	public void setPlaybackPitch(float f) {
-		Log.e(TAG, "Setting playback pitch unsupported in video player");
-		throw new UnsupportedOperationException("Setting playback pitch unsupported in video player");
-	}
-
-	@Override
-	public void setPlaybackSpeed(float f) {
-		Log.e(TAG, "Setting playback speed unsupported in video player");
-		throw new UnsupportedOperationException("Setting playback speed unsupported in video player");
+	public void setPlaybackParams(float speed, boolean skipSilence) {
+		//Ignore this for non ExoPlayer implementations
 	}
 
 	@Override
diff --git a/core/src/main/res/drawable-hdpi/ic_av_fast_forward_80dp.png b/core/src/main/res/drawable-hdpi/ic_av_fast_forward_80dp.png
deleted file mode 100755
index 43783fbce..000000000
--- a/core/src/main/res/drawable-hdpi/ic_av_fast_forward_80dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_av_pause_circle_outline_80dp.png b/core/src/main/res/drawable-hdpi/ic_av_pause_circle_outline_80dp.png
deleted file mode 100644
index 115f7ebef..000000000
--- a/core/src/main/res/drawable-hdpi/ic_av_pause_circle_outline_80dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_av_play_circle_outline_80dp.png b/core/src/main/res/drawable-hdpi/ic_av_play_circle_outline_80dp.png
deleted file mode 100644
index 392c87bd2..000000000
--- a/core/src/main/res/drawable-hdpi/ic_av_play_circle_outline_80dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_av_rewind_80dp.png b/core/src/main/res/drawable-hdpi/ic_av_rewind_80dp.png
deleted file mode 100755
index 41052af65..000000000
--- a/core/src/main/res/drawable-hdpi/ic_av_rewind_80dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_baseline_question_answer_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_baseline_question_answer_white_24dp.png
new file mode 100755
index 000000000..67924a5a2
--- /dev/null
+++ b/core/src/main/res/drawable-hdpi/ic_baseline_question_answer_white_24dp.png
diff --git a/core/src/main/res/drawable-hdpi/ic_bug_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_bug_grey600_24dp.png
new file mode 100644
index 000000000..daadfb35f
--- /dev/null
+++ b/core/src/main/res/drawable-hdpi/ic_bug_grey600_24dp.png
diff --git a/core/src/main/res/drawable-hdpi/ic_bug_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_bug_white_24dp.png
new file mode 100644
index 000000000..549f67bf4
--- /dev/null
+++ b/core/src/main/res/drawable-hdpi/ic_bug_white_24dp.png
diff --git a/core/src/main/res/drawable-hdpi/ic_cellphone_text_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_cellphone_text_grey600_24dp.png
new file mode 100644
index 000000000..71ccc26ea
--- /dev/null
+++ b/core/src/main/res/drawable-hdpi/ic_cellphone_text_grey600_24dp.png
diff --git a/core/src/main/res/drawable-hdpi/ic_cellphone_text_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_cellphone_text_white_24dp.png
new file mode 100644
index 000000000..70e52c60b
--- /dev/null
+++ b/core/src/main/res/drawable-hdpi/ic_cellphone_text_white_24dp.png
diff --git a/core/src/main/res/drawable-hdpi/ic_check_box_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_check_box_grey600_24dp.png
deleted file mode 100644
index 187a426a8..000000000
--- a/core/src/main/res/drawable-hdpi/ic_check_box_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_check_box_outline_blank_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_check_box_outline_blank_grey600_24dp.png
deleted file mode 100644
index 076773bca..000000000
--- a/core/src/main/res/drawable-hdpi/ic_check_box_outline_blank_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_check_box_outline_blank_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_check_box_outline_blank_white_24dp.png
deleted file mode 100644
index ecaf0d5be..000000000
--- a/core/src/main/res/drawable-hdpi/ic_check_box_outline_blank_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_check_box_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_check_box_white_24dp.png
deleted file mode 100644
index 5ce64cc5f..000000000
--- a/core/src/main/res/drawable-hdpi/ic_check_box_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_format_list_bulleted_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_format_list_bulleted_grey600_24dp.png
new file mode 100644
index 000000000..3668c9a00
--- /dev/null
+++ b/core/src/main/res/drawable-hdpi/ic_format_list_bulleted_grey600_24dp.png
diff --git a/core/src/main/res/drawable-hdpi/ic_format_list_bulleted_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_format_list_bulleted_white_24dp.png
new file mode 100644
index 000000000..a1a2c5b68
--- /dev/null
+++ b/core/src/main/res/drawable-hdpi/ic_format_list_bulleted_white_24dp.png
diff --git a/core/src/main/res/drawable-hdpi/ic_forum_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_forum_grey600_24dp.png
new file mode 100644
index 000000000..da5398d15
--- /dev/null
+++ b/core/src/main/res/drawable-hdpi/ic_forum_grey600_24dp.png
diff --git a/core/src/main/res/drawable-hdpi/ic_indeterminate_check_box_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_indeterminate_check_box_grey600_24dp.png
deleted file mode 100644
index e56fbf224..000000000
--- a/core/src/main/res/drawable-hdpi/ic_indeterminate_check_box_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-hdpi/ic_indeterminate_check_box_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_indeterminate_check_box_white_24dp.png
deleted file mode 100644
index dccf44930..000000000
--- a/core/src/main/res/drawable-hdpi/ic_indeterminate_check_box_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_av_fast_forward_80dp.png b/core/src/main/res/drawable-mdpi/ic_av_fast_forward_80dp.png
deleted file mode 100755
index 0bf060d89..000000000
--- a/core/src/main/res/drawable-mdpi/ic_av_fast_forward_80dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_av_pause_circle_outline_80dp.png b/core/src/main/res/drawable-mdpi/ic_av_pause_circle_outline_80dp.png
deleted file mode 100644
index 1e71c271f..000000000
--- a/core/src/main/res/drawable-mdpi/ic_av_pause_circle_outline_80dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_av_play_circle_outline_80dp.png b/core/src/main/res/drawable-mdpi/ic_av_play_circle_outline_80dp.png
deleted file mode 100644
index d305f0c69..000000000
--- a/core/src/main/res/drawable-mdpi/ic_av_play_circle_outline_80dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_av_rewind_80dp.png b/core/src/main/res/drawable-mdpi/ic_av_rewind_80dp.png
deleted file mode 100755
index 99ac9f3c9..000000000
--- a/core/src/main/res/drawable-mdpi/ic_av_rewind_80dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_baseline_question_answer_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_baseline_question_answer_white_24dp.png
new file mode 100755
index 000000000..e87df752e
--- /dev/null
+++ b/core/src/main/res/drawable-mdpi/ic_baseline_question_answer_white_24dp.png
diff --git a/core/src/main/res/drawable-mdpi/ic_bug_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_bug_grey600_24dp.png
new file mode 100644
index 000000000..4b372a4e3
--- /dev/null
+++ b/core/src/main/res/drawable-mdpi/ic_bug_grey600_24dp.png
diff --git a/core/src/main/res/drawable-mdpi/ic_bug_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_bug_white_24dp.png
new file mode 100644
index 000000000..9d7603552
--- /dev/null
+++ b/core/src/main/res/drawable-mdpi/ic_bug_white_24dp.png
diff --git a/core/src/main/res/drawable-mdpi/ic_cellphone_text_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_cellphone_text_grey600_24dp.png
new file mode 100644
index 000000000..c26da2ce2
--- /dev/null
+++ b/core/src/main/res/drawable-mdpi/ic_cellphone_text_grey600_24dp.png
diff --git a/core/src/main/res/drawable-mdpi/ic_cellphone_text_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_cellphone_text_white_24dp.png
new file mode 100644
index 000000000..8569a642d
--- /dev/null
+++ b/core/src/main/res/drawable-mdpi/ic_cellphone_text_white_24dp.png
diff --git a/core/src/main/res/drawable-mdpi/ic_check_box_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_check_box_grey600_24dp.png
deleted file mode 100644
index d5bdfa433..000000000
--- a/core/src/main/res/drawable-mdpi/ic_check_box_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_check_box_outline_blank_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_check_box_outline_blank_grey600_24dp.png
deleted file mode 100644
index aefe5b6c1..000000000
--- a/core/src/main/res/drawable-mdpi/ic_check_box_outline_blank_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_check_box_outline_blank_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_check_box_outline_blank_white_24dp.png
deleted file mode 100644
index a3a588c64..000000000
--- a/core/src/main/res/drawable-mdpi/ic_check_box_outline_blank_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_check_box_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_check_box_white_24dp.png
deleted file mode 100644
index dc94cdbf4..000000000
--- a/core/src/main/res/drawable-mdpi/ic_check_box_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_format_list_bulleted_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_format_list_bulleted_grey600_24dp.png
new file mode 100644
index 000000000..726eae499
--- /dev/null
+++ b/core/src/main/res/drawable-mdpi/ic_format_list_bulleted_grey600_24dp.png
diff --git a/core/src/main/res/drawable-mdpi/ic_format_list_bulleted_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_format_list_bulleted_white_24dp.png
new file mode 100644
index 000000000..0cc401dff
--- /dev/null
+++ b/core/src/main/res/drawable-mdpi/ic_format_list_bulleted_white_24dp.png
diff --git a/core/src/main/res/drawable-mdpi/ic_forum_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_forum_grey600_24dp.png
new file mode 100644
index 000000000..d3bcfe7b6
--- /dev/null
+++ b/core/src/main/res/drawable-mdpi/ic_forum_grey600_24dp.png
diff --git a/core/src/main/res/drawable-mdpi/ic_indeterminate_check_box_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_indeterminate_check_box_grey600_24dp.png
deleted file mode 100644
index 0e6ce58e3..000000000
--- a/core/src/main/res/drawable-mdpi/ic_indeterminate_check_box_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-mdpi/ic_indeterminate_check_box_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_indeterminate_check_box_white_24dp.png
deleted file mode 100644
index c496b4648..000000000
--- a/core/src/main/res/drawable-mdpi/ic_indeterminate_check_box_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-v21/overlay_button_circle_background.xml b/core/src/main/res/drawable-v21/overlay_button_circle_background.xml
deleted file mode 100644
index c121690df..000000000
--- a/core/src/main/res/drawable-v21/overlay_button_circle_background.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <gradient
-        android:type="radial"
-        android:gradientRadius="37.5%p"
-        android:startColor="#000000"
-        android:endColor="@android:color/transparent"/>
-</shape>
\ No newline at end of file
diff --git a/core/src/main/res/drawable-xhdpi/ic_av_fast_forward_80dp.png b/core/src/main/res/drawable-xhdpi/ic_av_fast_forward_80dp.png
deleted file mode 100755
index 270dc9bf8..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_av_fast_forward_80dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_av_pause_circle_outline_80dp.png b/core/src/main/res/drawable-xhdpi/ic_av_pause_circle_outline_80dp.png
deleted file mode 100644
index 2e0b8ff6f..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_av_pause_circle_outline_80dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_av_play_circle_outline_80dp.png b/core/src/main/res/drawable-xhdpi/ic_av_play_circle_outline_80dp.png
deleted file mode 100644
index 990ae524a..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_av_play_circle_outline_80dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_av_rewind_80dp.png b/core/src/main/res/drawable-xhdpi/ic_av_rewind_80dp.png
deleted file mode 100755
index d94a40811..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_av_rewind_80dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_baseline_question_answer_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_baseline_question_answer_white_24dp.png
new file mode 100755
index 000000000..731f89c83
--- /dev/null
+++ b/core/src/main/res/drawable-xhdpi/ic_baseline_question_answer_white_24dp.png
diff --git a/core/src/main/res/drawable-xhdpi/ic_bug_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_bug_grey600_24dp.png
new file mode 100644
index 000000000..49e5deaa9
--- /dev/null
+++ b/core/src/main/res/drawable-xhdpi/ic_bug_grey600_24dp.png
diff --git a/core/src/main/res/drawable-xhdpi/ic_bug_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_bug_white_24dp.png
new file mode 100644
index 000000000..7416bde03
--- /dev/null
+++ b/core/src/main/res/drawable-xhdpi/ic_bug_white_24dp.png
diff --git a/core/src/main/res/drawable-xhdpi/ic_cellphone_text_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_cellphone_text_grey600_24dp.png
new file mode 100644
index 000000000..fc8219fa9
--- /dev/null
+++ b/core/src/main/res/drawable-xhdpi/ic_cellphone_text_grey600_24dp.png
diff --git a/core/src/main/res/drawable-xhdpi/ic_cellphone_text_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_cellphone_text_white_24dp.png
new file mode 100644
index 000000000..9468fa9a9
--- /dev/null
+++ b/core/src/main/res/drawable-xhdpi/ic_cellphone_text_white_24dp.png
diff --git a/core/src/main/res/drawable-xhdpi/ic_check_box_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_check_box_grey600_24dp.png
deleted file mode 100644
index e46ab71b4..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_check_box_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_check_box_outline_blank_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_check_box_outline_blank_grey600_24dp.png
deleted file mode 100644
index bb15a903a..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_check_box_outline_blank_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_check_box_outline_blank_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_check_box_outline_blank_white_24dp.png
deleted file mode 100644
index 336682497..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_check_box_outline_blank_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_check_box_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_check_box_white_24dp.png
deleted file mode 100644
index cdb4a3181..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_check_box_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_format_list_bulleted_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_format_list_bulleted_grey600_24dp.png
new file mode 100644
index 000000000..322adb6e0
--- /dev/null
+++ b/core/src/main/res/drawable-xhdpi/ic_format_list_bulleted_grey600_24dp.png
diff --git a/core/src/main/res/drawable-xhdpi/ic_format_list_bulleted_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_format_list_bulleted_white_24dp.png
new file mode 100644
index 000000000..c25860017
--- /dev/null
+++ b/core/src/main/res/drawable-xhdpi/ic_format_list_bulleted_white_24dp.png
diff --git a/core/src/main/res/drawable-xhdpi/ic_forum_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_forum_grey600_24dp.png
new file mode 100644
index 000000000..ac6876140
--- /dev/null
+++ b/core/src/main/res/drawable-xhdpi/ic_forum_grey600_24dp.png
diff --git a/core/src/main/res/drawable-xhdpi/ic_indeterminate_check_box_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_indeterminate_check_box_grey600_24dp.png
deleted file mode 100644
index 3b0d3aa1a..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_indeterminate_check_box_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xhdpi/ic_indeterminate_check_box_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_indeterminate_check_box_white_24dp.png
deleted file mode 100644
index 57e478e9f..000000000
--- a/core/src/main/res/drawable-xhdpi/ic_indeterminate_check_box_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_av_fast_forward_80dp.png b/core/src/main/res/drawable-xxhdpi/ic_av_fast_forward_80dp.png
deleted file mode 100755
index 3b55c5d55..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_av_fast_forward_80dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_av_pause_circle_outline_80dp.png b/core/src/main/res/drawable-xxhdpi/ic_av_pause_circle_outline_80dp.png
deleted file mode 100644
index 76cc4db32..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_av_pause_circle_outline_80dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_av_play_circle_outline_80dp.png b/core/src/main/res/drawable-xxhdpi/ic_av_play_circle_outline_80dp.png
deleted file mode 100644
index eebf0110c..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_av_play_circle_outline_80dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_av_rewind_80dp.png b/core/src/main/res/drawable-xxhdpi/ic_av_rewind_80dp.png
deleted file mode 100755
index 38a5fc264..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_av_rewind_80dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_baseline_question_answer_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_baseline_question_answer_white_24dp.png
new file mode 100755
index 000000000..255b82707
--- /dev/null
+++ b/core/src/main/res/drawable-xxhdpi/ic_baseline_question_answer_white_24dp.png
diff --git a/core/src/main/res/drawable-xxhdpi/ic_bug_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_bug_grey600_24dp.png
new file mode 100644
index 000000000..7bbf31c6b
--- /dev/null
+++ b/core/src/main/res/drawable-xxhdpi/ic_bug_grey600_24dp.png
diff --git a/core/src/main/res/drawable-xxhdpi/ic_bug_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_bug_white_24dp.png
new file mode 100644
index 000000000..fe2c2bee3
--- /dev/null
+++ b/core/src/main/res/drawable-xxhdpi/ic_bug_white_24dp.png
diff --git a/core/src/main/res/drawable-xxhdpi/ic_cellphone_text_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_cellphone_text_grey600_24dp.png
new file mode 100644
index 000000000..82a453f05
--- /dev/null
+++ b/core/src/main/res/drawable-xxhdpi/ic_cellphone_text_grey600_24dp.png
diff --git a/core/src/main/res/drawable-xxhdpi/ic_cellphone_text_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_cellphone_text_white_24dp.png
new file mode 100644
index 000000000..d1f990a65
--- /dev/null
+++ b/core/src/main/res/drawable-xxhdpi/ic_cellphone_text_white_24dp.png
diff --git a/core/src/main/res/drawable-xxhdpi/ic_check_box_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_check_box_grey600_24dp.png
deleted file mode 100644
index 7093f28d5..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_check_box_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_check_box_outline_blank_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_check_box_outline_blank_grey600_24dp.png
deleted file mode 100644
index 050e6cd6c..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_check_box_outline_blank_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_check_box_outline_blank_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_check_box_outline_blank_white_24dp.png
deleted file mode 100644
index 56d380575..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_check_box_outline_blank_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_check_box_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_check_box_white_24dp.png
deleted file mode 100644
index ba9af5265..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_check_box_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_format_list_bulleted_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_format_list_bulleted_grey600_24dp.png
new file mode 100644
index 000000000..87f8073ea
--- /dev/null
+++ b/core/src/main/res/drawable-xxhdpi/ic_format_list_bulleted_grey600_24dp.png
diff --git a/core/src/main/res/drawable-xxhdpi/ic_format_list_bulleted_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_format_list_bulleted_white_24dp.png
new file mode 100644
index 000000000..da3433c61
--- /dev/null
+++ b/core/src/main/res/drawable-xxhdpi/ic_format_list_bulleted_white_24dp.png
diff --git a/core/src/main/res/drawable-xxhdpi/ic_forum_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_forum_grey600_24dp.png
new file mode 100644
index 000000000..7a3204693
--- /dev/null
+++ b/core/src/main/res/drawable-xxhdpi/ic_forum_grey600_24dp.png
diff --git a/core/src/main/res/drawable-xxhdpi/ic_indeterminate_check_box_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_indeterminate_check_box_grey600_24dp.png
deleted file mode 100644
index 2e7d39a5a..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_indeterminate_check_box_grey600_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxhdpi/ic_indeterminate_check_box_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_indeterminate_check_box_white_24dp.png
deleted file mode 100644
index ec4981f5c..000000000
--- a/core/src/main/res/drawable-xxhdpi/ic_indeterminate_check_box_white_24dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_av_fast_forward_80dp.png b/core/src/main/res/drawable-xxxhdpi/ic_av_fast_forward_80dp.png
deleted file mode 100755
index 1c915d9dd..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_av_fast_forward_80dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_av_rewind_80dp.png b/core/src/main/res/drawable-xxxhdpi/ic_av_rewind_80dp.png
deleted file mode 100755
index 190bb0f4c..000000000
--- a/core/src/main/res/drawable-xxxhdpi/ic_av_rewind_80dp.png
+++ /dev/null
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_baseline_question_answer_white_24db.png b/core/src/main/res/drawable-xxxhdpi/ic_baseline_question_answer_white_24db.png
new file mode 100755
index 000000000..0d697e0f9
--- /dev/null
+++ b/core/src/main/res/drawable-xxxhdpi/ic_baseline_question_answer_white_24db.png
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_bug_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_bug_grey600_24dp.png
new file mode 100644
index 000000000..b612b2aa9
--- /dev/null
+++ b/core/src/main/res/drawable-xxxhdpi/ic_bug_grey600_24dp.png
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_bug_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_bug_white_24dp.png
new file mode 100644
index 000000000..32a3f5511
--- /dev/null
+++ b/core/src/main/res/drawable-xxxhdpi/ic_bug_white_24dp.png
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_cellphone_text_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_cellphone_text_grey600_24dp.png
new file mode 100644
index 000000000..829b15396
--- /dev/null
+++ b/core/src/main/res/drawable-xxxhdpi/ic_cellphone_text_grey600_24dp.png
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_cellphone_text_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_cellphone_text_white_24dp.png
new file mode 100644
index 000000000..baa783a92
--- /dev/null
+++ b/core/src/main/res/drawable-xxxhdpi/ic_cellphone_text_white_24dp.png
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_format_list_bulleted_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_format_list_bulleted_grey600_24dp.png
new file mode 100644
index 000000000..c56590fe0
--- /dev/null
+++ b/core/src/main/res/drawable-xxxhdpi/ic_format_list_bulleted_grey600_24dp.png
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_format_list_bulleted_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_format_list_bulleted_white_24dp.png
new file mode 100644
index 000000000..5deea3286
--- /dev/null
+++ b/core/src/main/res/drawable-xxxhdpi/ic_format_list_bulleted_white_24dp.png
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_forum_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_forum_grey600_24dp.png
new file mode 100644
index 000000000..0ae33696b
--- /dev/null
+++ b/core/src/main/res/drawable-xxxhdpi/ic_forum_grey600_24dp.png
diff --git a/core/src/main/res/drawable/ic_av_fast_forward_white_80dp.xml b/core/src/main/res/drawable/ic_av_fast_forward_white_80dp.xml
new file mode 100644
index 000000000..a60145f1d
--- /dev/null
+++ b/core/src/main/res/drawable/ic_av_fast_forward_white_80dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="80dp"
+    android:width="80dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"
+          android:fillColor="#FFFFFFFF"
+          android:strokeColor="#505050"
+          android:strokeWidth="0.75"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_av_fast_rewind_white_80dp.xml b/core/src/main/res/drawable/ic_av_fast_rewind_white_80dp.xml
new file mode 100644
index 000000000..4609e0c3e
--- /dev/null
+++ b/core/src/main/res/drawable/ic_av_fast_rewind_white_80dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0"
+        android:width="80dp"
+        android:height="80dp">
+    <path android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"
+          android:fillColor="#FFFFFFFF"
+          android:strokeColor="#505050"
+          android:strokeWidth="0.75"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_av_pause_white_80dp.xml b/core/src/main/res/drawable/ic_av_pause_white_80dp.xml
new file mode 100644
index 000000000..ad8847cb7
--- /dev/null
+++ b/core/src/main/res/drawable/ic_av_pause_white_80dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="80dp"
+        android:width="80dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+    <path android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"
+          android:fillColor="#FFFFFFFF"
+          android:strokeColor="#505050"
+          android:strokeWidth="0.75"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_av_play_white_80dp.xml b/core/src/main/res/drawable/ic_av_play_white_80dp.xml
new file mode 100644
index 000000000..9f9dbb1b1
--- /dev/null
+++ b/core/src/main/res/drawable/ic_av_play_white_80dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="80dp"
+        android:width="80dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+    <path android:pathData="M8,5v14l11,-7z"
+          android:fillColor="#FFFFFFFF"
+          android:strokeColor="#505050"
+          android:strokeWidth="0.75"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_fab_edit.xml b/core/src/main/res/drawable/ic_fab_edit.xml
new file mode 100644
index 000000000..cb2e394b0
--- /dev/null
+++ b/core/src/main/res/drawable/ic_fab_edit.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_remove_grey600.xml b/core/src/main/res/drawable/ic_remove_grey600.xml
new file mode 100644
index 000000000..5a6b2af6b
--- /dev/null
+++ b/core/src/main/res/drawable/ic_remove_grey600.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF757575" android:pathData="M19,13H5v-2h14v2z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_remove_white.xml b/core/src/main/res/drawable/ic_remove_white.xml
new file mode 100644
index 000000000..d812091fb
--- /dev/null
+++ b/core/src/main/res/drawable/ic_remove_white.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M19,13H5v-2h14v2z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_select_all_grey600.xml b/core/src/main/res/drawable/ic_select_all_grey600.xml
new file mode 100644
index 000000000..96e9a2de5
--- /dev/null
+++ b/core/src/main/res/drawable/ic_select_all_grey600.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF757575"
+        android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_select_all_white.xml b/core/src/main/res/drawable/ic_select_all_white.xml
new file mode 100644
index 000000000..0fc49c923
--- /dev/null
+++ b/core/src/main/res/drawable/ic_select_all_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_select_none_grey600.xml b/core/src/main/res/drawable/ic_select_none_grey600.xml
new file mode 100644
index 000000000..8057f73ca
--- /dev/null
+++ b/core/src/main/res/drawable/ic_select_none_grey600.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF757575"
+        android:pathData="m3,5l2,0l0,-2c-1.1,0 -2,0.9 -2,2zm0,8l2,0l0,-2l-2,0l0,2zm4,8l2,0l0,-2l-2,0l0,2zm-4,-12l2,0l0,-2l-2,0l0,2zm10,-6l-2,0l0,2l2,0l0,-2zm6,0l0,2l2,0c0,-1.1 -0.9,-2 -2,-2zm-14,18l0,-2l-2,0c0,1.1 0.9,2 2,2zm-2,-4l2,0l0,-2l-2,0l0,2zm6,-14l-2,0l0,2l2,0l0,-2zm2,18l2,0l0,-2l-2,0l0,2zm8,-8l2,0l0,-2l-2,0l0,2zm0,8c1.1,0 2,-0.9 2,-2l-2,0l0,2zm0,-12l2,0l0,-2l-2,0l0,2zm0,8l2,0l0,-2l-2,0l0,2zm-4,4l2,0l0,-2l-2,0l0,2zm0,-16l2,0l0,-2l-2,0l0,2z"/>
+    <path android:fillColor="#FF757575"
+        android:pathData="M17,8.41L15.59,7 12,10.59 8.41,7 7,8.41 10.59,12 7,15.59 8.41,17 12,13.41 15.59,17 17,15.59 13.41,12z"/>
+</vector>
diff --git a/core/src/main/res/drawable/ic_select_none_white.xml b/core/src/main/res/drawable/ic_select_none_white.xml
new file mode 100644
index 000000000..3e1f6b884
--- /dev/null
+++ b/core/src/main/res/drawable/ic_select_none_white.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="m3,5l2,0l0,-2c-1.1,0 -2,0.9 -2,2zm0,8l2,0l0,-2l-2,0l0,2zm4,8l2,0l0,-2l-2,0l0,2zm-4,-12l2,0l0,-2l-2,0l0,2zm10,-6l-2,0l0,2l2,0l0,-2zm6,0l0,2l2,0c0,-1.1 -0.9,-2 -2,-2zm-14,18l0,-2l-2,0c0,1.1 0.9,2 2,2zm-2,-4l2,0l0,-2l-2,0l0,2zm6,-14l-2,0l0,2l2,0l0,-2zm2,18l2,0l0,-2l-2,0l0,2zm8,-8l2,0l0,-2l-2,0l0,2zm0,8c1.1,0 2,-0.9 2,-2l-2,0l0,2zm0,-12l2,0l0,-2l-2,0l0,2zm0,8l2,0l0,-2l-2,0l0,2zm-4,4l2,0l0,-2l-2,0l0,2zm0,-16l2,0l0,-2l-2,0l0,2z"/>
+    <path android:fillColor="#FFFFFFFF"
+        android:pathData="M17,8.41L15.59,7 12,10.59 8.41,7 7,8.41 10.59,12 7,15.59 8.41,17 12,13.41 15.59,17 17,15.59 13.41,12z"/>
+</vector>
diff --git a/core/src/main/res/drawable/overlay_button_circle_background.xml b/core/src/main/res/drawable/overlay_button_circle_background.xml
deleted file mode 100644
index 90c51472c..000000000
--- a/core/src/main/res/drawable/overlay_button_circle_background.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <gradient
-        android:type="radial"
-        android:gradientRadius="60"
-        android:startColor="#000000"
-        android:endColor="@android:color/transparent"/>
-</shape>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/overlay_drawable_dark_trueblack.xml b/core/src/main/res/drawable/overlay_drawable_dark_trueblack.xml
new file mode 100644
index 000000000..5f58e8421
--- /dev/null
+++ b/core/src/main/res/drawable/overlay_drawable_dark_trueblack.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item>
+        <shape android:shape="rectangle" >
+            <solid android:color="#45B3E1" />
+        </shape>
+    </item>
+    <item android:top="1dp">
+        <shape android:shape="rectangle" >
+            <solid android:color="@color/black" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/core/src/main/res/drawable/progress_bar_horizontal_trueblack.xml b/core/src/main/res/drawable/progress_bar_horizontal_trueblack.xml
new file mode 100644
index 000000000..604bb2655
--- /dev/null
+++ b/core/src/main/res/drawable/progress_bar_horizontal_trueblack.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape>
+            <solid android:color="#000000"/>
+        </shape>
+    </item>
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <solid android:color="@color/holo_blue_dark"/>
+            </shape>
+        </clip>
+    </item>
+</layer-list>
diff --git a/core/src/main/res/values-ar/strings.xml b/core/src/main/res/values-ar/strings.xml
index fe932e959..5c29b5119 100644
--- a/core/src/main/res/values-ar/strings.xml
+++ b/core/src/main/res/values-ar/strings.xml
@@ -1,16 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
+  <string name="feed_update_receiver_name">تحديث التسجيل</string>
+  <string name="feeds_label">مغذيات</string>
+  <string name="statistics_label">إحصائيات</string>
+  <string name="add_feed_label">إضافة بودكاست</string>
+  <string name="episodes_label">حلقات</string>
   <string name="all_episodes_short_label">الكل</string>
+  <string name="new_episodes_label">جديد</string>
   <string name="favorite_episodes_label">المفضلات</string>
   <string name="new_label">جديد</string>
-  <string name="settings_label">اعدادات</string>
+  <string name="settings_label">إعدادات</string>
   <string name="downloads_label">تنزيل</string>
   <string name="downloads_running_label">جارى التشغيل</string>
   <string name="downloads_completed_label">اكتمل</string>
   <string name="downloads_log_label">سجل</string>
+  <string name="subscriptions_label">تسجيلات</string>
+  <string name="subscriptions_list_label">لائحة التسجيلات</string>
   <string name="cancel_download_label">الغاء التنزيل</string>
+  <string name="playback_history_label">أرشيف التشغيل</string>
+  <string name="gpodnet_main_label">gpodder.net</string>
+  <string name="gpodnet_summary">تزامن مع أجهزة أخرى</string>
+  <string name="gpodnet_auth_label">تسجيل الدخول لموقع gpodder</string>
+  <string name="free_space_label"> %1$s مجانا</string>
+  <string name="episode_cache_full_title">ذاكرة تخزين الحلقات ممتلئة</string>
+  <string name="episode_cache_full_message">لقد تم تجاوز الحد الأقصى لتخزين الحلقات. المرجو الرفع من قيمة التخزين في قائمة الإعدادات.</string>
+  <string name="synchronizing">المزامنة...</string>
   <!--Statistics fragment-->
+  <string name="total_time_listened_to_podcasts">مجموع وقت تشغيل البودكاستات:</string>
+  <string name="statistics_mode">نمط الإحصائيات</string>
   <!--Main activity-->
   <string name="drawer_open">قائمة الفتح</string>
   <string name="drawer_close">قائمة الاغلاف</string>
@@ -26,11 +44,13 @@
   <string name="copied_url_msg">تم نسخ الرابط للحافظة</string>
   <string name="go_to_position_label">اذهب لهذا الموقع</string>
   <!--Playback history-->
+  <string name="clear_history_label">مسح الأرشيف</string>
   <!--Other-->
   <string name="confirm_label">تأكيد</string>
   <string name="cancel_label">الغاء</string>
   <string name="yes">نعم</string>
   <string name="no">لا</string>
+  <string name="reset">إعادة التعيين</string>
   <string name="author_label">المؤلف</string>
   <string name="language_label">لغة</string>
   <string name="url_label">عنوان الموقع</string>
@@ -60,7 +80,6 @@
   <string name="show_info_label">اظهار المعلومات</string>
   <string name="share_label">مشاركة</string>
   <string name="share_link_label">مشاركة الرابط</string>
-  <string name="episode_actions">تطبيق الاجراء</string>
   <string name="hide_unplayed_episodes_label">لم يتم تشغيله</string>
   <string name="hide_paused_episodes_label">ايقاف مؤقت</string>
   <string name="hide_downloaded_episodes_label">تم التنزيل</string>
@@ -105,24 +124,73 @@
   <!--Auto-Flattr dialog-->
   <!--Search-->
   <!--OPML import and export-->
+  <string name="opml_import_error_no_file">لم يتم اختيار أي ملف</string>
+  <string name="select_all_label">اختر الكل</string>
+  <string name="deselect_all_label">ألغ اختيار الكل</string>
+  <string name="select_options_label">اختر...</string>
+  <string name="choose_file_from_filesystem">عبر ملف نظام داخلي </string>
+  <string name="choose_file_from_external_application">إستخدام تطبيق خارجي</string>
+  <string name="opml_export_label">تصدير بصيغة OPML</string>
+  <string name="html_export_label">تصدير بصيغة HTML</string>
+  <string name="exporting_label">جار التصدير ...</string>
+  <string name="export_error_label">حدث خطأ أثناء التصدير</string>
+  <string name="export_success_title">تم التصدير بنجاح</string>
   <!--Sleep timer-->
+  <string name="enter_time_here_label">أدخل التوقيت</string>
+  <string name="timer_vibration_label">تشغيل الهزاز</string>
+  <string name="time_seconds">ثواني</string>
+  <string name="time_minutes">دقائق</string>
+  <string name="time_hours">ساعات</string>
   <!--gpodder.net-->
+  <string name="gpodnet_taglist_header">الفئات</string>
+  <string name="gpodnet_toplist_header">أقوى البودكاستات</string>
+  <string name="gpodnet_suggestions_header">إقتراحات</string>
+  <string name="gpodnetauth_login_title">تسجيل الدخول</string>
+  <string name="gpodnetauth_login_butLabel">تسجيل الدخول</string>
+  <string name="username_label">إسم المستخدم</string>
+  <string name="password_label">كلمة المرور</string>
+  <string name="gpodnetauth_device_title">اختيار الأجهزة:</string>
+  <string name="gpodnetauth_device_butCreateNewDevice">أدخل جهازا جديدا</string>
+  <string name="gpodnetauth_device_chooseExistingDevice">اختر جهازا من القائمة: </string>
+  <string name="gpodnetauth_device_butChoose">إختر</string>
+  <string name="gpodnetauth_finish_title">لقد تم تسجيل الدخول بنجاح!</string>
+  <string name="gpodnetauth_finish_butgomainscreen">إذهب إلى الصفحة الرئيسية</string>
+  <string name="gpodnetsync_auth_error_descr">خطأ في إسم المستخدم أو كلمة المرور</string>
+  <string name="gpodnetsync_pref_report_successful">تم بنجاح</string>
   <!--Directory chooser-->
+  <string name="selected_folder_label">إختيار المستند:</string>
+  <string name="create_folder_label">أنشأ مستندا جديدا</string>
+  <string name="choose_data_directory">إختيار مستند البيانات</string>
   <!--Online feed view-->
+  <string name="downloading_label">تحميل ...</string>
   <!--Content descriptions for image buttons-->
+  <string name="media_type_audio_label">صوت</string>
+  <string name="media_type_video_label">فيديو</string>
+  <string name="load_next_page_label">تحميل الصفحة التالية</string>
   <!--Feed information screen-->
+  <string name="authentication_label">تسجيل الدخول</string>
   <!--Progress information-->
   <!--AntennaPodSP-->
   <!--Episodes apply actions-->
   <string name="all_label">الكل</string>
+  <string name="selected_all_label">إختيار كل الحلقات</string>
   <string name="unplayed_label">لم يتم تشغيله</string>
   <string name="downloaded_label">تم التنزيل</string>
   <string name="not_downloaded_label">لم يتم التنزيل</string>
   <!--Sort-->
   <!--Rating dialog-->
   <!--Audio controls-->
+  <string name="volume">مستوى الصوت</string>
   <!--proxy settings-->
+  <string name="proxy_type_label">النوع</string>
   <!--Database import/export-->
+  <string name="label_import">استيراد</string>
+  <string name="label_export">تصدير</string>
+  <string name="export_ok">تم التصدير بنجاح</string>
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
+  <string name="notification_channel_downloading">تحميل</string>
+  <string name="notification_channel_playing">يشغل حاليا</string>
+  <string name="notification_channel_error">الأخطاء</string>
 </resources>
diff --git a/core/src/main/res/values-az/strings.xml b/core/src/main/res/values-az/strings.xml
index c27aa54d2..92bfb7f44 100644
--- a/core/src/main/res/values-az/strings.xml
+++ b/core/src/main/res/values-az/strings.xml
@@ -165,7 +165,6 @@
   <string name="deselect_all_label">Seçimi ləğv et</string>
   <string name="opml_export_label">OPML ixraçı</string>
   <string name="export_error_label">İxracın xətası</string>
-  <string name="opml_export_success_sum">OPML fayl:\u0020 yazılıb</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Yuxu taymerini qoy</string>
   <string name="disable_sleeptimer_label">Yuxu taymerini keçir</string>
@@ -200,4 +199,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-b+ast/strings.xml b/core/src/main/res/values-b+ast/strings.xml
index 5113a895e..421896086 100644
--- a/core/src/main/res/values-b+ast/strings.xml
+++ b/core/src/main/res/values-b+ast/strings.xml
@@ -109,7 +109,6 @@
   <string name="feed_remover_msg">Desaniciando fees</string>
   <string name="load_complete_feed">Completóse\'l refrescu\'l feed</string>
   <string name="hide_episodes_title">Anubrir episodios</string>
-  <string name="episode_actions">Aplicar aiciones</string>
   <string name="hide_unplayed_episodes_label">Ensin reproducir</string>
   <string name="hide_paused_episodes_label">Posóse</string>
   <string name="hide_played_episodes_label">Reprodúxose</string>
@@ -243,7 +242,6 @@
   <!--Preferences-->
   <string name="storage_pref">Almacenamientu</string>
   <string name="project_pref">Proyeutu</string>
-  <string name="services_label">Servicios</string>
   <string name="flattr_label">Flattr</string>
   <string name="pref_episode_cleanup_title">Llimpieza d\'episodios</string>
   <string name="pref_pauseOnDisconnect_sum">Posa la reproducción al desconeutase los auriculares o Bluetooth</string>
@@ -378,4 +376,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-bg/strings.xml b/core/src/main/res/values-bg/strings.xml
index 286c9a3eb..19dc2a971 100644
--- a/core/src/main/res/values-bg/strings.xml
+++ b/core/src/main/res/values-bg/strings.xml
@@ -30,6 +30,7 @@
   <string name="drawer_feed_counter_downloaded">Брой изтеглени епизоди</string>
   <string name="drawer_feed_counter_none">Никакви</string>
   <!--Webview actions-->
+  <string name="open_in_browser_label">Отвори в браузъра</string>
   <string name="copy_url_label">Копирай URL адрес</string>
   <string name="share_url_label">Сподели URL адрес</string>
   <string name="copied_url_msg">Адресът е копиран</string>
@@ -40,6 +41,7 @@
   <string name="cancel_label">Отказ</string>
   <string name="yes">Да</string>
   <string name="no">Не</string>
+  <string name="reset">Нулиране</string>
   <string name="author_label">Автор</string>
   <string name="language_label">Език</string>
   <string name="url_label">URL</string>
@@ -47,7 +49,9 @@
   <string name="cover_label">Снимка</string>
   <string name="error_label">Грешка</string>
   <string name="error_msg_prefix">Възникна грешка:</string>
+  <string name="refresh_label">Обнови</string>
   <string name="external_storage_error_msg">Няма налична външна памет. Уверете се, че външната памет е монтирана, за да може приложението да работи правилно.</string>
+  <string name="chapter_duration">Времетраене: %1$s</string>
   <string name="description_label">Описание</string>
   <string name="most_recent_prefix">Най-нов епизод:\u0020</string>
   <string name="size_prefix">Размер:\u0020</string>
@@ -60,6 +64,7 @@
   <string name="etxtFeedurlHint">www.primer.com/emisiq</string>
   <string name="txtvfeedurl_label">Добавяне на подкаст по URL адрес</string>
   <string name="podcastdirectories_label">Намиране на подкаст в директория</string>
+  <string name="podcastdirectories_descr">Можете да търсите нови подкасти в iTunes или fyyd, или да прегледате gpodder.net според име, категория и популярност.</string>
   <!--Actions on feeds-->
   <string name="mark_all_read_label">Маркирай всички като слушани</string>
   <string name="mark_all_read_msg">Всички епизоди са маркирани като слушани</string>
@@ -79,6 +84,8 @@
   <string name="share_item_url_label">Сподели URL адрес на епизода</string>
   <string name="share_item_url_with_position_label">Сподели URL адрес на епизода с позиция</string>
   <string name="feed_remover_msg">Премахване на емисията</string>
+  <string name="hide_downloaded_episodes_label">Изтеглени</string>
+  <string name="hide_not_downloaded_episodes_label">Неизтеглени</string>
   <!--actions on feeditems-->
   <string name="stream_label">Стрийм</string>
   <string name="marked_as_seen_label">Маркиран като прегледан</string>
@@ -111,7 +118,6 @@
   <string name="other_pref">Други</string>
   <string name="about_pref">Относно</string>
   <string name="queue_label">Опашка</string>
-  <string name="services_label">Услуги</string>
   <string name="flattr_label">Flattr</string>
   <string name="pref_episode_cleanup_title">Почистване на епизодите</string>
   <string name="pref_episode_cleanup_summary">Епизодите, които не са в опашката и не са в любими, отговарят на условията за премахване, ако автоматичното изтегляне се нуждае от място за нови епизоди</string>
@@ -175,6 +181,7 @@
   <string name="crash_report_sum">Изпратете най-новия доклад за срив чрез имейл</string>
   <string name="send_email">Изпращане на имейл</string>
   <string name="experimental_pref">Експериментални</string>
+  <string name="pref_current_value">Текуща стойност: %1$s</string>
   <string name="pref_proxy_title">Прокси</string>
   <string name="pref_faq">Често задавани въпроси</string>
   <string name="pref_known_issues">Известни проблеми</string>
@@ -193,10 +200,9 @@
   <string name="html_export_label">HTML експортиране</string>
   <string name="exporting_label">Експортиране...</string>
   <string name="export_error_label">Грешка при експортиране</string>
-  <string name="opml_export_success_title">Успешно OPML експортиране.</string>
-  <string name="opml_export_success_sum">.opml файлът беше записан в:\u0020</string>
   <string name="opml_import_ask_read_permission">Необходим е достъп до външната памет за прочитане на OPML файла</string>
   <!--Sleep timer-->
+  <string name="timer_vibration_label">Вибрация</string>
   <string name="time_seconds">секунди</string>
   <string name="time_minutes">минути</string>
   <string name="time_hours">часа</string>
@@ -216,6 +222,7 @@
   <string name="gpodnet_taglist_header">КАТЕГОРИИ</string>
   <string name="gpodnet_toplist_header">ТОП ПОДКАСТИ</string>
   <string name="gpodnet_suggestions_header">ПРЕДЛОЖЕНИЯ</string>
+  <string name="gpodnet_search_hint">Търсене в gpodder.net</string>
   <string name="gpodnetauth_login_title">Вход</string>
   <string name="gpodnetauth_login_butLabel">Вход</string>
   <string name="username_label">Потребителско име</string>
@@ -229,11 +236,21 @@
   <!--Progress information-->
   <!--AntennaPodSP-->
   <string name="filter">Филтър</string>
+  <string name="search_fyyd_label">Търсене във fyyd</string>
   <!--Episodes apply actions-->
   <!--Sort-->
   <!--Rating dialog-->
   <!--Audio controls-->
   <!--proxy settings-->
+  <string name="proxy_type_label">Тип</string>
+  <string name="host_label">Хост</string>
+  <string name="port_label">Порт</string>
+  <string name="proxy_test_label">Тест</string>
+  <string name="proxy_test_successful">Тестът е успешен</string>
+  <string name="proxy_test_failed">Тестът е неуспешен</string>
+  <string name="proxy_port_invalid_error">Портът не е валиден</string>
+  <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-ca-rES/strings.xml b/core/src/main/res/values-ca-rES/strings.xml
index fe20ff5da..d9f216268 100644
--- a/core/src/main/res/values-ca-rES/strings.xml
+++ b/core/src/main/res/values-ca-rES/strings.xml
@@ -58,4 +58,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-ca/strings.xml b/core/src/main/res/values-ca/strings.xml
index 86fac02a5..ecf51f704 100644
--- a/core/src/main/res/values-ca/strings.xml
+++ b/core/src/main/res/values-ca/strings.xml
@@ -1,12 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
+  <string name="feed_update_receiver_name">Actualitzar subscripcions</string>
   <string name="feeds_label">Canals</string>
   <string name="statistics_label">Estadístiques</string>
   <string name="add_feed_label">Afegeix podcast</string>
   <string name="episodes_label">Episodis</string>
   <string name="all_episodes_short_label">Tot</string>
-  <string name="favorite_episodes_label">Favorits</string>
+  <string name="new_episodes_label">Nou</string>
+  <string name="favorite_episodes_label">Preferits</string>
   <string name="new_label">Nous</string>
   <string name="settings_label">Configuració</string>
   <string name="downloads_label">Baixades</string>
@@ -15,13 +17,15 @@
   <string name="downloads_log_label">Registre</string>
   <string name="subscriptions_label">Subscripcions</string>
   <string name="subscriptions_list_label">Llista de subscripcions</string>
-  <string name="cancel_download_label">Cancel·la la baixada</string>
+  <string name="cancel_download_label">Cancel·la\nBaixada</string>
   <string name="playback_history_label">Historial de reproducció</string>
   <string name="gpodnet_main_label">gpodder.net</string>
+  <string name="gpodnet_summary">Sincronitzar amb altres dispositius</string>
   <string name="gpodnet_auth_label">Inici de sessió a gpodder.net</string>
   <string name="free_space_label">%1$s lliure</string>
-  <string name="episode_cache_full_title">Caché d\'episodi completa</string>
-  <string name="episode_cache_full_message">S\'ha arribat al límit de la caché. Pots incrementar la capacitat de la caché a les Opcions</string>
+  <string name="episode_cache_full_title">La memòria cau d\'episodis és plena</string>
+  <string name="episode_cache_full_message">S\'ha arribat al límit de la memòria cau d\'episodis. Pots incrementar-ne la capacitat a la configuració.</string>
+  <string name="synchronizing">Sincronitzant...</string>
   <!--Statistics fragment-->
   <string name="total_time_listened_to_podcasts">Temps total de podcasts reproduïts</string>
   <string name="statistics_details_dialog">%1$d de %2$depisodis començats.\n\nReproduïts %3$s de %4$s.</string>
@@ -33,7 +37,7 @@
   <string name="drawer_open">Obre menú</string>
   <string name="drawer_close">Tanca menú</string>
   <string name="drawer_preferences">Calaix de preferències</string>
-  <string name="drawer_feed_order_unplayed_episodes">Ordre per durada</string>
+  <string name="drawer_feed_order_unplayed_episodes">Ordre per comptador</string>
   <string name="drawer_feed_order_alphabetical">Ordre alfabètic</string>
   <string name="drawer_feed_order_last_update">Ordre per data de publicació</string>
   <string name="drawer_feed_order_most_played">Ordre per número d\'episodis reproduïts</string>
@@ -56,13 +60,14 @@
   <string name="yes">Sí</string>
   <string name="no">No</string>
   <string name="reset">Reiniciar</string>
-  <string name="author_label">Autor</string>
+  <string name="author_label">Autor/s</string>
   <string name="language_label">Llengua</string>
   <string name="url_label">Adreça web</string>
   <string name="podcast_settings_label">Configuració</string>
   <string name="cover_label">Imatge</string>
   <string name="error_label">Error</string>
   <string name="error_msg_prefix">S\'ha produït un error:</string>
+  <string name="needs_storage_permission">Calen permisos d\'emmagatzematge per a aquesta operació</string>
   <string name="refresh_label">Actualitza</string>
   <string name="external_storage_error_msg">L\'emmagatzemament extern no està disponible. Assegureu-vos que està muntat per què l\'aplicació funcioni correctament.</string>
   <string name="chapters_label">Capítols</string>
@@ -82,7 +87,7 @@
   <string name="auto_download_apply_to_items_title">Aplica als episodis previs</string>
   <string name="auto_download_apply_to_items_message">El nou ajustament de <i>baixada automàtica</i> s\'aplicarà als nous episodis.\nVols que també sigui aplicat als episodis publicats prèviament?</string>
   <string name="auto_delete_label">Esborra episodi automàticament</string>
-  <string name="parallel_downloads_suffix">\u0020baixades paral·leles</string>
+  <string name="parallel_downloads_suffix">\u0020baixades en paral·lel</string>
   <string name="feed_auto_download_global">Valor predeterminat global</string>
   <string name="feed_auto_download_always">Sempre</string>
   <string name="feed_auto_download_never">Mai</string>
@@ -105,25 +110,28 @@
   <string name="mark_all_read_label">Marca-ho tot com a llegit</string>
   <string name="mark_all_read_msg">S\'han marcat tots els episodis com a llegits</string>
   <string name="mark_all_read_confirmation_msg">Si us plau confirma que vols marcar tots els episodis com reproduits.</string>
-  <string name="mark_all_read_feed_confirmation_msg">Si us plau confirma que vols marcar tots els episodis d\'aquest canal com reproduits.</string>
+  <string name="mark_all_read_feed_confirmation_msg">Si us plau, confirmeu que voleu marcar tots els episodis d\'aquest podcast com a reproduïts.</string>
   <string name="mark_all_seen_label">Marca tot com a llegit</string>
-  <string name="mark_all_seen_msg">S\'han marcat tots els episodis com a vistos</string>
+  <string name="mark_all_seen_msg">Marcar tots episodis com a visualitzats</string>
   <string name="mark_all_seen_confirmation_msg">Si us plau confirma que vols marcar tots els episodis com vistos.</string>
   <string name="show_info_label">Mostra informació</string>
-  <string name="rename_feed_label">Renombra podcast</string>
-  <string name="remove_feed_label">Esborra podcast</string>
-  <string name="share_label">Compartir...</string>
-  <string name="share_link_label">Comparteix l\'enllaç</string>
-  <string name="share_file_label">Comparteix un fitxer</string>
-  <string name="share_link_with_position_label">Comparteix enllaç amb posició</string>
-  <string name="share_feed_url_label">Comparteix adreça del canal</string>
-  <string name="share_item_url_label">Comparteix adreça del fitxer del canal</string>
-  <string name="share_item_url_with_position_label">Comparteix adreça del fitxer del canal amb posició</string>
-  <string name="feed_delete_confirmation_msg">Confirmeu que voleu suprimir el canal \"%1$s\" i TOTS els episodis que n\'heu descarregat.</string>
-  <string name="feed_remover_msg">S\'està esborrant el canal</string>
-  <string name="load_complete_feed">S\'ha actualitzat el canal</string>
+  <string name="show_feed_settings_label">Mostrar configuració del podcast</string>
+  <string name="feed_info_label">Informació del podcast</string>
+  <string name="feed_settings_label">Configuració del podcast</string>
+  <string name="rename_feed_label">Canvia el nom al podcast</string>
+  <string name="remove_feed_label">Suprimeix podcast</string>
+  <string name="share_label">Comparteix...</string>
+  <string name="share_link_label">Comparteix l\'adreça de l\'episodi</string>
+  <string name="share_link_with_position_label">Comparteix l\'adreça de l\'episodi i la posició</string>
+  <string name="share_file_label">Comparteix el fitxer</string>
+  <string name="share_feed_url_label">Comparteix l\'adreça del canal</string>
+  <string name="share_item_url_label">Comparteix l\'adreça del fitxer multimèdia</string>
+  <string name="share_item_url_with_position_label">Comparteix l\'adreça del fitxer multimèdia i la posició</string>
+  <string name="feed_delete_confirmation_msg">Si us plau, confirmeu que voleu eliminar el podcast \"%1$s\" i tots els seus episodis (fins i tot els ja baixats).</string>
+  <string name="feed_remover_msg">Eliminant podcast</string>
+  <string name="load_complete_feed">Refrescar tot el podcast</string>
   <string name="hide_episodes_title">Amaga Episodis</string>
-  <string name="episode_actions">Aplica accions</string>
+  <string name="batch_edit">Editar lot</string>
   <string name="hide_unplayed_episodes_label">Per reproduir</string>
   <string name="hide_paused_episodes_label">Pausat</string>
   <string name="hide_played_episodes_label">Reproduit</string>
@@ -132,6 +140,7 @@
   <string name="hide_downloaded_episodes_label">Baixat</string>
   <string name="hide_not_downloaded_episodes_label">No baixat</string>
   <string name="hide_has_media_label">Conté medis</string>
+  <string name="hide_is_favorite_label">És preferint</string>
   <string name="filtered_label">Filtrat</string>
   <string name="refresh_failed_msg">{fa-exclamation-circle} Darrera actualització fallida</string>
   <string name="open_podcast">Obrir podcast</string>
@@ -144,7 +153,8 @@
   <string name="remove_label">Suprimeix</string>
   <string name="delete_label">Esborrar</string>
   <string name="delete_failed">No s\'ha pogut esborrar el fitxer. Reiniciar el dispositiu pot ajudar.</string>
-  <string name="remove_episode_lable">Esborra episodi</string>
+  <string name="remove_episode_lable">Suprimeix episodi</string>
+  <string name="mark_as_seen_label">Marcar com a visualitzat</string>
   <string name="marked_as_seen_label">Marcat com a vist</string>
   <string name="mark_read_label">Marca com a llegit</string>
   <string name="marked_as_read_label">Marcats com llegits</string>
@@ -152,22 +162,24 @@
   <string name="add_to_queue_label">Afegeix a la cua</string>
   <string name="added_to_queue_label">Afegit a la cua</string>
   <string name="remove_from_queue_label">Suprimeix de la cua</string>
-  <string name="add_to_favorite_label">Afegit a Favorits</string>
-  <string name="added_to_favorites">Afegit a favorits</string>
-  <string name="remove_from_favorite_label">Suprimeix de Favorits</string>
-  <string name="removed_from_favorites">Tret de favorits</string>
+  <string name="add_to_favorite_label">Afegit a preferits</string>
+  <string name="added_to_favorites">Afegit a preferits</string>
+  <string name="remove_from_favorite_label">Suprimeix de preferits</string>
+  <string name="removed_from_favorites">S\'ha suprimit de preferits</string>
   <string name="visit_website_label">Visita el lloc web</string>
   <string name="support_label">Comparteix amb Flattr</string>
   <string name="skip_episode_label">Omet l\'episodi</string>
   <string name="activate_auto_download">Activa baixades automàtiques</string>
   <string name="deactivate_auto_download">Desactiva les baixades automàtiques</string>
   <string name="reset_position">Restablir posició de reproducció</string>
-  <string name="removed_item">Element eliminat</string>
+  <string name="removed_item">S\'ha suprimit l\'element</string>
   <!--Download messages and labels-->
   <string name="download_successful">ha funcionat</string>
   <string name="download_failed">ha fallat</string>
   <string name="download_pending">Baixada pendent</string>
   <string name="download_running">Baixada en procés</string>
+  <string name="download_error_details">Detalls</string>
+  <string name="download_error_details_message">%1$s \n\nURL del fitxer:\n%2$s</string>
   <string name="download_error_device_not_found">No s\'ha trobat cap dispositiu d\'emmagatzemament</string>
   <string name="download_error_insufficient_space">No hi ha prou espai</string>
   <string name="download_error_file_error">Error de fitxer</string>
@@ -218,6 +230,7 @@
   <string name="playback_error_unknown">Error desconegut</string>
   <string name="no_media_playing_label">No s\'està reproduint res</string>
   <string name="player_buffering_msg">S\'està carregant</string>
+  <string name="player_go_to_picture_in_picture">Mode Picture-in-picture</string>
   <string name="playbackservice_notification_title">Podcast en reproducció</string>
   <string name="unknown_media_key">AntennaPod - Control desconegut: %1$d</string>
   <!--Queue operations-->
@@ -234,7 +247,9 @@
   <string name="date">Data</string>
   <string name="duration">Durada</string>
   <string name="episode_title">Títol de l\'episodi</string>
-  <string name="feed_title">Títol del feed</string>
+  <string name="feed_title">Títol del podcast</string>
+  <string name="random">Aleatori</string>
+  <string name="smart_shuffle">Mescla intel·ligent</string>
   <string name="ascending">Ascendent</string>
   <string name="descending">Descendent</string>
   <string name="clear_queue_confirmation_msg">Si us plau, confirma que vols suprimir tots els episodis de la cua</string>
@@ -272,7 +287,7 @@
   <string name="enable_sonic">Activa Sonic</string>
   <!--Empty list labels-->
   <string name="no_items_label">No hi ha elements a la llista.</string>
-  <string name="no_feeds_label">No us heu subscrit a cap canal.</string>
+  <string name="no_feeds_label">Encara no us heu subscrit a cap podcast.</string>
   <string name="no_chapters_label">Aquest episodi no té capítols</string>
   <string name="no_shownotes_label">Aquest episodi no té notes.</string>
   <!--Preferences-->
@@ -281,15 +296,23 @@
   <string name="other_pref">Altres</string>
   <string name="about_pref">Quant a</string>
   <string name="queue_label">Cua</string>
-  <string name="services_label">Serveis</string>
+  <string name="integrations_label">Integracions</string>
   <string name="flattr_label">Flattr</string>
+  <string name="flattr_summary">Servei de micropagaments</string>
+  <string name="automation">Automatització</string>
+  <string name="download_pref_details">Detalls</string>
+  <string name="import_export_pref">Importa/Exporta</string>
+  <string name="appearance">Aparença</string>
+  <string name="external_elements">Elements externs</string>
+  <string name="interruptions">Interrupcions</string>
+  <string name="buttons">Botons de control de reproducció</string>
+  <string name="media_player">Reproductor multimèdia</string>
   <string name="pref_episode_cleanup_title">Neteja l\'episodi</string>
-  <string name="pref_episode_cleanup_summary">Els episodis que no es troben a la cua i no són favorits haurien de ser candidats a ser esborrats si l\'Auto Descàrrega necessita espai per a nous episodis</string>
+  <string name="pref_episode_cleanup_summary">Els episodis que no es troben a la cua i no són preferits seran candidats a ser suprimits si l\'Auto Descàrrega necessita espai per a nous episodis</string>
   <string name="pref_pauseOnDisconnect_sum">Pausa la reproducció en desconnectar els auriculars o el bluetooth</string>
   <string name="pref_unpauseOnHeadsetReconnect_sum">Continua la reproducció en connectar novament els auriculars</string>
   <string name="pref_unpauseOnBluetoothReconnect_sum">Continua la reproducció en connectar novament el bluetooth</string>
   <string name="pref_hardwareForwardButtonSkips_title">Endavant per saltar</string>
-  <string name="pref_hardwareForwardButtonSkips_sum">En prémer el botó físic d\'Endavant, passar al següent episodi en comptes d\'avançar a la reproducció</string>
   <string name="pref_hardwarePreviousButtonRestarts_title">Endarrere per reiniciar</string>
   <string name="pref_hardwarePreviousButtonRestarts_sum">En prémer un botó físic, reinicieu l\'episodi actual en lloc de rebobinar-lo</string>
   <string name="pref_followQueue_sum">Salta al següent element de la cua en acabar la reproducció</string>
@@ -299,8 +322,8 @@
   <string name="pref_smart_mark_as_played_title">Marca intel·ligent com a reproduït</string>
   <string name="pref_skip_keeps_episodes_sum">Mantenir episodis quan són passats de llarg</string>
   <string name="pref_skip_keeps_episodes_title">Mantenir els episodis passats de llarg</string>
-  <string name="pref_favorite_keeps_episodes_sum">Conserva els episodis marcats com a favorits.</string>
-  <string name="pref_favorite_keeps_episodes_title">Conserva els episodis favorits.</string>
+  <string name="pref_favorite_keeps_episodes_sum">Conserva els episodis marcats com a preferits.</string>
+  <string name="pref_favorite_keeps_episodes_title">Conserva els episodis preferits.</string>
   <string name="playback_pref">Reproducció</string>
   <string name="network_pref">Xarxa</string>
   <string name="pref_autoUpdateIntervallOrTime_title">Actualitza interval o horari del dia</string>
@@ -338,7 +361,7 @@
   <string name="pref_nav_drawer_feed_order_title">Estableix l\'ordre de les subscripcions</string>
   <string name="pref_nav_drawer_feed_order_sum">Canvia l\'ordre de les subscripcions</string>
   <string name="pref_nav_drawer_feed_counter_title">Estableix el comptador de les subscripcions</string>
-  <string name="pref_nav_drawer_feed_counter_sum">Canvia la informació mostrada pel comptador de les subscripcions</string>
+  <string name="pref_nav_drawer_feed_counter_sum">Canvia la informació mostrada pel comptador de les subscripcions. També afecta l\'ordre de les subscripcions si a l\'opció \'Ordre de les subscripcions\' s\'ha indicat \'Comptador\'.</string>
   <string name="pref_set_theme_sum">Canvieu l\'aparença d\'AntennaPod.</string>
   <string name="pref_automatic_download_title">Baixada automàtica</string>
   <string name="pref_automatic_download_sum">Configureu la baixada automàtica d\'episodis.</string>
@@ -349,9 +372,10 @@
   <string name="pref_automatic_download_on_battery_title">Baixa mentre no es carrega</string>
   <string name="pref_automatic_download_on_battery_sum">Permet les baixades automàtiques mentre la bateria no es carrega</string>
   <string name="pref_parallel_downloads_title">Baixades paral·leles</string>
-  <string name="pref_episode_cache_title">Memòria d\'episodis</string>
+  <string name="pref_episode_cache_title">Memòria cau d\'episodis</string>
   <string name="pref_theme_title_light">Clar</string>
   <string name="pref_theme_title_dark">Fosc</string>
+  <string name="pref_theme_title_trueblack">Negra (per AMOLED)</string>
   <string name="pref_episode_cache_unlimited">Sense límits</string>
   <string name="pref_update_interval_hours_plural">hores</string>
   <string name="pref_update_interval_hours_singular">hora</string>
@@ -380,8 +404,6 @@
   <string name="pref_rewind_sum">Personalitza el nombre de segons del salt endarrere quan es prem el botó de Rebobinat</string>
   <string name="pref_gpodnet_sethostname_title">Definex nom del servidor</string>
   <string name="pref_gpodnet_sethostname_use_default_host">Utilitza el servidor per defecte</string>
-  <string name="pref_expandNotify_title">Amplia la notificació</string>
-  <string name="pref_expandNotify_sum">Amplia sempre les notificacions per mostrar els botons de reproducció.</string>
   <string name="pref_persistNotify_title">Botons de reproducció persistents</string>
   <string name="pref_persistNotify_sum">Manté els controls a l\'àrea de notificacions i pantalla de bloqueig quan la reproducció estigui aturada</string>
   <string name="pref_compact_notification_buttons_title">Estableix els botons del bloqueig de pantalla</string>
@@ -402,8 +424,7 @@
   <string name="crash_report_sum">Envia l\'últim informe de tancament abrupte per e-mail</string>
   <string name="send_email">Envia e-mail</string>
   <string name="experimental_pref">Experimental</string>
-  <string name="pref_sonic_title">Reproductor Sonic Media Player</string>
-  <string name="pref_sonic_message">Fes servir el reproductor Sonic Media Player integrat en comptes del reproductor natiu d\'Android i Prestissimo</string>
+  <string name="pref_media_player_message">Seleccioneu el reproductor multimèdia per a reproduir fitxers</string>
   <string name="pref_current_value">Valor actual: %1$s</string>
   <string name="pref_proxy_title">Servidor intermediari</string>
   <string name="pref_proxy_sum">Estableix un servidor intermediari</string>
@@ -415,6 +436,11 @@
   <string name="pref_cast_message_free_flavor">Chromecast requereix de llibreries propietàries de terceres parts que estan inhabilitades en aquesta versió d\'AntennaPod</string>
   <string name="pref_enqueue_downloaded_title">Afegeix les baixades a la cua</string>
   <string name="pref_enqueue_downloaded_summary">Afegeix els episodis descarregats a la cua</string>
+  <string name="media_player_builtin">Reproductor Android estàndard</string>
+  <string name="pref_videoBehavior_title">En sortir d\'un vídeo</string>
+  <string name="pref_videoBehavior_sum">Comportament a l\'abandonar la reproducció d\'un vídeo</string>
+  <string name="stop_playback">Atura reproducció</string>
+  <string name="continue_playback">Continuar reproducció d\'audio</string>
   <!--Auto-Flattr dialog-->
   <string name="auto_flattr_enable">Activa la compartició automàtica per Flattr</string>
   <string name="auto_flattr_after_percent">Comparteix per Flattr l\'episodi en haver-ne reproduït el %d per cent</string>
@@ -424,8 +450,8 @@
   <string name="search_hint">Cerca episodis</string>
   <string name="found_in_shownotes_label">Troba a les notes dels canals</string>
   <string name="found_in_chapters_label">Trobat als capítols</string>
-  <string name="found_in_authors_label">Troba als autors</string>
-  <string name="found_in_feeds_label">Troba als canals</string>
+  <string name="found_in_authors_label">Trobat a autor/s</string>
+  <string name="found_in_feeds_label">Trobat a un podcast</string>
   <string name="search_status_no_results">No s\'ha trobat cap resultat</string>
   <string name="search_label">Cerca</string>
   <string name="found_in_title_label">Trobat al títol</string>
@@ -451,8 +477,8 @@
   <string name="html_export_label">Exporta HTML</string>
   <string name="exporting_label">Exportant...</string>
   <string name="export_error_label">Error d\'exportació</string>
-  <string name="opml_export_success_title">S\'ha exportat l\'OPML correctament.</string>
-  <string name="opml_export_success_sum">El fitxer OPML s\'ha escrit a:\u0020</string>
+  <string name="export_success_title">Exportació correcta</string>
+  <string name="export_success_sum">S\'ha exportat el fitxer a:\n\n%1$s</string>
   <string name="opml_import_ask_read_permission">Per llegir arxius OPML és necessari accés a la memòria externa</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Defineix un temporitzador</string>
@@ -625,7 +651,7 @@
   <string name="label_import">Importa</string>
   <string name="label_export">Exporta</string>
   <string name="import_select_file">Tria un fitxer per a importar</string>
-  <string name="export_ok">S\'ha exportat amb èxit. S\'ha escrit la base de dades a la targeta SD.</string>
+  <string name="export_ok">Exportació correcta.</string>
   <string name="import_ok">S\'ha importat amb èxit.\n\nPremeu D\'acord per a reiniciar l\'AntennaPod.</string>
   <!--Casting-->
   <string name="cast_media_route_menu_title">Reproduir a...</string>
@@ -643,4 +669,13 @@
   <string name="cast_failed_seek">No s\'ha pogut cercar la nova posició al dispositiu de difusió</string>
   <string name="cast_failed_receiver_player_error">El reproductor receptor ha trobat un error greu</string>
   <string name="cast_failed_media_error_skipping">Error en la reproducció. Saltant...</string>
+  <!--Notification channels-->
+  <string name="notification_channel_user_action">Acció necessària</string>
+  <string name="notification_channel_user_action_description">Mostrar si es requereix la vostra acció, per exemple si heu d\'entrar una contrasenya.</string>
+  <string name="notification_channel_downloading">Baixant</string>
+  <string name="notification_channel_downloading_description">Mostrar durant baixades.</string>
+  <string name="notification_channel_playing">Reproducció actual</string>
+  <string name="notification_channel_playing_description">Permet controlar la reproducció. Aquesta és la notificació principal que veureu durant la reproducció d\'un podcast.</string>
+  <string name="notification_channel_error">Errors</string>
+  <string name="notification_channel_error_description">Mostrar si quelcom va malament, per exemple si una baixada o sincronització fallen.</string>
 </resources>
diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml
index f7b1156de..1d9868b2c 100644
--- a/core/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/src/main/res/values-cs-rCZ/strings.xml
@@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
+  <string name="feed_update_receiver_name">Aktualizovat sbírky</string>
   <string name="feeds_label">Kanály</string>
   <string name="statistics_label">Statistiky</string>
   <string name="add_feed_label">Přidat podcast</string>
   <string name="episodes_label">Epizody</string>
   <string name="all_episodes_short_label">Vše</string>
+  <string name="new_episodes_label">Nový</string>
   <string name="favorite_episodes_label">Oblíbené</string>
   <string name="new_label">Nový</string>
   <string name="settings_label">Nastavení</string>
@@ -18,10 +20,12 @@
   <string name="cancel_download_label">Zrušit stahování</string>
   <string name="playback_history_label">Historie přehrávání</string>
   <string name="gpodnet_main_label">gpodder.net</string>
+  <string name="gpodnet_summary">Synchronizovat s ostatními přístroji</string>
   <string name="gpodnet_auth_label">Login pro gpodder.net</string>
   <string name="free_space_label">%1$s volné</string>
   <string name="episode_cache_full_title">Odkládací prostor pro epizody je plný</string>
   <string name="episode_cache_full_message">Došlo k zaplnění limitu odkládacího prostoru pro epizody. Můžete navýšit vyhrazený prostor v Nastavení.</string>
+  <string name="synchronizing">Synchronizace...</string>
   <!--Statistics fragment-->
   <string name="total_time_listened_to_podcasts">Celkový čas poslechnutých podcastů:</string>
   <string name="statistics_details_dialog">%1$d z %2$d započatých epizod.\n\nPřehraných %3$s z %4$s.</string>
@@ -52,7 +56,7 @@
   <string name="no">Ne
 </string>
   <string name="reset">Reset</string>
-  <string name="author_label">Autor</string>
+  <string name="author_label">Přispěvatel(é)</string>
   <string name="language_label">Jazyk</string>
   <string name="url_label">URL</string>
   <string name="podcast_settings_label">Nastavení</string>
@@ -88,6 +92,7 @@
   <plurals name="episode_cleanup_days_after_listening">
     <item quantity="one">1 den po dokončení</item>
     <item quantity="few">%d dny po dokončení</item>
+    <item quantity="many">%d dnů po dokončení</item>
     <item quantity="other">%d dnů po dokončení</item>
   </plurals>
   <!--'Add Feed' Activity labels-->
@@ -101,23 +106,12 @@
   <string name="mark_all_read_label">Označit vše jako poslechnuté</string>
   <string name="mark_all_read_msg">Všechny epizody označeny jako poslechnuté</string>
   <string name="mark_all_read_confirmation_msg">Potvrďte prosím, že chcete označit všechny vybrané epizody jako poslechnuté.</string>
-  <string name="mark_all_read_feed_confirmation_msg">Potvrďte prosím, že chcete označit všechny epizody z tohoto zdroje jako poslechnuté.</string>
   <string name="mark_all_seen_label">Označit vše jako zobrazené</string>
-  <string name="mark_all_seen_msg">Označit všechny epizody jako shlédnuté</string>
   <string name="mark_all_seen_confirmation_msg">Potvrďte prosím, že chcete označit všechny epizody jako shlédnuté.</string>
   <string name="show_info_label">Informace o zdroji</string>
-  <string name="rename_feed_label">Přejmenovat podcast</string>
-  <string name="remove_feed_label">Odstranit podcast</string>
   <string name="share_label">Sdílet</string>
-  <string name="share_link_label">Sdílet odkaz</string>
-  <string name="share_link_with_position_label">Sdílet odkaz s pozicí</string>
   <string name="share_feed_url_label">Sdílet URL kanálu</string>
-  <string name="share_item_url_label">Sdílet URL souboru epizody</string>
-  <string name="share_item_url_with_position_label">Sdílet URL souboru epizody s pozicí</string>
-  <string name="feed_remover_msg">Odstranit kanál</string>
-  <string name="load_complete_feed">Obnovit kompletní kanál</string>
   <string name="hide_episodes_title">Skrýt epizody</string>
-  <string name="episode_actions">Provést akce</string>
   <string name="hide_unplayed_episodes_label">Neposlechnuté</string>
   <string name="hide_paused_episodes_label">Pozastavené</string>
   <string name="hide_played_episodes_label">Poslechnuté</string>
@@ -185,6 +179,7 @@
   <plurals name="downloads_left">
     <item quantity="one">%d čekající na stažení</item>
     <item quantity="few">%d čekající na stažení</item>
+    <item quantity="many">%d čekajících na stažení</item>
     <item quantity="other">%d čekajících na stažení</item>
   </plurals>
   <string name="downloads_processing">Probíhá stahování</string>
@@ -228,7 +223,6 @@
   <string name="date">Datum</string>
   <string name="duration">Délka</string>
   <string name="episode_title">Název epizody</string>
-  <string name="feed_title">Název kanálu</string>
   <string name="ascending">Vzestupně</string>
   <string name="descending">Sestupně</string>
   <string name="clear_queue_confirmation_msg">Potvrďte prosím, že chcete vyčistit tuto frontu a VŠECHNY v ní obsažené epizody</string>
@@ -266,7 +260,6 @@
   <string name="enable_sonic">Povolit Sonic</string>
   <!--Empty list labels-->
   <string name="no_items_label">Žádné položky v seznamu.</string>
-  <string name="no_feeds_label">Zatím nebyly přidány žádné kanály.</string>
   <string name="no_chapters_label">Tato epizoda nemá žádné kapitoly.</string>
   <string name="no_shownotes_label">Tato epizoda neobsahuje žádné poznámky.</string>
   <!--Preferences-->
@@ -275,14 +268,12 @@
   <string name="other_pref">Ostatní</string>
   <string name="about_pref">O aplikaci</string>
   <string name="queue_label">Fronta</string>
-  <string name="services_label">Služby</string>
   <string name="flattr_label">Flattr</string>
   <string name="pref_episode_cleanup_title">Vyčistit epizody</string>
   <string name="pref_episode_cleanup_summary">Epizody, které nejsou ve frontě a nejsou označeny za oblíbené by mělo být možné smazat, pokud bude funkce automatického stahování potřebovat místo pro nové epizody</string>
   <string name="pref_pauseOnDisconnect_sum">Při odpojení sluchátek nebo bluetooth připojení pozastavit přehrávání.</string>
   <string name="pref_unpauseOnHeadsetReconnect_sum">Pokračovat v přehrávání po připojení sluchátek</string>
   <string name="pref_unpauseOnBluetoothReconnect_sum">Pokračovat v přehrávání po připojení bluetooth</string>
-  <string name="pref_hardwareForwardButtonSkips_sum">Po stlačení hardwarového tlačítka pro posun vpřed místo přetočení vpřed přeskočit na další epizodu</string>
   <string name="pref_hardwarePreviousButtonRestarts_title">Tlačítko zpět restartuje</string>
   <string name="pref_hardwarePreviousButtonRestarts_sum">Po stlačení hardwarového tlačítka pro posun zpět místo přetočení vpřed restartovat přehrávání aktuální epizody</string>
   <string name="pref_followQueue_sum">Po přehrání položky z fronty přejít automaticky na další</string>
@@ -328,7 +319,6 @@
   <string name="pref_nav_drawer_feed_order_title">Nastavit pořadí sbírek</string>
   <string name="pref_nav_drawer_feed_order_sum">Upravit pořadí vašich sbírek</string>
   <string name="pref_nav_drawer_feed_counter_title">Nastavit počítadlo sbírek</string>
-  <string name="pref_nav_drawer_feed_counter_sum">Upravit informaci zobrazovanou počítadlem sbírek</string>
   <string name="pref_set_theme_sum">Změnit vzhled AntennaPod.</string>
   <string name="pref_automatic_download_title">Automatické stahování</string>
   <string name="pref_automatic_download_sum">Nastavení automatického stahování epizod.</string>
@@ -364,8 +354,6 @@
   <string name="pref_playback_speed_sum">Přizpůsobení rychlosti je dostupné pro přehrávání zvuku různými rychlostmi</string>
   <string name="pref_gpodnet_sethostname_title">Nastavit hostname</string>
   <string name="pref_gpodnet_sethostname_use_default_host">Použít přednastaveného hosta</string>
-  <string name="pref_expandNotify_title">Rozšířené upozornění</string>
-  <string name="pref_expandNotify_sum">Vždy zobrazovat tlačítka pro přehrávání v upozornění.</string>
   <string name="pref_persistNotify_title">Pevné ovládání přehrávání</string>
   <string name="pref_persistNotify_sum">Zachovat upozornění a ovládání na obrazovce uzamčení i při pozastaveném přehrávání.</string>
   <string name="pref_compact_notification_buttons_title">Nastavení tlačítek uzamčené obrazovky</string>
@@ -386,7 +374,6 @@
   <string name="crash_report_sum">Odesílat hlášení o posledním pádu aplikace emailem</string>
   <string name="send_email">Poslat email</string>
   <string name="experimental_pref">Experimentální</string>
-  <string name="pref_sonic_message">Použít připojený sonic media player jako náhradu za výchozí přehrávač médií pro Android a Prestissimo</string>
   <string name="pref_current_value">Aktuální hodnota: %1$s</string>
   <string name="pref_proxy_title">Proxy</string>
   <string name="pref_proxy_sum">Nastavit síťovou proxy</string>
@@ -430,8 +417,6 @@
   <string name="html_export_label">HTML export</string>
   <string name="exporting_label">Export</string>
   <string name="export_error_label">Chyba exportu</string>
-  <string name="opml_export_success_title">OPML export byl úspěšný.</string>
-  <string name="opml_export_success_sum">OPML soubor byl zapsán do:\u0020</string>
   <string name="opml_import_ask_read_permission">Pro přečtení OPML souboru je vyžadován  přístup k externímu úložišti</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Nastavit časovač vypnutí</string>
@@ -449,16 +434,19 @@
   <plurals name="time_seconds_quantified">
     <item quantity="one">1 sekunda</item>
     <item quantity="few">%d sekundy</item>
+    <item quantity="many">%d sekund</item>
     <item quantity="other">%d sekund</item>
   </plurals>
   <plurals name="time_minutes_quantified">
     <item quantity="one">1 minuta</item>
     <item quantity="few">%d minuty</item>
+    <item quantity="many">%d minut</item>
     <item quantity="other">%d minut</item>
   </plurals>
   <plurals name="time_hours_quantified">
     <item quantity="one">1 hodina</item>
     <item quantity="few">%d hodiny</item>
+    <item quantity="many">%d hodin</item>
     <item quantity="other">%d hodin</item>
   </plurals>
   <string name="auto_enable_label">Automaticky zapnout</string>
@@ -618,4 +606,5 @@
   <string name="cast_failed_seek">Selhal posun na novou pozici na vysílači</string>
   <string name="cast_failed_receiver_player_error">Přijímač zaznamenal závažnou chybu</string>
   <string name="cast_failed_media_error_skipping">Chyba přehrávání médií. Přeskakuji...</string>
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-da/strings.xml b/core/src/main/res/values-da/strings.xml
index 6364ef099..a094cdacf 100644
--- a/core/src/main/res/values-da/strings.xml
+++ b/core/src/main/res/values-da/strings.xml
@@ -56,7 +56,6 @@
   <string name="yes">Ja</string>
   <string name="no">Nej</string>
   <string name="reset">Nulstil</string>
-  <string name="author_label">Forfatter</string>
   <string name="language_label">Sprog</string>
   <string name="url_label">Webadresse</string>
   <string name="podcast_settings_label">Indstillinger </string>
@@ -105,25 +104,13 @@
   <string name="mark_all_read_label">Marker alle som afspillet</string>
   <string name="mark_all_read_msg">Marker alle udsendelser som afspillet</string>
   <string name="mark_all_read_confirmation_msg">Bekræft venligst at du ønsker at markere alle udsendelser som værende afspillet.</string>
-  <string name="mark_all_read_feed_confirmation_msg">Bekræft venligst at du ønsker at markere alle udsendelser i denne feed som værende afspillet.</string>
   <string name="mark_all_seen_label">Marker alle som set</string>
-  <string name="mark_all_seen_msg">Markerede alle udsendelser som set</string>
   <string name="mark_all_seen_confirmation_msg">Bekræft venligst at du ønsker at markere alle udsendelser som set.</string>
   <string name="show_info_label">Vis information</string>
-  <string name="rename_feed_label">Omdøb podcast</string>
-  <string name="remove_feed_label">Fjern podcast</string>
   <string name="share_label">Del…</string>
-  <string name="share_link_label">Del link</string>
   <string name="share_file_label">Del fil</string>
-  <string name="share_link_with_position_label">Del link med position</string>
   <string name="share_feed_url_label">Del webadresse for feedet</string>
-  <string name="share_item_url_label">Del webadresse for udsendelsen</string>
-  <string name="share_item_url_with_position_label">Del webadresse for udsendelsen med position</string>
-  <string name="feed_delete_confirmation_msg">Bekræft venligst at du ønsker at slette feedet \"%1$s\" og ALLE overførte udsendelser i dette feed.</string>
-  <string name="feed_remover_msg">Fjerner feed</string>
-  <string name="load_complete_feed">Opdater hele feedet</string>
   <string name="hide_episodes_title">Skjul udsendelser</string>
-  <string name="episode_actions">Anvend handlinger</string>
   <string name="hide_unplayed_episodes_label">Uafspillede</string>
   <string name="hide_paused_episodes_label">Sat på pause</string>
   <string name="hide_played_episodes_label">Afspillede</string>
@@ -234,7 +221,6 @@
   <string name="date">Dato</string>
   <string name="duration">Varighed</string>
   <string name="episode_title">Titel på udsendelse</string>
-  <string name="feed_title">Titel på feed</string>
   <string name="ascending">Stigende</string>
   <string name="descending">Faldende</string>
   <string name="clear_queue_confirmation_msg">Bekræft venligst at du vil rydde ALLE udsendelser fra køen</string>
@@ -272,7 +258,6 @@
   <string name="enable_sonic">Slå Sonic til</string>
   <!--Empty list labels-->
   <string name="no_items_label">Der er ingen elementer i denne liste.</string>
-  <string name="no_feeds_label">Du har endnu ikke abonneret på nogen feeds.</string>
   <string name="no_chapters_label">Denne udsendelse har ingen kapitler.</string>
   <string name="no_shownotes_label">Denne udsendelse har ingen beskrivelse.</string>
   <!--Preferences-->
@@ -281,7 +266,6 @@
   <string name="other_pref">Andre</string>
   <string name="about_pref">Om</string>
   <string name="queue_label">Kø</string>
-  <string name="services_label">Tjenester</string>
   <string name="flattr_label">Flattr</string>
   <string name="pref_episode_cleanup_title">Oprydning i udsendelser</string>
   <string name="pref_episode_cleanup_summary">Tillad at udsendelser, som ikke er i køen og som ikke er markeret som foretrukne, kan fjernes, hvis Automatisk overførsel har brug for plads til nye udsendelser</string>
@@ -289,7 +273,6 @@
   <string name="pref_unpauseOnHeadsetReconnect_sum">Genoptag afspilning når hovedtelefonerne tilsluttes igen</string>
   <string name="pref_unpauseOnBluetoothReconnect_sum">Genoptag afspilning når bluetooth forbinder igen</string>
   <string name="pref_hardwareForwardButtonSkips_title">Fremadknap springer over</string>
-  <string name="pref_hardwareForwardButtonSkips_sum">Når der trykkes på en fysisk fremadknap, skal der springes til den næste udsendelse i stedet for at spoles fremad.</string>
   <string name="pref_hardwarePreviousButtonRestarts_title">Tilbageknap genstarter</string>
   <string name="pref_hardwarePreviousButtonRestarts_sum">Når der trykkes på en fysisk tilbageknap, skal den aktuelle udsendelse afspilles forfra i stedet for at der spoles tilbage.</string>
   <string name="pref_followQueue_sum">Spring til næste element i køen når afspilningen er færdig</string>
@@ -338,7 +321,6 @@
   <string name="pref_nav_drawer_feed_order_title">Vælg abonnementsorden</string>
   <string name="pref_nav_drawer_feed_order_sum">Ændr rækkefølgen af dine abonnementer</string>
   <string name="pref_nav_drawer_feed_counter_title">Indstil abonnementstæller</string>
-  <string name="pref_nav_drawer_feed_counter_sum">Vælg den information, som abonnementstælleren viser</string>
   <string name="pref_set_theme_sum">Ændr AntennaPods udseende.</string>
   <string name="pref_automatic_download_title">Automatisk overførsel</string>
   <string name="pref_automatic_download_sum">Konfigurer automatisk overførsel af udsendelser</string>
@@ -380,8 +362,6 @@
   <string name="pref_rewind_sum">Indstil antallet af sekunder, der skal springes tilbage, når der trykkes på tilbagespolingsknappen</string>
   <string name="pref_gpodnet_sethostname_title">Indstil værtsnavn</string>
   <string name="pref_gpodnet_sethostname_use_default_host">Brug standard vært</string>
-  <string name="pref_expandNotify_title">Udvidelse af notifikation</string>
-  <string name="pref_expandNotify_sum">Udvid altid notifikationen for at vise afspilningsknapper.</string>
   <string name="pref_persistNotify_title">Vedholdende afspilningsknapper</string>
   <string name="pref_persistNotify_sum">Behold notifikation og knapper på låseskærmen, når afspilningen sættes på pause.</string>
   <string name="pref_compact_notification_buttons_title">Indstil knapper på låseskærm</string>
@@ -402,8 +382,6 @@
   <string name="crash_report_sum">Send den seneste nedbrudsrapport via e-mail</string>
   <string name="send_email">Send e-mail</string>
   <string name="experimental_pref">Eksperimentelt</string>
-  <string name="pref_sonic_title">Sonic-medieafspiller</string>
-  <string name="pref_sonic_message">Brug indbygget Sonic-medieafspiller i stedet for Androids indbyggede medieafspiller og Prestissimo</string>
   <string name="pref_current_value">Nuværende værdi: %1$s</string>
   <string name="pref_proxy_title">Proxy</string>
   <string name="pref_proxy_sum">Indstil en netværksproxy</string>
@@ -424,8 +402,6 @@
   <string name="search_hint">Søg efter udsendelser</string>
   <string name="found_in_shownotes_label">Fundet i beskrivelse</string>
   <string name="found_in_chapters_label">Fundet i kapitler</string>
-  <string name="found_in_authors_label">Fundet i forfattere</string>
-  <string name="found_in_feeds_label">Fundet i feeds</string>
   <string name="search_status_no_results">Fandt ingen resultater</string>
   <string name="search_label">Søg</string>
   <string name="found_in_title_label">Fundet i titel</string>
@@ -451,8 +427,6 @@
   <string name="html_export_label">HTML-eksport</string>
   <string name="exporting_label">Eksporterer…</string>
   <string name="export_error_label">Eksportfejl</string>
-  <string name="opml_export_success_title">OPML-eksport lykkedes.</string>
-  <string name="opml_export_success_sum">.opml-filen blev skrevet til:\u0020</string>
   <string name="opml_import_ask_read_permission">Adgang til eksternt lager er påkrævet for at læse OPML-filen</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Indstil søvntimer</string>
@@ -637,4 +611,5 @@
   <string name="cast_failed_seek">Det lykkedes ikke at søge til den nye position på cast-enheden</string>
   <string name="cast_failed_receiver_player_error">Modtagerafspilleren er stødt på en alvorlig fejl</string>
   <string name="cast_failed_media_error_skipping">Fejl ved afspilning af medie. Springer over…</string>
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-de/strings.xml b/core/src/main/res/values-de/strings.xml
index c1faf9b5b..3c736f1b0 100644
--- a/core/src/main/res/values-de/strings.xml
+++ b/core/src/main/res/values-de/strings.xml
@@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
+  <string name="feed_update_receiver_name">Abonnements aktualisieren</string>
   <string name="feeds_label">Feeds</string>
   <string name="statistics_label">Statistiken</string>
   <string name="add_feed_label">Podcast hinzufügen</string>
   <string name="episodes_label">Episoden</string>
   <string name="all_episodes_short_label">Alle</string>
+  <string name="new_episodes_label">Neu</string>
   <string name="favorite_episodes_label">Favoriten</string>
   <string name="new_label">Neu</string>
   <string name="settings_label">Einstellungen</string>
@@ -18,10 +20,12 @@
   <string name="cancel_download_label">Download abbrechen</string>
   <string name="playback_history_label">Zuletzt gespielt</string>
   <string name="gpodnet_main_label">gpodder.net</string>
+  <string name="gpodnet_summary">Mit anderen Geräten synchronisieren</string>
   <string name="gpodnet_auth_label">gpodder.net Anmeldung</string>
   <string name="free_space_label">%1$s frei</string>
   <string name="episode_cache_full_title">Episodenspeicher voll</string>
   <string name="episode_cache_full_message">Der Episodenspeicher ist voll. Du kannst die Größe des Episodenspeichers in den Einstellungen erhöhen.</string>
+  <string name="synchronizing">Synchronisiere...</string>
   <!--Statistics fragment-->
   <string name="total_time_listened_to_podcasts">Gesamtzeit gespielter Podcasts:</string>
   <string name="statistics_details_dialog">%1$d von %2$d Episoden gestartet.\n\n%3$s von %4$s Episoden gespielt.</string>
@@ -56,15 +60,16 @@
   <string name="yes">Ja</string>
   <string name="no">Nein</string>
   <string name="reset">Reset</string>
-  <string name="author_label">Autor</string>
+  <string name="author_label">Autor(en)</string>
   <string name="language_label">Sprache</string>
   <string name="url_label">URL</string>
   <string name="podcast_settings_label">Einstellungen</string>
   <string name="cover_label">Bild</string>
   <string name="error_label">Fehler</string>
   <string name="error_msg_prefix">Ein Fehler ist aufgetreten:</string>
+  <string name="needs_storage_permission">Für diese Funktion wird die Speicher-Berechtigung benötigt</string>
   <string name="refresh_label">Aktualisieren</string>
-  <string name="external_storage_error_msg">Der externe Speicher ist nicht verfügbar. Bitte stelle sicher, dass das externe Speichermedium eingelegt ist, damit die Anwendung funktioniert.</string>
+  <string name="external_storage_error_msg">Der externe Speicher ist nicht verfügbar. Bitte stelle sicher, dass das externe Speichermedium eingelegt ist, damit die App funktioniert.</string>
   <string name="chapters_label">Kapitel</string>
   <string name="chapter_duration">Dauer: %1$s</string>
   <string name="shownotes_label">Shownotizen</string>
@@ -110,20 +115,23 @@
   <string name="mark_all_seen_msg">Alle Episoden als gesehen markiert</string>
   <string name="mark_all_seen_confirmation_msg">Bitte bestätige, dass alle Episoden als gesehen markiert werden sollen.</string>
   <string name="show_info_label">Informationen anzeigen</string>
-  <string name="rename_feed_label">Podcast umbenennen</string>
+  <string name="show_feed_settings_label">Zeige Feed-Einstellungen</string>
+  <string name="feed_info_label">Feed-Informationen</string>
+  <string name="feed_settings_label">Feed-Einstellungen</string>
+  <string name="rename_feed_label">Feed umbenennen</string>
   <string name="remove_feed_label">Podcast entfernen</string>
   <string name="share_label">Teilen…</string>
-  <string name="share_link_label">Teile Link</string>
-  <string name="share_file_label">Teile Datei</string>
+  <string name="share_link_label">Episoden URL Teilen</string>
   <string name="share_link_with_position_label">Teile Link mit Zeitmarke</string>
+  <string name="share_file_label">Teile Datei</string>
   <string name="share_feed_url_label">Teile URL des Podcasts</string>
-  <string name="share_item_url_label">Teile URL der Episode</string>
-  <string name="share_item_url_with_position_label">Teile URL der Episode mit Zeitmarke</string>
-  <string name="feed_delete_confirmation_msg">Bitte bestätige, dass du den Feed \"%1$s\" und ALLE heruntergeladenen Episoden löschen möchtest.</string>
-  <string name="feed_remover_msg">Entferne Feed</string>
+  <string name="share_item_url_label">Teile URL der Episodendatei</string>
+  <string name="share_item_url_with_position_label">Teile URL der Episodendatei mit Zeitmarke</string>
+  <string name="feed_delete_confirmation_msg">Bitte bestätige, dass du den Podcast \"%1$s\" und ALLE heruntergeladenen Episoden dieses Feeds entfernen möchtest.</string>
+  <string name="feed_remover_msg">Entferne Podcast</string>
   <string name="load_complete_feed">Kompletten Feed aktualisieren</string>
   <string name="hide_episodes_title">Episoden verbergen</string>
-  <string name="episode_actions">Aktionen anwenden</string>
+  <string name="batch_edit">Stapelbearbeitung</string>
   <string name="hide_unplayed_episodes_label">Ungespielt</string>
   <string name="hide_paused_episodes_label">Pausiert</string>
   <string name="hide_played_episodes_label">Gespielt</string>
@@ -132,6 +140,7 @@
   <string name="hide_downloaded_episodes_label">Heruntergeladen</string>
   <string name="hide_not_downloaded_episodes_label">Nicht heruntergeladen</string>
   <string name="hide_has_media_label">Hat Medien</string>
+  <string name="hide_is_favorite_label">Favorit</string>
   <string name="filtered_label">Gefiltert</string>
   <string name="refresh_failed_msg">{fa-exclamation-circle} Aktualisierung fehlgeschlagen</string>
   <string name="open_podcast">Podcast öffnen</string>
@@ -145,6 +154,7 @@
   <string name="delete_label">Löschen</string>
   <string name="delete_failed">Die Datei kann nicht gelöscht werden. Eventuell hilft es, das Gerät neu zu starten.</string>
   <string name="remove_episode_lable">Episode entfernen</string>
+  <string name="mark_as_seen_label">Als gelesen markieren</string>
   <string name="marked_as_seen_label">Als gesehen markiert</string>
   <string name="mark_read_label">Als gespielt markieren</string>
   <string name="marked_as_read_label">Als gespielt markiert</string>
@@ -168,6 +178,8 @@
   <string name="download_failed">fehlgeschlagen</string>
   <string name="download_pending">Download anstehend</string>
   <string name="download_running">Download läuft</string>
+  <string name="download_error_details">Details</string>
+  <string name="download_error_details_message">%1$s \n\nDatei-URL:\n%2$s</string>
   <string name="download_error_device_not_found">Speichermedium nicht gefunden</string>
   <string name="download_error_insufficient_space">Zu wenig Speicherplatz</string>
   <string name="download_error_file_error">Dateifehler</string>
@@ -218,6 +230,7 @@
   <string name="playback_error_unknown">Unbekannter Fehler</string>
   <string name="no_media_playing_label">Keine Medienwiedergabe</string>
   <string name="player_buffering_msg">Puffert</string>
+  <string name="player_go_to_picture_in_picture">Bild-in-Bild-Modus</string>
   <string name="playbackservice_notification_title">Spiele Podcast ab</string>
   <string name="unknown_media_key">AntennaPod - Unbekannte Medientaste: %1$d</string>
   <!--Queue operations-->
@@ -234,7 +247,9 @@
   <string name="date">Datum</string>
   <string name="duration">Dauer</string>
   <string name="episode_title">Episodentitel</string>
-  <string name="feed_title">Podcastname</string>
+  <string name="feed_title">Feedname</string>
+  <string name="random">Zufällig</string>
+  <string name="smart_shuffle">Schlaues Mischen</string>
   <string name="ascending">Aufsteigend</string>
   <string name="descending">Absteigend</string>
   <string name="clear_queue_confirmation_msg">Bitte bestätige, dass ALLE Episoden aus der Abspielliste entfernt werden sollen</string>
@@ -281,15 +296,23 @@
   <string name="other_pref">Anderes</string>
   <string name="about_pref">Über</string>
   <string name="queue_label">Abspielliste</string>
-  <string name="services_label">Dienste</string>
+  <string name="integrations_label">Einbindungen</string>
   <string name="flattr_label">Flattr</string>
+  <string name="flattr_summary">Micropayment-Dienst</string>
+  <string name="automation">Automatisierung</string>
+  <string name="download_pref_details">Details</string>
+  <string name="import_export_pref">Import/Export</string>
+  <string name="appearance">Erscheinungsbild</string>
+  <string name="external_elements">Externe Elemente</string>
+  <string name="interruptions">Unterbrechungen</string>
+  <string name="buttons">Buttons zur Steuerung der Wiedergabe</string>
+  <string name="media_player">Medienabspieler</string>
   <string name="pref_episode_cleanup_title">Automatisches Löschen</string>
   <string name="pref_episode_cleanup_summary">Episoden, die weder in der Abspielliste noch Favoriten sind, können gelöscht werden, wenn beim automatischen Herunterladen Speicherplatz für neue Episoden gebraucht wird</string>
   <string name="pref_pauseOnDisconnect_sum">Wiedergabe pausieren, wenn Kopfhörer ausgesteckt oder Bluetooth getrennt wird</string>
   <string name="pref_unpauseOnHeadsetReconnect_sum">Wiedergabe fortsetzen, wenn Kopfhörer wieder eingesteckt werden</string>
   <string name="pref_unpauseOnBluetoothReconnect_sum">Wiedergabe fortsetzen, wenn Bluetooth wieder verbunden ist</string>
   <string name="pref_hardwareForwardButtonSkips_title">\"Nächster\"-Taste springt zur nächsten Episode</string>
-  <string name="pref_hardwareForwardButtonSkips_sum">Zur nächsten Episode springen, wenn die \"Nächster\"-Taste gedrückt wird (statt vorzuspulen)</string>
   <string name="pref_hardwarePreviousButtonRestarts_title">Vorheriger-Taste startet neu</string>
   <string name="pref_hardwarePreviousButtonRestarts_sum">Die Wiedergabe der aktuellen Episode neu starten, wenn die \"Vorheriger\"-Taste gedrückt wird (statt zurückzuspulen)</string>
   <string name="pref_followQueue_sum">Springe zur nächsten Episode in der Abspielliste, wenn die Wiedergabe endet</string>
@@ -338,7 +361,7 @@
   <string name="pref_nav_drawer_feed_order_title">Reihenfolge der Abonnements einstellen</string>
   <string name="pref_nav_drawer_feed_order_sum">Ändere die Reihenfolge deiner Abonnements</string>
   <string name="pref_nav_drawer_feed_counter_title">Abonnement-Zähler einstellen</string>
-  <string name="pref_nav_drawer_feed_counter_sum">Ändere, welche Information der Abonnement-Zähler anzeigt</string>
+  <string name="pref_nav_drawer_feed_counter_sum">Ändere die durch den Abonnementszähler angezeigten Informationen. Betrifft auch die Sortierung der Abonnements wenn \"Reihenfolge der Abonnements\" auf \"Zähler\" gesetzt ist.</string>
   <string name="pref_set_theme_sum">Ändere das Aussehen von AntennaPod.</string>
   <string name="pref_automatic_download_title">Automatisches Herunterladen</string>
   <string name="pref_automatic_download_sum">Konfiguriere das automatische Herunterladen von Episoden.</string>
@@ -352,6 +375,7 @@
   <string name="pref_episode_cache_title">Episodenspeicher</string>
   <string name="pref_theme_title_light">Hell</string>
   <string name="pref_theme_title_dark">Dunkel</string>
+  <string name="pref_theme_title_trueblack">Schwarz (für AMOLED)</string>
   <string name="pref_episode_cache_unlimited">Unbegrenzt</string>
   <string name="pref_update_interval_hours_plural">Stunden</string>
   <string name="pref_update_interval_hours_singular">Stunde</string>
@@ -380,8 +404,6 @@
   <string name="pref_rewind_sum">Passe an, wie viele Sekunden zurückgespult wird, wenn die entsprechende Hardware-Taste gedrückt wird</string>
   <string name="pref_gpodnet_sethostname_title">Hostname ändern</string>
   <string name="pref_gpodnet_sethostname_use_default_host">Standard-Host verwenden</string>
-  <string name="pref_expandNotify_title">Benachrichtigung erweitern</string>
-  <string name="pref_expandNotify_sum">Erweiterte Wiedergabebenachrichtigung mit Abspiel-, Pause- und Stop-Knöpfen anzeigen.</string>
   <string name="pref_persistNotify_title">Persistente Wiedergabesteuerung</string>
   <string name="pref_persistNotify_sum">Zeige Wiedergabebedienelemente in der Benachrichtigung und im Lockscreen an, während die Wiedergabe pausiert ist.</string>
   <string name="pref_compact_notification_buttons_title">Lockscreen-Wiedergabetasten festlegen</string>
@@ -402,8 +424,7 @@
   <string name="crash_report_sum">Sende den aktuellen Absturzbericht per E-Mail</string>
   <string name="send_email">E-Mail senden</string>
   <string name="experimental_pref">Experimentell</string>
-  <string name="pref_sonic_title">Sonic Media Player</string>
-  <string name="pref_sonic_message">Benutze den integrierten Sonic Mediaplayer als Ersatz für Androids eigenen Mediaplayer und Prestissimo</string>
+  <string name="pref_media_player_message">Wähle, welcher Medienabspieler benutzt werden soll, um Dateien abzuspielen</string>
   <string name="pref_current_value">Aktueller Wert: %1$s</string>
   <string name="pref_proxy_title">Proxy</string>
   <string name="pref_proxy_sum">Richte einen Netzwerk-Proxy ein</string>
@@ -415,6 +436,11 @@
   <string name="pref_cast_message_free_flavor">Chromecast benötigt proprietäre Bibliotheken von Drittanbietern, die in dieser Version von AntennaPod deaktiviert sind</string>
   <string name="pref_enqueue_downloaded_title">Downloads einreihen</string>
   <string name="pref_enqueue_downloaded_summary">Füge heruntergeladene Episoden zur Abspielliste hinzu</string>
+  <string name="media_player_builtin">Androids eingebauter Abspieler</string>
+  <string name="pref_videoBehavior_title">Beim Beenden des Videos</string>
+  <string name="pref_videoBehavior_sum">Verhalten beim Verlassen der Video-Wiedergabe</string>
+  <string name="stop_playback">Wiedergabe anhalten</string>
+  <string name="continue_playback">Audiowiedergabe fortsetzen</string>
   <!--Auto-Flattr dialog-->
   <string name="auto_flattr_enable">Automatisches Flattrn aktivieren</string>
   <string name="auto_flattr_after_percent">Flattr eine Episode, sobald %d Prozent gespielt worden sind</string>
@@ -424,8 +450,8 @@
   <string name="search_hint">Suche nach Episoden</string>
   <string name="found_in_shownotes_label">In Shownotizen gefunden</string>
   <string name="found_in_chapters_label">In Kapiteln gefunden</string>
-  <string name="found_in_authors_label">In Autoren gefunden</string>
-  <string name="found_in_feeds_label">In Feeds gefunden</string>
+  <string name="found_in_authors_label">Gefunden in Autor(en)</string>
+  <string name="found_in_feeds_label">Gefunden in Podcast</string>
   <string name="search_status_no_results">Keine Ergebnisse gefunden</string>
   <string name="search_label">Suchen</string>
   <string name="found_in_title_label">In Titel gefunden</string>
@@ -451,8 +477,8 @@
   <string name="html_export_label">HTML Export</string>
   <string name="exporting_label">Exportiere…</string>
   <string name="export_error_label">Exportfehler</string>
-  <string name="opml_export_success_title">OPML Export erfolgreich</string>
-  <string name="opml_export_success_sum">Die OPML Datei wurde unter dem folgenden Pfad gespeichert:\u0020</string>
+  <string name="export_success_title">Export erfolgreich</string>
+  <string name="export_success_sum">Die exportierte Datei wurde geschrieben nach:\n\n%1$s</string>
   <string name="opml_import_ask_read_permission">Zugriff auf externen Speicher wird benötigt, um die OPML Datei zu lesen</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Timer einstellen</string>
@@ -625,7 +651,7 @@
   <string name="label_import">Import</string>
   <string name="label_export">Export</string>
   <string name="import_select_file">Zu importierende Datei auswählen</string>
-  <string name="export_ok">Export erfolgreich. Die Datenbank wurde auf die SD-Karte geschrieben.</string>
+  <string name="export_ok">Export erfolgreich.</string>
   <string name="import_ok">Import erfolgreich.\n\nBitte OK drücken, um AntennaPod neuzustarten</string>
   <!--Casting-->
   <string name="cast_media_route_menu_title">Abspielen auf...</string>
@@ -643,4 +669,13 @@
   <string name="cast_failed_seek">Spulen zur neuen Position fehlgeschlagen</string>
   <string name="cast_failed_receiver_player_error">Es wurde ein schwerer Fehler beim Empfangsgerät festgestellt</string>
   <string name="cast_failed_media_error_skipping">Fehler bei Wiedergabe. Überspringe...</string>
+  <!--Notification channels-->
+  <string name="notification_channel_user_action">Handlung notwendig</string>
+  <string name="notification_channel_user_action_description">Wird gezeigt, wenn deine Handlung notwendig ist, zum Beispiel wenn du ein Passwort eingeben musst.</string>
+  <string name="notification_channel_downloading">Lädt herunter</string>
+  <string name="notification_channel_downloading_description">Wird gezeigt beim Herunterladen.</string>
+  <string name="notification_channel_playing">Jetzt spielt</string>
+  <string name="notification_channel_playing_description">Erlaubt es, die Wiedergabe zu steuern. Dies ist die Hauptbenachrichtigung, die du siehst, während ein Podcast abgespielt wird.</string>
+  <string name="notification_channel_error">Fehler</string>
+  <string name="notification_channel_error_description">Wird gezeigt, wenn etwas schief gegangen ist, etwa wenn das Herunterladen oder die gpodder-Synchronisierung fehlschlägt.</string>
 </resources>
diff --git a/core/src/main/res/values-el/strings.xml b/core/src/main/res/values-el/strings.xml
index 152e73426..f72115bb2 100644
--- a/core/src/main/res/values-el/strings.xml
+++ b/core/src/main/res/values-el/strings.xml
@@ -1,16 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
+  <string name="feed_update_receiver_name">Ανανέωση Συνδρομών</string>
   <string name="feeds_label">Ροές</string>
   <string name="statistics_label">Στατιστικά</string>
   <string name="add_feed_label">Προσθήκη Podcast</string>
   <string name="episodes_label">Επεισόδια</string>
   <string name="all_episodes_short_label">Όλα</string>
+  <string name="new_episodes_label">Νέα</string>
   <string name="favorite_episodes_label">Αγαπημένα</string>
   <string name="new_label">Νέα</string>
   <string name="settings_label">Ρυθμίσεις</string>
   <string name="downloads_label">Λήψεις</string>
-  <string name="downloads_running_label">Εκτέλεση</string>
+  <string name="downloads_running_label">Εκτέλείται</string>
   <string name="downloads_completed_label">Ολοκληρώθηκε</string>
   <string name="downloads_log_label">Είσοδος</string>
   <string name="subscriptions_label">Συνδρομές</string>
@@ -18,55 +20,71 @@
   <string name="cancel_download_label">Ακύρωση\nΛήψης</string>
   <string name="playback_history_label">Ιστορικό Αναπαραγωγής</string>
   <string name="gpodnet_main_label">gpodder.net</string>
+  <string name="gpodnet_summary">Συγχρονισμός με άλλες συσκευές</string>
   <string name="gpodnet_auth_label">gpodder.net Σύνδεση</string>
+  <string name="synchronizing">Εκτελείται συγχρονισμός</string>
   <!--Statistics fragment-->
+  <string name="total_time_listened_to_podcasts">Συνολικός χρόνος εκτελεσμένων podcasts:</string>
   <!--Main activity-->
   <string name="drawer_open">Άνοιγμα μενού</string>
   <string name="drawer_close">Κλείσιμο μενού</string>
   <string name="drawer_feed_order_alphabetical">Ταξινόμηση αλφαβητικά</string>
   <string name="drawer_feed_order_last_update">Ταξινόμηση κατά ημερομηνία δημοσίευσης</string>
+  <string name="drawer_feed_order_most_played">Ταξινόμηση κατά αριθμό εκτελεσμένων επεισοδίων</string>
+  <string name="drawer_feed_counter_new_unplayed">Αριθμός νέων  επεισοδίων και αριθμός μη εκτελεσμένων επεισοδίων</string>
   <string name="drawer_feed_counter_new">Αριθμός νέων επεισοδίων</string>
+  <string name="drawer_feed_counter_unplayed">Αριθμός μη εκτελεσμένων επεισοδίων</string>
+  <string name="drawer_feed_counter_downloaded">Αριθμός ληφθέντων επεισοδίων</string>
+  <string name="drawer_feed_counter_none">Κενό</string>
   <!--Webview actions-->
   <string name="open_in_browser_label">Άνοιγμα στον Περιηγητή</string>
   <string name="copy_url_label">Αντιγραφή διεύθυνσης URL</string>
-  <string name="share_url_label">Μοιρασμα URL</string>
+  <string name="share_url_label">Μοίρασμα URL</string>
   <string name="copied_url_msg">Αντιγραφή URL στο Πρόχειρο</string>
+  <string name="go_to_position_label">Μετάβαση σε αυτή τη θέση</string>
   <!--Playback history-->
   <string name="clear_history_label">Εκκαθάριση Ιστορικού</string>
   <!--Other-->
   <string name="confirm_label">Επιβεβαίωση</string>
   <string name="cancel_label">Ακύρωση</string>
-  <string name="author_label">Δημιουργος</string>
-  <string name="language_label">Γλωσσα</string>
-  <string name="podcast_settings_label">Ρυθμισεις</string>
-  <string name="cover_label">Εικονα</string>
-  <string name="error_label">Σφαλμα</string>
+  <string name="yes">Ναι</string>
+  <string name="no">Όχι</string>
+  <string name="language_label">Γλώσσα</string>
+  <string name="url_label">URL</string>
+  <string name="podcast_settings_label">Ρυθμίσεις</string>
+  <string name="cover_label">Εικόνα</string>
+  <string name="error_label">Σφάλμα</string>
   <string name="error_msg_prefix">Παρουσιάστηκε ένα σφάλμα:</string>
   <string name="refresh_label">Ανανέωση</string>
   <string name="external_storage_error_msg">Καμία εξωτερική αποθήκευση είναι διαθέσιμη. Παρακαλώ βεβαιωθείτε ότι η εξωτερική αποθήκευση έχει τοποθετηθεί έτσι ώστε η εφαρμογή να μπορεί να λειτουργήσει σωστά.</string>
   <string name="chapters_label">Κεφάλαια</string>
+  <string name="chapter_duration">Διάρκεια: %1$s</string>
   <string name="shownotes_label">Εμφάνιση Σημειώσεων</string>
   <string name="description_label">Περιγραφή</string>
-  <string name="episodes_suffix">\u0020επεισοδια</string>
+  <string name="most_recent_prefix">Πιο πρόσφατο επεισόδιο:\u0020</string>
+  <string name="episodes_suffix">\u0020επεισόδια</string>
   <string name="length_prefix">Μήκος:\u0020</string>
   <string name="size_prefix">Μέγεθος:\u0020</string>
   <string name="processing_label">Επεξεργασία</string>
-  <string name="save_username_password_label">Αποθήκευση του όνοματος χρήστη και του κωδικόυ πρόσβασης</string>
+  <string name="save_username_password_label">Αποθήκευση του ονόματος χρήστη και του κωδικού πρόσβασης</string>
   <string name="close_label">Κλείσιμο</string>
-  <string name="retry_label">Επανάληψη</string>
+  <string name="retry_label">Επαναπροσπάθεια</string>
   <string name="auto_download_label">Συμπερίληψη στην αυτόματη λήψη</string>
+  <string name="auto_download_apply_to_items_title">Εφαρμογή σε προηγούμενα επεισόδια</string>
+  <string name="auto_delete_label">Αυτόματη διαγραφή επεισοδίου</string>
   <string name="parallel_downloads_suffix">\u0020παράλληλες λήψεις</string>
   <string name="feed_auto_download_always">Πάντα</string>
   <string name="feed_auto_download_never">Ποτέ</string>
+  <string name="send_label">Αποστολή...</string>
   <string name="episode_cleanup_never">Ποτέ</string>
   <!--'Add Feed' Activity labels-->
   <string name="feedurl_label">URL της Ροής</string>
   <string name="etxtFeedurlHint">www.example.com/feed</string>
   <string name="txtvfeedurl_label">Προσθήκη Podcast με τη διεύθυνση URL</string>
+  <string name="podcastdirectories_label">Εύρεση Podcast στο Φάκελο</string>
   <string name="browse_gpoddernet_label">Περιήγηση στο gpodder.net</string>
   <!--Actions on feeds-->
   <string name="show_info_label">Εμφάνιση πληροφοριών</string>
-  <string name="remove_feed_label">Κατάργηση Podcast</string>
   <string name="hide_episodes_title">Απόκρυψη Επεισοδίων</string>
   <string name="hide_downloaded_episodes_label">Ειλημμένα</string>
   <string name="refresh_failed_msg">{fa-exclamation-circle} Η Τελευταία Ανανέωση Απέτυχε</string>
@@ -175,12 +193,10 @@
   <string name="set_playback_speed_label">Ταχύτητες αναπαραγωγής</string>
   <!--Empty list labels-->
   <string name="no_items_label">Δεν υπάρχουν στοιχεία σε αυτή τη λίστα.</string>
-  <string name="no_feeds_label">Δεν έχετε εγγραφεί σε οποιεσδήποτε τροφοδοσίες ακόμα</string>
   <!--Preferences-->
   <string name="other_pref">Άλλα</string>
   <string name="about_pref">Σχετικά με</string>
   <string name="queue_label">Σειρά αναμονής</string>
-  <string name="services_label">Υπηρεσίες</string>
   <string name="flattr_label">Flattr</string>
   <string name="pref_unpauseOnHeadsetReconnect_sum">Συνέχιση της αναπαραγωγής, όταν τα ακουστικά επανασυνδέονται</string>
   <string name="pref_followQueue_sum">Μετάβαση στο επόμενο στοιχείο σειράς αναμονής όταν η αναπαραγωγή ολοκληρωθεί</string>
@@ -223,8 +239,6 @@
   <string name="pref_playback_speed_sum">Προσαρμόστε τις διαθέσιμες ταχύτητες για αναπαραγωγή ήχου μεταβλητής ταχύτητας</string>
   <string name="pref_gpodnet_sethostname_title">Ορισμός κεντρικού υπολογιστή</string>
   <string name="pref_gpodnet_sethostname_use_default_host">Χρήση προεπιλεγμένης υποδοχής</string>
-  <string name="pref_expandNotify_title">Ανάπτυξη κοινοποίησης</string>
-  <string name="pref_expandNotify_sum">Πάντα επέκταση της ειδοποίησης για εμφανιση κουμπιων αναπαραγωγής.</string>
   <string name="pref_persistNotify_sum">Διατηρηση των ελέγχων κοινοποίησης και lockscreen όταν γίνεται παύση της αναπαραγωγής.</string>
   <string name="pref_expand_notify_unsupport_toast">Εκδόσεις του Android πριν από το 4.1 δεν υποστηρίζουν εκτεταμένες κοινοποιήσεις.</string>
   <string name="pref_queueAddToFront_sum">Προσθήκη νέων επεισοδίων στο μπροστινό μέρος της ουράς.</string>
@@ -255,8 +269,6 @@
   <string name="choose_file_from_external_application">Χρησιμοποιήστε εξωτερική εφαρμογή</string>
   <string name="opml_export_label">OPML εξαγωγή</string>
   <string name="export_error_label">Σφάλμα κατά την εξαγωγή</string>
-  <string name="opml_export_success_title">Η Εξαγωγή OPML είναι επιτυχής</string>
-  <string name="opml_export_success_sum">Το αρχείο .opml συντάχθηκε για:\u0020</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Ρύθμιση του χρονοδιακόπτη ύπνου</string>
   <string name="disable_sleeptimer_label">Απενεργοποίηση χρονοδιακόπτη ύπνου</string>
@@ -341,4 +353,7 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
+  <string name="notification_channel_downloading">Λήψη</string>
+  <string name="notification_channel_error">Σφάλματα</string>
 </resources>
diff --git a/core/src/main/res/values-es-rES/strings.xml b/core/src/main/res/values-es-rES/strings.xml
index 8aa30231b..024989498 100644
--- a/core/src/main/res/values-es-rES/strings.xml
+++ b/core/src/main/res/values-es-rES/strings.xml
@@ -193,7 +193,6 @@
   <string name="deselect_all_label">Deseleccionar todo</string>
   <string name="opml_export_label">Exportar a OPML</string>
   <string name="export_error_label">Error en la exportación</string>
-  <string name="opml_export_success_sum">El archivo OPML se ha escrito en:\u0020</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Establecer un temporizador</string>
   <string name="disable_sleeptimer_label">Desactivar el temporizador</string>
@@ -229,4 +228,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-es/strings.xml b/core/src/main/res/values-es/strings.xml
index 7c6341a06..73eabec89 100644
--- a/core/src/main/res/values-es/strings.xml
+++ b/core/src/main/res/values-es/strings.xml
@@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
+  <string name="feed_update_receiver_name">Actualizar suscripciones</string>
   <string name="feeds_label">Canales</string>
   <string name="statistics_label">Estadísticas</string>
-  <string name="add_feed_label">Añadir podcast</string>
+  <string name="add_feed_label">Añadir pódcast</string>
   <string name="episodes_label">Episodios</string>
   <string name="all_episodes_short_label">Todos</string>
+  <string name="new_episodes_label">Nuevos</string>
   <string name="favorite_episodes_label">Favoritos</string>
   <string name="new_label">Nuevos</string>
   <string name="settings_label">Ajustes</string>
@@ -13,41 +15,43 @@
   <string name="downloads_running_label">En curso</string>
   <string name="downloads_completed_label">Completadas</string>
   <string name="downloads_log_label">Registro</string>
-  <string name="subscriptions_label">Subscripciones</string>
-  <string name="subscriptions_list_label">Lista de subscripciones</string>
+  <string name="subscriptions_label">Suscripciones</string>
+  <string name="subscriptions_list_label">Lista de suscripciones</string>
   <string name="cancel_download_label">Cancelar\ndescarga</string>
   <string name="playback_history_label">Historial de reproducciones</string>
   <string name="gpodnet_main_label">gpodder.net</string>
+  <string name="gpodnet_summary">Sincronizar con otros dispositivos</string>
   <string name="gpodnet_auth_label">Iniciar sesión en gpodder.net</string>
   <string name="free_space_label">%1$s libre</string>
-  <string name="episode_cache_full_title">Caché de episodios completa</string>
-  <string name="episode_cache_full_message">Se ha alcanzado el límite de caché de episodios. Puedes aumentar el tamaño de la caché en las Opciones.</string>
+  <string name="episode_cache_full_title">Almacenamiento de episodios completo</string>
+  <string name="episode_cache_full_message">Se ha alcanzado el límite de almacenamiento de episodios. Puedes aumentar el tamaño en opciones.</string>
+  <string name="synchronizing">Sincronizando…</string>
   <!--Statistics fragment-->
-  <string name="total_time_listened_to_podcasts">Tiempo total reproducido:</string>
-  <string name="statistics_details_dialog">Empezados %1$d episodios de %2$d.\n\nReproducidos %3$s de %4$s.</string>
+  <string name="total_time_listened_to_podcasts">Tiempo total de reproducción de pódcast:</string>
+  <string name="statistics_details_dialog">%1$d episodios iniciados de %2$d.\n\nReproducidos %3$s de %4$s.</string>
   <string name="statistics_mode">Modo de estadísticas</string>
   <string name="statistics_mode_normal">Calcula la duración real reproducida. Reproducir dos veces cuenta doble, y marcar como leído no cuenta como reproducido</string>
-  <string name="statistics_mode_count_all">Resumir todos los podcasts marcados como reproducidos</string>
+  <string name="statistics_mode_count_all">Suma de todos los pódcast marcados como reproducidos</string>
   <string name="statistics_speed_not_counted">Aviso: La velocidad de reproducción nunca se tiene en cuenta.</string>
   <!--Main activity-->
   <string name="drawer_open">Abrir menú</string>
   <string name="drawer_close">Cerrar menú</string>
   <string name="drawer_preferences">Preferencias del cajón</string>
-  <string name="drawer_feed_order_unplayed_episodes">Ordenar por cuenta</string>
+  <string name="drawer_feed_order_unplayed_episodes">Ordenar por contador</string>
   <string name="drawer_feed_order_alphabetical">Ordenar alfabéticamente</string>
   <string name="drawer_feed_order_last_update">Ordenar por fecha de publicación</string>
   <string name="drawer_feed_order_most_played">Ordenar por número de episodios reproducidos</string>
-  <string name="drawer_feed_counter_new_unplayed">Cantidad de episodios nuevos y no escuchados</string>
-  <string name="drawer_feed_counter_new">Cantidad de episodios nuevos</string>
-  <string name="drawer_feed_counter_unplayed">Cantidad de episodios no escuchados</string>
-  <string name="drawer_feed_counter_downloaded">Cantidad de episodios descargados</string>
+  <string name="drawer_feed_counter_new_unplayed">Número de episodios nuevos y no reproducidos</string>
+  <string name="drawer_feed_counter_new">Número de episodios nuevos</string>
+  <string name="drawer_feed_counter_unplayed">Número de episodios no reproducidos</string>
+  <string name="drawer_feed_counter_downloaded">Número de episodios descargados</string>
   <string name="drawer_feed_counter_none">Ninguno</string>
   <!--Webview actions-->
   <string name="open_in_browser_label">Abrir en el navegador</string>
   <string name="copy_url_label">Copiar URL</string>
   <string name="share_url_label">Compartir URL</string>
-  <string name="copied_url_msg">URL copiado en el portapapeles</string>
-  <string name="go_to_position_label">Ir a esta posición</string>
+  <string name="copied_url_msg">URL copiada al portapapeles</string>
+  <string name="go_to_position_label">Ir a esa posición</string>
   <!--Playback history-->
   <string name="clear_history_label">Vaciar el historial</string>
   <!--Other-->
@@ -55,14 +59,15 @@
   <string name="cancel_label">Cancelar</string>
   <string name="yes">Sí</string>
   <string name="no">No</string>
-  <string name="reset">Resetear</string>
-  <string name="author_label">Autor</string>
+  <string name="reset">Restablecer</string>
+  <string name="author_label">Autor(es)</string>
   <string name="language_label">Idioma</string>
   <string name="url_label">URL</string>
   <string name="podcast_settings_label">Ajustes</string>
   <string name="cover_label">Imagen</string>
   <string name="error_label">Error</string>
   <string name="error_msg_prefix">Se produjo un error:</string>
+  <string name="needs_storage_permission">Se necesitan permisos de almacenamiento para esta operación</string>
   <string name="refresh_label">Actualizar</string>
   <string name="external_storage_error_msg">No se encuentra un almacenamiento externo. Asegúrese de que su almacenamiento externo esté montado para que la aplicación funcione correctamente.</string>
   <string name="chapters_label">Capítulos</string>
@@ -80,15 +85,15 @@
   <string name="retry_label">Reintentar</string>
   <string name="auto_download_label">Incluir en descargas automáticas</string>
   <string name="auto_download_apply_to_items_title">Aplicar a episodios anteriores</string>
-  <string name="auto_download_apply_to_items_message">La nueva opción <i>Auto Descarga</i> se aplicará automáticamente a episodios nuevos.\n¿También desea aplicarlo a episodios anteriores?</string>
-  <string name="auto_delete_label">Borrar Episodio Automáticamente</string>
+  <string name="auto_download_apply_to_items_message">La nueva opción <i>descarga automática</i> se aplicará automáticamente a episodios nuevos.\n¿También desea aplicarlo a episodios anteriores?</string>
+  <string name="auto_delete_label">Borrar episodio automáticamente</string>
   <string name="parallel_downloads_suffix">\u0020descargas paralelas</string>
   <string name="feed_auto_download_global">Global por defecto</string>
   <string name="feed_auto_download_always">Siempre</string>
   <string name="feed_auto_download_never">Nunca</string>
   <string name="send_label">Enviar…</string>
   <string name="episode_cleanup_never">Nunca</string>
-  <string name="episode_cleanup_queue_removal">Cuando no esté en cola</string>
+  <string name="episode_cleanup_queue_removal">Cuando no esté en la cola</string>
   <string name="episode_cleanup_after_listening">Después de acabar</string>
   <plurals name="episode_cleanup_days_after_listening">
     <item quantity="one">1 día después de acabar</item>
@@ -97,77 +102,84 @@
   <!--'Add Feed' Activity labels-->
   <string name="feedurl_label">URL del canal</string>
   <string name="etxtFeedurlHint">www.ejemplo.com/feed</string>
-  <string name="txtvfeedurl_label">Añadir podcast por URL</string>
-  <string name="podcastdirectories_label">Buscar podcast en directorio</string>
-  <string name="podcastdirectories_descr">Para podcasts nuevos, puedes buscar en iTunes o fyyd, o explorar gpodder.net por nombre, categoría o popularidad.</string>
-  <string name="browse_gpoddernet_label">Explorar gpodder.net</string>
+  <string name="txtvfeedurl_label">Añadir pódcast por URL</string>
+  <string name="podcastdirectories_label">Buscar pódcast en el directorio</string>
+  <string name="podcastdirectories_descr">Para nuevos pódcast, puedes buscar en iTunes o fyyd, o explorar en gpodder.net por nombre, categoría o popularidad.</string>
+  <string name="browse_gpoddernet_label">Explorar en gpodder.net</string>
   <!--Actions on feeds-->
-  <string name="mark_all_read_label">Marcar todos como escuchado</string>
-  <string name="mark_all_read_msg">Se marcaron todos los episodios como escuchados</string>
-  <string name="mark_all_read_confirmation_msg">Confirme que quiere marcar todos los episodios como escuchados.</string>
-  <string name="mark_all_read_feed_confirmation_msg">Confirme que quiere marcar todos los episodios de este canal como escuchados.</string>
+  <string name="mark_all_read_label">Marcar todos como reproducidos</string>
+  <string name="mark_all_read_msg">Marcados todos los episodios como reproducidos</string>
+  <string name="mark_all_read_confirmation_msg">Confirme que quiere marcar todos los episodios como reproducidos.</string>
+  <string name="mark_all_read_feed_confirmation_msg">Confirme que quiere marcar todos los episodios de este pódcast como reproducidos.</string>
   <string name="mark_all_seen_label">Marcar todos como vistos</string>
-  <string name="mark_all_seen_msg">Marcar todos los episodios como vistos</string>
-  <string name="mark_all_seen_confirmation_msg">Por favor confirma que quieres marcar todos los episodios como vistos.</string>
+  <string name="mark_all_seen_msg">Marcados todos los episodios como vistos</string>
+  <string name="mark_all_seen_confirmation_msg">Confirme que quiere marcar todos los episodios como vistos.</string>
   <string name="show_info_label">Información del programa</string>
-  <string name="rename_feed_label">Renombrar Podcast</string>
-  <string name="remove_feed_label">Eliminar podcast</string>
+  <string name="show_feed_settings_label">Mostrar ajustes del pódcast</string>
+  <string name="feed_info_label">Información del pódcast</string>
+  <string name="feed_settings_label">Ajustes del pódcast</string>
+  <string name="rename_feed_label">Renombrar el pódcast</string>
+  <string name="remove_feed_label">Eliminar el pódcast</string>
   <string name="share_label">Compartir…</string>
-  <string name="share_link_label">Compartir el enlace de la web</string>
-  <string name="share_file_label">Compartir archivo</string>
-  <string name="share_link_with_position_label">Compartir enlace con posición</string>
+  <string name="share_link_label">Compartir URL del episodio</string>
+  <string name="share_link_with_position_label">Compartir URL del episodio con posición</string>
+  <string name="share_file_label">Compartir el archivo</string>
   <string name="share_feed_url_label">Compartir URL del canal</string>
-  <string name="share_item_url_label">Compartir URL del archivo del episodio</string>
-  <string name="share_item_url_with_position_label">Compartir URL del episodio con posición</string>
-  <string name="feed_delete_confirmation_msg">Por favor, confirma que quieres borrar el feed \"%1$s\" y TODOS los episodios descargados de dicho feed.</string>
-  <string name="feed_remover_msg">Quitando el canal</string>
-  <string name="load_complete_feed">Actualizar el canal completo</string>
+  <string name="share_item_url_label">Compartir URL del archivo</string>
+  <string name="share_item_url_with_position_label">Compartir URL del archivo con posición</string>
+  <string name="feed_delete_confirmation_msg">Confirme que quiere borrar el pódcast \"%1$s\" y TODOS los episodios (incluidos los descargados).</string>
+  <string name="feed_remover_msg">Eliminando el pódcast</string>
+  <string name="load_complete_feed">Actualizar el pódcast completo</string>
   <string name="hide_episodes_title">Ocultar episodios</string>
-  <string name="episode_actions">Aplicar acciones</string>
-  <string name="hide_unplayed_episodes_label">No escuchados</string>
+  <string name="batch_edit">Edición por lotes</string>
+  <string name="hide_unplayed_episodes_label">No reproducidos</string>
   <string name="hide_paused_episodes_label">Pausados</string>
-  <string name="hide_played_episodes_label">Escuchados</string>
+  <string name="hide_played_episodes_label">Reproducidos</string>
   <string name="hide_queued_episodes_label">En cola</string>
   <string name="hide_not_queued_episodes_label">No en cola</string>
   <string name="hide_downloaded_episodes_label">Descargados</string>
   <string name="hide_not_downloaded_episodes_label">No descargados</string>
   <string name="hide_has_media_label">Tiene multimedia</string>
+  <string name="hide_is_favorite_label">Es favorito</string>
   <string name="filtered_label">Filtrados</string>
   <string name="refresh_failed_msg">{fa-exclamation-circle} Error en última actualización</string>
-  <string name="open_podcast">Abrir Podcast</string>
+  <string name="open_podcast">Abrir pódcast</string>
   <!--actions on feeditems-->
   <string name="download_label">Descargar</string>
   <string name="play_label">Reproducir</string>
   <string name="pause_label">Pausar</string>
   <string name="stop_label">Detener</string>
-  <string name="stream_label">Transmitir</string>
-  <string name="remove_label">Quitar</string>
+  <string name="stream_label">Escuchar en directo</string>
+  <string name="remove_label">Eliminar</string>
   <string name="delete_label">Borrar</string>
   <string name="delete_failed">No se puede borrar el fichero. Reiniciar el dispositivo podría ayudar.</string>
-  <string name="remove_episode_lable">Quitar episodio</string>
-  <string name="marked_as_seen_label">Marcar como visto</string>
-  <string name="mark_read_label">Marcar como escuchado</string>
-  <string name="marked_as_read_label">Marcado como escuchado</string>
-  <string name="mark_unread_label">Marcar como no escuchado</string>
+  <string name="remove_episode_lable">Eliminar episodio</string>
+  <string name="mark_as_seen_label">Marcar como visto</string>
+  <string name="marked_as_seen_label">Marcado como visto</string>
+  <string name="mark_read_label">Marcar como reproducido</string>
+  <string name="marked_as_read_label">Marcado como reproducido</string>
+  <string name="mark_unread_label">Marcar como no reproducido</string>
   <string name="add_to_queue_label">Añadir a la cola</string>
   <string name="added_to_queue_label">Añadido a la cola</string>
-  <string name="remove_from_queue_label">Quitar de la cola</string>
-  <string name="add_to_favorite_label">Añadir a Favoritos</string>
-  <string name="added_to_favorites">Añadido a Favoritos</string>
-  <string name="remove_from_favorite_label">Eliminar de Favoritos</string>
-  <string name="removed_from_favorites">Quitado de Favoritos</string>
+  <string name="remove_from_queue_label">Eliminar de la cola</string>
+  <string name="add_to_favorite_label">Añadir a favoritos</string>
+  <string name="added_to_favorites">Añadido a favoritos</string>
+  <string name="remove_from_favorite_label">Eliminar de favoritos</string>
+  <string name="removed_from_favorites">Eliminado de favoritos</string>
   <string name="visit_website_label">Visitar el sitio web</string>
   <string name="support_label">Añadir a Flattr</string>
   <string name="skip_episode_label">Omitir episodio</string>
   <string name="activate_auto_download">Activar descarga automática</string>
   <string name="deactivate_auto_download">Desactivar descarga automática</string>
-  <string name="reset_position">Resetear posición de reproducción</string>
+  <string name="reset_position">Restablecer la posición de reproducción</string>
   <string name="removed_item">Elemento elminado</string>
   <!--Download messages and labels-->
-  <string name="download_successful">exitoso</string>
-  <string name="download_failed">fallido</string>
+  <string name="download_successful">exitosa</string>
+  <string name="download_failed">fallida</string>
   <string name="download_pending">Descarga pendiente</string>
   <string name="download_running">Descarga en curso</string>
+  <string name="download_error_details">Detalles</string>
+  <string name="download_error_details_message">%1$s \n\nURL de archivo:\n%2$s</string>
   <string name="download_error_device_not_found">No se ha encontrado un dispositivo de almacenamiento</string>
   <string name="download_error_insufficient_space">Espacio insuficiente</string>
   <string name="download_error_file_error">Error de archivo</string>
@@ -182,9 +194,9 @@
   <string name="download_error_forbidden">Prohibido</string>
   <string name="cancel_all_downloads_label">Cancelar todas las descargas</string>
   <string name="download_canceled_msg">Descarga cancelada</string>
-  <string name="download_canceled_autodownload_enabled_msg">Descarga cancelada\nSe desactivó <i>Descarga automática</i> en este elemento</string>
+  <string name="download_canceled_autodownload_enabled_msg">Descarga cancelada\nSe desactivó la <i>descarga automática</i> en este elemento</string>
   <string name="download_report_title">Descargas completadas con error(es)</string>
-  <string name="download_report_content_title">Informe de descarga</string>
+  <string name="download_report_content_title">Informe de descargas</string>
   <string name="download_error_malformed_url">URL con formato incorrecto</string>
   <string name="download_error_io_error">Error de E/S</string>
   <string name="download_error_request_error">Error de solicitud</string>
@@ -194,22 +206,22 @@
     <item quantity="other">Quedan %d descargas</item>
   </plurals>
   <string name="downloads_processing">Procesando descargas</string>
-  <string name="download_notification_title">Descargando datos del podcast</string>
+  <string name="download_notification_title">Descargando datos del pódcast</string>
   <string name="download_report_content">%1$d descargas exitosas, %2$d fallidas</string>
   <string name="download_log_title_unknown">Título desconocido</string>
   <string name="download_type_feed">Canal</string>
-  <string name="download_type_media">Archivo de medios</string>
+  <string name="download_type_media">Archivo multimedia</string>
   <string name="download_type_image">Imagen</string>
   <string name="download_request_error_dialog_message_prefix">Ha ocurrido un error al intentar descargar el archivo:\u0020</string>
-  <string name="authentication_notification_title">Se necesita autenticación</string>
-  <string name="authentication_notification_msg">Para acceder al recurso solicitado debe proporcionar un usuario y contraseña</string>
+  <string name="authentication_notification_title">Autenticación requerida</string>
+  <string name="authentication_notification_msg">El recurso solicitado requiere un usuario y contraseña</string>
   <string name="confirm_mobile_download_dialog_title">Confirmar descarga por red móvil</string>
-  <string name="confirm_mobile_download_dialog_message_not_in_queue">Se desactivaron las descargas por red de datos móviles en la configuración.\n\nPuede elegir entre añadir el episodio a la cola o permitir las descargas temporalmente.\n\n<small>Se recordará la elección por 10 minutos.</small></string>
-  <string name="confirm_mobile_download_dialog_message">Se desactivaron las descargas por red de datos móviles en la configuración.\n\n¿Quiere permitir las descargas temporalmente?\n\n<small>Se recordará la elección por 10 minutos.</small></string>
+  <string name="confirm_mobile_download_dialog_message_not_in_queue">Se desactivaron las descargas por red de datos móviles en la configuración.\n\nPuede elegir entre añadir el episodio a la cola o permitir las descargas temporalmente.\n\n<small>Se recordará su elección durante 10 minutos.</small></string>
+  <string name="confirm_mobile_download_dialog_message">Se desactivaron las descargas por red de datos móviles en la configuración.\n\n¿Quiere permitir las descargas temporalmente?\n\n<small>Se recordará su elección durante 10 minutos.</small></string>
   <string name="confirm_mobile_download_dialog_only_add_to_queue">Añadir a la cola</string>
   <string name="confirm_mobile_download_dialog_enable_temporarily">Permitir temporalmente</string>
   <!--Mediaplayer messages-->
-  <string name="player_error_msg">Error</string>
+  <string name="player_error_msg">¡Error!</string>
   <string name="player_stopped_msg">No hay medios en reproducción</string>
   <string name="player_preparing_msg">Preparando</string>
   <string name="player_ready_msg">Listo</string>
@@ -218,7 +230,8 @@
   <string name="playback_error_unknown">Error desconocido</string>
   <string name="no_media_playing_label">No hay medios en reproducción</string>
   <string name="player_buffering_msg">Almacenando</string>
-  <string name="playbackservice_notification_title">Reproduciendo el podcast</string>
+  <string name="player_go_to_picture_in_picture">Modo picture-in-picture</string>
+  <string name="playbackservice_notification_title">Reproduciendo el pódcast</string>
   <string name="unknown_media_key">AntennaPod - Tecla multimedia desconocida: %1$d</string>
   <!--Queue operations-->
   <string name="lock_queue">Bloquear cola</string>
@@ -227,108 +240,118 @@
   <string name="queue_unlocked">Cola desbloqueada</string>
   <string name="clear_queue_label">Vaciar la cola</string>
   <string name="undo">Deshacer</string>
-  <string name="removed_from_queue">Se quitó el elemento</string>
+  <string name="removed_from_queue">Elemento eliminado</string>
   <string name="move_to_top_label">Mover al principio</string>
   <string name="move_to_bottom_label">Mover al final</string>
   <string name="sort">Ordenar</string>
   <string name="date">Fecha</string>
   <string name="duration">Duración</string>
   <string name="episode_title">Título del episodio</string>
-  <string name="feed_title">Título del feed</string>
+  <string name="feed_title">Título del pódcast</string>
+  <string name="random">Aleatorio</string>
+  <string name="smart_shuffle">Reproducción inteligente</string>
   <string name="ascending">Ascendente</string>
   <string name="descending">Descendente</string>
   <string name="clear_queue_confirmation_msg">Confirme que quiere borrar TODOS los episodios de la cola</string>
   <!--Flattr-->
   <string name="flattr_auth_label">Identificarse en Flattr</string>
-  <string name="flattr_auth_explanation">Pulse el botón inferior para comenzar la autenticación. Su navegador abrirá la pantalla de identificación de Flattr y le preguntará si quiere conceder permiso a AntennaPod para valorar cosas. Tras concederlo, volverá a esta pantalla automáticamente.</string>
+  <string name="flattr_auth_explanation">Pulse el botón inferior para iniciar el proceso de autenticación. Su navegador abrirá la pantalla de inicio de sesión en Flattr y le preguntará si quiere conceder permiso a AntennaPod para valorar. Tras concederlo, volverá a esta pantalla automáticamente.</string>
   <string name="authenticate_label">Autenticarse</string>
-  <string name="return_home_label">Volver a la pantalla principal</string>
-  <string name="flattr_auth_success">Autentificación exitosa. Ya puede valorar cosas en Flattr desde la aplicación.</string>
-  <string name="no_flattr_token_title">No se ha encontrado un token de Flattr</string>
+  <string name="return_home_label">Volver al inicio</string>
+  <string name="flattr_auth_success">Autenticación exitosa. Ya puede valorar en Flattr desde la aplicación.</string>
+  <string name="no_flattr_token_title">No se ha encontrado el token de Flattr</string>
   <string name="no_flattr_token_notification_msg">Parece que su cuenta de Flattr no está conectada con AntennaPod. Toque aquí para autenticarse.</string>
-  <string name="no_flattr_token_msg">Su cuenta de Flattr no está conectada con AntennaPod. Puede conectarla o puede visitar la página web de cada cosa para valorarla desde allí.</string>
+  <string name="no_flattr_token_msg">Su cuenta de Flattr no está conectada con AntennaPod. Puede conectarla con AntennaPod para valorar dentro de la aplicación o puede visitar la página web de Flattr para valorar desde allí.</string>
   <string name="authenticate_now_label">Autenticarse</string>
   <string name="action_forbidden_title">Acción prohibida</string>
-  <string name="action_forbidden_msg">AntennaPod no tiene permiso para realizar esta acción. La razón puede ser que se haya revocado el token de acceso de AntennaPod para su cuenta. Puede re-autenticarse o visitar la página web de la cosa.</string>
+  <string name="action_forbidden_msg">AntennaPod no tiene permiso para realizar esta acción. La razón puede ser que se haya revocado el token de acceso de AntennaPod en su cuenta. Puede reautenticarse o visitar la página web.</string>
   <string name="access_revoked_title">Acceso revocado</string>
-  <string name="access_revoked_info">Ha revocado el token de acceso de AntennaPod a su cuenta. Para completar el proceso debe eliminar esta aplicación de la lista de aplicaciones aprobadas, en los ajustes de Flattr.</string>
+  <string name="access_revoked_info">Ha revocado el token de acceso de AntennaPod a su cuenta. Para completar el proceso debe eliminar esta aplicación de la lista de aplicaciones aprobadas en los ajustes de la web de Flattr.</string>
   <!--Flattr-->
-  <string name="flattr_click_success">Ha hecho Flattr en un elemento.</string>
-  <string name="flattr_click_success_count">Ha hecho Flattr en %d elementos.</string>
-  <string name="flattr_click_success_queue">Flattr: %s.</string>
-  <string name="flattr_click_failure_count">No se pudo hacer Flattr en %d elementos.</string>
-  <string name="flattr_click_failure">No se hizo Flattr: %s.</string>
-  <string name="flattr_click_enqueued">Se hará Flattr de esta cosa más tarde</string>
-  <string name="flattring_thing">Haciendo Flattr de %s</string>
-  <string name="flattring_label">AntennaPod haciendo Flattr</string>
-  <string name="flattrd_label">AntennaPod hizo Flattr</string>
-  <string name="flattrd_failed_label">AntennaPod Flattr falló</string>
-  <string name="flattr_retrieving_status">Obteniendo lista de Flattr</string>
+  <string name="flattr_click_success">Ha valorado con Flattr un elemento.</string>
+  <string name="flattr_click_success_count">Ha valorado con Flattr %d elementos.</string>
+  <string name="flattr_click_success_queue">valorado con Flattr: %s.</string>
+  <string name="flattr_click_failure_count">No se pudieron valorar con Flattr %d elementos.</string>
+  <string name="flattr_click_failure">No se ha valorado con Flattr: %s.</string>
+  <string name="flattr_click_enqueued">Se valorará con Flattr más tarde</string>
+  <string name="flattring_thing">Valorando con Flattr a %s</string>
+  <string name="flattring_label">AntennaPod está valorando con Flattr</string>
+  <string name="flattrd_label">AntennaPod ha valorado con Flattr</string>
+  <string name="flattrd_failed_label">AntennaPod falló al valorar con Flattr</string>
+  <string name="flattr_retrieving_status">Obteniendo lista de valoraciones con Flattr</string>
   <!--Variable Speed-->
   <string name="download_plugin_label">Descargar complemento</string>
   <string name="no_playback_plugin_title">Complemento no instalado</string>
-  <string name="no_playback_plugin_or_sonic_msg">Para que funciona la velocidad de reproducción variable, recomendamos habilitar el reproductor Sonic Media [Android 4.1+].\n\nPor otro lado, puedes descargar el plugin de terceros <i>Prestissimo</i> de la Play Store.\nCualquier problema con Prestissimo no es reponsabilidad de AntennaPod y no debería ser reportado al propietario del plugin.</string>
+  <string name="no_playback_plugin_or_sonic_msg">Para que funcione la velocidad de reproducción variable, recomendamos habilitar el reproductor Sonic [Android 4.1+].\n\nTambién puede descargar el plugin <i>Prestissimo</i> de la Play Store.\nNingún problema con Prestissimo es reponsabilidad de AntennaPod y debería ser reportado al propietario del plugin.</string>
   <string name="set_playback_speed_label">Velocidades de reproducción</string>
   <string name="enable_sonic">Activar Sonic</string>
   <!--Empty list labels-->
   <string name="no_items_label">Esta lista no tiene elementos.</string>
-  <string name="no_feeds_label">No se ha suscrito a ningún canal.</string>
+  <string name="no_feeds_label">No se ha suscrito a ningún pódcast.</string>
   <string name="no_chapters_label">Este episodio no tiene capítulos.</string>
-  <string name="no_shownotes_label">Este episodio no tiene anotaciones.</string>
+  <string name="no_shownotes_label">Este episodio no tiene notas del programa.</string>
   <!--Preferences-->
   <string name="storage_pref">Almacenamiento</string>
   <string name="project_pref">Proyecto</string>
   <string name="other_pref">Otros</string>
   <string name="about_pref">Acerca de</string>
   <string name="queue_label">Cola</string>
-  <string name="services_label">Servicios</string>
+  <string name="integrations_label">Integraciones</string>
   <string name="flattr_label">Flattr</string>
+  <string name="flattr_summary">Servicio de micropagos</string>
+  <string name="automation">Automatización</string>
+  <string name="download_pref_details">Detalles</string>
+  <string name="import_export_pref">Importar/Exportar</string>
+  <string name="appearance">Apariencia</string>
+  <string name="external_elements">Elementos externos</string>
+  <string name="interruptions">Interrupciones</string>
+  <string name="buttons">Botones de control</string>
+  <string name="media_player">Reproductor multimedia</string>
   <string name="pref_episode_cleanup_title">Limpieza de episodios</string>
-  <string name="pref_episode_cleanup_summary">Los episodios que no estén en la cola ni en Favoritos pueden eliminarse si Descarga automática necesita espacio para episodios nuevos</string>
+  <string name="pref_episode_cleanup_summary">Los episodios que no estén en la cola ni en favoritos pueden eliminarse si la descarga automática necesita espacio para nuevos episodios</string>
   <string name="pref_pauseOnDisconnect_sum">Pausar la reproducción al desconectar los auriculares o el bluetooth</string>
-  <string name="pref_unpauseOnHeadsetReconnect_sum">Reanudar reproducción cuando se reconecten los auriculares</string>
-  <string name="pref_unpauseOnBluetoothReconnect_sum">Reanudar reproducción cuando se reconecte el bluetooth</string>
-  <string name="pref_hardwareForwardButtonSkips_title">Saltar episodio con botón avance</string>
-  <string name="pref_hardwareForwardButtonSkips_sum">Al pulsar el botón físico de avanzar se saltará al siguiente episodio en lugar de sólo avanzar</string>
-  <string name="pref_hardwarePreviousButtonRestarts_title">Botón anterior reinicia</string>
-  <string name="pref_hardwarePreviousButtonRestarts_sum">Al pulsar el botón físico de retroceder se comenzará el episodio de nuevo, en lugar de rebobinar</string>
+  <string name="pref_unpauseOnHeadsetReconnect_sum">Reanudar la reproducción cuando se reconecten los auriculares</string>
+  <string name="pref_unpauseOnBluetoothReconnect_sum">Reanudar la reproducción cuando se reconecte el bluetooth</string>
+  <string name="pref_hardwareForwardButtonSkips_title">Botón avance: Saltar</string>
+  <string name="pref_hardwarePreviousButtonRestarts_title">Botón retroceso: Reiniciar</string>
+  <string name="pref_hardwarePreviousButtonRestarts_sum">Al pulsar el botón físico de retroceso se comenzará el episodio de nuevo en lugar de retroceder</string>
   <string name="pref_followQueue_sum">Saltar al siguiente elemento de la cola al acabar la reproducción</string>
-  <string name="pref_auto_delete_sum">Borrar episodio cuando finalice la reproducción</string>
+  <string name="pref_auto_delete_sum">Borrar el episodio cuando finalice la reproducción</string>
   <string name="pref_auto_delete_title">Eliminar automáticamente</string>
-  <string name="pref_smart_mark_as_played_sum">Marcar episodios como escuchados incluso si todavía quedan unos segundos por escuchar</string>
-  <string name="pref_smart_mark_as_played_title">Marcar como terminado inteligente</string>
-  <string name="pref_skip_keeps_episodes_sum">Conservar episodios al saltarlos</string>
+  <string name="pref_smart_mark_as_played_sum">Marca los episodios como reproducidos incluso si todavía quedan unos segundos por escuchar</string>
+  <string name="pref_smart_mark_as_played_title">Marcado inteligente como reproducido</string>
+  <string name="pref_skip_keeps_episodes_sum">Conservar los episodios cuando son saltados</string>
   <string name="pref_skip_keeps_episodes_title">Conservar episodios saltados</string>
   <string name="pref_favorite_keeps_episodes_sum">Conservar los episodios cuando se marcan como favoritos</string>
-  <string name="pref_favorite_keeps_episodes_title">Conservar los episodios favoritos</string>
+  <string name="pref_favorite_keeps_episodes_title">Conservar episodios favoritos</string>
   <string name="playback_pref">Reproducción</string>
   <string name="network_pref">Red</string>
   <string name="pref_autoUpdateIntervallOrTime_title">Intervalo de actualización u hora del día</string>
-  <string name="pref_autoUpdateIntervallOrTime_sum">Especificar el intervalo o la hora del día en que se actualizarán automáticamente los canales</string>
-  <string name="pref_autoUpdateIntervallOrTime_message">Se puede ajustar un <i>intervalo</i> como \"cada 2 horas\", especificar una <i>hora del día</i> como \"7:00 AM\" o <i>deshabilitar</i> las actualizaciones automáticas.\n\n<small>Nota: Las horas de actualización no son exactas. Puede haber un ligero retraso.</small></string>
+  <string name="pref_autoUpdateIntervallOrTime_sum">Especifique un intervalo o una hora específica del día para actualizar automáticamente los canales</string>
+  <string name="pref_autoUpdateIntervallOrTime_message">Se puede ajustar un <i>intervalo</i> como \"cada 2 horas\", especificar una <i>hora del día</i> como las \"7:00 AM\" o <i>deshabilitar</i> las actualizaciones automáticas.\n\n<small>Nota: Las horas de actualización no son exactas. Puede haber un ligero retraso.</small></string>
   <string name="pref_autoUpdateIntervallOrTime_Disable">Deshabilitar</string>
   <string name="pref_autoUpdateIntervallOrTime_Interval">Ajustar intervalo</string>
   <string name="pref_autoUpdateIntervallOrTime_TimeOfDay">Ajustar hora del día</string>
   <string name="pref_autoUpdateIntervallOrTime_every">todos los %1$s</string>
   <string name="pref_autoUpdateIntervallOrTime_at">a las %1$s</string>
-  <string name="pref_downloadMediaOnWifiOnly_sum">Solo descargar los contenidos por WiFi</string>
+  <string name="pref_downloadMediaOnWifiOnly_sum">Descargar los contenidos solo por wifi</string>
   <string name="pref_followQueue_title">Reproducción continua</string>
-  <string name="pref_downloadMediaOnWifiOnly_title">Descarga de contenidos por WiFi</string>
-  <string name="pref_pauseOnHeadsetDisconnect_title">Desconexión de los cascos</string>
-  <string name="pref_unpauseOnHeadsetReconnect_title">Reconectar auriculares</string>
-  <string name="pref_unpauseOnBluetoothReconnect_title">Reconectar Bluetooth</string>
+  <string name="pref_downloadMediaOnWifiOnly_title">Descarga de contenidos por wifi</string>
+  <string name="pref_pauseOnHeadsetDisconnect_title">Desconectar sin los auriculares</string>
+  <string name="pref_unpauseOnHeadsetReconnect_title">Reconectar con los auriculares</string>
+  <string name="pref_unpauseOnBluetoothReconnect_title">Reconectar con Bluetooth</string>
   <string name="pref_mobileUpdate_title">Actualizaciones por red móvil</string>
-  <string name="pref_mobileUpdate_sum">Permitir actualizaciones por red de datos móvil</string>
+  <string name="pref_mobileUpdate_sum">Permitir actualizaciones por la red de datos móvil</string>
   <string name="refreshing_label">Actualizando</string>
   <string name="flattr_settings_label">Ajustes de Flattr</string>
-  <string name="pref_flattr_auth_title">Identificación en Flattr</string>
+  <string name="pref_flattr_auth_title">Identificarse en Flattr</string>
   <string name="pref_flattr_auth_sum">Identifíquese en Flattr para valorar cosas directamente desde la aplicación</string>
-  <string name="pref_flattr_this_app_title">Valorar esta aplicación en Flattr</string>
+  <string name="pref_flattr_this_app_title">Valorar en Flattr esta aplicación</string>
   <string name="pref_flattr_this_app_sum">Apoye el desarrollo de AntennaPod valorándola en Flattr. ¡Gracias!</string>
-  <string name="pref_revokeAccess_title">Revocar el acceso</string>
-  <string name="pref_revokeAccess_sum">Rescindir el permiso de acceso de esta aplicación a su cuenta de Flattr.</string>
-  <string name="pref_auto_flattr_title">Uso de Flattr automático</string>
-  <string name="pref_auto_flattr_sum">Configurar flattr automático</string>
+  <string name="pref_revokeAccess_title">Revocar acceso</string>
+  <string name="pref_revokeAccess_sum">Revocar el acceso de esta aplicación en su cuenta de Flattr.</string>
+  <string name="pref_auto_flattr_title">Flattr automático</string>
+  <string name="pref_auto_flattr_sum">Configurar Flattr automático</string>
   <string name="user_interface_label">Interfaz de usuario</string>
   <string name="pref_set_theme_title">Elegir un tema</string>
   <string name="pref_nav_drawer_title">Personalizar el cajón de navegación</string>
@@ -338,131 +361,134 @@
   <string name="pref_nav_drawer_feed_order_title">Ajustar orden de suscripción</string>
   <string name="pref_nav_drawer_feed_order_sum">Cambiar el orden de las suscripciones</string>
   <string name="pref_nav_drawer_feed_counter_title">Ajustar contador de suscripción</string>
-  <string name="pref_nav_drawer_feed_counter_sum">Cambiar la información mostrada en el contador de suscripción</string>
+  <string name="pref_nav_drawer_feed_counter_sum">Cambiar la información mostrada en el contador de las suscripciones. También afecta al orden de las suscripciones si el \'orden de la suscripción\' está en modo \'Contador\'.</string>
   <string name="pref_set_theme_sum">Cambiar la apariencia de AntennaPod.</string>
   <string name="pref_automatic_download_title">Descarga automática</string>
   <string name="pref_automatic_download_sum">Configurar la descarga automática de episodios.</string>
-  <string name="pref_autodl_wifi_filter_title">Activar el filtro WiFi</string>
-  <string name="pref_autodl_wifi_filter_sum">Permitir la descarga automática sólo para las redes WiFi marcadas.</string>
+  <string name="pref_autodl_wifi_filter_title">Activar el filtro wifi</string>
+  <string name="pref_autodl_wifi_filter_sum">Permitir la descarga automática sólo desde las redes wifi seleccionadas.</string>
   <string name="pref_autodl_allow_on_mobile_title">Descargar bajo conexión móvil</string>
-  <string name="pref_autodl_allow_on_mobile_sum">Permite descarga automática sobre la red de Internet del móvil.</string>
+  <string name="pref_autodl_allow_on_mobile_sum">Permitir la descarga automática a través de la conexión de datos móviles.</string>
   <string name="pref_automatic_download_on_battery_title">Descargar cuando no se está cargando</string>
-  <string name="pref_automatic_download_on_battery_sum">Permitir la descarga automática cuando la batería no está cargando</string>
+  <string name="pref_automatic_download_on_battery_sum">Permitir la descarga automática cuando la batería no se esté cargando</string>
   <string name="pref_parallel_downloads_title">Descargas paralelas</string>
-  <string name="pref_episode_cache_title">Caché de episodios</string>
+  <string name="pref_episode_cache_title">Almacenamiento de episodios</string>
   <string name="pref_theme_title_light">Claro</string>
   <string name="pref_theme_title_dark">Oscuro</string>
+  <string name="pref_theme_title_trueblack">Negro (para AMOLED)</string>
   <string name="pref_episode_cache_unlimited">Ilimitado</string>
   <string name="pref_update_interval_hours_plural">horas</string>
   <string name="pref_update_interval_hours_singular">hora</string>
   <string name="pref_update_interval_hours_manual">Manual</string>
   <string name="pref_gpodnet_authenticate_title">Iniciar sesión</string>
-  <string name="pref_gpodnet_authenticate_sum">Inicie sesión con su cuenta de gpodder.net para sincronizar sus suscripciones.</string>
+  <string name="pref_gpodnet_authenticate_sum">Iniciar sesión en su cuenta de gpodder.net para sincronizar sus suscripciones.</string>
   <string name="pref_gpodnet_logout_title">Cerrar sesión</string>
-  <string name="pref_gpodnet_logout_toast">Ha cerrado la sesión correctamente.</string>
-  <string name="pref_gpodnet_setlogin_information_title">Cambiar información de acceso</string>
+  <string name="pref_gpodnet_logout_toast">Ha cerrado la sesión correctamente</string>
+  <string name="pref_gpodnet_setlogin_information_title">Cambiar información de inicio de sesión</string>
   <string name="pref_gpodnet_setlogin_information_sum">Modificar datos de inicio de sesión en gpodder.net.</string>
   <string name="pref_gpodnet_sync_changes_title">Sincronizar cambios ahora</string>
-  <string name="pref_gpodnet_sync_changes_sum">Sincronizar cambios del estado de subscripción y episodio con gpodder.net.</string>
-  <string name="pref_gpodnet_full_sync_title">Sincronización completa ahora</string>
-  <string name="pref_gpodnet_full_sync_sum">Sincronizar el estado de todas las suscripciones y estados de episodio con gpodder.net.</string>
+  <string name="pref_gpodnet_sync_changes_sum">Sincronizar cambios de suscripción y episodios con gpodder.net.</string>
+  <string name="pref_gpodnet_full_sync_title">Sincronización completa</string>
+  <string name="pref_gpodnet_full_sync_sum">Sincronizar todas las suscripciones y episodios con gpodder.net.</string>
   <string name="pref_gpodnet_sync_sum_last_sync_line">Último intento de sincronización: %1$s (%2$s)</string>
-  <string name="pref_gpodnet_sync_started">Comenzó sincronización</string>
-  <string name="pref_gpodnet_full_sync_started">Comenzó sincronización completa</string>
-  <string name="pref_gpodnet_login_status"><![CDATA[Autenticado como <i>%1$s</i> con dispositivo <i>%2$s</i>]]></string>
-  <string name="pref_gpodnet_notifications_title">Mostrar notificaciones de errores de sincronización</string>
-  <string name="pref_gpodnet_notifications_sum">Este ajuste no afecta a errores de autenticación.</string>
+  <string name="pref_gpodnet_sync_started">Sincronización iniciada</string>
+  <string name="pref_gpodnet_full_sync_started">Sincronización completa iniciada</string>
+  <string name="pref_gpodnet_login_status"><![CDATA[Identificado como <i>%1$s</i> con dispositivo <i>%2$s</i>]]></string>
+  <string name="pref_gpodnet_notifications_title">Mostrar errores de sincronización</string>
+  <string name="pref_gpodnet_notifications_sum">Este ajuste no afecta a los errores de autenticación.</string>
   <string name="pref_playback_speed_title">Velocidades de reproducción</string>
-  <string name="pref_playback_speed_sum">Personalice las velocidades disponibles para la reproducción de audio a velocidad variable</string>
+  <string name="pref_playback_speed_sum">Personalice las velocidades disponibles en la reproducción de audio a velocidad variable</string>
   <string name="pref_fast_forward">Intervalo de avance</string>
-  <string name="pref_fast_forward_sum">Personaliza el número de segundos a avanzar cuando se pulsa el botón de avance rápido</string>
+  <string name="pref_fast_forward_sum">Personalice el número de segundos que avanzará cuando se pulsa el botón de avance</string>
   <string name="pref_rewind">Intervalo de retroceso</string>
-  <string name="pref_rewind_sum">Personaliza el número de segundos a retroceder cuando se pulsa el botón de retroceder</string>
-  <string name="pref_gpodnet_sethostname_title">Definir nombre de equipo</string>
-  <string name="pref_gpodnet_sethostname_use_default_host">Usar nombre de equipo por defecto</string>
-  <string name="pref_expandNotify_title">Expandir Notificación</string>
-  <string name="pref_expandNotify_sum">Expandir siempre la notificación para mostrar los botones de reproducción</string>
+  <string name="pref_rewind_sum">Personalice el número de segundos que retrocederá cuando se pulsa el botón de retrocedeso</string>
+  <string name="pref_gpodnet_sethostname_title">Establecer nombre del dispositivo</string>
+  <string name="pref_gpodnet_sethostname_use_default_host">Usar el nombre por defecto</string>
   <string name="pref_persistNotify_title">Controles de reproducción persistentes</string>
-  <string name="pref_persistNotify_sum">Mantener la notificación y controles en pantalla de bloqueo cuando se pausa.</string>
-  <string name="pref_compact_notification_buttons_title">Configurar botones de la pantalla de bloqueo</string>
-  <string name="pref_compact_notification_buttons_sum">Cambiar los botones de la pantalla de bloqueo. El botón play/pausa siempre está incluido.</string>
-  <string name="pref_compact_notification_buttons_dialog_title">Seleccionar un máximo de %1$d elementos</string>
+  <string name="pref_persistNotify_sum">Mantener las notificaciones y los controles en pantalla de bloqueo cuando se pausa la reproducción.</string>
+  <string name="pref_compact_notification_buttons_title">Configurar botones en la pantalla de bloqueo</string>
+  <string name="pref_compact_notification_buttons_sum">Cambiar los botones en la pantalla de bloqueo. El botón reproducir/pausar siempre está incluido.</string>
+  <string name="pref_compact_notification_buttons_dialog_title">Seleccionar máximo %1$d elementos</string>
   <string name="pref_compact_notification_buttons_dialog_error">Sólo puedes seleccionar un máximo de %1$d elementos.</string>
   <string name="pref_lockscreen_background_title">Establecer fondo de pantalla de bloqueo</string>
-  <string name="pref_lockscreen_background_sum">Establecer el fondo de pantalla de bloqueo desde la imagen del episodio. Como efecto lateral, esto también mostrará la imagen en aplicaciones de terceros.</string>
+  <string name="pref_lockscreen_background_sum">Establecer el fondo de pantalla de bloqueo desde la imagen del episodio. Como efecto secundario, esto también mostrarán las imagen de aplicaciones de terceros.</string>
   <string name="pref_showDownloadReport_title">Mostrar informe de descarga</string>
   <string name="pref_showDownloadReport_sum">Si la descarga falla, generar un informe con los detalles del fallo</string>
   <string name="pref_expand_notify_unsupport_toast">Las versiones de Android anteriores a la 4.1 no soportan notificaciones expandidas</string>
   <string name="pref_queueAddToFront_sum">Agregar nuevos episodios al principio de la cola.</string>
   <string name="pref_queueAddToFront_title">Poner al principio de la cola.</string>
   <string name="pref_smart_mark_as_played_disabled">Deshabilitado</string>
-  <string name="pref_image_cache_size_title">Tamaño de la caché de imágenes</string>
-  <string name="pref_image_cache_size_sum">Tamaño de la caché en disco para imágenes.</string>
-  <string name="crash_report_title">Informe de fallo</string>
-  <string name="crash_report_sum">Enviar el último informe de fallo por e-mail</string>
-  <string name="send_email">Enviar e-mail</string>
+  <string name="pref_image_cache_size_title">Tamaño del almacenamiento de imágenes</string>
+  <string name="pref_image_cache_size_sum">Tamaño del almacenamiento de imágenes en disco.</string>
+  <string name="crash_report_title">Informe de fallos</string>
+  <string name="crash_report_sum">Enviar el último informe de fallo por correo electrónico</string>
+  <string name="send_email">Enviar correo electrónico</string>
   <string name="experimental_pref">Experimental</string>
-  <string name="pref_sonic_title">Sonic media player</string>
-  <string name="pref_sonic_message">Usar el reproductor Sonic Media incorporado en lugar del reproductor multimedia de Android y Prestissimo</string>
+  <string name="pref_media_player_message">Seleccione qué reproductor multimedia usar para reproducir archivos</string>
   <string name="pref_current_value">Valor actual: %1$s</string>
   <string name="pref_proxy_title">Proxy</string>
   <string name="pref_proxy_sum">Configurar proxy de red</string>
   <string name="pref_faq">Preguntas frecuentes</string>
   <string name="pref_known_issues">Problemas conocidos</string>
-  <string name="pref_no_browser_found">No se ha encontrado navegador web.</string>
+  <string name="pref_no_browser_found">No se ha encontrado un navegador web.</string>
   <string name="pref_cast_title">Soporte para Chromecast</string>
   <string name="pref_cast_message_play_flavor">Habilitar soporte para reproducción remota en dispositivos Cast (como Chromecast, altavoces o Android TV)</string>
   <string name="pref_cast_message_free_flavor">Chromecast requiere librerías propietarias de terceros que están deshabilitadas en esta versión de AntennaPod</string>
-  <string name="pref_enqueue_downloaded_title">Poner descargados en cola</string>
+  <string name="pref_enqueue_downloaded_title">Agregar descargados a la cola</string>
   <string name="pref_enqueue_downloaded_summary">Agregar episodios descargados a la cola</string>
+  <string name="media_player_builtin">Reproductor Android integrado</string>
+  <string name="pref_videoBehavior_title">Al salir del vídeo</string>
+  <string name="pref_videoBehavior_sum">Comportamiento al salir de la reproducción de video</string>
+  <string name="stop_playback">Parar reproducción</string>
+  <string name="continue_playback">Continuar la reproducción de audio</string>
   <!--Auto-Flattr dialog-->
   <string name="auto_flattr_enable">Habilitar Flattr automático</string>
-  <string name="auto_flattr_after_percent">Hacer Flattr del episodio en cuanto se haya reproducido el %d por ciento</string>
-  <string name="auto_flattr_ater_beginning">Hacer Flattr del episodio al comenzar la reproducción</string>
-  <string name="auto_flattr_ater_end">Hacer Flattr del episodio al terminar la reproducción</string>
+  <string name="auto_flattr_after_percent">Valorar con Flattr el episodio cuando se haya reproducido el %d por ciento</string>
+  <string name="auto_flattr_ater_beginning">Valorar con Flattr el episodio al comenzar la reproducción</string>
+  <string name="auto_flattr_ater_end">Valorar con Flattr el episodio al terminar la reproducción</string>
   <!--Search-->
   <string name="search_hint">Buscar episodios</string>
-  <string name="found_in_shownotes_label">Encontrado en las notas del show</string>
+  <string name="found_in_shownotes_label">Encontrado en las notas del programa</string>
   <string name="found_in_chapters_label">Encontrado en los capítulos</string>
-  <string name="found_in_authors_label">Encontrado en los autores</string>
-  <string name="found_in_feeds_label">Encontrado en los feeds</string>
+  <string name="found_in_authors_label">Encontrado en autor(es)</string>
+  <string name="found_in_feeds_label">Encontrado en pódcast</string>
   <string name="search_status_no_results">No se han encontrado resultados</string>
   <string name="search_label">Buscar</string>
   <string name="found_in_title_label">Encontrado en el título</string>
-  <string name="no_results_for_query">No se han encontrado resultados para \"%1$s\"</string>
+  <string name="no_results_for_query">No se han encontrado resultados de \"%1$s\"</string>
   <!--OPML import and export-->
-  <string name="opml_import_txtv_button_lable">Los archivos OPML le permiten migrar sus podcasts de una aplicación a otra.</string>
+  <string name="opml_import_txtv_button_lable">Los archivos OPML le permiten migrar sus pódcast de una aplicación a otra.</string>
   <string name="opml_import_option">Opción %1$d</string>
   <string name="opml_import_explanation_1">Elegir un una ruta del sistema de ficheros local.</string>
-  <string name="opml_import_explanation_2">Usar una aplicación externa tipo Dropbox, Google Drive or su gestor de ficheros favorito para abrir un archivo OPML.</string>
-  <string name="opml_import_explanation_3">Muchas aplicaciones como Google Mail, Dropbox, Google Drive y la mayoría de gestores de ficheros pueden <i>abrir</i> archivos OPML <i>con</i> AntennaPod.</string>
+  <string name="opml_import_explanation_2">Usar una aplicación externa tipo Dropbox, Google Drive o su gestor de ficheros favorito para abrir un archivo OPML.</string>
+  <string name="opml_import_explanation_3">Muchas aplicaciones como Google Mail, Dropbox, Google Drive y la mayoría de gestores de ficheros pueden <i>abrir</i> archivos OPML <i>de</i> AntennaPod.</string>
   <string name="start_import_label">Comenzar la importación</string>
-  <string name="opml_import_label">Importación de OPML</string>
+  <string name="opml_import_label">Importar de OPML</string>
   <string name="opml_directory_error">¡ERROR!</string>
   <string name="reading_opml_label">Leyendo el archivo OPML</string>
-  <string name="opml_reader_error">Error al leer el documento OPML</string>
+  <string name="opml_reader_error">Error al leer el documento OPML:</string>
   <string name="opml_import_error_no_file">¡Debes seleccionar un archivo!</string>
   <string name="select_all_label">Seleccionar todo</string>
   <string name="deselect_all_label">Deseleccionar todo</string>
   <string name="select_options_label">Seleccionar…</string>
   <string name="choose_file_from_filesystem">Desde el sistema de ficheros local</string>
-  <string name="choose_file_from_external_application">Usar aplicación externa</string>
+  <string name="choose_file_from_external_application">Usar una aplicación externa</string>
   <string name="opml_export_label">Exportar a OPML</string>
   <string name="html_export_label">Exportar a HTML</string>
   <string name="exporting_label">Exportando…</string>
   <string name="export_error_label">Error en la exportación</string>
-  <string name="opml_export_success_title">Exportación a OPML exitosa</string>
-  <string name="opml_export_success_sum">El archivo OPML se ha escrito en:\u0020</string>
-  <string name="opml_import_ask_read_permission">Es necesario el acceso al almacenamiento externo para leer archivos OPML</string>
+  <string name="export_success_title">Exportación exitosa</string>
+  <string name="export_success_sum">El archivo exportado fue guardado en:\n\n%1$s</string>
+  <string name="opml_import_ask_read_permission">Necesita acceso al almacenamiento externo para leer archivos OPML</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Establecer un temporizador</string>
   <string name="disable_sleeptimer_label">Desactivar el temporizador</string>
   <string name="enter_time_here_label">Introducir hora</string>
   <string name="sleep_timer_label">Temporizador</string>
   <string name="time_left_label">Tiempo restante:\u0020</string>
-  <string name="time_dialog_invalid_input">Entrada no válida, el tiempo debe ser un entero</string>
-  <string name="timer_about_to_expire_label"><b>Cuando el temporizador vaya a expirara:</b></string>
-  <string name="shake_to_reset_label">Agitar para reiniciar temporizador</string>
+  <string name="time_dialog_invalid_input">Entrada no válida, el tiempo debe ser un número entero</string>
+  <string name="timer_about_to_expire_label"><b>Cuando el temporizador vaya a expirar:</b></string>
+  <string name="shake_to_reset_label">Agitar para reiniciar el temporizador</string>
   <string name="timer_vibration_label">Vibrar</string>
   <string name="time_seconds">segundos</string>
   <string name="time_minutes">minutos</string>
@@ -479,22 +505,22 @@
     <item quantity="one">1 hora</item>
     <item quantity="other">%d horas</item>
   </plurals>
-  <string name="auto_enable_label">Auto-habilitar</string>
-  <string name="sleep_timer_enabled_label">Temporizador de sueño habilitado</string>
-  <string name="sleep_timer_disabled_label">Temporizador de sueño deshabilitado</string>
+  <string name="auto_enable_label">Autohabilitar</string>
+  <string name="sleep_timer_enabled_label">Temporizador habilitado</string>
+  <string name="sleep_timer_disabled_label">Temporizador deshabilitado</string>
   <!--gpodder.net-->
   <string name="gpodnet_taglist_header">CATEGORÍAS</string>
-  <string name="gpodnet_toplist_header">MEJORES PODCASTS</string>
+  <string name="gpodnet_toplist_header">MEJORES PÓDCAST</string>
   <string name="gpodnet_suggestions_header">SUGERENCIAS</string>
   <string name="gpodnet_search_hint">Buscar en gpodder.net</string>
   <string name="gpodnetauth_login_title">Iniciar sesión</string>
-  <string name="gpodnetauth_login_descr">Bienvenido al proceso de autenticación de gpodder.net. Primero, escriba sus datos de inicio de sesión:</string>
+  <string name="gpodnetauth_login_descr">Bienvenidoinicio de sesión de gpodder.net. Primero, escriba sus datos de inicio de sesión:</string>
   <string name="gpodnetauth_login_butLabel">Iniciar sesión</string>
-  <string name="gpodnetauth_login_register">Si no tienes una cuenta aún, puedes crearla en:\nhttps://gpodder.net/register/</string>
-  <string name="username_label">Nombre de usuario</string>
+  <string name="gpodnetauth_login_register">Si aún no tienes una cuenta, puedes crearla en:\nhttps://gpodder.net/register/</string>
+  <string name="username_label">Usuario</string>
   <string name="password_label">Contraseña</string>
   <string name="gpodnetauth_device_title">Selección del dispositivo</string>
-  <string name="gpodnetauth_device_descr">Cree un nuevo dispositivo para usar con su cuenta de gpodder.net o elija uno existente:</string>
+  <string name="gpodnetauth_device_descr">Cree un nuevo dispositivo para usar en su cuenta de gpodder.net o elija uno existente:</string>
   <string name="gpodnetauth_device_deviceID">Id. de dispositivo:\u0020</string>
   <string name="gpodnetauth_device_caption">Descripción</string>
   <string name="gpodnetauth_device_butCreateNewDevice">Crear dispositivo nuevo</string>
@@ -507,7 +533,7 @@
   <string name="gpodnetauth_finish_descr">¡Enhorabuena! Su cuenta de gpodder.net está ahora asociada con su dispositivo. A partir de ahora AntennaPod sincronizará automáticamente las suscripciones de su dispositivo con su cuenta de gpodder.net.</string>
   <string name="gpodnetauth_finish_butsyncnow">Comenzar sincronización ahora</string>
   <string name="gpodnetauth_finish_butgomainscreen">Ir a la pantalla principal</string>
-  <string name="gpodnetsync_auth_error_title">Error de autenticación de gpodder.net</string>
+  <string name="gpodnetsync_auth_error_title">Error de autenticación en gpodder.net</string>
   <string name="gpodnetsync_auth_error_descr">Usuario o contraseña incorrectos</string>
   <string name="gpodnetsync_error_title">Error de sincronización de gpodder.net</string>
   <string name="gpodnetsync_error_descr">Ocurrió un error de sincronización:\u0020</string>
@@ -518,10 +544,10 @@
   <string name="create_folder_label">Crear carpeta</string>
   <string name="choose_data_directory">Elegir carpeta de datos</string>
   <string name="choose_data_directory_message">Por favor elige la raíz de la carpeta de datos. AntennaPod creará los subdirectorios apropiados.</string>
-  <string name="choose_data_directory_permission_rationale">Se necesita acceso a almacenamiento externo para cambiar la carpeta de datos</string>
-  <string name="create_folder_msg">¿Crear carpeta con nombre «%1$s»?</string>
+  <string name="choose_data_directory_permission_rationale">Necesita acceso al almacenamiento externo para cambiar la carpeta de datos</string>
+  <string name="create_folder_msg">¿Crear carpeta con nombre \"%1$s\"?</string>
   <string name="create_folder_success">Carpeta creada</string>
-  <string name="create_folder_error_no_write_access">No se puede escribir a esta carpeta</string>
+  <string name="create_folder_error_no_write_access">No se puede escribir en esta carpeta</string>
   <string name="create_folder_error_already_exists">Ya existe la carpeta</string>
   <string name="create_folder_error">No se ha podido crear la carpeta</string>
   <string name="folder_does_not_exist_error">\"%1$s\" no existe</string>
@@ -532,7 +558,7 @@
   <string name="set_to_default_folder">Elegir carpeta predeterminada</string>
   <string name="pref_pausePlaybackForFocusLoss_sum">Pausar la reproducción en lugar de bajar el volumen cuando otra aplicación reproduzca sonidos</string>
   <string name="pref_pausePlaybackForFocusLoss_title">Pausar durante las interrupciones</string>
-  <string name="pref_resumeAfterCall_sum">Reanudar reproducción tras una llamada</string>
+  <string name="pref_resumeAfterCall_sum">Reanudar la reproducción tras una llamada</string>
   <string name="pref_resumeAfterCall_title">Reanudar tras una llamada</string>
   <string name="pref_restart_required">Es necesario reiniciar AntennaPod para aplicar los cambios.</string>
   <!--Online feed view-->
@@ -540,8 +566,8 @@
   <string name="subscribed_label">Suscrito</string>
   <string name="downloading_label">Descargando…</string>
   <!--Content descriptions for image buttons-->
-  <string name="rewind_label">Rebobinar</string>
-  <string name="fast_forward_label">Avance rápido</string>
+  <string name="rewind_label">Retroceso</string>
+  <string name="fast_forward_label">Avance</string>
   <string name="media_type_audio_label">Audio</string>
   <string name="media_type_video_label">Vídeo</string>
   <string name="navigate_upwards_label">Navegar hacia arriba</string>
@@ -551,40 +577,40 @@
   <string name="load_next_page_label">Cargar la página siguiente</string>
   <!--Feed information screen-->
   <string name="authentication_label">Autenticación</string>
-  <string name="authentication_descr">Cambiar nombre y contraseña de este podcast y sus episodios</string>
-  <string name="auto_download_settings_label">Opciones de Auto Descarga</string>
-  <string name="episode_filters_label">Filtro de Episodios</string>
-  <string name="episode_filters_description">Listado de términos para decidir si un episodio debe ser incluído o excluído al auto descargar</string>
+  <string name="authentication_descr">Cambiar nombre y contraseña de este pódcast y sus episodios</string>
+  <string name="auto_download_settings_label">Opciones de descarga automática</string>
+  <string name="episode_filters_label">Filtro de episodios</string>
+  <string name="episode_filters_description">Lista de términos usados para decidir si un episodio debe ser incluído o excluído de la descarga automática</string>
   <string name="episode_filters_include">Incluir</string>
   <string name="episode_filters_exclude">Excluir</string>
-  <string name="episode_filters_hint">Palabras sueltas \n\"Múltiples palabras\"</string>
+  <string name="episode_filters_hint">Palabras sueltas \n\"múltiples palabras\"</string>
   <string name="keep_updated">Mantener actualizado</string>
   <!--Progress information-->
   <string name="progress_upgrading_database">Actualizando la base de datos</string>
   <!--AntennaPodSP-->
-  <string name="sp_apps_importing_feeds_msg">Importando subscripciones de aplicaciones de uso específico...</string>
+  <string name="sp_apps_importing_feeds_msg">Importando suscripciones de aplicaciones de uso específico…</string>
   <string name="search_itunes_label">Buscar en iTunes</string>
   <string name="filter">Filtro</string>
-  <string name="search_fyyd_label">Buscar fyyd</string>
+  <string name="search_fyyd_label">Buscar en fyyd</string>
   <!--Episodes apply actions-->
-  <string name="all_label">Todo</string>
-  <string name="selected_all_label">Seleccionados todos los episodios</string>
+  <string name="all_label">Todos</string>
+  <string name="selected_all_label">Todos los episodios seleccionados</string>
   <string name="none_label">Ninguno</string>
-  <string name="deselected_all_label">Deseleccionados todos los episodios</string>
-  <string name="played_label">Reproducido</string>
-  <string name="selected_played_label">Seleccionados episodios reproducidos</string>
+  <string name="deselected_all_label">Ningún episodio seleccionado</string>
+  <string name="played_label">Reproducidos</string>
+  <string name="selected_played_label">Episodios reproducidos seleccionados</string>
   <string name="unplayed_label">No reproducidos</string>
-  <string name="selected_unplayed_label">Seleccionados episodios no reproducidos</string>
-  <string name="downloaded_label">Descargado</string>
-  <string name="selected_downloaded_label">Seleccionados episodios descargados</string>
+  <string name="selected_unplayed_label">Episodios no reproducidos seleccionados</string>
+  <string name="downloaded_label">Descargados</string>
+  <string name="selected_downloaded_label">Episodios descargados seleccionados</string>
   <string name="not_downloaded_label">No descargado</string>
-  <string name="selected_not_downloaded_label">Seleccionados episodios no descargados</string>
+  <string name="selected_not_downloaded_label">Episodios no descargados seleccionados</string>
   <string name="queued_label">En cola</string>
-  <string name="selected_queued_label">Seleccionados episodios en cola</string>
-  <string name="not_queued_label">No en cola</string>
-  <string name="selected_not_queued_label">Seleccionados episodios no en cola</string>
+  <string name="selected_queued_label">Episodios en cola seleccionados</string>
+  <string name="not_queued_label">No están en cola</string>
+  <string name="selected_not_queued_label">Episodios que no están en cola seleccionados</string>
   <string name="has_media">Tiene multimedia</string>
-  <string name="selected_has_media_label">Seleccionar episodios con multimedia</string>
+  <string name="selected_has_media_label">Episodios con multimedia seleccionados</string>
   <!--Sort-->
   <string name="sort_title_a_z">Título (A \u2192 Z)</string>
   <string name="sort_title_z_a">Título (Z \u2192 A)</string>
@@ -594,9 +620,9 @@
   <string name="sort_duration_long_short">Duración (Largo \u2192 Corto)</string>
   <!--Rating dialog-->
   <string name="rating_title">¿Te gusta AntennaPod?</string>
-  <string name="rating_message">Estaríamos muy agradecidos si nos dedicas un tiempo para puntuar AntennaPod</string>
+  <string name="rating_message">Estaríamos muy agradecidos si nos dedicas un poco de tiempo para valorar AntennaPod.</string>
   <string name="rating_never_label">Déjame en paz</string>
-  <string name="rating_later_label">Recuérdamelo después</string>
+  <string name="rating_later_label">Recuérdamelo más tarde</string>
   <string name="rating_now_label">¡Venga, hagámoslo!</string>
   <!--Audio controls-->
   <string name="audio_controls">Controles de audio</string>
@@ -605,42 +631,51 @@
   <string name="left_short">I</string>
   <string name="right_short">D</string>
   <string name="audio_effects">Efectos de audio</string>
-  <string name="stereo_to_mono">Downmix: De estereo a mono</string>
-  <string name="sonic_only">Sólo Sonic</string>
+  <string name="stereo_to_mono">Mezclar: de estéreo a mono</string>
+  <string name="sonic_only">Solo Sonic</string>
   <!--proxy settings-->
   <string name="proxy_type_label">Tipo</string>
   <string name="host_label">Host</string>
   <string name="port_label">Puerto</string>
   <string name="optional_hint">(Opcional)</string>
-  <string name="proxy_test_label">Probar</string>
-  <string name="proxy_checking">Comprobando...</string>
+  <string name="proxy_test_label">Test</string>
+  <string name="proxy_checking">Comprobando…</string>
   <string name="proxy_test_successful">Test correcto</string>
   <string name="proxy_test_failed">Test fallido</string>
   <string name="proxy_host_empty_error">El host no puede estar en blanco</string>
-  <string name="proxy_host_invalid_error">El host no es una IP ni un host válido</string>
-  <string name="proxy_port_invalid_error">Puerto inválido</string>
+  <string name="proxy_host_invalid_error">El host no es una dirección IP o dominio válido</string>
+  <string name="proxy_port_invalid_error">Puerto no válido</string>
   <!--Database import/export-->
   <string name="import_export">Importar/Exportar base de datos</string>
-  <string name="import_export_warning">Esta función experimental se puede usar para transferir tus suscripciones y episodios reproducidos a otro dispositivo.\n\nLas base de datos exportadas solo se pueden importar cuando se usa la misma versión de AntennaPod. En otro caso, esta función podría provocar comportamiento inesperado.\n\nDespués de importar, los episodios podrían mostrarse como descargados cuando no lo están. Reproduce estos episodios para que AntennaPod lo detecte.</string>
+  <string name="import_export_warning">Esta función experimental se puede usar para transferir sus suscripciones y episodios reproducidos a otro dispositivo.\n\nLas bases de datos exportadas solo se pueden importar cuando se usa la misma versión de AntennaPod. En otro caso, esta función podría provocar un comportamiento inesperado.\n\nDespués de la importación, los episodios podrían mostrarse como descargados cuando no lo están. Presione el botón de reproducción de los episodios para que AntennaPod lo detecte.</string>
   <string name="label_import">Importar</string>
   <string name="label_export">Exportar</string>
-  <string name="import_select_file">Seleccionar firchero a importar</string>
-  <string name="export_ok">Exportación exitosa. La base de datos se guardó en la tarjeta SD.</string>
-  <string name="import_ok">Importación exitosa.\n\nPor favor, pulse OK para reiniciar AntennaPod</string>
+  <string name="import_select_file">Seleccionar archivo a importar</string>
+  <string name="export_ok">Exportación exitosa.</string>
+  <string name="import_ok">Importación exitosa.\n\nPulse OK para reiniciar AntennaPod</string>
   <!--Casting-->
-  <string name="cast_media_route_menu_title">Reproducir en...</string>
-  <string name="cast_disconnect_label">Desconectar la sesión Cast</string>
-  <string name="cast_not_castable">El medio seleccionado no es compatible con el dispositivo Cast</string>
-  <string name="cast_failed_to_play">Fallo al iniciar la reproducción del medio</string>
-  <string name="cast_failed_to_stop">Fallo al detener la reproducción del medio</string>
-  <string name="cast_failed_to_pause">Fallo al pausar la reproducción del medio</string>
+  <string name="cast_media_route_menu_title">Reproducir en…</string>
+  <string name="cast_disconnect_label">Desconectar la sesión de cast</string>
+  <string name="cast_not_castable">El medio seleccionado no es compatible con el dispositivo de cast</string>
+  <string name="cast_failed_to_play">Error al iniciar la reproducción del medio</string>
+  <string name="cast_failed_to_stop">Error al detener la reproducción del medio</string>
+  <string name="cast_failed_to_pause">Error al pausar la reproducción del medio</string>
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
-  <string name="cast_failed_setting_volume">Fallo al ajustar el volumen</string>
-  <string name="cast_failed_no_connection">No hay conexión con el dispositivo Cast</string>
-  <string name="cast_failed_no_connection_trans">Se ha perdido la conexión con el dispositivo Cast. La aplicación está intentando reconectar. Por favor, espera unos segundos e intenta de nuevo.</string>
-  <string name="cast_failed_perform_action">Fallo en la acción</string>
-  <string name="cast_failed_status_request">Fallo al sincronizar con el dispositivo Cast</string>
-  <string name="cast_failed_seek">Fallo al cambiar de posición en el dispositivo Cast</string>
+  <string name="cast_failed_setting_volume">Error al ajustar el volumen</string>
+  <string name="cast_failed_no_connection">No hay ninguna conexión con el dispositivo de cast</string>
+  <string name="cast_failed_no_connection_trans">Se ha perdido la conexión con dispositivo de cast. La aplicación está intentando restablecer la conexión. Espere unos segundos y vuelva a intentarlo.</string>
+  <string name="cast_failed_perform_action">Error al realizar la acción</string>
+  <string name="cast_failed_status_request">Error al sincronizar con el dispositivo de cast</string>
+  <string name="cast_failed_seek">Error al buscar la nueva posición en el dispositivo de cast</string>
   <string name="cast_failed_receiver_player_error">El reproductor ha encontrado un error grave</string>
-  <string name="cast_failed_media_error_skipping">Error reproduciendo medio. Saltando...</string>
+  <string name="cast_failed_media_error_skipping">Error reproduciendo medio. Saltando…</string>
+  <!--Notification channels-->
+  <string name="notification_channel_user_action">Acción necesaria</string>
+  <string name="notification_channel_user_action_description">Se muestra si su acción es necesaria, por ejemplo, si necesita introducir una contraseña.</string>
+  <string name="notification_channel_downloading">Descargando</string>
+  <string name="notification_channel_downloading_description">Se muestra mientras se está descargando.</string>
+  <string name="notification_channel_playing">Reproduciendo</string>
+  <string name="notification_channel_playing_description">Permite controlar la reproducción. Es la notificación principal que se ve mientras se reproduce un pódcast.</string>
+  <string name="notification_channel_error">Errores</string>
+  <string name="notification_channel_error_description">Muestra si algo salió mal, por ejemplo, si falla la descarga o la sincronización de gpodder</string>
 </resources>
diff --git a/core/src/main/res/values-et/strings.xml b/core/src/main/res/values-et/strings.xml
index d7afdf834..9d5673751 100644
--- a/core/src/main/res/values-et/strings.xml
+++ b/core/src/main/res/values-et/strings.xml
@@ -48,7 +48,6 @@
   <string name="yes">Jah</string>
   <string name="no">Ei</string>
   <string name="reset">Nulli</string>
-  <string name="author_label">Autor</string>
   <string name="language_label">Keel</string>
   <string name="url_label">URL</string>
   <string name="podcast_settings_label">Seaded</string>
@@ -93,18 +92,11 @@
   <string name="mark_all_read_label">Märgi kuulatuks</string>
   <string name="mark_all_read_msg">Märgi kõik saated esitatuks</string>
   <string name="mark_all_seen_label">Märgi kõik nähtuks</string>
-  <string name="mark_all_seen_msg">Märgi kõik saated nähtuks</string>
   <string name="show_info_label">Näita infot</string>
-  <string name="rename_feed_label">Nimeta taskuhääling ümber</string>
-  <string name="remove_feed_label">Eemalda taskuhääling</string>
   <string name="share_label">Jaga...</string>
-  <string name="share_link_label">Jaga linki</string>
-  <string name="share_link_with_position_label">Jaga linki koos asukohaga</string>
+  <string name="share_file_label">Jaga faili</string>
   <string name="share_feed_url_label">Jaga uudisvoo URL-i</string>
-  <string name="feed_remover_msg">Uudisvoo eemaldamine</string>
-  <string name="load_complete_feed">Värskenda kogu uudisvoogu</string>
   <string name="hide_episodes_title">Peida saated</string>
-  <string name="episode_actions">Rakenda tegevused</string>
   <string name="hide_unplayed_episodes_label">Esitamata</string>
   <string name="hide_paused_episodes_label">Peatatud</string>
   <string name="hide_played_episodes_label">Esitatud</string>
@@ -147,6 +139,7 @@
   <string name="download_failed">ebaõnnestus</string>
   <string name="download_pending">Ootel allalaadimine</string>
   <string name="download_running">Allalaadimine on käimas</string>
+  <string name="download_error_details">Üksikasjad</string>
   <string name="download_error_device_not_found">Salvestuskohta ei leitud</string>
   <string name="download_error_insufficient_space">Pole piisavalt ruumi</string>
   <string name="download_error_file_error">Faili viga</string>
@@ -207,7 +200,6 @@
   <string name="date">Kuupäeva järgi</string>
   <string name="duration">Kestuse järgi</string>
   <string name="episode_title">Saate pealkiri</string>
-  <string name="feed_title">Uudisvoo pealkiri</string>
   <string name="ascending">Kasvavalt</string>
   <string name="descending">Kahanevalt</string>
   <!--Flattr-->
@@ -224,7 +216,6 @@
   <string name="enable_sonic">Luba Sonicu kasutamine</string>
   <!--Empty list labels-->
   <string name="no_items_label">Selles nimekirjas pole midagi.</string>
-  <string name="no_feeds_label">Sa pole veel ühtegi uusidvoogi tellinud.</string>
   <string name="no_chapters_label">Saatel pole peatükke.</string>
   <string name="no_shownotes_label">Sellel saatel pole mingeid märkusi.</string>
   <!--Preferences-->
@@ -233,7 +224,6 @@
   <string name="other_pref">Muud</string>
   <string name="about_pref">Info</string>
   <string name="queue_label">Järjekord</string>
-  <string name="services_label">Teenused</string>
   <string name="flattr_label">Flattr</string>
   <string name="pref_episode_cleanup_title">Saadete kustutamien</string>
   <string name="pref_followQueue_sum">Kui saade lõpeb, siis esita kohe järgmine järjekorras olev saade.</string>
@@ -241,6 +231,7 @@
   <string name="pref_auto_delete_title">Automaatne kustutamine</string>
   <string name="pref_skip_keeps_episodes_sum">Hoia saated alles, kui need jäetakse vahele</string>
   <string name="pref_skip_keeps_episodes_title">Hoia vahelejäetud osad alles</string>
+  <string name="pref_favorite_keeps_episodes_title">Säilita lemmikosad</string>
   <string name="playback_pref">Esitamine</string>
   <string name="network_pref">Võrk</string>
   <string name="pref_autoUpdateIntervallOrTime_title">Uuendamise intervall või kellaaeg</string>
@@ -293,8 +284,6 @@
   <string name="pref_playback_speed_title">Esitamise kiirused</string>
   <string name="pref_gpodnet_sethostname_title">Määra hostinimi</string>
   <string name="pref_gpodnet_sethostname_use_default_host">Kasuta vaikimisi hosti</string>
-  <string name="pref_expandNotify_title">Teavituste laiendamine</string>
-  <string name="pref_expandNotify_sum">Näita alati teavitustes pleieri nuppe.</string>
   <string name="pref_persistNotify_title">Püsivad taasesitamise nupud</string>
   <string name="pref_compact_notification_buttons_title">Määra lukustutekraani nupud</string>
   <string name="pref_lockscreen_background_title">Määra lukustusekraani taustapilt</string>
@@ -342,8 +331,6 @@
   <string name="html_export_label">HTML eksport</string>
   <string name="exporting_label">Eksportimine...</string>
   <string name="export_error_label">Viga eksportimisel</string>
-  <string name="opml_export_success_title">OPML eksport oli edukas.</string>
-  <string name="opml_export_success_sum">.opml fail kirjutati kausta:\u0020</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Määra unetaimer</string>
   <string name="disable_sleeptimer_label">Keela unetaimer</string>
@@ -368,6 +355,9 @@
     <item quantity="one">1 tund</item>
     <item quantity="other">%d tundi</item>
   </plurals>
+  <string name="auto_enable_label">Automaatne kustutamine</string>
+  <string name="sleep_timer_enabled_label">Unetaimer on sisse lülitatud</string>
+  <string name="sleep_timer_disabled_label">Unetaimer on välja lülitatud</string>
   <!--gpodder.net-->
   <string name="gpodnet_taglist_header">KATEGOORIAD</string>
   <string name="gpodnet_toplist_header">POPIMAD TASKUHÄÄLINGUD</string>
@@ -385,6 +375,7 @@
   <string name="gpodnetauth_device_chooseExistingDevice">Vali olemasolev seade:</string>
   <string name="gpodnetauth_device_errorEmpty">Seadme ID ei tohi olla tühi</string>
   <string name="gpodnetauth_device_errorAlreadyUsed">Seadme ID on juba kasutuses</string>
+  <string name="gpodnetauth_device_caption_errorEmpty">Pealkiri ei tohi olla tühi</string>
   <string name="gpodnetauth_device_butChoose">Vali</string>
   <string name="gpodnetauth_finish_title">Sisse logitud!</string>
   <string name="gpodnetauth_finish_butsyncnow">Alusta kohe sünkroonimist</string>
@@ -490,9 +481,17 @@
   <string name="proxy_test_successful">Kontroll oli edukas</string>
   <string name="proxy_test_failed">Kontroll ebaõnnestus</string>
   <string name="proxy_host_empty_error">Hostinimi ei saa olla tühi</string>
+  <string name="proxy_host_invalid_error">Se pole korrektne IP aadress või domeen</string>
   <string name="proxy_port_invalid_error">Port pole korrektne</string>
   <!--Database import/export-->
+  <string name="import_export">Andmebaasi importimine/eksportimine</string>
+  <string name="label_import">Impordi</string>
+  <string name="label_export">Ekspordi</string>
+  <string name="import_select_file">Vali fail, mida importida</string>
+  <string name="export_ok">Eksportimine on sooritatud.</string>
   <!--Casting-->
   <string name="cast_media_route_menu_title">Esita...</string>
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <string name="cast_failed_media_error_skipping">Tõrge meedia esitamisel. Jätame vahele...</string>
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-fa/strings.xml b/core/src/main/res/values-fa/strings.xml
index fb8bb5e7c..dc6e7cb2e 100644
--- a/core/src/main/res/values-fa/strings.xml
+++ b/core/src/main/res/values-fa/strings.xml
@@ -1,15 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
+  <string name="feed_update_receiver_name">به‌روز رسانی اشتراک‌ها</string>
   <string name="feeds_label">خوراک</string>
   <string name="statistics_label">آمار</string>
   <string name="add_feed_label">اضافه کردن پادکست</string>
-  <string name="episodes_label">قسمت ها</string>
+  <string name="episodes_label">قسمت‌ها</string>
   <string name="all_episodes_short_label">همه</string>
+  <string name="new_episodes_label">جدید</string>
   <string name="favorite_episodes_label">علاقه مندی ها</string>
   <string name="new_label">جدید</string>
   <string name="settings_label">تنظیمات</string>
-  <string name="downloads_label">دانلودها</string>
+  <string name="downloads_label">بارگیری‌ها</string>
   <string name="downloads_running_label">در حال اجرا</string>
   <string name="downloads_completed_label">تکمیل شده</string>
   <string name="downloads_log_label">log</string>
@@ -18,10 +20,12 @@
   <string name="cancel_download_label">بارگیری n\ لغو</string>
   <string name="playback_history_label">تاریخچه پخش</string>
   <string name="gpodnet_main_label">gpodder.net</string>
+  <string name="gpodnet_summary">هم‌گام‌سازی با دیگر دستگاه‌ها</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">ظرفیت حافظه پنهان تکمیل شده است</string>
   <string name="episode_cache_full_message">حد مجاز  تکمیل شده است . شما می توانید اندازه حافظه پنهان را در تنظیمات افزایش دهید.</string>
+  <string name="synchronizing">در حال هم‌گام‌سازی</string>
   <!--Statistics fragment-->
   <string name="total_time_listened_to_podcasts">مجموع زمان پخش پادکست ها:</string>
   <string name="statistics_mode">حالت آمار</string>
@@ -35,11 +39,11 @@
   <string name="drawer_feed_order_unplayed_episodes">مرتب سازی بر اساس شمارنده</string>
   <string name="drawer_feed_order_alphabetical">مرتب سازی بر اساس حروف الفبا</string>
   <string name="drawer_feed_order_last_update">مرتب سازی بر اساس تاریخ انتشار</string>
-  <string name="drawer_feed_order_most_played">مرتب سازی بر اساس تعداد قسمت پخش شده</string>
-  <string name="drawer_feed_counter_new_unplayed">تعداد قسمت های جدید و پخش نشده</string>
-  <string name="drawer_feed_counter_new">تعداد قسمت های جدید</string>
-  <string name="drawer_feed_counter_unplayed">تعداد قسمت های پخش نشده</string>
-  <string name="drawer_feed_counter_downloaded">تعداد قسمت های دانلود شده</string>
+  <string name="drawer_feed_order_most_played">مرتب‌سازی بر اساس تعداد قسمت پخش شده</string>
+  <string name="drawer_feed_counter_new_unplayed">تعداد قسمت‌های جدید و پخش نشده</string>
+  <string name="drawer_feed_counter_new">تعداد قسمت‌های جدید</string>
+  <string name="drawer_feed_counter_unplayed">تعداد قسمت‌های پخش نشده</string>
+  <string name="drawer_feed_counter_downloaded">تعداد قسمت‌های بارگیری شده</string>
   <string name="drawer_feed_counter_none">هیچ یک</string>
   <!--Webview actions-->
   <string name="open_in_browser_label">باز کردن در مرور گر</string>
@@ -55,7 +59,7 @@
   <string name="yes">بله</string>
   <string name="no">خیر</string>
   <string name="reset">بازنشانی</string>
-  <string name="author_label">نویسنده</string>
+  <string name="author_label">مؤلف(ها)</string>
   <string name="language_label">زبان</string>
   <string name="url_label">URL</string>
   <string name="podcast_settings_label">تنظیمات</string>
@@ -69,7 +73,7 @@
   <string name="shownotes_label">Shownotes</string>
   <string name="description_label">شرح</string>
   <string name="most_recent_prefix">آخرین قسمت: \u0020</string>
-  <string name="episodes_suffix">\u0020قسمت ها</string>
+  <string name="episodes_suffix">\u0020قسمت</string>
   <string name="length_prefix">طول:\u0020</string>
   <string name="size_prefix">حجم:\u0020</string>
   <string name="processing_label">در حال پردازش</string>
@@ -78,10 +82,10 @@
   <string name="close_label">بستن</string>
   <string name="retry_label">تلاش مجدد</string>
   <string name="auto_download_label">شامل در دریافت خودکار است</string>
-  <string name="auto_download_apply_to_items_title">اعمال به قسمت های قبلی</string>
-  <string name="auto_download_apply_to_items_message">تنظیمات جدید<i>دانلود خودکار</i> به طور اتوماتیک به قسمت های جدید اعمال خواهد شد. \ n آیا شما همچنین می خواهید آن را به قسمت هایی که قبلا منتشر شده اعمال کنید؟</string>
-  <string name="auto_delete_label">حذف خودکار قسمت ها </string>
-  <string name="parallel_downloads_suffix">\u0020دانلود همزمان</string>
+  <string name="auto_download_apply_to_items_title">اعمال بر قسمت‌های قبلی</string>
+  <string name="auto_download_apply_to_items_message">تنظیمات جدید<i>بارگیری خودکار</i> به طور خودکار بر قسمت‌های جدید اعمال خواهد شد.\n آیا می‌خواهید آن را بر قسمت‌هایی که قبلا منتشر شده نیز اعمال کنید؟</string>
+  <string name="auto_delete_label">حذف خودکار قسمت</string>
+  <string name="parallel_downloads_suffix">\u0020بارگیری هم‌زمان</string>
   <string name="feed_auto_download_global">پیش فرض جهانی</string>
   <string name="feed_auto_download_always">همیشه</string>
   <string name="feed_auto_download_never">Never</string>
@@ -90,6 +94,7 @@
   <string name="episode_cleanup_queue_removal">وقتی که در صف نیست</string>
   <string name="episode_cleanup_after_listening">بعد از تمام شدن</string>
   <plurals name="episode_cleanup_days_after_listening">
+    <item quantity="one">%dروز بعد از اتمام</item>
     <item quantity="other">%dروز بعد از اتمام</item>
   </plurals>
   <!--'Add Feed' Activity labels-->
@@ -101,46 +106,45 @@
   <string name="browse_gpoddernet_label">Browse gpodder.net</string>
   <!--Actions on feeds-->
   <string name="mark_all_read_label">علامت گذاری همه به عنوان پخش شده</string>
-  <string name="mark_all_read_msg">همه قسمت ها به عنوان پخش شده علامت گذاری شد.</string>
-  <string name="mark_all_read_confirmation_msg">لطفا تأیید کنید که میخواهید تمام قسمتها را بعنوان پخش شده علامت بزنید.</string>
-  <string name="mark_all_read_feed_confirmation_msg">لطفا تأیید کنید که میخواهید تمام قسمتهای این خوراک را بعنوان پخش شده علامت بزنید.</string>
+  <string name="mark_all_read_msg">همه قسمت‌ها به عنوان پخش شده علامت‌گذاری شد</string>
+  <string name="mark_all_read_confirmation_msg">لطفا تأیید کنید که می‌خواهید تمام قسمت‌ها را به عنوان پخش شده علامت بزنید.</string>
   <string name="mark_all_seen_label">علامت گذاری همه به عنوان دیده شده</string>
-  <string name="mark_all_seen_msg">همه قسمت ها بعنوان دیده شده علامت گذاری شد.</string>
-  <string name="mark_all_seen_confirmation_msg">لطفا تأیید کنید که میخواهید تمام قسمتها را بعنوان دیده شده علامت بزنید.</string>
+  <string name="mark_all_seen_confirmation_msg">لطفا تأیید کنید که می‌خواهید تمام قسمت‌ها را به عنوان دیده شده علامت بزنید.</string>
   <string name="show_info_label">نمایش اطلاعات</string>
-  <string name="rename_feed_label"> تغییر نام پادکست</string>
-  <string name="remove_feed_label">حذف پادکست</string>
+  <string name="show_feed_settings_label">نمایش تنظیمات پادکست</string>
+  <string name="feed_info_label">اطلاعات پادکست</string>
+  <string name="feed_settings_label">تنظیمات پادکست</string>
+  <string name="rename_feed_label">تغییر نام پادکست</string>
+  <string name="remove_feed_label">پاک‌کردن پادکست</string>
   <string name="share_label">اشتراک گذاری...</string>
-  <string name="share_link_label">اشتراک گذاری لینک</string>
+  <string name="share_link_label">هم‌رسانی نشانی پادکست</string>
   <string name="share_file_label">اشتراک گذاری فایل</string>
-  <string name="share_link_with_position_label">اشتراک گذاری لینک با موقعیت پخش</string>
   <string name="share_feed_url_label">اشتراک گذاری URL خوراک </string>
-  <string name="share_item_url_label">اشتراک گذاری فایل URL  قسمت</string>
-  <string name="share_item_url_with_position_label">اشتراک گذاری فایل URL قسمت با موقعیت پخش</string>
-  <string name="feed_delete_confirmation_msg">لطفا تأیید کنید که میخواهید خوراک \"%1$s\" و تمام قسمتهای آن که دانلود کرده اید را حذف کنید.</string>
-  <string name="feed_remover_msg">حذف خوراک</string>
-  <string name="load_complete_feed">تازه کردن کامل خوراک</string>
-  <string name="hide_episodes_title">پنهان کردن قسمت ها</string>
-  <string name="episode_actions">درخواست اعمال</string>
+  <string name="share_item_url_label">هم‌رسانی نشانی پرونده رسانه</string>
+  <string name="feed_remover_msg">در حال پاک‌کردن پادکست</string>
+  <string name="load_complete_feed">تازه‌سازی تمام پادکست</string>
+  <string name="hide_episodes_title">پنهان کردن قسمت‌ها</string>
+  <string name="batch_edit">ویرایش گروهی</string>
   <string name="hide_unplayed_episodes_label">پخش نشده</string>
   <string name="hide_paused_episodes_label">متوقف شد</string>
   <string name="hide_played_episodes_label">پخش شد</string>
   <string name="hide_queued_episodes_label">در صف</string>
   <string name="hide_not_queued_episodes_label">خارج از صف</string>
-  <string name="hide_downloaded_episodes_label">دانلود شده</string>
-  <string name="hide_not_downloaded_episodes_label">دانلود نشده</string>
+  <string name="hide_downloaded_episodes_label">بارگیری شده</string>
+  <string name="hide_not_downloaded_episodes_label">بارگیری نشده</string>
   <string name="hide_has_media_label">دارای رسانه</string>
   <string name="filtered_label">فیلتر شده</string>
   <string name="open_podcast">باز کردن پادکست</string>
   <!--actions on feeditems-->
-  <string name="download_label">دانلود</string>
+  <string name="download_label">بارگیری</string>
   <string name="play_label">پخش</string>
   <string name="pause_label">مکث</string>
   <string name="stop_label">توقف</string>
+  <string name="stream_label">جریان</string>
   <string name="remove_label">حذف</string>
   <string name="delete_label">حذف</string>
   <string name="delete_failed">فایل حذف نشد.! راه اندازی مجدد دستگاه می تواند کمک کند.</string>
-  <string name="remove_episode_lable">حذف قسمت</string>
+  <string name="remove_episode_lable">پاک کردن قسمت</string>
   <string name="marked_as_seen_label">علامت گذاری به عنوان دیده شده</string>
   <string name="mark_read_label">علامت گذاری به عنوان پخش شده</string>
   <string name="marked_as_read_label">بعنوان پخش شده علامت گذاری شد</string>
@@ -152,16 +156,19 @@
   <string name="added_to_favorites">به موارد دلخواه اضافه شد.</string>
   <string name="remove_from_favorite_label">از علاقه مندی ها حذف شود</string>
   <string name="removed_from_favorites">از موارد دلخواه حذف شد.</string>
+  <string name="visit_website_label">مشاهده وب‌سایت</string>
   <string name="skip_episode_label">رد شدن از قسمت</string>
-  <string name="activate_auto_download">فعال کردن دانلود خودکار</string>
-  <string name="deactivate_auto_download">غیر فعال کردن دانلود خودکار</string>
+  <string name="activate_auto_download">فعال کردن بارگیری خودکار</string>
+  <string name="deactivate_auto_download">غیر فعال کردن بارگیری خودکار</string>
   <string name="reset_position">تنظیم مجدد موقعیت پخش</string>
   <string name="removed_item">مورد حذف شده است</string>
   <!--Download messages and labels-->
   <string name="download_successful">موفقیت آمیز</string>
   <string name="download_failed">ناموفق</string>
-  <string name="download_pending">دانلود در حال انتظار</string>
-  <string name="download_running">دانلود در حال اجرا</string>
+  <string name="download_pending">بارگیری معوق</string>
+  <string name="download_running">بارگیری در حال اجرا</string>
+  <string name="download_error_details">جزئیات</string>
+  <string name="download_error_details_message">%1$s\n\nنشانی پرونده:\n%2$s</string>
   <string name="download_error_device_not_found">حافظه خارجی یافت نشد.</string>
   <string name="download_error_insufficient_space">فضای ناکافی</string>
   <string name="download_error_file_error">خطای فایل</string>
@@ -171,24 +178,121 @@
   <string name="download_error_connection_error">خطای اتصال</string>
   <string name="download_error_unknown_host">میزبان ناشناس</string>
   <string name="download_error_unauthorized">خطای احراز هویت</string>
-  <string name="cancel_all_downloads_label">لغو همه دانلودها</string>
-  <string name="download_canceled_msg">دانلود لغو شد.</string>
+  <string name="download_error_file_type_type">خطای نوع پرونده</string>
+  <string name="download_error_forbidden">ممنوع</string>
+  <string name="cancel_all_downloads_label">لغو همه بارگیری‌ها</string>
+  <string name="download_canceled_msg">بارگیری لغو شد.</string>
   <string name="download_canceled_autodownload_enabled_msg"> دانلود لغو \n غیرفعال  کردن <i> دانلود خودکار </i> برای این مورد </string>
+  <string name="download_report_title">بارگیری‌ها با خطا(ها) کامل شد</string>
+  <string name="download_report_content_title">گزارش بارگیری</string>
+  <string name="download_error_io_error">خطای ورودی/خروجی</string>
+  <string name="download_error_request_error">خطای درخواست</string>
+  <string name="download_error_db_access">خطای دسترسی به پایگاه‌داده</string>
+  <string name="downloads_processing">پردازش بارگیری‌ها</string>
+  <string name="download_notification_title">بارگیری داده پادکست</string>
+  <string name="download_log_title_unknown">عنوان ناشناخته</string>
   <string name="download_type_feed">خوراک</string>
+  <string name="download_type_media">پرونده رسانه</string>
+  <string name="download_type_image">تصویر</string>
+  <string name="confirm_mobile_download_dialog_enable_temporarily">اجازه موقت</string>
   <!--Mediaplayer messages-->
+  <string name="player_error_msg">خطا!</string>
+  <string name="player_stopped_msg">رسانه‌ای در حال پخش نیست</string>
+  <string name="player_preparing_msg">آماده‌سازی</string>
+  <string name="player_ready_msg">آماده</string>
+  <string name="playback_error_unknown">خطای ناشناخته</string>
+  <string name="no_media_playing_label">رسانه‌ای در حال پخش نیست</string>
+  <string name="player_go_to_picture_in_picture">حالت تصویر در تصویر</string>
+  <string name="playbackservice_notification_title">در حال پخش پادکست</string>
   <!--Queue operations-->
+  <string name="clear_queue_label">پاک‌کردن صف</string>
+  <string name="sort">مرتب‌سازی</string>
+  <string name="date">تاریخ</string>
+  <string name="duration">مدت</string>
+  <string name="episode_title">عنوان قسمت</string>
+  <string name="feed_title">عنوان پادکست</string>
+  <string name="random">تصادفی</string>
   <!--Flattr-->
+  <string name="return_home_label">بازگشت به خانه</string>
   <!--Flattr-->
   <!--Variable Speed-->
   <!--Empty list labels-->
   <!--Preferences-->
+  <string name="storage_pref">حافظه</string>
+  <string name="project_pref">پروژه</string>
+  <string name="other_pref">دیگر</string>
+  <string name="about_pref">درباره</string>
+  <string name="queue_label">صف</string>
+  <string name="download_pref_details">جزئیات</string>
+  <string name="import_export_pref">وارد/صادر کرد</string>
+  <string name="appearance">نمایش</string>
+  <string name="external_elements">عناصر خارجی</string>
+  <string name="buttons">دکمه‌های کنترل پخش</string>
+  <string name="media_player">پخش‌کننده رسانه</string>
+  <string name="pref_auto_delete_title">حذف خودکار</string>
+  <string name="playback_pref">پخش</string>
+  <string name="network_pref">شبکه</string>
+  <string name="user_interface_label">رابط کاربری</string>
+  <string name="pref_set_theme_title">انتخاب پوسته</string>
+  <string name="pref_theme_title_light">روشن</string>
+  <string name="pref_theme_title_dark">تاریک</string>
+  <string name="pref_theme_title_trueblack">سیاه (مناسب AMOLED)</string>
+  <string name="pref_episode_cache_unlimited">نامحدود</string>
+  <string name="pref_update_interval_hours_plural">ساعت</string>
+  <string name="pref_update_interval_hours_singular">ساعت</string>
+  <string name="pref_update_interval_hours_manual">دستی</string>
+  <string name="pref_gpodnet_authenticate_title">ورود</string>
+  <string name="pref_gpodnet_logout_title">خروج</string>
+  <string name="pref_gpodnet_logout_toast">خروج موفقیت‌آمیز بود</string>
+  <string name="pref_gpodnet_setlogin_information_title">تغییر اطلاعات ورود</string>
+  <string name="pref_playback_speed_title">سرعت‌های پخش</string>
+  <string name="pref_lockscreen_background_title">تنظیم پس‌زمینه صفحه قفل</string>
+  <string name="pref_queueAddToFront_title">فرستادن به جلوی صف</string>
+  <string name="pref_smart_mark_as_played_disabled">غیرفعال</string>
+  <string name="crash_report_title">گزارش مشکل</string>
+  <string name="crash_report_sum">فرستادن گزارش آخرین مشکل با رایانامه</string>
+  <string name="send_email">فرستادن رایانامه</string>
+  <string name="experimental_pref">آزمایشی</string>
+  <string name="pref_proxy_title">پروکسی</string>
+  <string name="pref_proxy_sum">تنظیم پروکسی شبکه</string>
+  <string name="pref_faq">سوالات پرتکرار</string>
+  <string name="pref_known_issues">مشکلات شناخته شده</string>
+  <string name="pref_no_browser_found">مرورگر وب پیدا نشد.</string>
+  <string name="pref_cast_title">پشتیبانی از کروم‌کست</string>
+  <string name="pref_enqueue_downloaded_title">در صف نهادن بارگیری‌شده‌ها</string>
+  <string name="media_player_builtin">پخش‌کننده پیش‌فرض اندروید</string>
+  <string name="stop_playback">توقف پخش</string>
+  <string name="continue_playback">ادامه پخش صدا</string>
   <!--Auto-Flattr dialog-->
   <!--Search-->
+  <string name="search_hint">جستجو برای قسمت‌ها</string>
+  <string name="search_status_no_results">نتیجه‌ای یافت نشد</string>
+  <string name="search_label">جستجو</string>
   <!--OPML import and export-->
+  <string name="opml_directory_error">خطا!</string>
+  <string name="select_all_label">انتخاب همه</string>
+  <string name="deselect_all_label">انتخاب هیچ</string>
+  <string name="select_options_label">انتخاب...</string>
   <!--Sleep timer-->
+  <string name="time_seconds">ثانیه</string>
+  <string name="time_minutes">دقیقه</string>
+  <string name="time_hours">ساعت</string>
   <!--gpodder.net-->
+  <string name="gpodnetsync_pref_report_successful">موفق</string>
+  <string name="gpodnetsync_pref_report_failed">ناموفق</string>
   <!--Directory chooser-->
+  <string name="selected_folder_label">پوشه انتخاب شده:</string>
+  <string name="create_folder_label">ساخت پوشه</string>
+  <string name="choose_data_directory">انتخاب پوشه داده</string>
+  <string name="create_folder_success">ساخت پوشه جدید</string>
+  <string name="create_folder_error_already_exists">این پوشه از قبل موجود است</string>
+  <string name="create_folder_error">ناتوانی در ساخت پوشه</string>
+  <string name="folder_not_empty_dialog_title">این پوشه، خالی نیست</string>
+  <string name="set_to_default_folder">انتخاب پوشه پیش‌فرض</string>
   <!--Online feed view-->
+  <string name="subscribe_label">اشتراک</string>
+  <string name="subscribed_label">مشترک‌شده</string>
+  <string name="downloading_label">درحال بارگیری...</string>
   <!--Content descriptions for image buttons-->
   <!--Feed information screen-->
   <!--Progress information-->
@@ -201,4 +305,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-fi/strings.xml b/core/src/main/res/values-fi/strings.xml
index acf3abe75..2d9481b84 100644
--- a/core/src/main/res/values-fi/strings.xml
+++ b/core/src/main/res/values-fi/strings.xml
@@ -36,4 +36,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-fr/strings.xml b/core/src/main/res/values-fr/strings.xml
index dc4e356bf..11c41d415 100644
--- a/core/src/main/res/values-fr/strings.xml
+++ b/core/src/main/res/values-fr/strings.xml
@@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
+  <string name="feed_update_receiver_name">Mettre à jour les abonnements</string>
   <string name="feeds_label">Flux</string>
   <string name="statistics_label">Statistiques</string>
   <string name="add_feed_label">Ajouter un podcast</string>
-  <string name="episodes_label">Épisodes</string>
+  <string name="episodes_label">Episodes</string>
   <string name="all_episodes_short_label">Tout</string>
+  <string name="new_episodes_label">Nouveaux</string>
   <string name="favorite_episodes_label">Favoris</string>
   <string name="new_label">Nouveau</string>
   <string name="settings_label">Préférences</string>
@@ -18,10 +20,12 @@
   <string name="cancel_download_label">Annuler les téléchargements</string>
   <string name="playback_history_label">Journal de lecture</string>
   <string name="gpodnet_main_label">gpodder.net</string>
+  <string name="gpodnet_summary">Synchroniser avec d\'autres appareils</string>
   <string name="gpodnet_auth_label">Identifiants gpodder.net</string>
   <string name="free_space_label">%1$s d\'espace libre</string>
   <string name="episode_cache_full_title">L\'emplacement pour stocker les épisodes est plein</string>
   <string name="episode_cache_full_message">Le nombre maximal d\'épisodes téléchargés a été atteint. Vous pouvez changer ce nombre dans les paramètres.</string>
+  <string name="synchronizing">Synchronisation...</string>
   <!--Statistics fragment-->
   <string name="total_time_listened_to_podcasts">Temps d\'écoute total</string>
   <string name="statistics_details_dialog">%1$d épisodes sur %2$d commencés.\n\nLu %3$s sur %4$s.</string>
@@ -44,9 +48,9 @@
   <string name="drawer_feed_counter_none">Aucun</string>
   <!--Webview actions-->
   <string name="open_in_browser_label">Ouvrir dans le navigateur</string>
-  <string name="copy_url_label">Copier l\'URL</string>
-  <string name="share_url_label">Partager l\'URL</string>
-  <string name="copied_url_msg">URL copiée dans le presse-papier</string>
+  <string name="copy_url_label">Copier le lien</string>
+  <string name="share_url_label">Partager le lien</string>
+  <string name="copied_url_msg">Lien copié dans le presse-papier</string>
   <string name="go_to_position_label">Aller à cette position</string>
   <!--Playback history-->
   <string name="clear_history_label">Effacer le journal</string>
@@ -56,13 +60,14 @@
   <string name="yes">Oui</string>
   <string name="no">Non</string>
   <string name="reset">Réinitialiser</string>
-  <string name="author_label">Auteur</string>
+  <string name="author_label">Auteur(s)</string>
   <string name="language_label">Langue</string>
-  <string name="url_label">URL</string>
+  <string name="url_label">Lien</string>
   <string name="podcast_settings_label">Préférences</string>
   <string name="cover_label">Image</string>
   <string name="error_label">Erreur</string>
   <string name="error_msg_prefix">Une erreur a eu lieu :</string>
+  <string name="needs_storage_permission">L\'autorisation d\'utiliser le stockage est requis pour cette opération</string>
   <string name="refresh_label">Rafraîchir</string>
   <string name="external_storage_error_msg">Aucun stockage externe n\'est disponible. Merci de connecter un  volume de stockage externe pour que l\'application puisse fonctionner correctement.</string>
   <string name="chapters_label">Chapitres</string>
@@ -83,7 +88,7 @@
   <string name="auto_download_apply_to_items_message">Le nouveau paramètre <i>Téléchargement Automatique</i> sera automatiquement appliqué sur chaque nouvel épisode.\nVoulez-vous faire de même avec les épisodes précédents ?</string>
   <string name="auto_delete_label">Suppression automatique de l\'épisode</string>
   <string name="parallel_downloads_suffix">\u0020téléchargements parallèles</string>
-  <string name="feed_auto_download_global">Global défaut</string>
+  <string name="feed_auto_download_global">Option par défaut</string>
   <string name="feed_auto_download_always">Toujours</string>
   <string name="feed_auto_download_never">Jamais</string>
   <string name="send_label">Envoyer...</string>
@@ -95,9 +100,9 @@
     <item quantity="other">%d jours après avoir été écouté</item>
   </plurals>
   <!--'Add Feed' Activity labels-->
-  <string name="feedurl_label">URL du flux</string>
-  <string name="etxtFeedurlHint">URL du flux</string>
-  <string name="txtvfeedurl_label">Ajouter un podcast par son URL</string>
+  <string name="feedurl_label">Lien du flux</string>
+  <string name="etxtFeedurlHint">www.example.com/feed</string>
+  <string name="txtvfeedurl_label">Ajouter un podcast à partir de son lien</string>
   <string name="podcastdirectories_label">Trouver le podcast dans la bibliothèque</string>
   <string name="podcastdirectories_descr">Pour de nouveaux podcasts vous pouvez chercher iTunes ou fyyd ou parcourir gpodder.net par nom, catégorie ou popularité.</string>
   <string name="browse_gpoddernet_label">Chercher sur gpodder.net</string>
@@ -105,33 +110,37 @@
   <string name="mark_all_read_label">Marquer tous les épisodes comme lus</string>
   <string name="mark_all_read_msg">Tous les épisodes ont été marqués comme lus</string>
   <string name="mark_all_read_confirmation_msg">Confirmer le marquage de tous les épisode comme lus</string>
-  <string name="mark_all_read_feed_confirmation_msg">Confirmer le marquage de tous les épisode de ce flux comme lus</string>
+  <string name="mark_all_read_feed_confirmation_msg">Confirmer le marquage de tous les épisodes de ce podcast comme lus</string>
   <string name="mark_all_seen_label">Marquer tous les épisodes comme vus</string>
   <string name="mark_all_seen_msg">Tous les épisodes ont été marqués vus</string>
   <string name="mark_all_seen_confirmation_msg">Merci de confirmer que vous voulez marquer tous les épisodes comme vus.</string>
   <string name="show_info_label">Voir les détails</string>
+  <string name="show_feed_settings_label">Paramètres du podcast...</string>
+  <string name="feed_info_label">Infos du podcast</string>
+  <string name="feed_settings_label">Paramètres du podcast</string>
   <string name="rename_feed_label">Renommer le podcast</string>
   <string name="remove_feed_label">Supprimer le podcast</string>
   <string name="share_label">Partager...</string>
-  <string name="share_link_label">Partager un lien vers le site</string>
+  <string name="share_link_label">Partager le lien</string>
+  <string name="share_link_with_position_label">Partager le lien avec la position</string>
   <string name="share_file_label">Partager le fichier</string>
-  <string name="share_link_with_position_label">Partager lien avec position</string>
-  <string name="share_feed_url_label">Partager lien du flux</string>
-  <string name="share_item_url_label">Partager le lien de l\'épisode</string>
-  <string name="share_item_url_with_position_label">Partager le lien de l\'épisode avec la position</string>
-  <string name="feed_delete_confirmation_msg">Confirmer que vous voulez supprimer le flux \"%1$s\" et TOUS les épisodes que vous avez téléchargés.</string>
-  <string name="feed_remover_msg">Flux en cours de suppression</string>
-  <string name="load_complete_feed">Mettre à jour tout le flux</string>
+  <string name="share_feed_url_label">Partager le lien du flux</string>
+  <string name="share_item_url_label">Partager le lien du fichier</string>
+  <string name="share_item_url_with_position_label">Partager le lien du fichier avec la position</string>
+  <string name="feed_delete_confirmation_msg">Confirmer que vous voulez supprimer le podcast \"%1$s\" et TOUS ses épisodes téléchargés.</string>
+  <string name="feed_remover_msg">Podcast en cours de suppression</string>
+  <string name="load_complete_feed">Mettre à jour tout le podcast</string>
   <string name="hide_episodes_title">Cacher épisodes</string>
-  <string name="episode_actions">Appliquer les actions</string>
-  <string name="hide_unplayed_episodes_label">Non joués</string>
+  <string name="batch_edit">Edition groupée</string>
+  <string name="hide_unplayed_episodes_label">Non lus</string>
   <string name="hide_paused_episodes_label">En pause</string>
-  <string name="hide_played_episodes_label">Joués</string>
-  <string name="hide_queued_episodes_label">Rajouté à la liste de lecture</string>
-  <string name="hide_not_queued_episodes_label">Non rajouté à la liste de lecture</string>
+  <string name="hide_played_episodes_label">Lus</string>
+  <string name="hide_queued_episodes_label">Dans la liste de lecture</string>
+  <string name="hide_not_queued_episodes_label">Pas dans la liste de lecture</string>
   <string name="hide_downloaded_episodes_label">Téléchargé</string>
   <string name="hide_not_downloaded_episodes_label">Non téléchargé</string>
-  <string name="hide_has_media_label">À des médias</string>
+  <string name="hide_has_media_label">Avec média</string>
+  <string name="hide_is_favorite_label">Est un favori</string>
   <string name="filtered_label">Filtré</string>
   <string name="refresh_failed_msg">{fa-exclamation-circle} La dernière mise à jour a échoué</string>
   <string name="open_podcast">Ouvrir Podcast</string>
@@ -144,7 +153,8 @@
   <string name="remove_label">Supprimer</string>
   <string name="delete_label">Effacer</string>
   <string name="delete_failed">Suppression du fichier impossible. Redémarrer pourrait aider.</string>
-  <string name="remove_episode_lable">Supprimer cet épisode</string>
+  <string name="remove_episode_lable">Supprimer</string>
+  <string name="mark_as_seen_label">Marquer comme vu</string>
   <string name="marked_as_seen_label">Marqué comme vu</string>
   <string name="mark_read_label">Marquer comme lu</string>
   <string name="marked_as_read_label">Les épisodes ont été marqués comme lus</string>
@@ -168,6 +178,8 @@
   <string name="download_failed">échoué</string>
   <string name="download_pending">Téléchargement en attente</string>
   <string name="download_running">Téléchargement en cours</string>
+  <string name="download_error_details">Détails</string>
+  <string name="download_error_details_message">%1$s \n\nLien du fichier :\n%2$s</string>
   <string name="download_error_device_not_found">Volume de stockage non trouvé</string>
   <string name="download_error_insufficient_space">Espace insuffisant</string>
   <string name="download_error_file_error">Accès au fichier impossible</string>
@@ -185,7 +197,7 @@
   <string name="download_canceled_autodownload_enabled_msg">Téléchargement annulé\n <i>Téléchargement Automatique</i> désactivé pour cet élément</string>
   <string name="download_report_title">Téléchargements terminés avec des erreurs</string>
   <string name="download_report_content_title">Rapport des téléchargements</string>
-  <string name="download_error_malformed_url">URL incorrecte</string>
+  <string name="download_error_malformed_url">Lien incorrecte</string>
   <string name="download_error_io_error">Erreur d\'E/S</string>
   <string name="download_error_request_error">Erreur de requête</string>
   <string name="download_error_db_access">Problème d\'accès à la base de données</string>
@@ -218,6 +230,7 @@
   <string name="playback_error_unknown">Erreur inconnue</string>
   <string name="no_media_playing_label">Aucune lecture</string>
   <string name="player_buffering_msg">Mise en mémoire</string>
+  <string name="player_go_to_picture_in_picture">Mode Picture-in-Picture</string>
   <string name="playbackservice_notification_title">Lecture de podcast en cours</string>
   <string name="unknown_media_key">AntennaPod - Touche média inconnue : %1$d</string>
   <!--Queue operations-->
@@ -234,7 +247,9 @@
   <string name="date">Date</string>
   <string name="duration">Durée</string>
   <string name="episode_title">Titre de l\'épisode</string>
-  <string name="feed_title">Nom du flux</string>
+  <string name="feed_title">Nom du podcast</string>
+  <string name="random">Aléatoire</string>
+  <string name="smart_shuffle">Tri intelligent</string>
   <string name="ascending">Ordre croissant</string>
   <string name="descending">Ordre décroissant</string>
   <string name="clear_queue_confirmation_msg">Veuillez confirmer que vous voulez bien supprimer TOUS les épisodes de la liste de lecture</string>
@@ -272,30 +287,38 @@
   <string name="enable_sonic">Activer Sonic</string>
   <!--Empty list labels-->
   <string name="no_items_label">Cette liste est vide.</string>
-  <string name="no_feeds_label">Vous n\'êtes encore abonné à aucun flux.</string>
+  <string name="no_feeds_label">Vous n\'êtes encore abonné à aucun podcast.</string>
   <string name="no_chapters_label">Cet épisode n\'a pas de chapitres.</string>
-  <string name="no_shownotes_label">Aucun descriptif pour cet épisode.</string>
+  <string name="no_shownotes_label">Aucune notes pour cet épisode.</string>
   <!--Preferences-->
   <string name="storage_pref">Stockage</string>
   <string name="project_pref">Projet</string>
   <string name="other_pref">Autres</string>
   <string name="about_pref">À propos</string>
-  <string name="queue_label">Liste</string>
-  <string name="services_label">Services</string>
+  <string name="queue_label">Liste de lecture</string>
+  <string name="integrations_label">Intégrations</string>
   <string name="flattr_label">Flattr</string>
+  <string name="flattr_summary">Service de micropaiement</string>
+  <string name="automation">Automatisation</string>
+  <string name="download_pref_details">Détails</string>
+  <string name="import_export_pref">Importation / Exportation</string>
+  <string name="appearance">Apparence</string>
+  <string name="external_elements">Eléments externes</string>
+  <string name="interruptions">Interruptions</string>
+  <string name="buttons">Boutons de lecture</string>
+  <string name="media_player">Lecteur multimédia</string>
   <string name="pref_episode_cleanup_title">Nettoyage des épisodes</string>
   <string name="pref_episode_cleanup_summary">Les épisodes qui ne sont pas dans la liste de lecture et qui ne sont pas marqués comme favoris peuvent être supprimés si l\'espace est insuffisant pour le téléchargement automatique de nouveaux épisodes</string>
   <string name="pref_pauseOnDisconnect_sum">Interrompre la lecture lorsque le casque ou le bluetooth sont déconnectés</string>
-  <string name="pref_unpauseOnHeadsetReconnect_sum">Reprendre la lecture quand les écouteurs sont reconnectés</string>
-  <string name="pref_unpauseOnBluetoothReconnect_sum">Reprendre la lecture quand le Bluetooth se reconnecte</string>
+  <string name="pref_unpauseOnHeadsetReconnect_sum">Reprendre la lecture quand les écouteurs sont connectés</string>
+  <string name="pref_unpauseOnBluetoothReconnect_sum">Reprendre la lecture quand le Bluetooth se connecte</string>
   <string name="pref_hardwareForwardButtonSkips_title">Le bouton \"saut avant\" saute l\'épisode</string>
-  <string name="pref_hardwareForwardButtonSkips_sum">Passer à l\'épisode suivant au lieu de faire un saut avant quand un bouton physique \"saut avant\" est pressé</string>
   <string name="pref_hardwarePreviousButtonRestarts_title">Le bouton \"saut arrière\" redémarre l\'épisode</string>
   <string name="pref_hardwarePreviousButtonRestarts_sum">Repartir de zéro au lieu de faire un saut arrière quand un bouton physique \"saut arrière\" est pressé</string>
   <string name="pref_followQueue_sum">Après la fin d\'un épisode, passer au suivant</string>
   <string name="pref_auto_delete_sum">Supprimer l\'épisode quand la lecture est finie</string>
   <string name="pref_auto_delete_title">Suppression automatique</string>
-  <string name="pref_smart_mark_as_played_sum">Les épisodes seront marqués comme lus même s\'il reste quelques secondes à jouer</string>
+  <string name="pref_smart_mark_as_played_sum">Les épisodes seront marqués comme lus même s\'il reste quelques secondes à écouter</string>
   <string name="pref_smart_mark_as_played_title">Marquer comme lu intelligemment</string>
   <string name="pref_skip_keeps_episodes_sum">Garder les épisodes quand ils sont passés</string>
   <string name="pref_skip_keeps_episodes_title">Garder les épisodes passés</string>
@@ -303,20 +326,20 @@
   <string name="pref_favorite_keeps_episodes_title">Garder les épisodes favoris</string>
   <string name="playback_pref">Lecture</string>
   <string name="network_pref">Réseau</string>
-  <string name="pref_autoUpdateIntervallOrTime_title">Mettre à jour l’intervalle ou l\'heure</string>
+  <string name="pref_autoUpdateIntervallOrTime_title">Intervalle / Heure de mise à jour</string>
   <string name="pref_autoUpdateIntervallOrTime_sum">Indiquer un intervalle ou une heure spécifique de mise à jour des flux</string>
-  <string name="pref_autoUpdateIntervallOrTime_message">Vous pouvez mettre en place un <i>intervalle</i> comme \"toutes les 2 heures\", une <i>heure précise</i> comme \"7:00\" ou désactiver les mises à jours automatique.\n\n<small>Note: Il est possible qu\'il y ait un délai car l\'heure de mise à jour peut être inexacte.</small></string>
+  <string name="pref_autoUpdateIntervallOrTime_message">Vous pouvez définir un <i>intervalle</i> comme \"toutes les 2 heures\" ou une <i>heure précise</i> comme \"7:00\" ou désactiver les mises à jours automatique.\n\n<small>Note: les heures de mise à jour ne sont pas précises. Vous pouvez avoir un petit délai.</small></string>
   <string name="pref_autoUpdateIntervallOrTime_Disable">Désactiver</string>
-  <string name="pref_autoUpdateIntervallOrTime_Interval">Définir intervalle</string>
-  <string name="pref_autoUpdateIntervallOrTime_TimeOfDay">Régler l\'heure</string>
+  <string name="pref_autoUpdateIntervallOrTime_Interval">Intervalle</string>
+  <string name="pref_autoUpdateIntervallOrTime_TimeOfDay">Heure</string>
   <string name="pref_autoUpdateIntervallOrTime_every">toutes les %1$s</string>
   <string name="pref_autoUpdateIntervallOrTime_at">à %1$s</string>
   <string name="pref_downloadMediaOnWifiOnly_sum">Ne télécharger les épisodes que par Wi-Fi</string>
   <string name="pref_followQueue_title">Lecture continue</string>
   <string name="pref_downloadMediaOnWifiOnly_title">Téléchargement en Wi-Fi</string>
-  <string name="pref_pauseOnHeadsetDisconnect_title">Déconnexion du casque</string>
-  <string name="pref_unpauseOnHeadsetReconnect_title">Reconnexion du casque</string>
-  <string name="pref_unpauseOnBluetoothReconnect_title">Reconnexion Bluetooth</string>
+  <string name="pref_pauseOnHeadsetDisconnect_title">Déconnexion des écouteurs ou du Bluetooth</string>
+  <string name="pref_unpauseOnHeadsetReconnect_title">Connexion des écouteurs</string>
+  <string name="pref_unpauseOnBluetoothReconnect_title">Connexion du Bluetooth</string>
   <string name="pref_mobileUpdate_title">Mises à jour mobile</string>
   <string name="pref_mobileUpdate_sum">Autoriser les mises à jour avec la connexion mobile</string>
   <string name="refreshing_label">Mise à jour en cours</string>
@@ -338,7 +361,7 @@
   <string name="pref_nav_drawer_feed_order_title">Définir l\'ordre des abonnements</string>
   <string name="pref_nav_drawer_feed_order_sum">Change l\'ordre de vos abonnements</string>
   <string name="pref_nav_drawer_feed_counter_title">Définir le compteur d\'abonnements</string>
-  <string name="pref_nav_drawer_feed_counter_sum">Changer l\'information affichée par le compteur d\'abonnements</string>
+  <string name="pref_nav_drawer_feed_counter_sum">Changer l\'information affichée par le compteur d\'abonnements. Cela change aussi l\'ordre des podcasts si ils sont triés par le compteur.</string>
   <string name="pref_set_theme_sum">Modifier l\'apparence d\'AntennaPod.</string>
   <string name="pref_automatic_download_title">Téléchargement automatique</string>
   <string name="pref_automatic_download_sum">Configurer le téléchargement automatique des épisodes.</string>
@@ -352,6 +375,7 @@
   <string name="pref_episode_cache_title">Épisodes stockés localement</string>
   <string name="pref_theme_title_light">Clair</string>
   <string name="pref_theme_title_dark">Sombre</string>
+  <string name="pref_theme_title_trueblack">Noir (pour écran AMOLED)</string>
   <string name="pref_episode_cache_unlimited">Illimité</string>
   <string name="pref_update_interval_hours_plural">heures</string>
   <string name="pref_update_interval_hours_singular">heure</string>
@@ -375,25 +399,23 @@
   <string name="pref_playback_speed_title">Vitesses de lecture</string>
   <string name="pref_playback_speed_sum">Définir les vitesses disponibles lors de la lecture audio</string>
   <string name="pref_fast_forward">Durée du saut avant</string>
-  <string name="pref_fast_forward_sum">Nombre de secondes à sauter quand le bouton \"saut avant\" est cliqué</string>
+  <string name="pref_fast_forward_sum">Nombre de secondes à sauter quand le bouton \"saut avant\" est pressé</string>
   <string name="pref_rewind">Durée du saut arrière</string>
-  <string name="pref_rewind_sum">Nombre de secondes à sauter quand le bouton \"saut arrière\" est cliqué</string>
+  <string name="pref_rewind_sum">Nombre de secondes à sauter quand le bouton \"saut arrière\" est pressé</string>
   <string name="pref_gpodnet_sethostname_title">Choisir un nom de domaine</string>
   <string name="pref_gpodnet_sethostname_use_default_host">Utiliser le nom de domaine par défaut</string>
-  <string name="pref_expandNotify_title">Etendre la notification</string>
-  <string name="pref_expandNotify_sum">Toujours étendre la notification pour montrer tous les boutons de lecture </string>
   <string name="pref_persistNotify_title">Boutons de lecture permanents</string>
   <string name="pref_persistNotify_sum">Garder les notifications et les boutons de lecture sur l\'écran de verouillage quand la lecture est en pause</string>
   <string name="pref_compact_notification_buttons_title">Définir les boutons de l\'écran de verrouillage</string>
   <string name="pref_compact_notification_buttons_sum">Change les boutons de lecture sur l\'écran de verrouillage. Le bouton de lecture/pause est toujours affiché.</string>
   <string name="pref_compact_notification_buttons_dialog_title">Choisir un maximum de %1$d éléments</string>
   <string name="pref_compact_notification_buttons_dialog_error">Vous ne pouvez pas choisir plus de %1$d éléments.</string>
-  <string name="pref_lockscreen_background_title">Changer l’arrière plan de l\'écran de déverrouillage</string>
-  <string name="pref_lockscreen_background_sum">Placer l\'image de l’épisode en arrière plan de l\'écran de déverrouillage. Cela aura aussi pour effet de montrer l\'image dans les autres applications.</string>
+  <string name="pref_lockscreen_background_title">Changer l’arrière plan de l\'écran de verrouillage</string>
+  <string name="pref_lockscreen_background_sum">Placer l\'image de l’épisode en arrière plan de l\'écran de verrouillage. Cela aura aussi pour effet de montrer l\'image dans les autres applications.</string>
   <string name="pref_showDownloadReport_title">Afficher le rapport de téléchargements</string>
   <string name="pref_showDownloadReport_sum">Si les téléchargements échouent, générer un rapport détaillé des échecs.</string>
   <string name="pref_expand_notify_unsupport_toast">Les versions d\'Android antérieures à 4.1 ne sont pas compatibles avec les notifications élargies</string>
-  <string name="pref_queueAddToFront_sum">Ajouter les nouveaux épisodes au début de la liste de lecture.</string>
+  <string name="pref_queueAddToFront_sum">Ajouter les nouveaux épisodes au début de la liste de lecture</string>
   <string name="pref_queueAddToFront_title">Mettre au début de la liste de lecture</string>
   <string name="pref_smart_mark_as_played_disabled">Désactivé</string>
   <string name="pref_image_cache_size_title">Taille du cache de l\'image</string>
@@ -402,8 +424,7 @@
   <string name="crash_report_sum">Envoyer le dernier rapport de crash par e-mail</string>
   <string name="send_email">Envoyer e-mail</string>
   <string name="experimental_pref">Expérimental</string>
-  <string name="pref_sonic_title">Lecteur multimédia Sonic</string>
-  <string name="pref_sonic_message">Utiliser le lecteur multimédia interne Sonic au lieu du lecteur natif d\'Android ou Prestissimo</string>
+  <string name="pref_media_player_message">Choisir le lecteur à utiliser pour lire les fichiers</string>
   <string name="pref_current_value">Valeur actuelle : %1$s</string>
   <string name="pref_proxy_title">Proxy</string>
   <string name="pref_proxy_sum">Paramétrer un réseau proxy</string>
@@ -415,17 +436,22 @@
   <string name="pref_cast_message_free_flavor">Chromecast nécessite des bibliothèques tierces qui sont désactivées dans cette version d\'AntennaPod</string>
   <string name="pref_enqueue_downloaded_title">Ajouter à la liste après téléchargement</string>
   <string name="pref_enqueue_downloaded_summary">Mettre les épisodes dans la la liste de lecture après téléchargement</string>
+  <string name="media_player_builtin">Lecteur natif d\'Android</string>
+  <string name="pref_videoBehavior_title">Sorti du lecteur pendant une vidéo</string>
+  <string name="pref_videoBehavior_sum">Définir ce qu\'il se passe si une vidéo est quittée pendant sa lecture</string>
+  <string name="stop_playback">Arrêter la lecture</string>
+  <string name="continue_playback">Continuer la lecture</string>
   <!--Auto-Flattr dialog-->
   <string name="auto_flattr_enable">Activer le paiement flattr automatique</string>
-  <string name="auto_flattr_after_percent">Lancer un paiement flattr pour un épisode dès que %d de l\'épisode a été joué</string>
+  <string name="auto_flattr_after_percent">Lancer un paiement flattr quand %d pourcent de l\'épisode a été lu</string>
   <string name="auto_flattr_ater_beginning">Lancer le paiement flattr d\'un épisode dès que la lecture commence</string>
   <string name="auto_flattr_ater_end">Lancer le paiement flattr d\'un épisode à la fin de la lecture</string>
   <!--Search-->
   <string name="search_hint">Chercher les épisodes</string>
   <string name="found_in_shownotes_label">Trouvé dans les notes d\'épisodes</string>
   <string name="found_in_chapters_label">Trouvé dans les titres de chapitre</string>
-  <string name="found_in_authors_label">Trouvés en tant qu\'auteur</string>
-  <string name="found_in_feeds_label">Trouvés dans les flux</string>
+  <string name="found_in_authors_label">Trouvés dans les auteurs</string>
+  <string name="found_in_feeds_label">Trouvés dans les podcasts</string>
   <string name="search_status_no_results">Aucun résultat trouvé</string>
   <string name="search_label">Recherche</string>
   <string name="found_in_title_label">Trouvé dans le titre</string>
@@ -437,7 +463,7 @@
   <string name="opml_import_explanation_2">Utiliser une application tierce comme Dropbox, Google Drive ou votre gestionnaire de fichier favori pour ouvrir un fichier OPML</string>
   <string name="opml_import_explanation_3">De nombreuses applications comme Google Mail, Dropbox ou Google Drive et la plupart des gestionnaires de fichiers peuvent <i>ouvrir</i> les fichiers OPML <i>avec</i> AntennaPod.</string>
   <string name="start_import_label">Démarrer l\'importation</string>
-  <string name="opml_import_label">Importation OPML</string>
+  <string name="opml_import_label">Import OPML</string>
   <string name="opml_directory_error">ERREUR !</string>
   <string name="reading_opml_label">Lecture du fichier OPML en cours</string>
   <string name="opml_reader_error">Une erreur s\'est produite pendant la lecture du fichier OPML :</string>
@@ -447,12 +473,12 @@
   <string name="select_options_label">Choisir...</string>
   <string name="choose_file_from_filesystem">Depuis le système de fichier local</string>
   <string name="choose_file_from_external_application">Utiliser une application tierce</string>
-  <string name="opml_export_label">Exportation OPML</string>
+  <string name="opml_export_label">Export OPML</string>
   <string name="html_export_label">Export HTML</string>
   <string name="exporting_label">Export en cours...</string>
   <string name="export_error_label">Erreur d\'exportation</string>
-  <string name="opml_export_success_title">Exportation OPML réussie.</string>
-  <string name="opml_export_success_sum">Le fichier .opml a été écrit ici :\u0020</string>
+  <string name="export_success_title">Export réussi</string>
+  <string name="export_success_sum">Le fichier a été exporté dans :\n\n%1$s</string>
   <string name="opml_import_ask_read_permission">L\'accès au stockage externe est requis pour lire le fichier OPML</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Activation du minuteur d\'arrêt</string>
@@ -565,25 +591,25 @@
   <string name="sp_apps_importing_feeds_msg">Importation des abonnements à partir d\'applications à usage unique...</string>
   <string name="search_itunes_label">Chercher sur iTunes</string>
   <string name="filter">Filtrer</string>
-  <string name="search_fyyd_label">Chercher fyyd</string>
+  <string name="search_fyyd_label">Chercher sur fyyd</string>
   <!--Episodes apply actions-->
   <string name="all_label">Tout</string>
   <string name="selected_all_label">Tous les épisodes ont été sélectionné</string>
   <string name="none_label">Aucun</string>
   <string name="deselected_all_label">Tous les épisodes ont été désélectionné</string>
-  <string name="played_label">Joués</string>
-  <string name="selected_played_label">Episodes joués sélectionnés</string>
-  <string name="unplayed_label">Non joués</string>
-  <string name="selected_unplayed_label">Episodes non joués sélectionnés</string>
+  <string name="played_label">Lus</string>
+  <string name="selected_played_label">Episodes lus sélectionnés</string>
+  <string name="unplayed_label">Non lus</string>
+  <string name="selected_unplayed_label">Episodes non lus sélectionnés</string>
   <string name="downloaded_label">Téléchargés</string>
   <string name="selected_downloaded_label">Episodes téléchargés sélectionnés</string>
   <string name="not_downloaded_label">Non téléchargés</string>
   <string name="selected_not_downloaded_label">Épisodes non téléchargés sélectionnés</string>
-  <string name="queued_label">Dans liste de lecture</string>
+  <string name="queued_label">Dans la liste de lecture</string>
   <string name="selected_queued_label">Episodes présents dans la liste de lecture sélectionnés</string>
   <string name="not_queued_label">En dehors de la liste de lecture</string>
   <string name="selected_not_queued_label">Episodes absents de la liste de lecture sélectionnés</string>
-  <string name="has_media">À des médias</string>
+  <string name="has_media">A des médias</string>
   <string name="selected_has_media_label">Sélectionner les épisodes avec des médias</string>
   <!--Sort-->
   <string name="sort_title_a_z">Titre (A \u2192 Z)</string>
@@ -620,12 +646,12 @@
   <string name="proxy_host_invalid_error">L\'hôte n\'est pas une adresse IP ou un domaine valide</string>
   <string name="proxy_port_invalid_error">Port non valide</string>
   <!--Database import/export-->
-  <string name="import_export">Importer/Exporter la base de données</string>
-  <string name="import_export_warning">Cette fonction expérimentale peut-être utilisée pour transférer vos abonnements et épisodes joués sur un autre appareil.\n\nLes bases de données exportées peuvent uniquement être importées sur la même version d\'AntennaPod. Dans le cas contraire, des dysfonctionnements peuvent survenir.\n\nAprès import, il est possible que des épisodes apparaissent téléchargés alors qu\'ils ne le sont pas. Appuyer sur le bouton de lecture pour qu\'AntennaPod le détecte.</string>
+  <string name="import_export">Import / Export de la base de données</string>
+  <string name="import_export_warning">Cette fonction expérimentale peut-être utilisée pour transférer vos abonnements et épisodes lus sur un autre appareil.\n\nLes bases de données exportées peuvent uniquement être importées sur la même version d\'AntennaPod. Dans le cas contraire, des dysfonctionnements peuvent apparaître.\n\nAprès import, il est possible que des épisodes apparaissent téléchargés alors qu\'ils ne le sont pas. Appuyer sur le bouton de lecture pour qu\'AntennaPod le détecte.</string>
   <string name="label_import">Importer</string>
   <string name="label_export">Exporter</string>
   <string name="import_select_file">Sélectionner le fichier à importer</string>
-  <string name="export_ok">Export réussi. La base de données a été écrite sur la carte SD.</string>
+  <string name="export_ok">Export réussi.</string>
   <string name="import_ok">Import réussi.\n\nAppuyer sur OK pour redémarrer AntennaPod</string>
   <!--Casting-->
   <string name="cast_media_route_menu_title">Lire sur...</string>
@@ -643,4 +669,13 @@
   <string name="cast_failed_seek">Échec de la recherche de la nouvelle position sur l\'appareil cast</string>
   <string name="cast_failed_receiver_player_error">Le lecteur de réception a rencontré une grave erreur</string>
   <string name="cast_failed_media_error_skipping">Erreur de lecture du média. Passage au suivant...</string>
+  <!--Notification channels-->
+  <string name="notification_channel_user_action">Action requise</string>
+  <string name="notification_channel_user_action_description">S\'affiche si une action est requise. Par exemple, un mot de passe à saisir.</string>
+  <string name="notification_channel_downloading">Téléchargement en cours</string>
+  <string name="notification_channel_downloading_description">S\'affiche lorsqu\'un téléchargement est en cours.</string>
+  <string name="notification_channel_playing">Lecture en cours</string>
+  <string name="notification_channel_playing_description">Permet de contrôler la lecture. C\'est la notification principale pendant la lecture d\'un podcast.</string>
+  <string name="notification_channel_error">Erreurs</string>
+  <string name="notification_channel_error_description">S\'affiche en cas de problème. Par exemple, un téléchargement ou une synchronisation qui échoue.</string>
 </resources>
diff --git a/core/src/main/res/values-gl-rES/strings.xml b/core/src/main/res/values-gl-rES/strings.xml
index 2dc04a5db..a2a4366ed 100644
--- a/core/src/main/res/values-gl-rES/strings.xml
+++ b/core/src/main/res/values-gl-rES/strings.xml
@@ -1,32 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
+  <string name="feed_update_receiver_name">Actualizar subscricións</string>
   <string name="feeds_label">Fontes</string>
   <string name="statistics_label">Estatísticas</string>
-  <string name="add_feed_label">Engadir Podcast</string>
+  <string name="add_feed_label">Engadir podcast</string>
   <string name="episodes_label">Episodios</string>
   <string name="all_episodes_short_label">Todo</string>
+  <string name="new_episodes_label">Novo</string>
   <string name="favorite_episodes_label">Favoritos</string>
   <string name="new_label">Novo</string>
   <string name="settings_label">Axustes</string>
   <string name="downloads_label">Descargas</string>
-  <string name="downloads_running_label">Descargando</string>
+  <string name="downloads_running_label">Funcionando</string>
   <string name="downloads_completed_label">Completado</string>
   <string name="downloads_log_label">Rexistro</string>
-  <string name="subscriptions_label">Suscricións</string>
-  <string name="subscriptions_list_label">Lista de suscricións</string>
+  <string name="subscriptions_label">Subscricións</string>
+  <string name="subscriptions_list_label">Lista de subscricións</string>
   <string name="cancel_download_label">Cancelar\nDescarga</string>
   <string name="playback_history_label">Historial de reprodución</string>
   <string name="gpodnet_main_label">gpodder.net</string>
+  <string name="gpodnet_summary">Sincronizar con outros dispositivos</string>
   <string name="gpodnet_auth_label">gpodder.net Conexión</string>
   <string name="free_space_label">%1$s libre</string>
   <string name="episode_cache_full_title">Caché de episodios chea</string>
   <string name="episode_cache_full_message">Acadouse o límite de espazo na caché de episodios. Pode incrementalo nos Axustes do tamaño da caché.</string>
+  <string name="synchronizing">Sincronizando...</string>
   <!--Statistics fragment-->
   <string name="total_time_listened_to_podcasts">Tempo total dos podcast reproducidos:</string>
   <string name="statistics_details_dialog">%1$d de %2$d episodios iniciados.\n\nReproducidos %3$s de %4$s.</string>
   <string name="statistics_mode">Modo de estatísticas</string>
-  <string name="statistics_mode_normal">Calcular a duración que foi realmente reproducida. Reproducir dúas veces conta dobre, mentras que marcar como lido non conta</string>
+  <string name="statistics_mode_normal">Calcular a duración que foi realmente reproducida. Reproducir dúas veces conta dobre, mentres que marcar como lido non conta</string>
   <string name="statistics_mode_count_all">Sumar todos os podcast marcados como reproducidos</string>
   <string name="statistics_speed_not_counted">Aviso: A velocidade de reprodución non se ten en conta en ningún caso.</string>
   <!--Main activity-->
@@ -34,7 +38,7 @@
   <string name="drawer_close">Pechar menú</string>
   <string name="drawer_preferences">Preferencias da caixa</string>
   <string name="drawer_feed_order_unplayed_episodes">Ordenar polo contador</string>
-  <string name="drawer_feed_order_alphabetical">Ordenar alfabéticamente</string>
+  <string name="drawer_feed_order_alphabetical">Ordenar alfabeticamente</string>
   <string name="drawer_feed_order_last_update">Ordenar por data de publicación</string>
   <string name="drawer_feed_order_most_played">Ordenar por número de episodios reproducidos</string>
   <string name="drawer_feed_counter_new_unplayed">Número de episodios novos e non reproducidos</string>
@@ -43,7 +47,7 @@
   <string name="drawer_feed_counter_downloaded">Número de episodios descargados</string>
   <string name="drawer_feed_counter_none">Ningún</string>
   <!--Webview actions-->
-  <string name="open_in_browser_label">Abrir en navegador</string>
+  <string name="open_in_browser_label">Abrir no navegador</string>
   <string name="copy_url_label">Copiar URL</string>
   <string name="share_url_label">Compartir URL</string>
   <string name="copied_url_msg">Copiar URL ao portapapeis</string>
@@ -56,15 +60,16 @@
   <string name="yes">Si</string>
   <string name="no">Non</string>
   <string name="reset">Restablecer</string>
-  <string name="author_label">Autor</string>
+  <string name="author_label">Autor(es)</string>
   <string name="language_label">Idioma</string>
   <string name="url_label">URL</string>
   <string name="podcast_settings_label">Axustes</string>
   <string name="cover_label">Imaxe</string>
   <string name="error_label">Fallo</string>
-  <string name="error_msg_prefix">Houbo un fallo:</string>
+  <string name="error_msg_prefix">Produciuse un fallo:</string>
+  <string name="needs_storage_permission">Precísase o permiso de almacenamento para esta operación</string>
   <string name="refresh_label">Actualizar</string>
-  <string name="external_storage_error_msg">Non se dispón de almacenamento externo. Por favor asegúrese de que o almacenamento externo está montado e así o app poderá funcionar correctamente.</string>
+  <string name="external_storage_error_msg">Non se dispón de almacenamento externo. Por favor asegúrese de que o almacenamento externo está montado e así o aplicativo poderá funcionar correctamente.</string>
   <string name="chapters_label">Capítulos</string>
   <string name="chapter_duration">Duración: %1$s</string>
   <string name="shownotes_label">Notas do episodio</string>
@@ -105,25 +110,28 @@
   <string name="mark_all_read_label">Marcar todo como reproducido</string>
   <string name="mark_all_read_msg">Marcáronse todos como reproducidos</string>
   <string name="mark_all_read_confirmation_msg">Por favor confirme que quere marcar todos os episodios como reproducidos.</string>
-  <string name="mark_all_read_feed_confirmation_msg">Por favor confirme que quere marcar todos os episodios de esta fonte como reproducidos.</string>
+  <string name="mark_all_read_feed_confirmation_msg">Por favor, confirme que quere marcar todos os episodios deste podcast como reproducidos.</string>
   <string name="mark_all_seen_label">Marcar como visto</string>
   <string name="mark_all_seen_msg">Marcáronse todos os episodios como vistos</string>
   <string name="mark_all_seen_confirmation_msg">Por favor confirme que quere marcar todos os episodios como vistos.</string>
   <string name="show_info_label">Mostrar información</string>
+  <string name="show_feed_settings_label">Mostrar axustes do podcast</string>
+  <string name="feed_info_label">Información do podcast</string>
+  <string name="feed_settings_label">Axustes do podcast</string>
   <string name="rename_feed_label">Mudar nome do podcast</string>
-  <string name="remove_feed_label">Quitar podcast</string>
+  <string name="remove_feed_label">Eliminar o podcast</string>
   <string name="share_label">Compartir...</string>
-  <string name="share_link_label">Compartir ligazón</string>
+  <string name="share_link_label">Compartir a URL do episodio</string>
+  <string name="share_link_with_position_label">Compartir a URL do ficheiro do episodio coa posición</string>
   <string name="share_file_label">Compartir ficheiro</string>
-  <string name="share_link_with_position_label">Compartir ligazón con posición</string>
   <string name="share_feed_url_label">Compartir URL da fonte</string>
-  <string name="share_item_url_label">Compartir a URL do ficheiro do episodio</string>
-  <string name="share_item_url_with_position_label">Compartir a URL do ficheiro do episodio con posición</string>
-  <string name="feed_delete_confirmation_msg">Por favor confirme que quere eliminar a fonte \"%1$s\" e TODOS os episodios de esta fonte anteriormente descargados.</string>
-  <string name="feed_remover_msg">Eliminando a fonte</string>
-  <string name="load_complete_feed">Actualizar completamente a fonte</string>
+  <string name="share_item_url_label">Compartir a URL do ficheiro multimedia</string>
+  <string name="share_item_url_with_position_label">Compartir a URL do ficheiro multimedia coa posición</string>
+  <string name="feed_delete_confirmation_msg">Por favor, confirme que quere eliminar o podcast \"%1$s\" e TODOS os seus episodios (incluídos os xa descargados).</string>
+  <string name="feed_remover_msg">Eliminando o podcast</string>
+  <string name="load_complete_feed">Actualizar o podcast completo</string>
   <string name="hide_episodes_title">Ocultar episodios</string>
-  <string name="episode_actions">Aplicar accións</string>
+  <string name="batch_edit">Edición por lote</string>
   <string name="hide_unplayed_episodes_label">Non reproducido</string>
   <string name="hide_paused_episodes_label">En pausa</string>
   <string name="hide_played_episodes_label">Reproducido</string>
@@ -132,6 +140,7 @@
   <string name="hide_downloaded_episodes_label">Descargado</string>
   <string name="hide_not_downloaded_episodes_label">Non descargado</string>
   <string name="hide_has_media_label">Ten medios</string>
+  <string name="hide_is_favorite_label">É favorito</string>
   <string name="filtered_label">Filtrado</string>
   <string name="refresh_failed_msg">{fa-exclamation-circle} Erro na última actualización</string>
   <string name="open_podcast">Abrir podcast</string>
@@ -145,6 +154,7 @@
   <string name="delete_label">Borrar</string>
   <string name="delete_failed">Non se puido eliminar o ficheiro. Reiniciar o dispositivo podería axudar.</string>
   <string name="remove_episode_lable">Eliminar episodio</string>
+  <string name="mark_as_seen_label">Marcar como visto</string>
   <string name="marked_as_seen_label">Marcar como visto</string>
   <string name="mark_read_label">Marcar como reproducido</string>
   <string name="marked_as_read_label">Marcado como reproducido</string>
@@ -168,6 +178,8 @@
   <string name="download_failed">fallou</string>
   <string name="download_pending">Descarga pendente</string>
   <string name="download_running">Descarga en proceso</string>
+  <string name="download_error_details">Detalles</string>
+  <string name="download_error_details_message">%1$s\n\nURL do ficheiro:\n %2$s </string>
   <string name="download_error_device_not_found">Non se atopou dispositivo de almacenamento</string>
   <string name="download_error_insufficient_space">Non hai suficiente espacio</string>
   <string name="download_error_file_error">Fallo de ficheiro</string>
@@ -182,7 +194,7 @@
   <string name="download_error_forbidden">Non admitido</string>
   <string name="cancel_all_downloads_label">Cancelar todas as descargas</string>
   <string name="download_canceled_msg">Descarga cancelada</string>
-  <string name="download_canceled_autodownload_enabled_msg">Descarga cancelada\nDeshabilitouse <i>Descarga automática</i> para este elemento</string>
+  <string name="download_canceled_autodownload_enabled_msg">Descarga cancelada\nDesactivouse a <i>Descarga Automática</i> para este elemento</string>
   <string name="download_report_title">Descargas completadas con erro(s)</string>
   <string name="download_report_content_title">Informe da descarga</string>
   <string name="download_error_malformed_url">URL mal formada</string>
@@ -204,8 +216,8 @@
   <string name="authentication_notification_title">Precísase autenticación</string>
   <string name="authentication_notification_msg">O recurso solicitado require un usuario e contrasinal</string>
   <string name="confirm_mobile_download_dialog_title">Confirme a descarga con datos do móbil</string>
-  <string name="confirm_mobile_download_dialog_message_not_in_queue">Descargar coa conexión de datos do móbil está deshabilitada nos axustes.\n\nPode escoller ben só engadir o episodio a cola ou pode permitir a descarga temporalmente.\n\n<small> A súa elección lembrarase durante 10 minutos.</small></string>
-  <string name="confirm_mobile_download_dialog_message">A descarga con datos móbiles está deshabilitada nos axustes.\n\nQuere permitir a descarga temporalmente?\n\n <small>A súa decisión lembrarase durante 10 minutos.</small></string>
+  <string name="confirm_mobile_download_dialog_message_not_in_queue">Descargar coa conexión de datos do móbil está desactivada nos axustes.\n\nPode escoller ben só engadir o episodio a cola ou pode permitir a descarga temporalmente.\n\n<small> A súa elección lembrarase durante 10 minutos.</small></string>
+  <string name="confirm_mobile_download_dialog_message">A descarga con datos móbiles está desactivada nos axustes.\n\nQuere permitir a descarga temporalmente?\n\n <small>A súa decisión lembrarase durante 10 minutos.</small></string>
   <string name="confirm_mobile_download_dialog_only_add_to_queue">Engadir a cola</string>
   <string name="confirm_mobile_download_dialog_enable_temporarily">Permitir temporalmente</string>
   <!--Mediaplayer messages-->
@@ -218,13 +230,14 @@
   <string name="playback_error_unknown">Fallo descoñecido</string>
   <string name="no_media_playing_label">Non reproducindo</string>
   <string name="player_buffering_msg">Almacenando</string>
+  <string name="player_go_to_picture_in_picture">Modo imaxe-en-imaxe</string>
   <string name="playbackservice_notification_title">Reproducindo podcast</string>
   <string name="unknown_media_key">AntennaPod - chave de medios descoñecida: %1$d</string>
   <!--Queue operations-->
-  <string name="lock_queue">Pechar a cola</string>
-  <string name="unlock_queue">Despechar a cola</string>
-  <string name="queue_locked">Cola pechada</string>
-  <string name="queue_unlocked">Cola despechada</string>
+  <string name="lock_queue">Bloquear a cola</string>
+  <string name="unlock_queue">Desbloquear a cola</string>
+  <string name="queue_locked">Cola bloqueada</string>
+  <string name="queue_unlocked">Cola desbloqueada</string>
   <string name="clear_queue_label">Limpar cola</string>
   <string name="undo">Desfacer</string>
   <string name="removed_from_queue">Elemento eliminado</string>
@@ -234,7 +247,9 @@
   <string name="date">Data</string>
   <string name="duration">Duración</string>
   <string name="episode_title">Título do episodio</string>
-  <string name="feed_title">Título da fonte</string>
+  <string name="feed_title">Título do podcast</string>
+  <string name="random">Aleatorio</string>
+  <string name="smart_shuffle">Barallado intelixente</string>
   <string name="ascending">Ascendente</string>
   <string name="descending">Descendente</string>
   <string name="clear_queue_confirmation_msg">Por favor confirme que quere limpar a cola e TODOS os episodios nela</string>
@@ -243,15 +258,15 @@
   <string name="flattr_auth_explanation">Pulse o botón inferior para iniciar o proceso de autenticación. Será redireccionado a pantalla de conexión en Flattr no seu navegador e pediralle permiso para que AntennaPod poida acceder. Despois de dar permiso, voltará a esta pantalla de xeito automático.</string>
   <string name="authenticate_label">Autenticar</string>
   <string name="return_home_label">Voltar ao inicio</string>
-  <string name="flattr_auth_success">Autenticouse correctamente! Xa pode enviar valoracións a Flattr desde o app.</string>
+  <string name="flattr_auth_success">Autenticouse correctamente! Xa pode enviar valoracións a Flattr desde o aplicativo.</string>
   <string name="no_flattr_token_title">Non se atopou o testemuño de Flattr</string>
   <string name="no_flattr_token_notification_msg">A súa conta de Flattr non semella estar conectada a AntennaPod. Toque aquí para autenticarse.</string>
-  <string name="no_flattr_token_msg">A súa conta de Flattr non semella estar conectada a AntennaPod. Ben pode conectar a súa conta a AntennaPod para interactuar en Flattr desde o app ou ben pode visitar o sitio web do elemento e darlle ao flattr desde alí.</string>
+  <string name="no_flattr_token_msg">A súa conta de Flattr non semella estar conectada a AntennaPod. Ben pode conectar a súa conta a AntennaPod para interactuar en Flattr desde o aplicativo ou ben pode visitar o sitio web do elemento e darlle ao flattr desde alí.</string>
   <string name="authenticate_now_label">Autenticar</string>
   <string name="action_forbidden_title">Acción non permitida</string>
   <string name="action_forbidden_msg">AntennaPod non ten permiso para esta acción. A razón podería ser que o testemuño de acceso de AntennaPod ou a súa conta fosen rexeitados. Pode voltar a autenticarse ou visitar o sitio web do elemento.</string>
   <string name="access_revoked_title">Acceso rexeitado</string>
-  <string name="access_revoked_info">Eliminou correctamente o testemuño de acceso de AntennaPod a súa conta. Para completar o proceso deberá eliminar este aplicativo da lista de aplicativos  autorizados nos axustes da súa conta na web de Flattr.</string>
+  <string name="access_revoked_info">Eliminou correctamente o token de acceso de AntennaPod á súa conta. Para completar o proceso deberá eliminar este aplicativo da lista de aplicativos autorizados nos axustes da súa conta na web de Flattr.</string>
   <!--Flattr-->
   <string name="flattr_click_success">Flateraches algo!</string>
   <string name="flattr_click_success_count">Flateraches %d cousas!</string>
@@ -272,7 +287,7 @@
   <string name="enable_sonic">Habilitar Sonic</string>
   <!--Empty list labels-->
   <string name="no_items_label">Non hai elementos na lista.</string>
-  <string name="no_feeds_label">Aínda non está suscrito a ningunha fonte.</string>
+  <string name="no_feeds_label">Aínda non está subscrito a ningún podcast.</string>
   <string name="no_chapters_label">Este episodio non ten capítulos.</string>
   <string name="no_shownotes_label">Este episodio non ten notas de episodio.</string>
   <!--Preferences-->
@@ -281,15 +296,23 @@
   <string name="other_pref">Outro</string>
   <string name="about_pref">Sobre</string>
   <string name="queue_label">Cola</string>
-  <string name="services_label">Servizos</string>
+  <string name="integrations_label">Integracións</string>
   <string name="flattr_label">Flattr</string>
+  <string name="flattr_summary">Servizo de micropagamentos</string>
+  <string name="automation">Automatizado</string>
+  <string name="download_pref_details">Detalles</string>
+  <string name="import_export_pref">Importar/Exportar</string>
+  <string name="appearance">Aspecto</string>
+  <string name="external_elements">Elementos externos</string>
+  <string name="interruptions">Interrupcións</string>
+  <string name="buttons">Botóns do control de reprodución</string>
+  <string name="media_player">Reprodutor de medios</string>
   <string name="pref_episode_cleanup_title">Limpeza de episodios</string>
   <string name="pref_episode_cleanup_summary">Os episodios que non están na cola e tampouco son favoritos deberían poder ser candidatos a ser eliminados si a función Descarga Automática precisa espazo para novos episodios.</string>
   <string name="pref_pauseOnDisconnect_sum">Deter a reprodución cando se desconectan os auriculares ou bluetooth</string>
   <string name="pref_unpauseOnHeadsetReconnect_sum">Retomar a reprodución cando se conectan os auriculares</string>
   <string name="pref_unpauseOnBluetoothReconnect_sum">Retomar a reprodución cando se reconecta o bluetooth</string>
   <string name="pref_hardwareForwardButtonSkips_title">O botón Adiante salta</string>
-  <string name="pref_hardwareForwardButtonSkips_sum">Cando se presiona o botón Adiante no dispositivo salta ao seguinte episodio en lugar de reproducir de xeito acelerado</string>
   <string name="pref_hardwarePreviousButtonRestarts_title">O botón Anterior reinicia</string>
   <string name="pref_hardwarePreviousButtonRestarts_sum">Cando se presiona Anterior no dispositivo reinicia o episodio no lugar de ir cara atrás</string>
   <string name="pref_followQueue_sum">Saltar ao seguinte elemento na cola cando remata o episodio</string>
@@ -304,9 +327,9 @@
   <string name="playback_pref">Reprodución</string>
   <string name="network_pref">Rede</string>
   <string name="pref_autoUpdateIntervallOrTime_title">Intervalo de actualización ou Hora do día</string>
-  <string name="pref_autoUpdateIntervallOrTime_sum">Indicar un intervalo ou unha hora en concreto para actualizar automáticamente as fontes</string>
-  <string name="pref_autoUpdateIntervallOrTime_message">Pode establecer un <i>intervalo</i> como \"2 horas\", unha <i>hora do día</i> en concreto como \"7:00 AM\" ou <i>deshabilitar</i>totalmente a actualización automática.\n\n<small>Aviso: indicar que pode haber un lixeiro retardo do momento da actualización.</small></string>
-  <string name="pref_autoUpdateIntervallOrTime_Disable">Deshabilitar</string>
+  <string name="pref_autoUpdateIntervallOrTime_sum">Indicar un intervalo ou unha hora en concreto para actualizar automaticamente as fontes</string>
+  <string name="pref_autoUpdateIntervallOrTime_message">Pode establecer un <i>intervalo</i> como \"2 horas\", unha <i>hora do día</i> en concreto como \"7:00 AM\" ou <i>desactivar</i> totalmente a actualización automática.\n\n<small>Aviso: pode haber un lixeiro retardo do momento da actualización.</small></string>
+  <string name="pref_autoUpdateIntervallOrTime_Disable">Desactivar</string>
   <string name="pref_autoUpdateIntervallOrTime_Interval">Establecer intervalo</string>
   <string name="pref_autoUpdateIntervallOrTime_TimeOfDay">Establecer hora do día</string>
   <string name="pref_autoUpdateIntervallOrTime_every">cada %1$s</string>
@@ -335,10 +358,10 @@
   <string name="pref_nav_drawer_sum">Personalice o aspecto da caixa de navegación</string>
   <string name="pref_nav_drawer_items_title">Estableza os elementos da Caixa de navegación</string>
   <string name="pref_nav_drawer_items_sum">Cambie os elementos que aparecerán na Caixa de navegación</string>
-  <string name="pref_nav_drawer_feed_order_title">Estableza a orde de suscrición</string>
-  <string name="pref_nav_drawer_feed_order_sum">Cambie a orde das súas suscricións</string>
-  <string name="pref_nav_drawer_feed_counter_title">Establecer o contador de suscricións</string>
-  <string name="pref_nav_drawer_feed_counter_sum">Cambie a información mostrada polo contador de suscricións</string>
+  <string name="pref_nav_drawer_feed_order_title">Estableza a orde das subscricións</string>
+  <string name="pref_nav_drawer_feed_order_sum">Cambie a orde das subscricións</string>
+  <string name="pref_nav_drawer_feed_counter_title">Establecer o contador de subscricións</string>
+  <string name="pref_nav_drawer_feed_counter_sum">Cambiar a información mostrada polo contador de subscricións. Tamén afecta á orde das subscricións se \"Orde das subscricións\" está establecida a \"Contador\".</string>
   <string name="pref_set_theme_sum">Cambiar o aspecto de AntennaPod.</string>
   <string name="pref_automatic_download_title">Descarga automática</string>
   <string name="pref_automatic_download_sum">Axuste a descarga automática de episodios.</string>
@@ -352,20 +375,21 @@
   <string name="pref_episode_cache_title">Caché de episodios</string>
   <string name="pref_theme_title_light">Claro</string>
   <string name="pref_theme_title_dark">Oscuro</string>
+  <string name="pref_theme_title_trueblack">Negro (listo para AMOLED)</string>
   <string name="pref_episode_cache_unlimited">Ilimitado</string>
   <string name="pref_update_interval_hours_plural">horas</string>
   <string name="pref_update_interval_hours_singular">hora</string>
   <string name="pref_update_interval_hours_manual">Manual</string>
   <string name="pref_gpodnet_authenticate_title">Conexión</string>
-  <string name="pref_gpodnet_authenticate_sum">Conectar coa súa conta gpodder.net para sincronizar as súas suscricións.</string>
+  <string name="pref_gpodnet_authenticate_sum">Conecte coa súa conta gpodder.net para sincronizar as súas subscricións.</string>
   <string name="pref_gpodnet_logout_title">Desconectar</string>
   <string name="pref_gpodnet_logout_toast">Desconectouse correctamente</string>
   <string name="pref_gpodnet_setlogin_information_title">Cambiar a información de conexión</string>
   <string name="pref_gpodnet_setlogin_information_sum">Cambiar a información de conexión da súa conta gpodder.net</string>
   <string name="pref_gpodnet_sync_changes_title">Sincronizar os cambios agora</string>
-  <string name="pref_gpodnet_sync_changes_sum">Sincronizar os datos de suscrición e estado dos episodios con gpodder.net</string>
+  <string name="pref_gpodnet_sync_changes_sum">Sincronizar os datos de subscrición e estado dos episodios con gpodder.net</string>
   <string name="pref_gpodnet_full_sync_title">Sincronice todo agora</string>
-  <string name="pref_gpodnet_full_sync_sum">Sincronizar todas as suscricións e estados de episodios con gpodder.net</string>
+  <string name="pref_gpodnet_full_sync_sum">Sincronizar todas as subscricións e estados de episodios con gpodder.net</string>
   <string name="pref_gpodnet_sync_sum_last_sync_line">Último intento de sincronización: %1$s (%2$s)</string>
   <string name="pref_gpodnet_sync_started">Sincronización iniciada</string>
   <string name="pref_gpodnet_full_sync_started">Sincronización completa iniciada</string>
@@ -380,8 +404,6 @@
   <string name="pref_rewind_sum">Personalice o número de segundos que se retrocede na reprodución cando se pulsa o botón retroceso</string>
   <string name="pref_gpodnet_sethostname_title">Establecer servidor</string>
   <string name="pref_gpodnet_sethostname_use_default_host">Utilizar servidor por omisión</string>
-  <string name="pref_expandNotify_title">Expandir notificación</string>
-  <string name="pref_expandNotify_sum">Expandir sempre a notificación para mostrar os botóns de reprodución</string>
   <string name="pref_persistNotify_title">Controles persistentes de reprodución</string>
   <string name="pref_persistNotify_sum">Manter notificación e controles na pantalla de bloqueo cando a reprodución está pausada.</string>
   <string name="pref_compact_notification_buttons_title">Establecer botóns de pantalla de bloqueo</string>
@@ -395,15 +417,14 @@
   <string name="pref_expand_notify_unsupport_toast">As versións de Android anteriores a 4.1 non teñen soporte para notificacións expandidas.</string>
   <string name="pref_queueAddToFront_sum">Engadir os novos episodios ao inicio da cola.</string>
   <string name="pref_queueAddToFront_title">Por no inicio da cola</string>
-  <string name="pref_smart_mark_as_played_disabled">Deshabilitado</string>
+  <string name="pref_smart_mark_as_played_disabled">Desactivado</string>
   <string name="pref_image_cache_size_title">Tamaño da caché de imaxes</string>
   <string name="pref_image_cache_size_sum">Tamaño da caché en disco para as imaxes.</string>
   <string name="crash_report_title">Informe de Desgracias</string>
   <string name="crash_report_sum">Enviar por email o informe de fallo xeral no aplicativo</string>
   <string name="send_email">Enviar email</string>
   <string name="experimental_pref">En probas</string>
-  <string name="pref_sonic_title">Sonic Media Player</string>
-  <string name="pref_sonic_message">Utilizar o sonic media player incluído no lugar do reprodutor nativo de Android e Prestissimo</string>
+  <string name="pref_media_player_message">Escolla o reprodutor de medios para reproducir ficheiros</string>
   <string name="pref_current_value">Valor actual: %1$s</string>
   <string name="pref_proxy_title">Proxy</string>
   <string name="pref_proxy_sum">Establecer un proxy para a rede</string>
@@ -412,9 +433,14 @@
   <string name="pref_no_browser_found">Non se atopou un navegador web</string>
   <string name="pref_cast_title">Soporte Chromecast</string>
   <string name="pref_cast_message_play_flavor">Habilitar o soporte de reprodución remota nun dispositivo Cast (como o Chromecast, Altofalantes ou Android TV)</string>
-  <string name="pref_cast_message_free_flavor">Chromecast precisa software propietario de terceiras partes que están deshabilitadas en esta versión de AntennaPod</string>
+  <string name="pref_cast_message_free_flavor">Chromecast precisa software propietario de terceiras partes que están desactivadas en esta versión de AntennaPod</string>
   <string name="pref_enqueue_downloaded_title">Foron descargados os elementos da cola</string>
   <string name="pref_enqueue_downloaded_summary">Engadir os episodios descargados a cola</string>
+  <string name="media_player_builtin">Reprodutor android nativo</string>
+  <string name="pref_videoBehavior_title">Ao saír do vídeo</string>
+  <string name="pref_videoBehavior_sum">Comportamento cando saia do vídeo</string>
+  <string name="stop_playback">Para a reprodución</string>
+  <string name="continue_playback">Continuar a reprodución de audio</string>
   <!--Auto-Flattr dialog-->
   <string name="auto_flattr_enable">Hablitar o flattring automático</string>
   <string name="auto_flattr_after_percent">Flattr o episodio tan pronto como o %d por cento foi reproducido</string>
@@ -424,8 +450,8 @@
   <string name="search_hint">Buscar episodios</string>
   <string name="found_in_shownotes_label">Atopado nas notas do episodio</string>
   <string name="found_in_chapters_label">Atopado en capítulos</string>
-  <string name="found_in_authors_label">Atopado en autores</string>
-  <string name="found_in_feeds_label">Atopado en fontes</string>
+  <string name="found_in_authors_label">Atopado en autor(es)</string>
+  <string name="found_in_feeds_label">Atopado no podcast</string>
   <string name="search_status_no_results">Non se atoparon resultados</string>
   <string name="search_label">Buscar</string>
   <string name="found_in_title_label">Atopado no título</string>
@@ -451,12 +477,12 @@
   <string name="html_export_label">Exportar HTML</string>
   <string name="exporting_label">Exportando...</string>
   <string name="export_error_label">Fallo ao exportar</string>
-  <string name="opml_export_success_title">Exportación OPML exitosa.</string>
-  <string name="opml_export_success_sum">O ficheiro .opml foi gardado en:\u0020</string>
+  <string name="export_success_title">Exportado con éxito</string>
+  <string name="export_success_sum">Escribeuse o ficheiro exportado en:\n\n%1$s</string>
   <string name="opml_import_ask_read_permission">Precísase acceso ao almacenamento externo para ler o ficheiro OPML</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Establecer apagado automático</string>
-  <string name="disable_sleeptimer_label">Deshabilitar o apagado automático</string>
+  <string name="disable_sleeptimer_label">Desactivar o apagado automático</string>
   <string name="enter_time_here_label">Introducir tempo</string>
   <string name="sleep_timer_label">Apagado automático</string>
   <string name="time_left_label">Tempo restante:\u0020</string>
@@ -479,9 +505,9 @@
     <item quantity="one">1 hora</item>
     <item quantity="other">%d horas</item>
   </plurals>
-  <string name="auto_enable_label">Habilitar automáticamente</string>
+  <string name="auto_enable_label">Habilitar automaticamente</string>
   <string name="sleep_timer_enabled_label">Apagado automático habilitado</string>
-  <string name="sleep_timer_disabled_label">Apagado automático deshabilitado</string>
+  <string name="sleep_timer_disabled_label">Apagado automático desactivado</string>
   <!--gpodder.net-->
   <string name="gpodnet_taglist_header">CATEGORÍAS</string>
   <string name="gpodnet_toplist_header">PODCASTS TOP</string>
@@ -504,7 +530,7 @@
   <string name="gpodnetauth_device_caption_errorEmpty">Non pode quedar baldeiro o titulo</string>
   <string name="gpodnetauth_device_butChoose">Escoller</string>
   <string name="gpodnetauth_finish_title">Conexión correcta!</string>
-  <string name="gpodnetauth_finish_descr">Parabéns! A súa conta gpodder.net está conectada ao dispositivo. AntennaPod poderá agora sincronizar automáticamente as súas suscricións no dispositivo na conta de gpodder.net</string>
+  <string name="gpodnetauth_finish_descr">Parabéns! A súa conta gpodder.net está conectada ao dispositivo. AntennaPod poderá agora sincronizar automaticamente as súas subscricións no dispositivo na conta de gpodder.net</string>
   <string name="gpodnetauth_finish_butsyncnow">Iniciar a sincronización</string>
   <string name="gpodnetauth_finish_butgomainscreen">Ir a pantalla principal</string>
   <string name="gpodnetsync_auth_error_title">fallo na autenticación en gpodder.net</string>
@@ -530,14 +556,14 @@
   <string name="folder_not_empty_dialog_title">O cartafol non está baldeiro</string>
   <string name="folder_not_empty_dialog_msg">O cartafol escollido non está baldeiro. As descargas de medios e outros ficheiros situaranse directamente en este cartafol. Proceder de todos xeitos?</string>
   <string name="set_to_default_folder">Escolla o cartafol por omisión</string>
-  <string name="pref_pausePlaybackForFocusLoss_sum">Pausar a reprodución en lugar de baixar o volume cando outro app quere reproducir un son.</string>
+  <string name="pref_pausePlaybackForFocusLoss_sum">Pausar a reprodución en lugar de baixar o volume cando outro aplicativo quere reproducir un son.</string>
   <string name="pref_pausePlaybackForFocusLoss_title">Pausa para interrupcións</string>
   <string name="pref_resumeAfterCall_sum">Retomar a reprodución despois de rematar a chamada telefónica</string>
   <string name="pref_resumeAfterCall_title">Retomar despois da chamada</string>
   <string name="pref_restart_required">AntennaPod debe reiniciarse para que esta opción se aplique.</string>
   <!--Online feed view-->
-  <string name="subscribe_label">Suscribir</string>
-  <string name="subscribed_label">Suscrito</string>
+  <string name="subscribe_label">Subscribir</string>
+  <string name="subscribed_label">Subscrito</string>
   <string name="downloading_label">Descargando...</string>
   <!--Content descriptions for image buttons-->
   <string name="rewind_label">Rebobinar</string>
@@ -562,10 +588,10 @@
   <!--Progress information-->
   <string name="progress_upgrading_database">Actualizando a base de datos</string>
   <!--AntennaPodSP-->
-  <string name="sp_apps_importing_feeds_msg">Importando as suscricións desde apps de propósito único...</string>
+  <string name="sp_apps_importing_feeds_msg">Importando as subscricións desde aplicativos de propósito único...</string>
   <string name="search_itunes_label">Buscar en iTunes</string>
   <string name="filter">Filtrado</string>
-  <string name="search_fyyd_label">Buscar fyyd</string>
+  <string name="search_fyyd_label">Buscar en fyyd</string>
   <!--Episodes apply actions-->
   <string name="all_label">Todo</string>
   <string name="selected_all_label">Seleccionar todos os episodios</string>
@@ -593,7 +619,7 @@
   <string name="sort_duration_short_long">Duración (Curto \u2192 Longo)</string>
   <string name="sort_duration_long_short">Duración (Longo \u2192 Curto)</string>
   <!--Rating dialog-->
-  <string name="rating_title">Gosta de AntennaPod?</string>
+  <string name="rating_title">Goza de AntennaPod?</string>
   <string name="rating_message">Agradeceríamos que dedicase un intre a valorar AntennaPod.</string>
   <string name="rating_never_label">Pasa de min oh!</string>
   <string name="rating_later_label">Lembrar máis tarde</string>
@@ -621,11 +647,11 @@
   <string name="proxy_port_invalid_error">Porto non válido</string>
   <!--Database import/export-->
   <string name="import_export">Importar/Exportar base de datos</string>
-  <string name="import_export_warning">Esta función experimental utilízase para transferir as súas suscricións e episodios reproducidos en outro dispositivo.\n\nAs bases de datos exportadas só se poden importar si utiliza a misma versión de AntennaPod. De todos xeitos, esta función pode comportarse de xeito raro.\n\nDespois de importar, os episodios poderían ser mostrados como descargados sin telo sido. Simplemente pulse o botón de reprodución dos episodios para que AntennaPod detecte esto.</string>
+  <string name="import_export_warning">Esta función experimental utilízase para transferir as súas subscricións e episodios reproducidos noutro dispositivo.\n\nAs bases de datos exportadas só se poden importar se utiliza a misma versión de AntennaPod. De todos xeitos, esta función pode comportarse de xeito raro.\n\nDespois de importar, os episodios poderían ser mostrados como descargados sin telo sido. Simplemente pulse o botón de reprodución dos episodios para que AntennaPod detecte esto.</string>
   <string name="label_import">Importar</string>
   <string name="label_export">Exportar</string>
   <string name="import_select_file">Escolla o ficheiro a importar</string>
-  <string name="export_ok">Exportouse correctamente. A base de datos escribeuse na tarxeta SD.</string>
+  <string name="export_ok">Exportado con éxito.</string>
   <string name="import_ok">Importación correcta.\n\nPulse OK para reiniciar AntennaPod</string>
   <!--Casting-->
   <string name="cast_media_route_menu_title">Reproducir en...</string>
@@ -643,4 +669,13 @@
   <string name="cast_failed_seek">Non se puido cambiar a posición no dispositivo de emisión</string>
   <string name="cast_failed_receiver_player_error">O reprodutor receptor atopou un fallo grave</string>
   <string name="cast_failed_media_error_skipping">Fallo na reprodución de medios. Saltando...</string>
+  <!--Notification channels-->
+  <string name="notification_channel_user_action">Acción requerida</string>
+  <string name="notification_channel_user_action_description">Mostrado si a súa acción é requerida, por exemplo si precisa introducir o contrasinal.</string>
+  <string name="notification_channel_downloading">Descargando</string>
+  <string name="notification_channel_downloading_description">Mostrado durante a descarga actual.</string>
+  <string name="notification_channel_playing">Soando agora</string>
+  <string name="notification_channel_playing_description">Permite controlar a reprodución. Esta é a notificación principal que verá mentras reproduce un podcast.</string>
+  <string name="notification_channel_error">Fallos</string>
+  <string name="notification_channel_error_description">Mostrado si algo falla, por exemplo si a descarga ou a sincronización con gpodder fallan.</string>
 </resources>
diff --git a/core/src/main/res/values-hi-rIN/strings.xml b/core/src/main/res/values-hi-rIN/strings.xml
index 7e3333a37..2cb584c48 100644
--- a/core/src/main/res/values-hi-rIN/strings.xml
+++ b/core/src/main/res/values-hi-rIN/strings.xml
@@ -1,35 +1,75 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
+  <string name="feed_update_receiver_name">सब्स्क्रिप्शन्स का अद्यतन </string>
   <string name="feeds_label">फिड्स</string>
+  <string name="statistics_label">आंकड़े</string>
+  <string name="add_feed_label">पॉडकास्ट जोड़ें</string>
+  <string name="episodes_label">एपिसोड</string>
+  <string name="all_episodes_short_label">सारे</string>
+  <string name="new_episodes_label">नये</string>
+  <string name="favorite_episodes_label">पसंदीदा</string>
   <string name="new_label">नया</string>
   <string name="settings_label">सेटिंग्स</string>
   <string name="downloads_label">डाउनलोड</string>
+  <string name="downloads_running_label">जारी</string>
+  <string name="downloads_completed_label">संपन्न हुए</string>
+  <string name="downloads_log_label">अभिलेख</string>
+  <string name="subscriptions_label">सब्स्क्रिप्शन्स</string>
+  <string name="subscriptions_list_label">सब्स्क्रिप्शन्स की सूची</string>
   <string name="cancel_download_label">डाउनलोड रद्द करें</string>
   <string name="playback_history_label">प्लेबैक इतिहास</string>
   <string name="gpodnet_main_label">gpodder.net</string>
-  <string name="gpodnet_auth_label">gpodder.net login</string>
+  <string name="gpodnet_summary">अन्य उपकरण के साथ समक्रमिक करें</string>
+  <string name="gpodnet_auth_label">gpodder.net लॉगिन</string>
+  <string name="free_space_label">%1$s खाली</string>
+  <string name="episode_cache_full_title">एपिसोड कैश भर गया है</string>
+  <string name="episode_cache_full_message">एपिसोड कैश सीमा तक पहुंच गया है। आप सेटिंग में कैश का आकार बढ़ा सकते हैं।</string>
+  <string name="synchronizing">समक्रमिक हो रहा है...</string>
   <!--Statistics fragment-->
+  <string name="total_time_listened_to_podcasts">चलाये गए पॉडकास्ट का कुल समय:</string>
+  <string name="statistics_details_dialog">%2$d में से %1$d एपिसोड शुरू किए गए है.\n\n%4$s में से %3$sपूरे हुए है। </string>
+  <string name="statistics_mode_normal">वास्तव में चलाई गयी अवधि की गणना करें। दो बार चलने पर दो बार गिना जायेगा, जबकि चल चूका सा चिह्नितो को नही गिना जायेगा।</string>
+  <string name="statistics_speed_not_counted">सूचना: प्लेबैक गति को कभी भी ध्यान में नहीं रखा जाता है।</string>
   <!--Main activity-->
+  <string name="drawer_open">मेन्यू खोलें</string>
+  <string name="drawer_close">मेन्यू बंद करें</string>
+  <string name="drawer_preferences">ड्रावर की प्राथमिकताएं</string>
+  <string name="drawer_feed_order_unplayed_episodes">काउंटर से क्रमबद्ध करें</string>
+  <string name="drawer_feed_order_alphabetical">वर्णानुक्रम से क्रमबद्ध करें</string>
+  <string name="drawer_feed_order_last_update">प्रकाशन तिथि से क्रमबद्ध करें</string>
+  <string name="drawer_feed_order_most_played">चलाए गए एपिसोड की संख्या</string>
+  <string name="drawer_feed_counter_new_unplayed">नए और नहीं चलाए गए एपिसोड की संख्या</string>
+  <string name="drawer_feed_counter_new">नए एपिसोड की संख्या</string>
+  <string name="drawer_feed_counter_unplayed">नहीं चलाए गए एपिसोड की संख्या</string>
+  <string name="drawer_feed_counter_downloaded">डाउनलोड किए गए एपिसोड की संख्या</string>
+  <string name="drawer_feed_counter_none">शून्य</string>
   <!--Webview actions-->
   <string name="open_in_browser_label">ब्राउज़र में खोलें</string>
   <string name="copy_url_label">कॉपी यूआरएल</string>
   <string name="share_url_label">शेयर यूआरएल</string>
-  <string name="copied_url_msg">यूआरएल को क्लिपबोर्ड पर कॉपी कर लिया गया है</string>
+  <string name="copied_url_msg">यूआरएल को क्लिपबोर्ड पर कॉपी किया गया है</string>
+  <string name="go_to_position_label">इस स्थान पर जाएं</string>
   <!--Playback history-->
   <string name="clear_history_label"> हिस्ट्री हटाएँ</string>
   <!--Other-->
   <string name="confirm_label">पुष्टि करें</string>
   <string name="cancel_label">रद्द करें</string>
-  <string name="author_label">	निर्माता</string>
+  <string name="yes">हाँ</string>
+  <string name="no">नहीं</string>
+  <string name="reset">रीसेट</string>
+  <string name="author_label">कलाकार</string>
   <string name="language_label">भाषा</string>
+  <string name="url_label">URL</string>
   <string name="podcast_settings_label">सेटिंग्स</string>
   <string name="cover_label">तस्वीर</string>
   <string name="error_label">त्रुटि</string>
   <string name="error_msg_prefix">एक त्रुटि हो गई:</string>
+  <string name="needs_storage_permission">इस कार्य की पूर्ती के लिए स्टोरेज अनुमति की आवश्यकता है</string>
   <string name="refresh_label">ताज़ा करें</string>
   <string name="external_storage_error_msg">कोई बाहरी भंडारण उपलब्ध नहीं है.सुनिश्चित करें कि आपने बाहरी भंडारण मुहिम शुरू की है ताकि अनुप्रयोग ठीक से काम कर सकते हैं</string>
   <string name="chapters_label">अध्याय</string>
+  <string name="chapter_duration">अवधि: %1$s</string>
   <string name="shownotes_label">नोट्स दिखाएँ</string>
   <string name="description_label">विवरण</string>
   <string name="most_recent_prefix">सबसे हाल का प्रकरण:\u0020</string>
@@ -37,40 +77,100 @@
   <string name="length_prefix">लंबाई:\u0020</string>
   <string name="size_prefix">साइज:\u0020</string>
   <string name="processing_label">प्रसंस्करण</string>
+  <string name="loading_label">लोड हो रहा है...</string>
   <string name="save_username_password_label">यूज़रनेम और पासवर्ड सहेजें</string>
   <string name="close_label">बंद करें</string>
   <string name="retry_label">पुन: प्रयास</string>
   <string name="auto_download_label">ऑटो डाउनलोड में शामिल करें</string>
+  <string name="auto_download_apply_to_items_title">पिछले एपिसोड पर लागू करें</string>
+  <string name="auto_download_apply_to_items_message">नया <i>ऑटो डाउनलोड</i> सेटिंग स्वचालित रूप से नए एपिसोड पर लागू की जाएगा।\nक्या आप इससे पहले प्रकाशित एपिसोड पर भी लागू करना चाहते हैं?</string>
+  <string name="auto_delete_label">ऑटो डिलीट एपिसोड</string>
+  <string name="parallel_downloads_suffix">\u0020समानांतर डाउनलोड</string>
+  <string name="feed_auto_download_global">सार्वभौमिक डिफ़ॉल्ट</string>
+  <string name="feed_auto_download_always">हमेशा</string>
+  <string name="feed_auto_download_never">कभी नहीँ</string>
+  <string name="send_label">भेजें...</string>
+  <string name="episode_cleanup_never">कभी नहीँ</string>
+  <string name="episode_cleanup_queue_removal">जब क़तार में नहीं हो</string>
+  <string name="episode_cleanup_after_listening">समाप्ति के बाद</string>
+  <plurals name="episode_cleanup_days_after_listening">
+    <item quantity="one">समाप्ति के 1 दिन बाद</item>
+    <item quantity="other">समाप्ति के %d दिन बाद</item>
+  </plurals>
   <!--'Add Feed' Activity labels-->
   <string name="feedurl_label">यूआरएल फ़ीड</string>
+  <string name="etxtFeedurlHint">www.example.com/feed</string>
   <string name="txtvfeedurl_label">यूआरएल द्वारा पॉडकास्ट जोड़ें</string>
   <string name="podcastdirectories_label">पॉडकास्ट निर्देशिका</string>
+  <string name="podcastdirectories_descr">नए पॉडकास्ट के लिए, आप iTunes या fyyd खोज सकते हैं, या gpodder.net को नाम, श्रेणी या लोकप्रियता द्वारा ब्राउज़ कर सकते हैं।</string>
+  <string name="browse_gpoddernet_label">gpodder.net ब्राउज़ करें</string>
   <!--Actions on feeds-->
   <string name="mark_all_read_label">पढ़ने के रूप में सभी को चिह्नित करें</string>
   <string name="show_info_label">जानकारी दिखाएँ</string>
-  <string name="remove_feed_label">पॉडकास्ट हटाएँ
-</string>
-  <string name="share_link_label">शेयर वेबसाइट लिंक</string>
-  <string name="feed_remover_msg">फ़ीड निकाल रहा है</string>
+  <string name="show_feed_settings_label">पॉडकास्ट सेटिंग दिखाएं</string>
+  <string name="feed_info_label">पॉडकास्ट की जानकारी</string>
+  <string name="feed_settings_label">पॉडकास्ट की सेटिंग</string>
+  <string name="rename_feed_label">पॉडकास्ट का नाम बदले</string>
+  <string name="remove_feed_label">पॉडकास्ट हटाए</string>
+  <string name="share_label">शेयर...</string>
+  <string name="share_link_label">एपिसोड URL शेयर करे</string>
+  <string name="share_link_with_position_label">स्थान के साथ एपिसोड URL शेयर करे</string>
+  <string name="share_file_label">फाइल शेयर करे</string>
+  <string name="share_feed_url_label">फीड URL शेयर करे</string>
+  <string name="share_item_url_label">मीडिया फाइल शेयर करे</string>
+  <string name="share_item_url_with_position_label"> स्थान के साथ मीडिया फाइल शेयर करे</string>
+  <string name="feed_remover_msg">पॉडकास्ट हटाया जारहा है</string>
+  <string name="load_complete_feed">सारे पॉडकास्ट को रिफ्रेश करें</string>
+  <string name="hide_episodes_title">एपिसोड छुपाए</string>
+  <string name="batch_edit">जत्था संपादित करें</string>
+  <string name="hide_unplayed_episodes_label">नहीं चलाए गए</string>
+  <string name="hide_paused_episodes_label">रोके गए</string>
+  <string name="hide_played_episodes_label">चलाए गए</string>
+  <string name="hide_queued_episodes_label">क़तार किए गए</string>
+  <string name="hide_not_queued_episodes_label">क़तार नही किए गए</string>
+  <string name="hide_downloaded_episodes_label">डाउनलोड किये गए</string>
+  <string name="hide_not_downloaded_episodes_label">नहीं डाउनलोड किये गए</string>
+  <string name="hide_has_media_label">मीडिया है</string>
+  <string name="hide_is_favorite_label">पसंदीदा है</string>
+  <string name="filtered_label">छाने हुए</string>
+  <string name="refresh_failed_msg">{fa-exclamation-circle} पिछला रिफ्रेश असफल हुआ</string>
+  <string name="open_podcast">पॉडकास्ट खोले</string>
   <!--actions on feeditems-->
   <string name="download_label">डाउनलोड</string>
   <string name="play_label">प्ले</string>
   <string name="pause_label">रोकें</string>
+  <string name="stop_label">रोकें</string>
   <string name="stream_label">स्ट्रिम</string>
   <string name="remove_label"> हटाएँ</string>
-  <string name="mark_read_label">पढ़ा हुआ के रूप में  चिह्नित करें</string>
-  <string name="mark_unread_label">ना पढ़ा हुआ के रूप में  चिह्नित करें</string>
+  <string name="delete_label">डिलीट</string>
+  <string name="delete_failed">फ़ाइल डिलीट करने में असमर्थ। डिवाइस को रिबूट करने से मदद मिल सकती है।</string>
+  <string name="remove_episode_lable">एपिसोड हटाएं</string>
+  <string name="mark_as_seen_label">देखा गया के रूप में चिह्नित करें</string>
+  <string name="marked_as_seen_label">देखा गया के रूप में चिह्नित किया गया</string>
+  <string name="mark_read_label">चलाया गया के रूप में चिह्नित करें</string>
+  <string name="marked_as_read_label">चलाया गया के रूप में चिह्नित किया गया</string>
+  <string name="mark_unread_label">नही चलाया गया के रूप में चिह्नित करें</string>
   <string name="add_to_queue_label">क़तार में जोड़ें</string>
+  <string name="added_to_queue_label">कांतर में जोड़े गए</string>
   <string name="remove_from_queue_label">क़तार से हटाएँ</string>
+  <string name="add_to_favorite_label">पसंदीदा सूची में जोड़े</string>
+  <string name="added_to_favorites">पसंदीदा सूची में जोड़ा गया</string>
+  <string name="remove_from_favorite_label">पसंदीदा सूची से हटाए</string>
+  <string name="removed_from_favorites">पसंदीदा सूची से हटया गया</string>
   <string name="visit_website_label">वेबसाइट पर जाएँ</string>
   <string name="support_label">इसे Flattr करें</string>
   <string name="skip_episode_label">एपिसोड छोङें</string>
+  <string name="activate_auto_download">ऑटो डाउनलोड सक्रिय करें</string>
+  <string name="deactivate_auto_download">ऑटो डाउनलोड निष्क्रिय करें</string>
+  <string name="reset_position">प्लेबैक स्थिति रीसेट करें</string>
+  <string name="removed_item">आइटम हटया गया</string>
   <!--Download messages and labels-->
-  <string name="download_successful">सफल
-</string>
-  <string name="download_failed">डाउनलोड विफल</string>
+  <string name="download_successful">सफल हुआ</string>
+  <string name="download_failed">असफल हुआ</string>
   <string name="download_pending">लंबित डाउनलोड</string>
   <string name="download_running">डाउनलोड चल रहा है</string>
+  <string name="download_error_details">विवरण</string>
+  <string name="download_error_details_message">%1$s \n\nफाइल URL:\n%2$s</string>
   <string name="download_error_device_not_found">स्टोरेज डिवाइस नहीं मिला</string>
   <string name="download_error_insufficient_space">अपर्याप्त स्थान</string>
   <string name="download_error_file_error">फ़ाइल त्रुटि</string>
@@ -80,13 +180,23 @@
   <string name="download_error_unsupported_type">असमर्थित फ़ीड प्रकार</string>
   <string name="download_error_connection_error">कनेक्शन त्रुटि</string>
   <string name="download_error_unknown_host">अज्ञात होस्ट</string>
+  <string name="download_error_unauthorized">प्रमाणीकरण त्रुटि</string>
+  <string name="download_error_file_type_type">फ़ाइल प्रकार त्रुटि</string>
+  <string name="download_error_forbidden">निषिद्ध</string>
   <string name="cancel_all_downloads_label">सभी डाउनलोड रद्द  करें</string>
   <string name="download_canceled_msg">डाउनलोड रद्द</string>
-  <string name="download_report_title">डाउनलोड पूरा हो गया है</string>
+  <string name="download_canceled_autodownload_enabled_msg">डाउनलोड रद्द हुआ\nइस आइटम के लिए <i>ऑटडाउनलोड</i> अक्षम किया गया</string>
+  <string name="download_report_title">त्रुटि के साथ डाउनलोड संपन्न हुए</string>
+  <string name="download_report_content_title">रिपोर्ट डाउनलोड करे</string>
   <string name="download_error_malformed_url">गलत URL</string>
   <string name="download_error_io_error">आईओ त्रुटि</string>
   <string name="download_error_request_error">अनुरोध त्रुटि</string>
   <string name="download_error_db_access">डेटाबेस का उपयोग त्रुटि</string>
+  <plurals name="downloads_left">
+    <item quantity="one">%d डाउनलोड बाकी</item>
+    <item quantity="other">%d डाउनलोड बाकी</item>
+  </plurals>
+  <string name="downloads_processing">डाउनलोड प्रोसेस किये जारहे</string>
   <string name="download_notification_title">पॉडकास्ट डेटा डाउनलोड करें</string>
   <string name="download_report_content">%1$d डाउनलोड सफल रहा, %2$d में विफल रहा है</string>
   <string name="download_log_title_unknown">अज्ञात शीर्षक</string>
@@ -94,6 +204,11 @@
   <string name="download_type_media">मीडिया फ़ाइल</string>
   <string name="download_type_image">छवि</string>
   <string name="download_request_error_dialog_message_prefix">फाइल डाउनलोड करने के लिए प्रयास करते समय एक त्रुटि हुई:\u0020</string>
+  <string name="authentication_notification_title">प्रमाणीकरण आवश्यक है</string>
+  <string name="authentication_notification_msg">आपके द्वारा अनुरोधित संसाधन के लिए यूजरनाम यूजरनेम और पासवर्ड की आवश्यकता है</string>
+  <string name="confirm_mobile_download_dialog_title">मोबाइल डाउनलोड की पुष्टि करें</string>
+  <string name="confirm_mobile_download_dialog_only_add_to_queue">कतारबद्ध करें</string>
+  <string name="confirm_mobile_download_dialog_enable_temporarily">अस्थायी रूप से अनुमति दें</string>
   <!--Mediaplayer messages-->
   <string name="player_error_msg">त्रुटि!</string>
   <string name="player_stopped_msg">मीडिया नहीं चल रहा</string>
@@ -105,12 +220,22 @@
   <string name="no_media_playing_label">मीडिया नहीं चल रहा</string>
   <string name="player_buffering_msg">बफरिंग</string>
   <string name="playbackservice_notification_title">प्लेईंग पॉडकास्ट</string>
+  <string name="unknown_media_key">एन्टेनापॉड - अनजान मीडिया की: %1$d</string>
   <!--Queue operations-->
   <string name="clear_queue_label">कतार साफ</string>
   <string name="undo">पूर्ववत् करें</string>
   <string name="removed_from_queue">आइटम हटाया</string>
   <string name="move_to_top_label">शीर्ष पर ले जाएं</string>
   <string name="move_to_bottom_label">नीचे जाएं</string>
+  <string name="date">दिनांक</string>
+  <string name="duration">अवधि</string>
+  <string name="episode_title">एपिसोड का शीर्षक</string>
+  <string name="feed_title">पॉडकास्ट का शीर्षक</string>
+  <string name="random">क्रमरहित</string>
+  <string name="smart_shuffle">चतुर मिश्रण</string>
+  <string name="ascending">आरोही</string>
+  <string name="descending">अवरोही</string>
+  <string name="clear_queue_confirmation_msg">कृपया पुष्टि करें कि आप सारे एपिसोड के इस कतार को हटाना चाहते हैं</string>
   <!--Flattr-->
   <string name="flattr_auth_label">Flattr पंजीकरण करें</string>
   <string name="flattr_auth_explanation">प्रमाणीकरण प्रक्रिया शुरू करने के लिए नीचे दिए गए बटन को दबाएं. आपके ब्राउज़र में flattr लॉगिन स्क्रीन को भेजा जाएगा और flattr बातें करने के लिए अनुमति AntennaPod को देने के लिए कहा जाएगा. आपकि अनुमति देने के बाद, आप स्वतः ही इस स्क्रीन में वापस आ जाएगें.</string>
@@ -128,23 +253,39 @@
   <string name="flattr_click_success">सफलतापूर्वक यह बात Flattr किया</string>
   <string name="flattr_click_success_count">सफलतापूर्वक %d बातोंको Flattr किया</string>
   <string name="flattr_click_success_queue">Flattr गिनती: %s</string>
-  <string name="flattring_label">ऐन्टेनापॉड Flattr </string>
+  <string name="flattring_label">ऐन्टेनापॉड Flattr कररहा है</string>
   <!--Variable Speed-->
   <string name="download_plugin_label">प्लगइन डाउनलोड करें</string>
   <string name="no_playback_plugin_title">प्लगइन स्थापित नहीं हुआ</string>
   <string name="set_playback_speed_label">प्लेबैक गति</string>
+  <string name="enable_sonic">सॉनिक सक्षम करे</string>
   <!--Empty list labels-->
   <string name="no_items_label">इस सूची में कोई आइटम नहीं हैं.</string>
-  <string name="no_feeds_label">आपने अभी तक किसी भी फ़ीड की सदस्यता नहीं ली है.</string>
+  <string name="no_feeds_label">आपने अभी तक किसी भी पॉडकास्ट को सब्सक्राइब नहीं किया है।</string>
+  <string name="no_chapters_label">इस एपिसोड में कोई अध्याय नहीं है।</string>
+  <string name="no_shownotes_label">इस एपिसोड में कोई शोनोट्स नहीं है।</string>
   <!--Preferences-->
+  <string name="storage_pref">स्टोरेज</string>
+  <string name="project_pref">परियोजना</string>
   <string name="other_pref">अन्य</string>
   <string name="about_pref">के बारे में</string>
   <string name="queue_label">पंक्ति</string>
-  <string name="services_label">सेवाएं</string>
   <string name="flattr_label">Flattr</string>
+  <string name="automation">स्वचालन</string>
+  <string name="download_pref_details">विवरण</string>
+  <string name="import_export_pref">आयात/निर्यात</string>
+  <string name="appearance">दिखावट</string>
+  <string name="external_elements">बाहरी तत्व</string>
+  <string name="interruptions">रुकावटे</string>
+  <string name="pref_episode_cleanup_title">एपिसोड की सफाई</string>
   <string name="pref_followQueue_sum">प्लेबैक के पूरा होने पर अगली पंक्ति आइटम के लिए जाएँ</string>
   <string name="playback_pref">प्लेबैक</string>
   <string name="network_pref">संजाल</string>
+  <string name="pref_autoUpdateIntervallOrTime_Disable">अक्षम करें</string>
+  <string name="pref_autoUpdateIntervallOrTime_Interval">अंतराल निर्धारित करें</string>
+  <string name="pref_autoUpdateIntervallOrTime_TimeOfDay">दिन का समय निर्धारित करें</string>
+  <string name="pref_autoUpdateIntervallOrTime_every">प्रति %1$s</string>
+  <string name="pref_autoUpdateIntervallOrTime_at">%1$s बजे </string>
   <string name="pref_downloadMediaOnWifiOnly_sum">केवल वाईफ़ाई पर मीडिया फ़ाइलें डाउनलोड करें</string>
   <string name="pref_followQueue_title">सतत प्लेबैक</string>
   <string name="pref_downloadMediaOnWifiOnly_title">वाईफाई मीडिया डाउनलोड करें</string>
@@ -179,6 +320,7 @@
   <string name="pref_gpodnet_logout_toast">लॉगआउट सफल रहा था</string>
   <string name="pref_gpodnet_setlogin_information_title">प्रवेश जानकारी बदलें</string>
   <string name="pref_gpodnet_setlogin_information_sum">अपने gpodder.net खाते के लिए प्रवेश जानकारी बदलें.</string>
+  <string name="pref_gpodnet_login_status"><![CDATA[ <i>%1$s</i> के रूप में <i>%2$s</i> डिवाइस के साथ लॉगिन किया गया ]]></string>
   <string name="pref_playback_speed_title">प्लेबैक गति</string>
   <string name="pref_playback_speed_sum">चर गति ऑडियो प्लेबैक के लिए उपलब्ध गति बनाइए</string>
   <string name="pref_gpodnet_sethostname_title">होस्टनाम सेट</string>
@@ -199,7 +341,6 @@
   <string name="deselect_all_label">सभी का चयन रद्द करें</string>
   <string name="opml_export_label">OPML निर्यात</string>
   <string name="export_error_label">निर्यात त्रुटि</string>
-  <string name="opml_export_success_sum">.ompl फ़ाइल लिखा गया था:\u0020</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">स्लीप टाइमर सेट</string>
   <string name="disable_sleeptimer_label">स्लीप टाइमर अक्षम</string>
@@ -247,7 +388,7 @@
   <string name="folder_not_empty_dialog_msg">आपके द्वारा चुने गए फ़ोल्डर खाली नहीं है. मीडिया डाउनलोड और अन्य फ़ाइलें इस फ़ोल्डर में सीधे रखा जाएगा. फिर भी जारी रखें?</string>
   <string name="set_to_default_folder">डिफ़ॉल्ट फ़ोल्डर चुनें</string>
   <string name="pref_pausePlaybackForFocusLoss_sum">प्लेबैक रोकें बजाय ध्वनियों को कम करने के अगर कोई  अन्य अनुप्रयोग इसे बजाना चाहता है </string>
-  <string name="pref_pausePlaybackForFocusLoss_title">रुकावट के लिए रोकें</string>
+  <string name="pref_pausePlaybackForFocusLoss_title">रुकावटो के लिए रोकें</string>
   <!--Online feed view-->
   <string name="subscribe_label">सदस्यता लें</string>
   <string name="subscribed_label">सदस्यता ली गई</string>
@@ -263,4 +404,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-hu/strings.xml b/core/src/main/res/values-hu/strings.xml
index 878925133..71e1283ce 100644
--- a/core/src/main/res/values-hu/strings.xml
+++ b/core/src/main/res/values-hu/strings.xml
@@ -32,6 +32,7 @@
   <string name="drawer_feed_order_unplayed_episodes">Rendezés számláló szerint</string>
   <string name="drawer_feed_order_alphabetical">Rendezés ABC rendben</string>
   <string name="drawer_feed_order_last_update">Rendezés megjelenés dátuma szerint</string>
+  <string name="drawer_feed_order_most_played">Rendezés játszott epizódok szerint</string>
   <string name="drawer_feed_counter_new_unplayed">Új és nem játszott epizódok száma</string>
   <string name="drawer_feed_counter_new">Új epizódok száma</string>
   <string name="drawer_feed_counter_unplayed">Nem játszott epizódok száma</string>
@@ -51,7 +52,6 @@
   <string name="yes">Igen</string>
   <string name="no">Nem</string>
   <string name="reset">Visszaállítás</string>
-  <string name="author_label">Szerző</string>
   <string name="language_label">Nyelv</string>
   <string name="url_label">URL</string>
   <string name="podcast_settings_label">Beállítások</string>
@@ -61,6 +61,7 @@
   <string name="refresh_label">Frissítés</string>
   <string name="external_storage_error_msg">Nem található külső tárhely. Biztosíts egy külső tárhelyet hogy az alkalmazás működni tudjon.</string>
   <string name="chapters_label">Fejezetek</string>
+  <string name="chapter_duration">Hossz: %1$s</string>
   <string name="shownotes_label">Jegyzetek</string>
   <string name="description_label">Leírás</string>
   <string name="most_recent_prefix">Legfrissebb epizód:\u0020</string>
@@ -82,7 +83,7 @@
   <string name="feed_auto_download_never">Soha</string>
   <string name="send_label">Küldés…</string>
   <string name="episode_cleanup_never">Soha</string>
-  <string name="episode_cleanup_queue_removal">Ha nem várakozik</string>
+  <string name="episode_cleanup_queue_removal">Ha nincs sorbaállítva</string>
   <string name="episode_cleanup_after_listening">Befejezés után</string>
   <plurals name="episode_cleanup_days_after_listening">
     <item quantity="one">1 nappal a befejezés után</item>
@@ -99,28 +100,18 @@
   <string name="mark_all_read_label">Az összes megjelölése lejátszottként</string>
   <string name="mark_all_read_msg">Az összes epizód lejátszottként megjelölve</string>
   <string name="mark_all_read_confirmation_msg">Biztosan megjelölöd az összes epizódot lejátszottként?</string>
-  <string name="mark_all_read_feed_confirmation_msg">Biztosan megjelölöd az összes epizódot az idővonalon lejátszottként?</string>
   <string name="mark_all_seen_label">Az összes megjelölése megnézettként</string>
-  <string name="mark_all_seen_msg">Az összes epizód megnézettként megjelölve</string>
   <string name="mark_all_seen_confirmation_msg">Biztosan megjelölöd az összes epizódott megnézettként?</string>
   <string name="show_info_label">Információ mutatása</string>
-  <string name="rename_feed_label">Podcast átnevezése</string>
-  <string name="remove_feed_label">Podcast eltávolítása</string>
   <string name="share_label">Megosztás…</string>
-  <string name="share_link_label">Link megosztása</string>
-  <string name="share_link_with_position_label">Link megosztása pozícióval</string>
+  <string name="share_file_label">Fájl megosztása</string>
   <string name="share_feed_url_label">Idővonal URL megosztása</string>
-  <string name="share_item_url_label">Epizód fájl URL megosztása</string>
-  <string name="share_item_url_with_position_label">Epizód fájl URL megosztása pozícióval</string>
-  <string name="feed_remover_msg">Idővonal eltávolítása</string>
-  <string name="load_complete_feed">Teljes idővonal frissítése</string>
   <string name="hide_episodes_title">Epizódok elrejtése</string>
-  <string name="episode_actions">Műveletek alkalmazása</string>
   <string name="hide_unplayed_episodes_label">Nem lejátszott</string>
   <string name="hide_paused_episodes_label">Szüneteltetett</string>
   <string name="hide_played_episodes_label">Lejátszott</string>
-  <string name="hide_queued_episodes_label">Várakozó</string>
-  <string name="hide_not_queued_episodes_label">Nem várakozó</string>
+  <string name="hide_queued_episodes_label">Sorbaállítva</string>
+  <string name="hide_not_queued_episodes_label">Nincs sorbaállítva</string>
   <string name="hide_downloaded_episodes_label">Letöltött</string>
   <string name="hide_not_downloaded_episodes_label">Nem letöltött</string>
   <string name="hide_has_media_label">További tartalma van</string>
@@ -137,12 +128,12 @@
   <string name="delete_label">Törlés</string>
   <string name="remove_episode_lable">Epizód eltávolítása</string>
   <string name="marked_as_seen_label">Megtekintettként megjelölve</string>
-  <string name="mark_read_label">Lejátszottként megjelölés</string>
+  <string name="mark_read_label">Jelölés játszottnak</string>
   <string name="marked_as_read_label">Lejátszottként megjelölve</string>
-  <string name="mark_unread_label">Nem lejátszottként megjelölés</string>
-  <string name="add_to_queue_label">Várakozási sorhoz adás</string>
-  <string name="added_to_queue_label">Várakozási sorhoz adva</string>
-  <string name="remove_from_queue_label">Várakozási sorból eltávolítás</string>
+  <string name="mark_unread_label">Jelölés nem játszottnak</string>
+  <string name="add_to_queue_label">Sorbaállítás</string>
+  <string name="added_to_queue_label">Hozzáadva a lejátszási sorhoz</string>
+  <string name="remove_from_queue_label">Eltávolítás lejátszási sorból</string>
   <string name="add_to_favorite_label">Kedvencekhez adás</string>
   <string name="added_to_favorites">Kedvencekhez adva</string>
   <string name="remove_from_favorite_label">Kedvencekből eltávolítás</string>
@@ -159,6 +150,8 @@
   <string name="download_failed">sikertelen</string>
   <string name="download_pending">Letöltés várakozik</string>
   <string name="download_running">Letöltés fut</string>
+  <string name="download_error_details">Részletek</string>
+  <string name="download_error_details_message">%1$s \n\nFájl URL:\n%2$s</string>
   <string name="download_error_device_not_found">Táreszköz nem található</string>
   <string name="download_error_insufficient_space">Túl kevés tárhely</string>
   <string name="download_error_file_error">Fájl Hiba</string>
@@ -173,30 +166,208 @@
   <string name="download_error_forbidden">Tiltott</string>
   <string name="cancel_all_downloads_label">Az összes letöltés visszavonása</string>
   <string name="download_canceled_msg">Letöltés visszavonva</string>
+  <string name="download_report_title">Letöltés befejeződött, hibák léptek fel</string>
+  <string name="download_report_content_title">Jelentés letöltése</string>
+  <string name="download_error_request_error">Lekérési hiba</string>
+  <string name="download_error_db_access">Adatbázis hozzáférési hiba</string>
+  <plurals name="downloads_left">
+    <item quantity="one">%d letöltés van hátra</item>
+    <item quantity="other">%d letöltés van hátra</item>
+  </plurals>
+  <string name="downloads_processing">Letöltések feldolgozása</string>
+  <string name="download_notification_title">Podcast adatok letöltése</string>
+  <string name="download_report_content">%1$d letöltés sikeres, %2$d sikertelen</string>
+  <string name="download_log_title_unknown">Ismeretlen cím</string>
+  <string name="download_type_feed">Csatorna</string>
+  <string name="download_type_media">Média fájl</string>
+  <string name="download_type_image">Kép</string>
+  <string name="authentication_notification_title">Bejelentkezés szükséges</string>
+  <string name="authentication_notification_msg">A kért forrás felhasználónevet és jelszót kér</string>
+  <string name="confirm_mobile_download_dialog_enable_temporarily">Átmenetileg engedélyez</string>
   <!--Mediaplayer messages-->
+  <string name="player_error_msg">Hiba!</string>
+  <string name="player_preparing_msg">Előkészítés</string>
+  <string name="player_ready_msg">Kész</string>
+  <string name="player_seeking_msg">Tekerés</string>
+  <string name="playback_error_server_died">Szerver kapcsolat megszakadt</string>
+  <string name="playback_error_unknown">Ismeretlen hiba</string>
+  <string name="player_buffering_msg">Pufferelés</string>
+  <string name="playbackservice_notification_title">Podcast lejátszása</string>
   <!--Queue operations-->
+  <string name="lock_queue">Lejátszási sor lezárása</string>
+  <string name="unlock_queue">Lejátszási sor feloldása</string>
+  <string name="queue_locked">Lejátszási sor lezárva</string>
+  <string name="queue_unlocked">Lejátszási sor feloldva</string>
+  <string name="clear_queue_label">Lejátszási sor tisztítása</string>
+  <string name="undo">Visszavonás</string>
+  <string name="removed_from_queue">Elem eltávolítva</string>
+  <string name="move_to_top_label">Mozgatás az elejére</string>
+  <string name="move_to_bottom_label">Mozgatás a végére</string>
+  <string name="sort">Rendezés</string>
+  <string name="date">Dátum</string>
+  <string name="duration">Hossz</string>
+  <string name="episode_title">Epizód cím</string>
+  <string name="ascending">Növekvő</string>
+  <string name="descending">Csökkenő</string>
   <!--Flattr-->
+  <string name="flattr_auth_label">Flattr bejelentkezés</string>
+  <string name="access_revoked_title">Hozzáférés megtagadva</string>
   <!--Flattr-->
   <!--Variable Speed-->
+  <string name="download_plugin_label">Kiegészítő letöltése</string>
+  <string name="no_playback_plugin_title">Kiegészítő nincs telepítve</string>
+  <string name="set_playback_speed_label">Lejátszási sebesség</string>
+  <string name="enable_sonic">Sonic engedélyezése</string>
   <!--Empty list labels-->
+  <string name="no_items_label">Nincs elem a listában</string>
   <!--Preferences-->
+  <string name="storage_pref">Tároló</string>
+  <string name="project_pref">Projekt</string>
+  <string name="other_pref">Egyebek</string>
+  <string name="about_pref">Rólam</string>
+  <string name="queue_label">Lejátszási sor</string>
+  <string name="flattr_label">Flattr</string>
+  <string name="pref_pauseOnDisconnect_sum">Lejátszás szüneteltetése fejhallgató és bluetooth leválasztásakor</string>
+  <string name="pref_hardwareForwardButtonSkips_title">Előre gomb átugor</string>
+  <string name="pref_hardwarePreviousButtonRestarts_title">Előző gomb újraindít</string>
+  <string name="pref_auto_delete_title">Autómata törlés</string>
+  <string name="pref_smart_mark_as_played_title">Intelligens játszottnak jelölés</string>
+  <string name="playback_pref">Lejátszás</string>
+  <string name="network_pref">Hálózat</string>
+  <string name="pref_autoUpdateIntervallOrTime_Interval">Intervallum</string>
+  <string name="pref_autoUpdateIntervallOrTime_TimeOfDay">Időpont</string>
+  <string name="pref_autoUpdateIntervallOrTime_every">minden %1$s</string>
+  <string name="pref_autoUpdateIntervallOrTime_at">%1$s-kor</string>
+  <string name="pref_downloadMediaOnWifiOnly_sum">Média fájlok letöltése csak WiFi-n</string>
+  <string name="pref_followQueue_title">Folyamatos lejátszás</string>
+  <string name="pref_downloadMediaOnWifiOnly_title">WiFi média lejátszás</string>
+  <string name="pref_pauseOnHeadsetDisconnect_title">Fejhallgató leválasztása</string>
+  <string name="pref_unpauseOnHeadsetReconnect_title">Fejhallgató újracsatlakoztatása</string>
+  <string name="pref_unpauseOnBluetoothReconnect_title">Bluetooth újracsatlakozás</string>
+  <string name="pref_mobileUpdate_title">Frissítések mobiladat-kapcsolaton</string>
+  <string name="pref_mobileUpdate_sum">Frissítések engedélyezése mobiladat-kapcsolaton keresztül</string>
+  <string name="flattr_settings_label">Flattr beállítások</string>
+  <string name="pref_flattr_auth_title">Flattr bejelentkezés</string>
+  <string name="pref_revokeAccess_title">Hozzáférés megvonása</string>
+  <string name="user_interface_label">Felhasználói felület</string>
+  <string name="pref_set_theme_title">Téma kiválasztása</string>
+  <string name="pref_nav_drawer_title">Navigációs fiók testreszabása</string>
+  <string name="pref_nav_drawer_sum">Navigációs fiók kinézetének testreszabás</string>
+  <string name="pref_nav_drawer_items_title">Navigációs fiók elemeinek kiválaasztása</string>
+  <string name="pref_set_theme_sum">AntennaPod kinézetének megváltoztatása</string>
+  <string name="pref_automatic_download_title">Autómatikus letöltés</string>
+  <string name="pref_automatic_download_sum">Epizódok autómatikus letöltésének beállítása</string>
+  <string name="pref_autodl_wifi_filter_title">Wi-Fi szűrő beállítása</string>
+  <string name="pref_parallel_downloads_title">Párhuzamos letöltések</string>
+  <string name="pref_episode_cache_title">Epizód gyorsítótár</string>
+  <string name="pref_theme_title_light">Világos</string>
+  <string name="pref_theme_title_dark">Sötét</string>
+  <string name="pref_update_interval_hours_plural">óra</string>
+  <string name="pref_update_interval_hours_singular">óra</string>
+  <string name="pref_gpodnet_authenticate_title">Bejelentkezés</string>
+  <string name="pref_gpodnet_authenticate_sum">Jelentkezz be a gpodder.net fiókodba a feliratkozások szinkronizálásához.</string>
+  <string name="pref_gpodnet_logout_title">Kijelentkezés</string>
+  <string name="pref_gpodnet_logout_toast">Kijelentkezés sikeres</string>
+  <string name="pref_gpodnet_sync_changes_title">Változások szinkronizálása most</string>
+  <string name="pref_gpodnet_full_sync_title">Teljes szinkronizálás most</string>
+  <string name="pref_playback_speed_title">Lejátszási sebesség</string>
+  <string name="pref_compact_notification_buttons_title">Zárképernyő gombok beállítása</string>
+  <string name="pref_lockscreen_background_title">Zárképernyő háttérkép</string>
+  <string name="pref_lockscreen_background_sum">Zárképernyő háttérkép átállítása az epizód képeként.</string>
+  <string name="pref_image_cache_size_title">Kép gyorsítótár mérete</string>
+  <string name="pref_image_cache_size_sum">Kép gyorsítótár méretének a lemezen</string>
+  <string name="crash_report_title">Hibajelentés</string>
+  <string name="experimental_pref">Kísérleti</string>
+  <string name="pref_proxy_title">Proxy</string>
+  <string name="pref_proxy_sum">Hálózati proxy beállítása</string>
+  <string name="pref_faq">GYIK</string>
+  <string name="pref_known_issues">Ismert hibák</string>
+  <string name="pref_no_browser_found">Nem található webböngésző</string>
+  <string name="pref_cast_title">Chromecast támogatás</string>
   <!--Auto-Flattr dialog-->
   <!--Search-->
+  <string name="search_hint">Epizódok keresése</string>
+  <string name="search_label">Keresés</string>
   <!--OPML import and export-->
+  <string name="start_import_label">Importálás indítása</string>
+  <string name="opml_import_label">OPML importálása</string>
+  <string name="opml_directory_error">HIBA!</string>
+  <string name="reading_opml_label">OPML fájl olvasása</string>
   <!--Sleep timer-->
+  <string name="sleep_timer_enabled_label">Elalvás időzítő engedélyezése</string>
+  <string name="sleep_timer_disabled_label">Elalvás időzítő kikapcsolása</string>
   <!--gpodder.net-->
+  <string name="gpodnet_taglist_header">KATEGÓRIÁK</string>
+  <string name="gpodnet_suggestions_header">AJÁNLÁSOK</string>
+  <string name="gpodnetauth_login_title">Bejelentkezés</string>
+  <string name="gpodnetauth_login_butLabel">Bejelentkezés</string>
+  <string name="username_label">Felhasználónév</string>
+  <string name="password_label">Jelszó</string>
+  <string name="gpodnetauth_device_title">Eszköz kiválasztása</string>
+  <string name="gpodnetsync_pref_report_successful">Sikeres</string>
+  <string name="gpodnetsync_pref_report_failed">Sikertelen</string>
   <!--Directory chooser-->
+  <string name="selected_folder_label">Kiválasztott mappa:</string>
+  <string name="create_folder_label">Mappa létrehozása</string>
+  <string name="create_folder_error_already_exists">Mappa már létezik</string>
+  <string name="folder_not_empty_dialog_title">Mappa nem üres</string>
+  <string name="set_to_default_folder">Alapértelmezett mappa kiválasztása</string>
   <!--Online feed view-->
+  <string name="subscribe_label">Feliratkozás</string>
+  <string name="subscribed_label">Feliratkozva</string>
+  <string name="downloading_label">Letöltés...</string>
   <!--Content descriptions for image buttons-->
+  <string name="media_type_audio_label">Hang</string>
+  <string name="media_type_video_label">Video</string>
+  <string name="load_next_page_label">Következő oldal betöltése</string>
   <!--Feed information screen-->
   <!--Progress information-->
   <!--AntennaPodSP-->
+  <string name="search_itunes_label">iTunes keresés</string>
+  <string name="search_fyyd_label">fyyd keresés</string>
   <!--Episodes apply actions-->
+  <string name="all_label">Mind</string>
+  <string name="downloaded_label">Letöltve</string>
+  <string name="not_downloaded_label">Nincs letöltve</string>
+  <string name="queued_label">Sorbaállítva</string>
+  <string name="not_queued_label">Nincs sorbaállítva</string>
   <!--Sort-->
+  <string name="sort_title_a_z">Cím (A \u2192 Z)</string>
+  <string name="sort_title_z_a">Cím (Z \u2192 A)</string>
+  <string name="sort_date_new_old">Dátum (Új \u2192 Régi)</string>
+  <string name="sort_date_old_new">Dátum (Régi \u2192 Új)</string>
+  <string name="sort_duration_short_long">Hossz (Rövid \u2192 Hosszú)</string>
+  <string name="sort_duration_long_short">Hossz (Hosszú \u2192 Rövid)</string>
   <!--Rating dialog-->
+  <string name="rating_later_label">Kérdezz rákésőbb</string>
   <!--Audio controls-->
+  <string name="audio_controls">Hang vezérlők</string>
+  <string name="playback_speed">Lejátszási sebesség</string>
+  <string name="volume">Hangerő</string>
+  <string name="left_short">B</string>
+  <string name="right_short">J</string>
+  <string name="audio_effects">Hangeffektek</string>
+  <string name="stereo_to_mono">Lekeverés: Sztereót Monora</string>
+  <string name="sonic_only">Csak Sonic</string>
   <!--proxy settings-->
+  <string name="proxy_type_label">Típus</string>
+  <string name="host_label">Kiszolgáló</string>
+  <string name="port_label">Port</string>
+  <string name="optional_hint">(Opcionális)</string>
+  <string name="proxy_test_label">Teszt</string>
+  <string name="proxy_test_successful">Teszt sikeres</string>
+  <string name="proxy_test_failed">Teszt sikertelen</string>
+  <string name="proxy_host_empty_error">Kiszolgáló nem lehet üres</string>
+  <string name="proxy_port_invalid_error">Port nem helyes</string>
   <!--Database import/export-->
+  <string name="import_export">Adatbázis importálása/exportálása</string>
+  <string name="label_import">Importálás</string>
+  <string name="label_export">Exportálás</string>
+  <string name="import_select_file">Fájl kiálasztás importáláshoz</string>
+  <string name="export_ok">Exportálás sikeres</string>
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <string name="cast_failed_setting_volume">Hiba a hangerő beállítása közben</string>
+  <string name="cast_failed_media_error_skipping">Hiba a lejátszás közben. Átugrás...</string>
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-id/strings.xml b/core/src/main/res/values-id/strings.xml
index e6ff6d1e7..62254518d 100644
--- a/core/src/main/res/values-id/strings.xml
+++ b/core/src/main/res/values-id/strings.xml
@@ -151,4 +151,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-is-rIS/strings.xml b/core/src/main/res/values-is-rIS/strings.xml
index acf3abe75..2d9481b84 100644
--- a/core/src/main/res/values-is-rIS/strings.xml
+++ b/core/src/main/res/values-is-rIS/strings.xml
@@ -36,4 +36,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
deleted file mode 100644
index 23c8ec1c0..000000000
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ /dev/null
@@ -1,526 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <!--Activitiy and fragment titles-->
-  <string name="feeds_label">Feed</string>
-  <string name="statistics_label">Statistiche</string>
-  <string name="add_feed_label">Aggiungi un podcast</string>
-  <string name="episodes_label">Episodi</string>
-  <string name="all_episodes_short_label">Tutti</string>
-  <string name="favorite_episodes_label">Preferiti</string>
-  <string name="new_label">Nuovo</string>
-  <string name="settings_label">Impostazioni</string>
-  <string name="downloads_label">Download</string>
-  <string name="downloads_running_label">In esecuzione</string>
-  <string name="downloads_completed_label">Completati</string>
-  <string name="downloads_log_label">Registro</string>
-  <string name="subscriptions_label">Abbonamenti</string>
-  <string name="subscriptions_list_label">Elenco degli Abbonamenti</string>
-  <string name="cancel_download_label">Annulla\nil Download</string>
-  <string name="playback_history_label">Cronologia delle riproduzioni</string>
-  <string name="gpodnet_main_label">gpodder.net</string>
-  <string name="gpodnet_auth_label">Accesso a gpodder.net</string>
-  <string name="free_space_label">%1$s disponibili</string>
-  <string name="episode_cache_full_title">Cache degli episodi piena</string>
-  <string name="episode_cache_full_message">Lo spazio di memoria della cache degli episodi è esaurito. Puoi aumentarlo nelle Impostazioni</string>
-  <!--Statistics fragment-->
-  <string name="total_time_listened_to_podcasts">Tempo totale di riproduzione:</string>
-  <string name="statistics_details_dialog">%1$d di %2$d episodi iniziati.\n\nRiprodotti %3$s di %4$s.</string>
-  <string name="statistics_mode">Modalità di statistica</string>
-  <string name="statistics_mode_normal">Calcola l\'attuale tempo di riproduzione. Riprodurre un podcast due volte verrà contato due volte, mentre segnarlo come riprodotto no.</string>
-  <string name="statistics_mode_count_all">Somma tutti i podcast segnati come riprodotti</string>
-  <string name="statistics_speed_not_counted">Avviso: La velocità di riproduzione non viene considerata.</string>
-  <!--Main activity-->
-  <string name="drawer_open">Apri il menù</string>
-  <string name="drawer_close">Chiudi il menù</string>
-  <string name="drawer_preferences">Preferenze del Drawer</string>
-  <string name="drawer_feed_order_unplayed_episodes">Ordina per contatore</string>
-  <string name="drawer_feed_order_alphabetical">Ordina alfabeticamente</string>
-  <string name="drawer_feed_order_last_update">Ordina per data di pubblicazione</string>
-  <string name="drawer_feed_order_most_played">Ordina per numero di episodi riprodotti</string>
-  <string name="drawer_feed_counter_new_unplayed">Numero di episodi nuovi e non riprodotti</string>
-  <string name="drawer_feed_counter_new">Numero di episodi nuovi</string>
-  <string name="drawer_feed_counter_unplayed">Numero di episodi non riprodotti</string>
-  <string name="drawer_feed_counter_downloaded">Numero di episodi scaricati</string>
-  <string name="drawer_feed_counter_none">Nulla</string>
-  <!--Webview actions-->
-  <string name="open_in_browser_label">Apri nel Browser</string>
-  <string name="copy_url_label">Copia URL</string>
-  <string name="share_url_label">Condividi URL</string>
-  <string name="copied_url_msg">URL copiato negli appunti</string>
-  <string name="go_to_position_label">Vai a questa posizione</string>
-  <!--Playback history-->
-  <string name="clear_history_label">Pulisci la cronologia</string>
-  <!--Other-->
-  <string name="confirm_label">Conferma</string>
-  <string name="cancel_label">Annulla</string>
-  <string name="yes">Sì</string>
-  <string name="no">No</string>
-  <string name="reset">Reimposta</string>
-  <string name="author_label">Autore</string>
-  <string name="language_label">Lingua</string>
-  <string name="url_label">URL</string>
-  <string name="podcast_settings_label">Impostazioni</string>
-  <string name="cover_label">Immagine</string>
-  <string name="error_label">Errore</string>
-  <string name="error_msg_prefix">È stato rilevato un errore:</string>
-  <string name="refresh_label">Aggiorna</string>
-  <string name="external_storage_error_msg">Non risulta disponibile lo spazio di archiviazione esterno. Assicurati che lo spazio di archiviazione sia montato per permettere all\'applicazione di funzionare correttamente.</string>
-  <string name="chapters_label">Capitoli</string>
-  <string name="chapter_duration">Durata: %1$s</string>
-  <string name="shownotes_label">Note dell\'episodio</string>
-  <string name="description_label">Descrizione</string>
-  <string name="most_recent_prefix">Episodio più recente:\u0020</string>
-  <string name="episodes_suffix">\u0020episodi</string>
-  <string name="length_prefix">Durata:\u0020</string>
-  <string name="size_prefix">Dimensione:\u0020</string>
-  <string name="processing_label">Elaborazione in corso</string>
-  <string name="loading_label">Caricamento...</string>
-  <string name="save_username_password_label">Salva nome utente e password</string>
-  <string name="close_label">Chiudi</string>
-  <string name="retry_label">Riprova</string>
-  <string name="auto_download_label">Includi nei download automatici</string>
-  <string name="auto_download_apply_to_items_title">Applica ai Precedenti Episodi</string>
-  <string name="auto_download_apply_to_items_message">L\'opzione <i>Download Automatico</i> verrà applicata ai nuovi episodi.\nVuoi anche applicarla agli episodi precedenti?</string>
-  <string name="auto_delete_label">Elimina Episodi Automaticamente</string>
-  <string name="parallel_downloads_suffix">\u0020download paralleli</string>
-  <string name="feed_auto_download_global">Impostazione Globale</string>
-  <string name="feed_auto_download_always">Sempre</string>
-  <string name="feed_auto_download_never">Mai</string>
-  <string name="send_label">Invia...</string>
-  <string name="episode_cleanup_never">Mai</string>
-  <string name="episode_cleanup_queue_removal">Quando non è in coda</string>
-  <string name="episode_cleanup_after_listening">Dopo il completamento</string>
-  <plurals name="episode_cleanup_days_after_listening">
-    <item quantity="one">1 giorno dopo il completamento</item>
-    <item quantity="other">%d giorni dopo il completamento</item>
-  </plurals>
-  <!--'Add Feed' Activity labels-->
-  <string name="feedurl_label">URL del feed</string>
-  <string name="etxtFeedurlHint">www.example.com/feed</string>
-  <string name="txtvfeedurl_label">Aggiungi un Podcast tramite URL</string>
-  <string name="podcastdirectories_label">Trova un podcast nella directory</string>
-  <string name="podcastdirectories_descr">Per trovare podcasts puoi cercare su iTunes o fyyd, oppure puoi esplorare gpodder.net per nome, categoria oppure popolarità.</string>
-  <string name="browse_gpoddernet_label">Esplora gpodder.net</string>
-  <!--Actions on feeds-->
-  <string name="mark_all_read_label">Segna tutti come riprodotti</string>
-  <string name="mark_all_read_msg">Segnati tutti gli episodi come riprodotti</string>
-  <string name="mark_all_read_confirmation_msg">Conferma che desideri segnare tutti gli episodi come riprodotti.</string>
-  <string name="mark_all_read_feed_confirmation_msg">Conferma che desideri segnare tutti gli episodi in questo feed come riprodotti.</string>
-  <string name="mark_all_seen_label">Segna tutti come visti</string>
-  <string name="mark_all_seen_msg">Segnati tutti gli episodi come visti</string>
-  <string name="mark_all_seen_confirmation_msg">Conferma che desideri segnare tutti gli episodi come visti.</string>
-  <string name="show_info_label">Informazioni</string>
-  <string name="rename_feed_label">Rinomina Podcast</string>
-  <string name="remove_feed_label">Rimuovi podcast</string>
-  <string name="share_label">Condividi...</string>
-  <string name="share_link_label">Condividi il link</string>
-  <string name="share_file_label">Condividi il file</string>
-  <string name="share_link_with_position_label">Condividi il Link con la Posizione</string>
-  <string name="share_feed_url_label">Condividi URL del Feed</string>
-  <string name="share_item_url_label">Condividi l\'URL dell\'episodio</string>
-  <string name="share_item_url_with_position_label">Condividi l\'URL del File dell\'epsiodio con la Posizione</string>
-  <string name="feed_delete_confirmation_msg">Conferma che desideri cancellare il feed \"%1$s\" e TUTTI i suoi episodi scaricati.</string>
-  <string name="feed_remover_msg">Rimozione del Feed in corso</string>
-  <string name="load_complete_feed">Ricarica il feed completo</string>
-  <string name="hide_episodes_title">Nascondi gli episodi</string>
-  <string name="episode_actions">Applica le azioni</string>
-  <string name="hide_unplayed_episodes_label">Non riprodotti</string>
-  <string name="hide_paused_episodes_label">In pausa</string>
-  <string name="hide_played_episodes_label">Riprodotti</string>
-  <string name="hide_queued_episodes_label">In coda</string>
-  <string name="hide_not_queued_episodes_label">Non in coda</string>
-  <string name="hide_downloaded_episodes_label">Scaricati</string>
-  <string name="hide_not_downloaded_episodes_label">Non scaricati</string>
-  <string name="filtered_label">Filtrati</string>
-  <string name="refresh_failed_msg">{fa-exclamation-circle} Ultimo aggiornamento fallito</string>
-  <string name="open_podcast">Apri Podcast</string>
-  <!--actions on feeditems-->
-  <string name="download_label">Download</string>
-  <string name="play_label">Riproduci</string>
-  <string name="pause_label">Pausa</string>
-  <string name="stop_label">Ferma</string>
-  <string name="stream_label">Stream</string>
-  <string name="remove_label">Rimuovi</string>
-  <string name="delete_label">Elimina</string>
-  <string name="remove_episode_lable">Rimuovi l\'episodio</string>
-  <string name="marked_as_seen_label">Segna come visto</string>
-  <string name="mark_read_label">Segna come riprodotto</string>
-  <string name="marked_as_read_label">Segnato come riprodotto</string>
-  <string name="mark_unread_label">Segna come non riprodotto</string>
-  <string name="add_to_queue_label">Aggiungi alla coda</string>
-  <string name="added_to_queue_label">Aggiunto alla coda</string>
-  <string name="remove_from_queue_label">Rimuovi dalla coda</string>
-  <string name="add_to_favorite_label">Aggiungi ai preferiti</string>
-  <string name="added_to_favorites">Aggiunto ai Preferiti</string>
-  <string name="remove_from_favorite_label">Rimuovi dai preferiti</string>
-  <string name="removed_from_favorites">Rimosso dai Preferiti</string>
-  <string name="visit_website_label">Visita il sito</string>
-  <string name="support_label">Carica questo su Flattr</string>
-  <string name="skip_episode_label">Salta l\'episodio</string>
-  <string name="activate_auto_download">Attiva il Download Automatico</string>
-  <string name="deactivate_auto_download">Disattiva il Download Automatico</string>
-  <string name="reset_position">Azzera la Posizione di Riproduzione</string>
-  <string name="removed_item">Elemento rimosso</string>
-  <!--Download messages and labels-->
-  <string name="download_successful">successo</string>
-  <string name="download_failed">fallito</string>
-  <string name="download_pending">Download in attesa</string>
-  <string name="download_running">Download in corso</string>
-  <string name="download_error_device_not_found">Spazio di archiviazione non trovato</string>
-  <string name="download_error_insufficient_space">Spazio insufficiente</string>
-  <string name="download_error_file_error">Errore del file</string>
-  <string name="download_error_http_data_error">Errore dei dati HTTP</string>
-  <string name="download_error_error_unknown">Errore sconosciuto</string>
-  <string name="download_error_parser_exception">Eccezione del decodificatore</string>
-  <string name="download_error_unsupported_type">Tipo di feed non supportato</string>
-  <string name="download_error_connection_error">Errore di connessione</string>
-  <string name="download_error_unknown_host">Host sconosciuto</string>
-  <string name="download_error_unauthorized">Errore di autenticazione</string>
-  <string name="download_error_file_type_type">Errore Formato FIle</string>
-  <string name="download_error_forbidden">Proibito</string>
-  <string name="cancel_all_downloads_label">Annulla tutti i download</string>
-  <string name="download_canceled_msg">Download annullato</string>
-  <string name="download_canceled_autodownload_enabled_msg">Download annullato\n<i>Download Automatico</i> disabilitato per questo elemento</string>
-  <string name="download_report_title">Download completato con un errore (o errori)</string>
-  <string name="download_report_content_title">Rapporto del Downoad</string>
-  <string name="download_error_malformed_url">URL malformato</string>
-  <string name="download_error_io_error">Errore IO</string>
-  <string name="download_error_request_error">Errore della richiesta</string>
-  <string name="download_error_db_access">Errore di accesso al database</string>
-  <plurals name="downloads_left">
-    <item quantity="one">%d download rimanente</item>
-    <item quantity="other">%d download rimanenti</item>
-  </plurals>
-  <string name="downloads_processing">Elaborazione dei download in corso</string>
-  <string name="download_notification_title">Download podcast in corso</string>
-  <string name="download_report_content">%1$d download con successo, %2$d falliti</string>
-  <string name="download_log_title_unknown">Titolo Sconosciuto</string>
-  <string name="download_type_feed">Feed</string>
-  <string name="download_type_media">File multimediali</string>
-  <string name="download_type_image">Immagine</string>
-  <string name="download_request_error_dialog_message_prefix">Rilevato errore durante il download del file:\u0020</string>
-  <string name="authentication_notification_title">Autenticazione richiesta</string>
-  <string name="authentication_notification_msg">La risorsa che hai richiesto richiede un nome utente e una password</string>
-  <string name="confirm_mobile_download_dialog_title">Conferma il download su cellulare</string>
-  <string name="confirm_mobile_download_dialog_only_add_to_queue">Metti in Coda</string>
-  <string name="confirm_mobile_download_dialog_enable_temporarily">Consenti temporaneamente</string>
-  <!--Mediaplayer messages-->
-  <string name="player_error_msg">Errore!</string>
-  <string name="player_stopped_msg">Nessun media in riproduzione</string>
-  <string name="player_preparing_msg">Preparazione</string>
-  <string name="player_ready_msg">Pronto</string>
-  <string name="player_seeking_msg">Ricerca posizione</string>
-  <string name="playback_error_server_died">Server morto</string>
-  <string name="playback_error_unknown">Errore sconosciuto</string>
-  <string name="no_media_playing_label">Nessun elemento multimediale in riproduzione</string>
-  <string name="player_buffering_msg">Buffer in corso</string>
-  <string name="playbackservice_notification_title">Riproduzione del podcast in corso</string>
-  <string name="unknown_media_key">AntennaPod - Chiave dell\'elemento multimediale sconosciuta: %1$d</string>
-  <!--Queue operations-->
-  <string name="lock_queue">Blocca la coda</string>
-  <string name="unlock_queue">Sblocca la coda</string>
-  <string name="queue_locked">Coda bloccata</string>
-  <string name="queue_unlocked">Coda sbloccata</string>
-  <string name="clear_queue_label">Svuota la Coda</string>
-  <string name="undo">Undo</string>
-  <string name="removed_from_queue">Oggetto rimosso</string>
-  <string name="move_to_top_label">Sposta all\'inizio</string>
-  <string name="move_to_bottom_label">Sposta in fondo</string>
-  <string name="sort">Ordina</string>
-  <string name="date">Per data</string>
-  <string name="duration">Per durata</string>
-  <string name="episode_title">Titolo dell\'episodio</string>
-  <string name="feed_title">Titolo del feed</string>
-  <string name="ascending">In ordine crescente</string>
-  <string name="descending">In ordine decrescente</string>
-  <string name="clear_queue_confirmation_msg">Per favore conferma che vuoi rimuovere dalla coda TUTTI gli episodi in essa presenti.</string>
-  <!--Flattr-->
-  <string name="flattr_auth_label">Accesso a Flattr</string>
-  <string name="flattr_auth_explanation">Premi il tasto seguente per iniziare il processo di autenticazione. Sarai trasferito alla pagina di login di flattr sul tuo browser e ti sarà richiesto di garantire ad AntennaPod il permesso di effettuare microdonazioni. Dopo la tua autorizzazione, sarai riportato alla seguente schermata in modo automatico.</string>
-  <string name="authenticate_label">Autenticazione</string>
-  <string name="return_home_label">Ritorna alla pagina iniziale</string>
-  <string name="flattr_auth_success">Autenticazione avvenuta con successo! Adesso puoi microdonare con flattr dall\'interno dell\'app.</string>
-  <string name="no_flattr_token_title">Nessun token flattr trovato</string>
-  <string name="no_flattr_token_notification_msg">Il tuo account di Flattr non sembra essere collegato ad AntennaPod. Premi qui per autenticarti.</string>
-  <string name="no_flattr_token_msg">Il tuo account flattr non sembra essere collegato ad AntennaPod. Potresti collegare il tuo account ad AntennaPod per utilizzare flattr dall\'app oppure puoi visitare il sito per utilizzare flattr direttamente da lì.</string>
-  <string name="authenticate_now_label">Autenticati</string>
-  <string name="action_forbidden_title">Azione proibita</string>
-  <string name="action_forbidden_msg">AntennaPod non ha il permesso di effettuare questa azione. La ragione potrebbe essere che il token di accesso di AntennaPod al tuo account è stato revocato. Puoi eseguire la re-autenticazione o altrimenti visitare il sito web.</string>
-  <string name="access_revoked_title">Accesso revocato</string>
-  <string name="access_revoked_info">Hai revocato l\'accesso di AntennaPod al tuo account. Al fine di completare il processo devi rimuovere l\'app dalla lista delle applicazioni autorizzare nelle impostazioni del tuo account sul sito di flattr.</string>
-  <!--Flattr-->
-  <string name="flattr_click_success">Caricata una cosa su Flattr!</string>
-  <string name="flattr_click_success_count">Caricate %d cose su Flattr!</string>
-  <string name="flattr_click_success_queue">Caricato su Flattr: %s.</string>
-  <string name="flattr_click_failure_count">È stato fallito il caricamento su Flattr di %d cose!</string>
-  <string name="flattr_click_failure">Non caricato su Flattr: %s.</string>
-  <string name="flattr_click_enqueued">La cosa verrà caricata su Flattr più tardi</string>
-  <string name="flattring_thing">Caricamento su Flattr di %s in corso</string>
-  <string name="flattring_label">AntennaPod sta eseguendo Flattr</string>
-  <string name="flattrd_label">AntennaPod ha caricato su Flattr</string>
-  <string name="flattrd_failed_label">Caricamento su Flattr di AntennaPod fallito</string>
-  <string name="flattr_retrieving_status">Ricezione di cose caricate su Flattr in corso</string>
-  <!--Variable Speed-->
-  <string name="download_plugin_label">Scarica plugin</string>
-  <string name="no_playback_plugin_title">Plugin non installato</string>
-  <string name="set_playback_speed_label">Velocità di riproduzione</string>
-  <string name="enable_sonic">Abilita Sonic</string>
-  <!--Empty list labels-->
-  <string name="no_items_label">Non ci sono oggetti in questo elenco.</string>
-  <string name="no_feeds_label">Non sei ancora abbonato a nessun feed.</string>
-  <string name="no_chapters_label">Questo episodio non ha capitoli.</string>
-  <string name="no_shownotes_label">Questo episodio non ha note.</string>
-  <!--Preferences-->
-  <string name="storage_pref">Memoria</string>
-  <string name="project_pref">Progetto</string>
-  <string name="other_pref">Altro</string>
-  <string name="about_pref">Informazioni</string>
-  <string name="queue_label">Coda</string>
-  <string name="services_label">Servizi</string>
-  <string name="flattr_label">Flattr</string>
-  <string name="pref_unpauseOnHeadsetReconnect_sum">Riprendi la riproduzione quando vengono riconnesse le cuffie</string>
-  <string name="pref_followQueue_sum">Passa al prossimo episodio in coda quanto si completa una riproduzione</string>
-  <string name="pref_auto_delete_sum">Elimina l\'episodio quando viene completata la riproduzione</string>
-  <string name="pref_auto_delete_title">Elimina automaticamente</string>
-  <string name="pref_skip_keeps_episodes_title">Manteni gli Episodi Saltati</string>
-  <string name="playback_pref">Riproduzione</string>
-  <string name="network_pref">Rete</string>
-  <string name="pref_autoUpdateIntervallOrTime_message">Puoi impostare un <i>intervallo</i> come \"ogni 2 ore\", impostare <i>un\'ora del giorno</i> specifica, come \"7:00\" oppure <i>disabilitare</i> gli aggiornamenti automatici del tutto.\n\n<small>Nota: I tempi di aggiornamento non sono perfetti. Potrai riscontrare dei brevi ritardi.</small></string>
-  <string name="pref_autoUpdateIntervallOrTime_Disable">Disabilita</string>
-  <string name="pref_autoUpdateIntervallOrTime_Interval">Imposta Intervallo</string>
-  <string name="pref_autoUpdateIntervallOrTime_every">ogni %1$s</string>
-  <string name="pref_autoUpdateIntervallOrTime_at">alle %1$s</string>
-  <string name="pref_downloadMediaOnWifiOnly_sum">Abilita il download dei media solo tramite WiFi</string>
-  <string name="pref_followQueue_title">Riproduzione Continua</string>
-  <string name="pref_downloadMediaOnWifiOnly_title">Download dei media su WiFi</string>
-  <string name="pref_pauseOnHeadsetDisconnect_title">Disconnessione cuffie</string>
-  <string name="pref_unpauseOnHeadsetReconnect_title">Riconnetti le Cuffie</string>
-  <string name="pref_unpauseOnBluetoothReconnect_title">Riconnessione Bluetooth</string>
-  <string name="pref_mobileUpdate_title">Aggiornamenti su Reti a Consumo</string>
-  <string name="pref_mobileUpdate_sum">Permetti gli aggiornamenti tramite connessione dati mobile</string>
-  <string name="refreshing_label">Aggiornamento</string>
-  <string name="flattr_settings_label">Impostazioni Flattr</string>
-  <string name="pref_flattr_auth_title">Flattr sign-in</string>
-  <string name="pref_flattr_auth_sum">Collega il tuo account flattr per utilizzare flattr direttamente dall\'app</string>
-  <string name="pref_flattr_this_app_title">Supporta con flattr questa app</string>
-  <string name="pref_flattr_this_app_sum">Supporta lo sviluppo di AntennaPod tramite flattr. Grazie!</string>
-  <string name="pref_revokeAccess_title">Revoca l\'accesso</string>
-  <string name="pref_revokeAccess_sum">Revoca il permesso, a questa applicazione, di accedere al tuo account flattr.</string>
-  <string name="pref_auto_flattr_title">Flattr automatico</string>
-  <string name="pref_auto_flattr_sum">Configura l\'esecuzione automatica di Flattr</string>
-  <string name="user_interface_label">Interfaccia utente</string>
-  <string name="pref_set_theme_title">Seleziona un Tema</string>
-  <string name="pref_nav_drawer_feed_order_title">Imposta l\'ordine delle Iscrizioni</string>
-  <string name="pref_set_theme_sum">Cambia l\'aspetto di AntennaPod</string>
-  <string name="pref_automatic_download_title">Download Automatico</string>
-  <string name="pref_automatic_download_sum">Configura il download automatico degli episodi</string>
-  <string name="pref_autodl_wifi_filter_title">Abilita il filtro Wi-Fi</string>
-  <string name="pref_autodl_wifi_filter_sum">Abilita il download automatico solo per alcune reti Wi-Fi selezionate.</string>
-  <string name="pref_automatic_download_on_battery_title">Scarica quando la batteria non è in carica</string>
-  <string name="pref_automatic_download_on_battery_sum">Permetti il download automatico quando la batteria non è in carica</string>
-  <string name="pref_parallel_downloads_title">Download Contemporanei</string>
-  <string name="pref_episode_cache_title">Cache degli Episodi</string>
-  <string name="pref_theme_title_light">Light</string>
-  <string name="pref_theme_title_dark">Dark</string>
-  <string name="pref_episode_cache_unlimited">Illimitato</string>
-  <string name="pref_update_interval_hours_plural">ore</string>
-  <string name="pref_update_interval_hours_singular">ora</string>
-  <string name="pref_update_interval_hours_manual">Manuale</string>
-  <string name="pref_gpodnet_authenticate_title">Login</string>
-  <string name="pref_gpodnet_authenticate_sum">Effettua il login con il tuo account gpodder.net per sincronizzare le tue sottoscrizioni.</string>
-  <string name="pref_gpodnet_logout_title">Logout</string>
-  <string name="pref_gpodnet_logout_toast">Logout effettuato</string>
-  <string name="pref_gpodnet_setlogin_information_title">Cambia le informazioni di login</string>
-  <string name="pref_gpodnet_setlogin_information_sum">Cambia le informazioni di login per il tuo account gpodder.net.</string>
-  <string name="pref_gpodnet_sync_started">Sincronizzazione avviata</string>
-  <string name="pref_playback_speed_title">Velocità di riproduzione</string>
-  <string name="pref_playback_speed_sum">Personalizza le velocità disponibili per la riproduzione audio a velocità variabile</string>
-  <string name="pref_gpodnet_sethostname_title">Imposta l\'hostname</string>
-  <string name="pref_gpodnet_sethostname_use_default_host">Usa l\'host di default</string>
-  <string name="pref_expandNotify_title">Espandi le notifiche</string>
-  <string name="pref_expandNotify_sum">Espandi sempre le notifiche per mostrare i pulsanti di riproduzione.</string>
-  <string name="pref_persistNotify_title">Controlli di riproduzione persistenti</string>
-  <string name="pref_persistNotify_sum">Mantieni le notifiche e i controlli del blocco dello schermo quando la riproduzione è in pausa.</string>
-  <string name="pref_showDownloadReport_title">Mostra il Rapporto del Download</string>
-  <string name="pref_expand_notify_unsupport_toast">Le versioni di Android prima della 4.1 non supportano le notifiche estese.</string>
-  <string name="pref_queueAddToFront_sum">Aggiungi un nuovo episodio in testa alla coda.</string>
-  <string name="pref_queueAddToFront_title">Aggiungi in cima alla coda</string>
-  <string name="pref_smart_mark_as_played_disabled">Disabilitato</string>
-  <string name="pref_image_cache_size_title">Dimensione Cache delle Immagini</string>
-  <string name="send_email">Invia e-mail</string>
-  <string name="experimental_pref">Sperimentale</string>
-  <string name="pref_current_value">Valore corrente: %1$s</string>
-  <string name="pref_proxy_title">Proxy</string>
-  <string name="pref_faq">FAQ</string>
-  <string name="pref_known_issues">Problemi noti</string>
-  <string name="pref_cast_title">Supporto a Chromecast</string>
-  <!--Auto-Flattr dialog-->
-  <string name="auto_flattr_enable">Abilita l\'esecuzione automatica di Flattr</string>
-  <string name="auto_flattr_after_percent">Carica l\'episodio su Flattr appena è stato riprodotto al %d percento</string>
-  <string name="auto_flattr_ater_beginning">Carica l\'episodio su Flattr appena comincia la riproduzione</string>
-  <string name="auto_flattr_ater_end">Carica l\'episodio su Flattr appena finisce la riproduzione</string>
-  <!--Search-->
-  <string name="found_in_chapters_label">Trovato nei capitoli</string>
-  <string name="search_status_no_results">Nessun risultato trovato</string>
-  <string name="search_label">Ricerca</string>
-  <string name="found_in_title_label">Trovato nel titolo</string>
-  <!--OPML import and export-->
-  <string name="opml_import_txtv_button_lable">I file OPML ti permettono di spostare i tuoi podcast da un programma ad un altro.</string>
-  <string name="start_import_label">Avvio importazione</string>
-  <string name="opml_import_label">Importazione OPML</string>
-  <string name="opml_directory_error">ERRORE!</string>
-  <string name="reading_opml_label">Lettura OPML file in corso</string>
-  <string name="opml_import_error_no_file">Nessun file selezionato!</string>
-  <string name="select_all_label">Seleziona tutti</string>
-  <string name="deselect_all_label">Deseleziona tutti</string>
-  <string name="choose_file_from_filesystem">Dal filesystem locale</string>
-  <string name="choose_file_from_external_application">Utilizza un\'applicazione esterna</string>
-  <string name="opml_export_label">Esportazione su OPML</string>
-  <string name="export_error_label">Errore di esportazione</string>
-  <string name="opml_export_success_title">Esportazione OPML avvenuta con successo.</string>
-  <string name="opml_export_success_sum">Il file .opml è stato scritto su:\u0020</string>
-  <!--Sleep timer-->
-  <string name="set_sleeptimer_label">Imposta timer</string>
-  <string name="disable_sleeptimer_label">Disabilita il timer di spegnimento</string>
-  <string name="enter_time_here_label">Tempo di spegnimento</string>
-  <string name="sleep_timer_label">Timer di spegnimento</string>
-  <string name="time_left_label">Tempo residuo:\u0020</string>
-  <string name="time_dialog_invalid_input">Input non valido, il campo deve essere un numero intero.</string>
-  <string name="timer_vibration_label">Vibra</string>
-  <string name="time_seconds">secondi</string>
-  <string name="time_minutes">minuti</string>
-  <string name="time_hours">ore</string>
-  <plurals name="time_seconds_quantified">
-    <item quantity="one">1 secondo</item>
-    <item quantity="other">%d secondi</item>
-  </plurals>
-  <plurals name="time_minutes_quantified">
-    <item quantity="one">1 minuto</item>
-    <item quantity="other">%d minuti</item>
-  </plurals>
-  <plurals name="time_hours_quantified">
-    <item quantity="one">1 ora</item>
-    <item quantity="other">%d ore</item>
-  </plurals>
-  <string name="auto_enable_label">Abilita automaticamente</string>
-  <!--gpodder.net-->
-  <string name="gpodnet_taglist_header">CATEGORIE</string>
-  <string name="gpodnet_toplist_header">TOP PODCAST</string>
-  <string name="gpodnet_suggestions_header">SUGGERIMENTI</string>
-  <string name="gpodnet_search_hint">Cerca su gpodder.net</string>
-  <string name="gpodnetauth_login_title">Login</string>
-  <string name="gpodnetauth_login_descr">Benvenuto sul processo di login di gpodder.net. Per prima cosa, inserisci le tue informazioni di login:</string>
-  <string name="gpodnetauth_login_butLabel">Login</string>
-  <string name="gpodnetauth_login_register">Se non hai ancora un account, puoi crearne uno qui:\nhttps://gpodder.net/register/</string>
-  <string name="username_label">Username</string>
-  <string name="password_label">Password</string>
-  <string name="gpodnetauth_device_title">Scelta del dispositivo</string>
-  <string name="gpodnetauth_device_descr">Crea un nuovo dispositivo per utilizzare il tuo account gpodder.net o scegline uno esistente:</string>
-  <string name="gpodnetauth_device_deviceID">ID del dispositivo:\u0020</string>
-  <string name="gpodnetauth_device_caption">Caption</string>
-  <string name="gpodnetauth_device_butCreateNewDevice">Crea un nuovo dispositivo</string>
-  <string name="gpodnetauth_device_chooseExistingDevice">Scegli un dispositivo esistente:</string>
-  <string name="gpodnetauth_device_errorEmpty">L\'ID del dispositivo non può essere vuoto</string>
-  <string name="gpodnetauth_device_errorAlreadyUsed">ID di dispositivo già in uso</string>
-  <string name="gpodnetauth_device_butChoose">Scegli</string>
-  <string name="gpodnetauth_finish_title">Login effettuato!</string>
-  <string name="gpodnetauth_finish_descr">Congraturazioni! Il tuo account gpodder.net è stato collegato con il tuo dispositivo. Da ora AntennaPod sincronizzerà automaticamente le sottoscrizioni sul tuo dispositivo con il tuo account gpodder.net.</string>
-  <string name="gpodnetauth_finish_butsyncnow">Avvia la sincronizzazione</string>
-  <string name="gpodnetauth_finish_butgomainscreen">Vai alla schermata principale</string>
-  <string name="gpodnetsync_auth_error_title">errore di autenticazione su gpodder.net</string>
-  <string name="gpodnetsync_auth_error_descr">Nome utente o password errati</string>
-  <string name="gpodnetsync_error_title">gpodder.net errore di sincronizzazione</string>
-  <string name="gpodnetsync_error_descr">Rilevato un errore in fase di sincronizzazione:\u0020</string>
-  <!--Directory chooser-->
-  <string name="selected_folder_label">Seleziona la cartella:</string>
-  <string name="create_folder_label">Crea una cartella</string>
-  <string name="choose_data_directory">Scegli la directory per i dati</string>
-  <string name="create_folder_msg">Crea una nuova directory con nome \"%1$s\"?</string>
-  <string name="create_folder_success">Crea una nuova directory</string>
-  <string name="create_folder_error_no_write_access">Impossibile scrivere in questa directory</string>
-  <string name="create_folder_error_already_exists">La cartella esiste già</string>
-  <string name="create_folder_error">Non è stato possibile creare la cartella</string>
-  <string name="folder_does_not_exist_error">\"%1$s\" non esiste</string>
-  <string name="folder_not_readable_error">\"%1$s\" non è leggibile</string>
-  <string name="folder_not_writable_error">\"%1$s\" non è scrivibile</string>
-  <string name="folder_not_empty_dialog_title">La cartella non è vuota</string>
-  <string name="folder_not_empty_dialog_msg">La cartella che hai selezionato non è vuota. I download dei media e altri file saranno creati in questa cartella. Continuare?</string>
-  <string name="set_to_default_folder">Scegli la cartella predefinita</string>
-  <string name="pref_pausePlaybackForFocusLoss_sum">Sospendi la riproduzione invece di abbassare il volume quando un\'altra app emette un suono</string>
-  <string name="pref_pausePlaybackForFocusLoss_title">Pausa su interruzione</string>
-  <string name="pref_resumeAfterCall_title">Riprendi dopo la chiamata</string>
-  <!--Online feed view-->
-  <string name="subscribe_label">Abbonati</string>
-  <string name="subscribed_label">Abbonato</string>
-  <string name="downloading_label">Download in corso...</string>
-  <!--Content descriptions for image buttons-->
-  <string name="rewind_label">Riavvolgi</string>
-  <string name="fast_forward_label">Avanti veloce</string>
-  <string name="media_type_audio_label">Audio</string>
-  <string name="media_type_video_label">Video</string>
-  <string name="navigate_upwards_label">Naviga verso l\'alto</string>
-  <string name="status_downloading_label">L\'episodio sta venendo scaricato</string>
-  <string name="in_queue_label">L\'episodio è in coda</string>
-  <string name="drag_handle_content_description">Trascina per cambiare la posizione di questo oggetto</string>
-  <string name="load_next_page_label">Carica la pagina successiva</string>
-  <!--Feed information screen-->
-  <string name="authentication_label">Autenticazione</string>
-  <string name="authentication_descr">Cambia il tuo nome utente e la tua password per questo podcast e i suoi episodi.</string>
-  <string name="episode_filters_include">Includi</string>
-  <string name="episode_filters_exclude">Escludi</string>
-  <string name="keep_updated">Mantieni Aggiornato</string>
-  <!--Progress information-->
-  <!--AntennaPodSP-->
-  <string name="sp_apps_importing_feeds_msg">Importazione di sottoscrizioni da applicazioni monouso in corso...</string>
-  <string name="search_itunes_label">Cerca su iTunes</string>
-  <string name="filter">Filtro</string>
-  <!--Episodes apply actions-->
-  <string name="all_label">Tutto</string>
-  <string name="selected_all_label">Seleziona tutti gli Episodi</string>
-  <string name="none_label">Nulla</string>
-  <string name="deselected_all_label">De-seleziona tutti gli episodi</string>
-  <string name="played_label">Riprodotti</string>
-  <string name="selected_played_label">Selezionati gli episodi riprodotti</string>
-  <string name="unplayed_label">Non riprodotti</string>
-  <string name="selected_unplayed_label">Selezionati gli episodi non riprodotti</string>
-  <string name="downloaded_label">Scaricati</string>
-  <string name="selected_downloaded_label">Seleziona gli episodi scaricati</string>
-  <string name="not_downloaded_label">Non scaricati</string>
-  <string name="selected_not_downloaded_label">Seleziona gli episodi non scaricati</string>
-  <string name="queued_label">In coda</string>
-  <string name="selected_queued_label">Seleziona gli episodi in coda</string>
-  <string name="not_queued_label">Non in coda</string>
-  <string name="selected_not_queued_label">Seleziona gli episodi non in coda</string>
-  <string name="selected_has_media_label">Seleziona gli episodi con elementi multimediali</string>
-  <!--Sort-->
-  <string name="sort_title_a_z">Titolo (A \u2192 Z)</string>
-  <string name="sort_title_z_a">Titolo (Z \u2192 A)</string>
-  <string name="sort_date_new_old">Data (Nuovi \u2192 Vecchi)</string>
-  <string name="sort_date_old_new">Data (Vecchi \u2192 Nuovi)</string>
-  <string name="sort_duration_short_long">Durata (Corti \u2192 Lunghi)</string>
-  <string name="sort_duration_long_short">Durata (Lunghi \u2192 Corti)</string>
-  <!--Rating dialog-->
-  <string name="rating_title">Ti piace AntennaPod?</string>
-  <string name="rating_later_label">Ricordamelo più tardi</string>
-  <!--Audio controls-->
-  <string name="audio_controls">Controlli audio</string>
-  <string name="playback_speed">Velocità di riproduzione</string>
-  <string name="volume">Volume</string>
-  <string name="left_short">Sx</string>
-  <string name="right_short">Dx</string>
-  <string name="audio_effects">Effetti Audio</string>
-  <!--proxy settings-->
-  <string name="proxy_type_label">Tipo</string>
-  <string name="host_label">Host</string>
-  <string name="port_label">Porta</string>
-  <string name="optional_hint">(Opzionale)</string>
-  <string name="proxy_test_label">Test</string>
-  <string name="proxy_checking">Controllo in corso...</string>
-  <string name="proxy_test_successful">Test avvenuto con successo</string>
-  <string name="proxy_test_failed">Test fallito</string>
-  <string name="proxy_port_invalid_error">Porta non valida</string>
-  <!--Database import/export-->
-  <!--Casting-->
-  <string name="cast_media_route_menu_title">Riproduci su...</string>
-  <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
-</resources>
diff --git a/core/src/main/res/values-it/strings.xml b/core/src/main/res/values-it/strings.xml
index 45cd8d334..6084c3020 100644
--- a/core/src/main/res/values-it/strings.xml
+++ b/core/src/main/res/values-it/strings.xml
@@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
+  <string name="feed_update_receiver_name">Aggiorna sottoscrizioni</string>
   <string name="feeds_label">Feed</string>
   <string name="statistics_label">Statistiche</string>
   <string name="add_feed_label">Aggiungi un podcast</string>
   <string name="episodes_label">Episodi</string>
   <string name="all_episodes_short_label">Tutti</string>
+  <string name="new_episodes_label">Nuovo</string>
   <string name="favorite_episodes_label">Preferiti</string>
   <string name="new_label">Nuovo</string>
   <string name="settings_label">Impostazioni</string>
@@ -18,10 +20,12 @@
   <string name="cancel_download_label">Annulla\nil download</string>
   <string name="playback_history_label">Cronologia delle riproduzioni</string>
   <string name="gpodnet_main_label">gpodder.net</string>
+  <string name="gpodnet_summary">Sincronizza con altri dispositivi</string>
   <string name="gpodnet_auth_label">Accesso a gpodder.net</string>
   <string name="free_space_label">%1$s liberi</string>
   <string name="episode_cache_full_title">Cache degli episodi piena</string>
   <string name="episode_cache_full_message">Lo spazio di memoria della cache dell\'episodio è esaurito. Puoi aumentarlo nelle Impostazioni</string>
+  <string name="synchronizing">Sincronizzazione...</string>
   <!--Statistics fragment-->
   <string name="total_time_listened_to_podcasts">Tempo totale di riproduzione:</string>
   <string name="statistics_details_dialog">%1$d di %2$d episodi iniziati.\n\nRiprodotti %3$s di %4$s.</string>
@@ -56,13 +60,14 @@
   <string name="yes">Sì</string>
   <string name="no">No</string>
   <string name="reset">Reimposta</string>
-  <string name="author_label">Autore</string>
+  <string name="author_label">Autore(i)</string>
   <string name="language_label">Lingua</string>
   <string name="url_label">URL</string>
   <string name="podcast_settings_label">Impostazioni</string>
   <string name="cover_label">Immagine</string>
   <string name="error_label">Errore</string>
   <string name="error_msg_prefix">È avvenuto un errore:</string>
+  <string name="needs_storage_permission">Permessi di archiviazione obbligatori per questa azione</string>
   <string name="refresh_label">Ricarica</string>
   <string name="external_storage_error_msg">Non è stata trovata nessuna memoria esterna. Controlla che la memoria esterna sia montata in modo che l\'app possa rilevarla</string>
   <string name="chapters_label">Capitoli</string>
@@ -105,24 +110,27 @@
   <string name="mark_all_read_label">Segna tutti come riprodotti</string>
   <string name="mark_all_read_msg">Segnati tutti gli episodi come riprodotti</string>
   <string name="mark_all_read_confirmation_msg">Conferma che desideri segnare tutti gli episodi come riprodotti.</string>
-  <string name="mark_all_read_feed_confirmation_msg">Conferma che desideri segnare tutti gli episodi in questo feed come riprodotti.</string>
+  <string name="mark_all_read_feed_confirmation_msg">Per favore conferma che vuoi segnare tutti gli episodi di questo podcast come riprodotti.</string>
   <string name="mark_all_seen_label">Segna tutti come visti</string>
-  <string name="mark_all_seen_msg">Segnati tutti gli episodi come visti</string>
+  <string name="mark_all_seen_msg">Segna tutti gli episodi come visti</string>
   <string name="mark_all_seen_confirmation_msg">Conferma che desideri segnare tutti gli episodi come visti.</string>
   <string name="show_info_label">Mostra delle informazioni</string>
-  <string name="rename_feed_label">Rinomina Podcast</string>
-  <string name="remove_feed_label">Rimuovi Podcast</string>
+  <string name="show_feed_settings_label">Mostra impostazioni podcast</string>
+  <string name="feed_info_label">Info podcast</string>
+  <string name="feed_settings_label">Impostazioni podcast</string>
+  <string name="rename_feed_label">Rinomina podcast</string>
+  <string name="remove_feed_label">Rimuovi podcast</string>
   <string name="share_label">Condividi...</string>
-  <string name="share_link_label">Condividi il link</string>
+  <string name="share_link_label">Condividi URL episodio</string>
+  <string name="share_link_with_position_label">Condividi URL episodio con posizione</string>
   <string name="share_file_label">Condividi il file</string>
-  <string name="share_link_with_position_label">Condividi il Link con la Posizione</string>
   <string name="share_feed_url_label">Condividi URL del Feed</string>
-  <string name="share_item_url_label">Condividi l\'URL dell\'episodio</string>
-  <string name="share_item_url_with_position_label">Condividi l\'URL del File dell\'epsiodio con la Posizione</string>
-  <string name="feed_delete_confirmation_msg">Conferma che desideri cancellare il feed \"%1$s\" e TUTTI i suoi episodi scaricati.</string>
-  <string name="feed_remover_msg">Rimozione del Feed in corso</string>
+  <string name="share_item_url_label">Condividi URL Media File</string>
+  <string name="share_item_url_with_position_label">Condividi URL Media File con posizione</string>
+  <string name="feed_delete_confirmation_msg">Conferma che vuoi eliminare il podcast \"%1$s\" e TUTTI i suoi episodi (compresi quelli scaricati).</string>
+  <string name="feed_remover_msg">Rimozione podcast</string>
+  <string name="load_complete_feed">Aggiorna l\'intero podcast</string>
   <string name="hide_episodes_title">Nascondi gli episodi</string>
-  <string name="episode_actions">Applica le azioni</string>
   <string name="hide_unplayed_episodes_label">Non riprodotti</string>
   <string name="hide_paused_episodes_label">In pausa</string>
   <string name="hide_played_episodes_label">Riprodotti</string>
@@ -130,6 +138,7 @@
   <string name="hide_not_queued_episodes_label">Non in coda</string>
   <string name="hide_downloaded_episodes_label">Scaricati</string>
   <string name="hide_not_downloaded_episodes_label">Non scaricati</string>
+  <string name="hide_is_favorite_label">Preferito</string>
   <string name="filtered_label">Filtrati</string>
   <string name="refresh_failed_msg">{fa-exclamation-circle} Ultimo aggiornamento fallito</string>
   <string name="open_podcast">Apri il Podcast</string>
@@ -141,7 +150,9 @@
   <string name="stream_label">Stream</string>
   <string name="remove_label">Rimuovi</string>
   <string name="delete_label">Elimina</string>
+  <string name="delete_failed">Impossibile eliminare il file. Il riavvio del dispositivo potrebbe aiutare.</string>
   <string name="remove_episode_lable">Rimuovi l\'episodio</string>
+  <string name="mark_as_seen_label">Segna come visto</string>
   <string name="marked_as_seen_label">Segna come visto</string>
   <string name="mark_read_label">Segna come riprodotto</string>
   <string name="marked_as_read_label">Segnato come riprodotto</string>
@@ -165,6 +176,8 @@
   <string name="download_failed">fallito</string>
   <string name="download_pending">Download in attesa</string>
   <string name="download_running">Download in corso</string>
+  <string name="download_error_details">Dettagli</string>
+  <string name="download_error_details_message">%1$s \n\nFile URL:\n%2$s</string>
   <string name="download_error_device_not_found">Spazio di archiviazione non trovato</string>
   <string name="download_error_insufficient_space">Spazio Insufficiente</string>
   <string name="download_error_file_error">Errore del file</string>
@@ -229,7 +242,6 @@
   <string name="date">Per data</string>
   <string name="duration">Per durata</string>
   <string name="episode_title">Titolo dell\'episodio</string>
-  <string name="feed_title">Titolo del feed</string>
   <string name="ascending">Crescente</string>
   <string name="descending">Decrescente</string>
   <string name="clear_queue_confirmation_msg">Per favore conferma che vuoi rimuovere dalla coda TUTTI gli episodi in essa presenti.</string>
@@ -266,7 +278,6 @@
   <string name="enable_sonic">Abilita Sonic</string>
   <!--Empty list labels-->
   <string name="no_items_label">Non ci sono oggetti in questo elenco.</string>
-  <string name="no_feeds_label">Non sei ancora abbonato a nessun feed.</string>
   <string name="no_chapters_label">Questo episodio non ha capitoli.</string>
   <string name="no_shownotes_label">Questo episodio non ha note.</string>
   <!--Preferences-->
@@ -275,12 +286,16 @@
   <string name="other_pref">Altro</string>
   <string name="about_pref">Riguardo a</string>
   <string name="queue_label">Coda</string>
-  <string name="services_label">Servizi</string>
   <string name="flattr_label">Flattr</string>
+  <string name="pref_episode_cleanup_title">Pulizia dell\'episodio</string>
+  <string name="pref_episode_cleanup_summary">Gli episodi che non sono in coda e non sono preferiti dovrebbero essere idonei alla rimozione se Auto Download richiede spazio per nuovi episodi</string>
+  <string name="pref_pauseOnDisconnect_sum">Sospendi la riproduzione quando le cuffie o il bluetooth sono disconnessi</string>
   <string name="pref_unpauseOnHeadsetReconnect_sum">Riprendi la riproduzione quando le cuffie vengono ricollegate</string>
+  <string name="pref_unpauseOnBluetoothReconnect_sum">Reprendi la riproduzione quando le cuffie o il bluetooth sono disconnessi</string>
   <string name="pref_followQueue_sum">Passa al prossimo episodio in coda al termine della riproduzione</string>
   <string name="pref_auto_delete_sum">Elimina l\'episodio al termine della riproduzione</string>
   <string name="pref_auto_delete_title">Elimina Automaticamente</string>
+  <string name="pref_smart_mark_as_played_sum">Contrassegna gli episodi come riprodotti anche se rimane meno di un certo numero di secondi di tempo di riproduzione</string>
   <string name="pref_skip_keeps_episodes_title">Manteni gli Episodi Saltati</string>
   <string name="playback_pref">Riproduzione</string>
   <string name="network_pref">Rete</string>
@@ -336,8 +351,6 @@
   <string name="pref_playback_speed_sum">Personalizza le velocità disponibili per la riproduzione audio a velocità variabile</string>
   <string name="pref_gpodnet_sethostname_title">Imposta il nome dell\'host</string>
   <string name="pref_gpodnet_sethostname_use_default_host">Utilizza l\'host predefinito</string>
-  <string name="pref_expandNotify_title">Espandi le notifiche</string>
-  <string name="pref_expandNotify_sum">Espandi sempre le notifiche per mostrare i pulsanti di riproduzione.</string>
   <string name="pref_persistNotify_title">Controlli di riproduzione persistenti</string>
   <string name="pref_persistNotify_sum">Mantieni le notifiche e i controlli del blocco dello schermo quando la riproduzione è in pausa.</string>
   <string name="pref_showDownloadReport_title">Mostra il Rapporto del Download</string>
@@ -376,8 +389,6 @@
   <string name="choose_file_from_external_application">Usa un\'applicazione esterna</string>
   <string name="opml_export_label">Esportazione OPML</string>
   <string name="export_error_label">Errore di esportazione</string>
-  <string name="opml_export_success_title">Esportazione OPML avvenuta con successo.</string>
-  <string name="opml_export_success_sum">Il file .opml è stato scritto su:\u0020</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Imposta timer di spegnimento</string>
   <string name="disable_sleeptimer_label">Disabilita il timer di spegnimento</string>
@@ -499,7 +510,9 @@
   <string name="sort_duration_long_short">Durata (Lunghi \u2192 Corti)</string>
   <!--Rating dialog-->
   <string name="rating_title">Ti piace AntennaPod?</string>
+  <string name="rating_never_label">Lasciami solo</string>
   <string name="rating_later_label">Ricordamelo più tardi</string>
+  <string name="rating_now_label">Certo, facciamolo!</string>
   <!--Audio controls-->
   <string name="audio_controls">Controlli audio</string>
   <string name="playback_speed">Velocità di riproduzione</string>
@@ -516,9 +529,13 @@
   <string name="proxy_checking">Controllo in corso...</string>
   <string name="proxy_test_successful">Test avvenuto con successo</string>
   <string name="proxy_test_failed">Test fallito</string>
+  <string name="proxy_host_empty_error">Host non può essere vuoto</string>
   <string name="proxy_port_invalid_error">Porta non valida</string>
   <!--Database import/export-->
+  <string name="import_select_file">Seleziona il file da importare</string>
+  <string name="export_ok">Esportato con successo.</string>
   <!--Casting-->
   <string name="cast_media_route_menu_title">Riproduci su...</string>
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-iw-rIL/strings.xml b/core/src/main/res/values-iw-rIL/strings.xml
index 96475b40e..8699c3eee 100644
--- a/core/src/main/res/values-iw-rIL/strings.xml
+++ b/core/src/main/res/values-iw-rIL/strings.xml
@@ -2,58 +2,70 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
   <string name="feeds_label">הזנות</string>
-  <string name="statistics_label">סטטיסטיקות</string>
-  <string name="add_feed_label">הוסף פודקאסט</string>
+  <string name="statistics_label">סטטיסטיקה</string>
+  <string name="add_feed_label">הוספת פודקאסט</string>
   <string name="episodes_label">פרקים</string>
-  <string name="all_episodes_short_label">הכל</string>
+  <string name="all_episodes_short_label">הכול</string>
   <string name="favorite_episodes_label">מועדפים</string>
   <string name="new_label">חדש</string>
   <string name="settings_label">הגדרות</string>
   <string name="downloads_label">הורדות</string>
-  <string name="downloads_running_label">פועל</string>
-  <string name="downloads_completed_label">סיים</string>
+  <string name="downloads_running_label">פעיל</string>
+  <string name="downloads_completed_label">הושלם</string>
   <string name="downloads_log_label">יומן</string>
   <string name="subscriptions_label">פודקאסטים</string>
   <string name="subscriptions_list_label">רשימת פודקאסטים</string>
-  <string name="cancel_download_label">בטל הורדה</string>
+  <string name="cancel_download_label">ביטול\nהורדה</string>
   <string name="playback_history_label">היסטוריית ניגון</string>
   <string name="gpodnet_main_label">gpodder.net</string>
-  <string name="gpodnet_auth_label">התחברות אל gpodder.net</string>
-  <string name="free_space_label">%1$s חינם</string>
-  <string name="episode_cache_full_title">זכרון -המטמון של פרקים מלא</string>
-  <string name="episode_cache_full_message">זכרון-המטמון של פרקים הגיע לגבול שלו. אפשר להגדיל את גודל המטמון בהגדרות.</string>
+  <string name="gpodnet_auth_label">כניסה אל gpodder.net</string>
+  <string name="free_space_label">%1$s פנויים</string>
+  <string name="episode_cache_full_title">מטמון הפרקים מלא</string>
+  <string name="episode_cache_full_message">מטמון הפרקים התמלא. ניתן להגדיל את גודל המטמון בהגדרות.</string>
   <!--Statistics fragment-->
-  <string name="total_time_listened_to_podcasts">סה\"כ זמן ניגון של פודקאסטים:</string>
-  <string name="statistics_mode_normal">חשב זמן שנוגן בפועל. פרק שנוגן פעמיים נספר פעמיים, לעומת פרק שרק סומן כנוגן - שלא נספר.</string>
+  <string name="total_time_listened_to_podcasts">זמן ניגון הפודקאסטים הכולל:</string>
+  <string name="statistics_details_dialog">%1$d מתוך %2$d פרקים החלו.\n\nנוגנו %3$s מתוך %4$s.</string>
+  <string name="statistics_mode">מצב סטטיסטיקה</string>
+  <string name="statistics_mode_normal">חישוב זמן שנוגן בפועל. נגינה כפולה נספרת פעמיים, בעוד שסימון כנוגן לא נחשב.</string>
+  <string name="statistics_mode_count_all">סיכום כל הפודקאסטים שסומנו כנוגנו</string>
+  <string name="statistics_speed_not_counted">לתשומת לבך: אין התייחסות למהירות הנגינה.</string>
   <!--Main activity-->
-  <string name="drawer_open">פתח תפריט</string>
-  <string name="drawer_close">סגור תפריט</string>
-  <string name="drawer_feed_order_alphabetical">מיין בסדר אלפביתי</string>
-  <string name="drawer_feed_order_last_update">מיין לפי תאריך פרסום</string>
-  <string name="drawer_feed_order_most_played">מיין לפי מספר פרקים שהושמעו </string>
+  <string name="drawer_open">פתיחת תפריט</string>
+  <string name="drawer_close">סגירת תפריט</string>
+  <string name="drawer_preferences">העדפות מגירה</string>
+  <string name="drawer_feed_order_unplayed_episodes">מיון לפי מונה</string>
+  <string name="drawer_feed_order_alphabetical">מיון בסדר אלפביתי</string>
+  <string name="drawer_feed_order_last_update">מיון לפי תאריך פרסום</string>
+  <string name="drawer_feed_order_most_played">מיון לפי מספר פרקים שהושמעו </string>
+  <string name="drawer_feed_counter_new_unplayed">מספר פרקים חדשים וכאלו שעדיין לא התנגנו</string>
+  <string name="drawer_feed_counter_new">מספר פרקים חדשים</string>
+  <string name="drawer_feed_counter_unplayed">מספר פרקים שעוד לא התנגנו</string>
+  <string name="drawer_feed_counter_downloaded">מספר פרקים שהתקבלו</string>
+  <string name="drawer_feed_counter_none">ללא</string>
   <!--Webview actions-->
-  <string name="open_in_browser_label">פתח בדפדפן</string>
-  <string name="copy_url_label">העתק כתובת אתר</string>
-  <string name="share_url_label">שתף כתובת אתר</string>
-  <string name="copied_url_msg">כתובת אתרהועתקה ללוח.</string>
-  <string name="go_to_position_label">עבור למיקום זה</string>
+  <string name="open_in_browser_label">פתיחה בדפדפן</string>
+  <string name="copy_url_label">העתקת כתובת</string>
+  <string name="share_url_label">שיתוף כתובת</string>
+  <string name="copied_url_msg">הכתובת הועתקה ללוח הגזירים</string>
+  <string name="go_to_position_label">מעבר למיקום זה</string>
   <!--Playback history-->
-  <string name="clear_history_label">נקה היסטוריה</string>
+  <string name="clear_history_label">ניקוי היסטוריה</string>
   <!--Other-->
   <string name="confirm_label">אישור</string>
-  <string name="cancel_label">בטל</string>
+  <string name="cancel_label">ביטול</string>
   <string name="yes">כן</string>
   <string name="no">לא</string>
-  <string name="author_label">מחבר</string>
+  <string name="reset">איפוס</string>
   <string name="language_label">שפה</string>
   <string name="url_label">כתובת</string>
   <string name="podcast_settings_label">הגדרות</string>
   <string name="cover_label">תמונה</string>
   <string name="error_label">שגיאה</string>
   <string name="error_msg_prefix">אירעה שגיאה:</string>
-  <string name="refresh_label">רענן</string>
-  <string name="external_storage_error_msg">אין אחסון חיצוני זמין. אנא ודא כי אחסון חיצוני הוא מותקן כך שהאפליקציה תוכל לעבוד כמו שצריך.</string>
+  <string name="refresh_label">רענון</string>
+  <string name="external_storage_error_msg">אין אחסון חיצוני זמין. נא לוודא שיש אחסון חיצוני מעוגן כדי שהיישומון יוכל לפעול כראוי.</string>
   <string name="chapters_label">פרקים</string>
+  <string name="chapter_duration">משך: %1$s</string>
   <string name="shownotes_label">הערות פרק</string>
   <string name="description_label">תיאור</string>
   <string name="most_recent_prefix">הפרק האחרון:\u0020</string>
@@ -62,187 +74,268 @@
   <string name="size_prefix">גודל:\u0020</string>
   <string name="processing_label">מעבד</string>
   <string name="loading_label">טוען...</string>
-  <string name="save_username_password_label">שמור שם משתמש וססמה</string>
-  <string name="close_label">סגור</string>
-  <string name="retry_label">נסה שוב</string>
-  <string name="auto_download_label">כלול בהורדות אוטומטיות</string>
+  <string name="save_username_password_label">שמירת שם משתמש וססמה</string>
+  <string name="close_label">סגירה</string>
+  <string name="retry_label">לנסות שוב</string>
+  <string name="auto_download_label">לכלול בהורדות אוטומטיות</string>
+  <string name="auto_download_apply_to_items_title">החלה על פרקים קודמים</string>
+  <string name="auto_download_apply_to_items_message">הגדרות ה<i>הורדה האוטומטית</i> החדשות יחולו אוטומטית על פרקים חדשים.\nלהחיל אותן גם על פרקים שפורסמו בעבר?</string>
+  <string name="auto_delete_label">מחיקת פרק באופן אוטומטי</string>
   <string name="parallel_downloads_suffix">\u0020הורדות במקביל</string>
+  <string name="feed_auto_download_global">בררת מחדל גלובלי</string>
   <string name="feed_auto_download_always">תמיד</string>
   <string name="feed_auto_download_never">אף פעם</string>
-  <string name="send_label">שלח...</string>
+  <string name="send_label">שליחה…</string>
   <string name="episode_cleanup_never">אף פעם</string>
+  <string name="episode_cleanup_queue_removal">כאשר לא בתור</string>
   <string name="episode_cleanup_after_listening">אחרי סיום</string>
   <plurals name="episode_cleanup_days_after_listening">
     <item quantity="one">יום אחרי סיום</item>
+    <item quantity="two">%d ימים לאחר סיום </item>
+    <item quantity="many">%d ימים לאחר סיום </item>
     <item quantity="other">%d ימים לאחר סיום </item>
   </plurals>
   <!--'Add Feed' Activity labels-->
   <string name="feedurl_label">כתובת הזנה</string>
-  <string name="etxtFeedurlHint">כתובת של הזנה או אתר אינטרנט</string>
-  <string name="txtvfeedurl_label">הוסף פודקאסט לפי כתובת אתר</string>
+  <string name="etxtFeedurlHint">www.example.com/feed</string>
+  <string name="txtvfeedurl_label">הוספת פודקאסט לפי כתובת</string>
   <string name="podcastdirectories_label">חפש פודקאסט בספריה</string>
-  <string name="browse_gpoddernet_label">עיין בgpodder.net</string>
+  <string name="podcastdirectories_descr">לאיתור פודקאסטים חדשים, ניתן לחפש ב־iTunes או ב־fyyd או לעיין ב־gpodder.net לפי שם, קטגוריה או פופולריות.</string>
+  <string name="browse_gpoddernet_label">עיון ב־gpodder.net</string>
   <!--Actions on feeds-->
-  <string name="mark_all_read_label">סמן הכל כנקרא</string>
-  <string name="mark_all_read_msg">סמן את כל הפרקים כנקרא</string>
-  <string name="mark_all_read_confirmation_msg">אנא אשר שאתה רוצה לסמן את כל פרקים כנקראים.</string>
-  <string name="mark_all_read_feed_confirmation_msg">אנא אשר שאתה רוצה לסמן את כל פרקים בהזנה זו כנקראים.</string>
-  <string name="mark_all_seen_label">סמן את כולם כנראו</string>
-  <string name="mark_all_seen_msg">סמן את כל הפרקים כנראו</string>
-  <string name="mark_all_seen_confirmation_msg">אנא אשר שאתה רוצה לסמן את כל פרקים כנראו.</string>
-  <string name="show_info_label">הצג מידע</string>
-  <string name="rename_feed_label">שנה שם פודקאסט</string>
-  <string name="remove_feed_label">הסר פודקאסט</string>
-  <string name="share_label">שתף...</string>
-  <string name="share_link_label">שתף קישור אתר</string>
-  <string name="feed_remover_msg">הסר הזנה</string>
-  <string name="load_complete_feed">רענן את כל ההזנה</string>
-  <string name="hide_episodes_title">הסתר פרקים</string>
+  <string name="mark_all_read_label">סימון הכול כנוגנו</string>
+  <string name="mark_all_read_msg">סימון את כל הפרקים כנוגנו</string>
+  <string name="mark_all_read_confirmation_msg">נא לאשר שברצונך לסמן את כל הפרקים כנוגנו.</string>
+  <string name="mark_all_seen_label">סימון כולם כנצפו</string>
+  <string name="mark_all_seen_confirmation_msg">נא לאשר שברצונך לסמן את כל הפרקים כנצפו.</string>
+  <string name="show_info_label">הצגת מידע</string>
+  <string name="share_label">שיתוף…</string>
+  <string name="share_file_label">שיתוף כתובת</string>
+  <string name="share_feed_url_label">שיתוף כתובת הזנה</string>
+  <string name="hide_episodes_title">הסתרת פרקים</string>
+  <string name="hide_unplayed_episodes_label">לא נוגן</string>
+  <string name="hide_paused_episodes_label">מושהה</string>
+  <string name="hide_played_episodes_label">נוגן</string>
+  <string name="hide_queued_episodes_label">בתור</string>
+  <string name="hide_not_queued_episodes_label">לא בתור</string>
+  <string name="hide_downloaded_episodes_label">הורד</string>
+  <string name="hide_not_downloaded_episodes_label">לא הורד</string>
+  <string name="hide_has_media_label">יש מדיה</string>
+  <string name="filtered_label">מסונן</string>
+  <string name="refresh_failed_msg">{fa-exclamation-circle} הרענון האחרון נכשל</string>
+  <string name="open_podcast">פתיחת פודקאסט</string>
   <!--actions on feeditems-->
-  <string name="download_label">הורד</string>
-  <string name="play_label">נגן</string>
-  <string name="pause_label">השהה</string>
-  <string name="stop_label">עצור</string>
-  <string name="stream_label">הזרם</string>
-  <string name="remove_label">הסר</string>
-  <string name="remove_episode_lable">הסר פרק</string>
-  <string name="mark_read_label">סמן כנקרא</string>
-  <string name="marked_as_read_label">סומן כנקרא</string>
-  <string name="mark_unread_label">סמן כלא נקרא</string>
-  <string name="add_to_queue_label">הוסף לתור</string>
+  <string name="download_label">הורדה</string>
+  <string name="play_label">ניגון</string>
+  <string name="pause_label">השהיה</string>
+  <string name="stop_label">עצירה</string>
+  <string name="stream_label">הזרמה</string>
+  <string name="remove_label">הסרה</string>
+  <string name="delete_label">מחיקה</string>
+  <string name="delete_failed">לא ניתן למחוק קובץ. הפעלת המכשיר מחדש עשויה לסייע.</string>
+  <string name="remove_episode_lable">הסרת פרק</string>
+  <string name="marked_as_seen_label">סימון כנצפה</string>
+  <string name="mark_read_label">סימון כנצפה</string>
+  <string name="marked_as_read_label">סימון כנוגן</string>
+  <string name="mark_unread_label">סימון כלא נוגן</string>
+  <string name="add_to_queue_label">הוספה לתור</string>
   <string name="added_to_queue_label">התווסף לתור</string>
-  <string name="remove_from_queue_label">הסר מהתור</string>
+  <string name="remove_from_queue_label">הסרה מהתור</string>
   <string name="add_to_favorite_label">התווסף למועדפים</string>
-  <string name="visit_website_label">בקר באתר</string>
-  <string name="support_label">תרום באמצעות Flattr</string>
-  <string name="skip_episode_label">דלג על הפרק</string>
+  <string name="added_to_favorites">התווסף למועדפים</string>
+  <string name="remove_from_favorite_label">הסרה מהמועדפים</string>
+  <string name="removed_from_favorites">הוסר מהמועדפים</string>
+  <string name="visit_website_label">ביקור באתר</string>
+  <string name="support_label">תרומה עם Flattr</string>
+  <string name="skip_episode_label">דילוג על פרק</string>
+  <string name="activate_auto_download">הפעלת הורדה אוטומטית</string>
+  <string name="deactivate_auto_download">השבתת הורדה אוטומטית</string>
+  <string name="reset_position">איפוס מיקום הנגינה</string>
+  <string name="removed_item">פריט הוסר</string>
   <!--Download messages and labels-->
   <string name="download_successful">הצלחה</string>
-  <string name="download_failed">כישלון</string>
-  <string name="download_pending">הורדה עתידית</string>
+  <string name="download_failed">כשל</string>
+  <string name="download_pending">הורדה ממתינה</string>
   <string name="download_running">הורדה מתבצעת</string>
-  <string name="download_error_device_not_found">התקן איחסון לא נמצא</string>
-  <string name="download_error_insufficient_space">אין די שטח איחסון</string>
+  <string name="download_error_details">פרטים</string>
+  <string name="download_error_details_message">%1$s \n\nכתובת הקובץ:\n%2$s</string>
+  <string name="download_error_device_not_found">התקן האחסון לא נמצא</string>
+  <string name="download_error_insufficient_space">אין די שטח אחסון</string>
   <string name="download_error_file_error">שגיאת קובץ</string>
-  <string name="download_error_http_data_error">שגיאת מידע HTTP</string>
+  <string name="download_error_http_data_error">שגיאת נתוני HTTP</string>
   <string name="download_error_error_unknown">שגיאה לא ידועה</string>
-  <string name="download_error_parser_exception">שגיאת תוכנית ניתוח</string>
+  <string name="download_error_parser_exception">שגיאת מפענח</string>
   <string name="download_error_unsupported_type">סוג ההזנה אינו נתמך</string>
   <string name="download_error_connection_error">שגיאת חיבור</string>
   <string name="download_error_unknown_host">שרת לא ידוע</string>
   <string name="download_error_unauthorized">שגיאת אימות</string>
-  <string name="cancel_all_downloads_label">בטל את כל ההורדות</string>
+  <string name="download_error_file_type_type">שגיאת סוג קובץ</string>
+  <string name="download_error_forbidden">אסור</string>
+  <string name="cancel_all_downloads_label">ביטול כל ההורדות</string>
   <string name="download_canceled_msg">הורדה בוטלה</string>
-  <string name="download_report_title">הורדות הושלמו</string>
-  <string name="download_error_malformed_url">כתובת אתר שגויה</string>
+  <string name="download_canceled_autodownload_enabled_msg">ההורדה בוטלה\nה<i>הורדה האוטומטית</i> הושבתה עבור פריט זה</string>
+  <string name="download_report_title">הורדות הושלמו עם שגיאה אחת או יותר</string>
+  <string name="download_report_content_title">דוח הורדה</string>
+  <string name="download_error_malformed_url">כתובת שגויה</string>
   <string name="download_error_io_error">שגיאת קלט פלט</string>
   <string name="download_error_request_error">שגיאת בקשה</string>
   <string name="download_error_db_access">שגיאת גישה למסד הנתונים</string>
-  <string name="downloads_processing">מעבד הורדות</string>
-  <string name="download_notification_title">מוריד פודקאסט</string>
-  <string name="download_report_content">%1$d הורדות הצליחו, %2$d ניכשלו</string>
+  <plurals name="downloads_left">
+    <item quantity="one">נותרה הורדה %d</item>
+    <item quantity="two">נותרו %d הורדות</item>
+    <item quantity="many">נותרו %d הורדות</item>
+    <item quantity="other">נותרו %d הורדות</item>
+  </plurals>
+  <string name="downloads_processing">ההורדות בהליכי עיבוד</string>
+  <string name="download_notification_title">נתוני הפודקאסט מתקבלים</string>
+  <string name="download_report_content">%1$d הורדות הצליחו, %2$d נכשלו</string>
   <string name="download_log_title_unknown">כותרת לא ידועה</string>
   <string name="download_type_feed">הזנה</string>
   <string name="download_type_media">קובץ מדיה</string>
   <string name="download_type_image">תמונה</string>
-  <string name="download_request_error_dialog_message_prefix">שגיאה אירעה בעת הניסיון הורדת הקובץ:\u0020</string>
-  <string name="authentication_notification_title">נידרש אימות</string>
-  <string name="authentication_notification_msg">המשאב אותה ביקשת דורש שם משתמש וססמה</string>
+  <string name="download_request_error_dialog_message_prefix">אירעה שגיאה בעת הניסיון הורדת הקובץ:\u0020</string>
+  <string name="authentication_notification_title">נדרש אימות</string>
+  <string name="authentication_notification_msg">המשאב שביקשת דורש שם משתמש וססמה</string>
+  <string name="confirm_mobile_download_dialog_title">אישור הורדה דרך רשת סלולרית</string>
+  <string name="confirm_mobile_download_dialog_message_not_in_queue">הורדה דרך חיבור נתונים של רשת סלולרית מושבת דרך ההגדרות.\n\nניתן לבחור בין הוספת הפרק לתור או לאפשר להוריד אותו באופן זמני.\n\n<small>הבחירה שלך תישמר למשך 10 דקות.</small></string>
+  <string name="confirm_mobile_download_dialog_message">הורדה דרך חיבור נתונים של רשת סלולרית מושבת דרך ההגדרות.\n\nלאפשר את ההורדה באופן זמני?\n\n<small>הבחירה שלך תישמר למשך 10 דקות.</small></string>
+  <string name="confirm_mobile_download_dialog_only_add_to_queue">הוספה לתור</string>
+  <string name="confirm_mobile_download_dialog_enable_temporarily">לאפשר לבינתיים</string>
   <!--Mediaplayer messages-->
   <string name="player_error_msg">שגיאה!</string>
-  <string name="player_stopped_msg">מדיה לא מתנגנת</string>
-  <string name="player_preparing_msg">מתכונן</string>
-  <string name="player_ready_msg">מוכן</string>
-  <string name="player_seeking_msg">מחפש</string>
-  <string name="playback_error_server_died">שרת מת</string>
+  <string name="player_stopped_msg">אין מדיה מתנגנת</string>
+  <string name="player_preparing_msg">בהכנה</string>
+  <string name="player_ready_msg">בהמתנה</string>
+  <string name="player_seeking_msg">מתבצע איתור</string>
+  <string name="playback_error_server_died">השרת לא מגיב</string>
   <string name="playback_error_unknown">שגיאה לא ידועה</string>
-  <string name="no_media_playing_label">מדיה לא מתנגנת</string>
-  <string name="player_buffering_msg">ממלא חוצץ</string>
-  <string name="playbackservice_notification_title">מנגן פודקאסט</string>
-  <string name="unknown_media_key">אנטנה-פוד - מפתח מדיה לא ידוע: %1$d</string>
+  <string name="no_media_playing_label">אין מדיה מתנגנת</string>
+  <string name="player_buffering_msg">החוצץ מתמלא</string>
+  <string name="playbackservice_notification_title">פודקאסט מתנגן</string>
+  <string name="unknown_media_key">אנטנה־פּוֹד - מפתח מדיה לא ידוע: %1$d</string>
   <!--Queue operations-->
-  <string name="clear_queue_label">נקה תור</string>
-  <string name="undo">בטל</string>
-  <string name="removed_from_queue">הסר פריט</string>
-  <string name="move_to_top_label">העבר למעלה</string>
-  <string name="move_to_bottom_label">העבר למטה</string>
-  <string name="sort">מיין</string>
+  <string name="lock_queue">נעילת תור</string>
+  <string name="unlock_queue">שחרור תור</string>
+  <string name="queue_locked">התור ננעל</string>
+  <string name="queue_unlocked">התור שוחרר מנעילה</string>
+  <string name="clear_queue_label">ניקוי תור</string>
+  <string name="undo">ביטול</string>
+  <string name="removed_from_queue">פריט הוסר</string>
+  <string name="move_to_top_label">העברה למעלה</string>
+  <string name="move_to_bottom_label">העברה למטה</string>
+  <string name="sort">מיון</string>
   <string name="date">תאריך</string>
   <string name="duration">משך</string>
+  <string name="episode_title">כותרת הפרק</string>
   <string name="ascending">בסדר עולה</string>
   <string name="descending">בסדר יורד</string>
-  <string name="clear_queue_confirmation_msg">אנא אשר שאתה רוצה לנקות את התור מכל הפרקים שבו</string>
+  <string name="clear_queue_confirmation_msg">נא לאשר את פינוי התור מכל הפרקים שבו</string>
   <!--Flattr-->
-  <string name="flattr_auth_label">כניסה ל-Fattr</string>
-  <string name="flattr_auth_explanation">לחץ על הכפתור למטה כדי להתחיל את תהליך האימות. אתה תועבר למסך כניסת flattr בדפדפן שלך ותתבקש לתת לאנטנה-פוד רשות לתרום באמצעות flattr. לאחר שקבלת אישור, תוכל לחזור למסך זה באופן אוטומטי.</string>
+  <string name="flattr_auth_label">כניסה ל־Fattr</string>
+  <string name="flattr_auth_explanation">נא ללחוץ על הכפתור שלמטה כדי להתחיל את תהליך האימות. פעולה זו תעביר אותך למסך הכניסה של Flattr בדפדפן שלך ותופיע בקשה לאפשר לאנטנה־פּוֹד לבצע פעולות ב־Flattr. לאחר מתן ההרשאה, המערכת תחזיר אותך למסך זה אוטומטית.</string>
   <string name="authenticate_label">אימות</string>
-  <string name="return_home_label">חזור למסך הבית</string>
-  <string name="flattr_auth_success">האימות הצליח! עכשיו אתה יכול לתרום באמצעות flattr מתוך האפליקציה.</string>
-  <string name="no_flattr_token_title">אסימון flattr לא נמצא</string>
-  <string name="no_flattr_token_notification_msg">חשבון ה-flattr שלך אינו מחובר לאנטנה-פוד. הקש כאן לאימות.</string>
-  <string name="no_flattr_token_msg">חשבון ה-flattr שלך אינו מחובר לאנטנה-פוד. אתה יכול לקשראת  לחשבונך לאנטנה-פוד לתרום באמצעות flattr מתוך האפליקציה או שאתה יכול לבקר באתר האינטרנט של הדבר לו תרצה לתרום.</string>
-  <string name="authenticate_now_label">אמת</string>
+  <string name="return_home_label">חזרה למסך הבית</string>
+  <string name="flattr_auth_success">האימות הצליח! כעת יש לך אפשרות לתרום עם Flattr מתוך היישומון.</string>
+  <string name="no_flattr_token_title">לא נמצא אסימון Flattr</string>
+  <string name="no_flattr_token_notification_msg">נראה כי חשבון ה־Flattr שלך אינו מחובר לאנטנה־פּוֹד. יש לגעת כאן לאימות.</string>
+  <string name="no_flattr_token_msg">נראה כי חשבון ה־Flattr שלך אינו מחובר לאנטנה־פּוֹד. יש לך אפשרות לחבר את חשבונך לאנטנה־פּוֹד כדי לתרום עם Flattr מתוך היישומון או לבקר באתר של מה שברצונך לתרום לו עם Flattr.</string>
+  <string name="authenticate_now_label">אימות</string>
   <string name="action_forbidden_title">הפעולה אסורה</string>
-  <string name="action_forbidden_msg">לאנטנה-פוד אין הרשאה לפעולה זו. הסיבה לכך יכולה להיות שאסימון הגישה של אנטנה-פוד לחשבון שלך בוטל. אתה יכול לבצע אימות מחדש או לבקר באתר האינטרנט של הדבר במקום.</string>
+  <string name="action_forbidden_msg">לאנטנה־פּוֹד אין הרשאה לבצע פעולה זו. הסיבה לכך עשויה להיות שאסימון הגישה של אנטנה־פּוֹד לחשבון שלך נשלל. ניתן לאמת מחדש או לבקר באתר המיועד במקום.</string>
   <string name="access_revoked_title">גישה בוטלה</string>
-  <string name="access_revoked_info">אסימון הגישה של אנטנה-פוד לחשבונך בוטל. על מנת להשלים את התהליך, אתה צריך להסיר יישום זה מהרשימת היישומים שאושרו בהגדרות החשבונך באתר flattr.</string>
+  <string name="access_revoked_info">אסימון הגישה של אנטנה־פוד לחשבונך בוטל. על מנת להשלים את התהליך, אתה צריך להסיר יישום זה מהרשימת היישומים שאושרו בהגדרות החשבונך באתר flattr.</string>
   <!--Flattr-->
-  <string name="flattr_click_success">תרמת ב-Flattr!</string>
-  <string name="flattr_click_success_count">תרמת ב-Flattr %d פעמים! </string>
+  <string name="flattr_click_success">תרמת ב־Flattr!</string>
+  <string name="flattr_click_success_count">תרמת ב־Flattr %d פעמים!</string>
   <string name="flattr_click_success_queue">תרומות Flattr: %s.</string>
-  <string name="flattr_click_failure_count">כישלון לתרום ב-Flattr %d!</string>
-  <string name="flattr_click_failure">לא נתרם ב-Flattr: %s.</string>
-  <string name="flattr_click_enqueued">תרומות ב-Flattr מאוחר יותר</string>
-  <string name="flattring_thing">תורם ב-Flattr %s</string>
-  <string name="flattring_label">אנטנה-פוד תורם ב-Flattr</string>
-  <string name="flattrd_label">אנטנה-פוד תרם ב-Flattr</string>
-  <string name="flattrd_failed_label">כישלון תרומת אנטנה-פוד ב-Flattr</string>
-  <string name="flattr_retrieving_status">איחזור תרומות Flattr</string>
+  <string name="flattr_click_failure_count">התרומה ב־Flattr %d נכשלה!</string>
+  <string name="flattr_click_failure">לא נתרם ב־Flattr: %s.</string>
+  <string name="flattr_click_enqueued">לתרום ב־Flattr מאוחר יותר</string>
+  <string name="flattring_thing">תרומה ב־Flattr %s</string>
+  <string name="flattring_label">תרומה ב־Flattr עם אנטנה־פּוֹד</string>
+  <string name="flattrd_label">תרומה ב־Flattr עם אנטנה־פּוֹד</string>
+  <string name="flattrd_failed_label">התרומה באנטנה־פּוֹד עם Flattr נכשלה</string>
+  <string name="flattr_retrieving_status">תרומות Flattr מתקבלות</string>
   <!--Variable Speed-->
-  <string name="download_plugin_label">הורד תוסף</string>
+  <string name="download_plugin_label">הורדת תוסף</string>
   <string name="no_playback_plugin_title">תוסף לא מותקן</string>
+  <string name="no_playback_plugin_or_sonic_msg">כדי שתכונת המהירות המשתנה תפעל, מומלץ להפעיל את נגן המדיה המובנה בשם Sonic [מ־Android 4.1 ואילך].\n\nלחלופין, ניתן להוריד תוסף צד שלישי בשם <i>Prestissimo</i> מהחנות Play.\nכל תקלה שמופיעה ב־Prestissimo אינה באחריות אנטנה־פּוֹד ויש לדווח עליה לבעלים על התוסף.</string>
   <string name="set_playback_speed_label">מהירויות ניגון</string>
+  <string name="enable_sonic">הפעלת Sonic</string>
   <!--Empty list labels-->
   <string name="no_items_label">אין פריטים ברשימה זו.</string>
-  <string name="no_feeds_label">לא נרשמת עדיין להזנות.</string>
+  <string name="no_chapters_label">לפרק זה אין פרקים.</string>
+  <string name="no_shownotes_label">לפרק זה אין הערות פרק.</string>
   <!--Preferences-->
+  <string name="storage_pref">אחסון</string>
+  <string name="project_pref">מיזם</string>
   <string name="other_pref">אחר</string>
-  <string name="about_pref">אודות</string>
+  <string name="about_pref">על אודות</string>
   <string name="queue_label">תור</string>
-  <string name="services_label">שירותים</string>
   <string name="flattr_label">Flattr</string>
-  <string name="pref_unpauseOnHeadsetReconnect_sum">המשך את הניגון כשהאוזניות מחוברות מחדש</string>
-  <string name="pref_followQueue_sum">עבור לפריט הבא בתור כאשר הניגון מסתיים</string>
-  <string name="pref_auto_delete_sum">מחק פרק כהניגון מסתיים</string>
+  <string name="pref_episode_cleanup_title">ניקוי פרקים</string>
+  <string name="pref_episode_cleanup_summary">פרקים שאינם בתור ואינם במועדפים אמורים לענות לתנאים של הסרה במקרה שההורדה האוטומטית זקוקה למקום לפרקים חדשים</string>
+  <string name="pref_pauseOnDisconnect_sum">השהיית הנגינה כאשר האוזניות או ה־Bluetooth מנותקים</string>
+  <string name="pref_unpauseOnHeadsetReconnect_sum">להמשיך את הניגון כשהאוזניות מחוברות מחדש</string>
+  <string name="pref_unpauseOnBluetoothReconnect_sum">להמשיך את הנגינה עם חיבור מחדש של ה־Bluetooth</string>
+  <string name="pref_hardwareForwardButtonSkips_title">כפתור קדימה מדלג</string>
+  <string name="pref_hardwarePreviousButtonRestarts_title">כפתור אחורה מתחיל מחדש</string>
+  <string name="pref_hardwarePreviousButtonRestarts_sum">לחיצה על כפתור החומרה אחורה מדלג מתחיל מחדש את נגינת הפרק הנוכחי במקום לחזור אחורה בפרק</string>
+  <string name="pref_followQueue_sum">לעבור לפריט הבא בתור כאשר הניגון מסתיים</string>
+  <string name="pref_auto_delete_sum">מחיקת פרק כשהניגון מסתיים</string>
   <string name="pref_auto_delete_title">מחיקה אוטומטית</string>
+  <string name="pref_smart_mark_as_played_sum">סימון פרקים כנוגנו אפילו אם נשארו כמה שניות לנגינה</string>
+  <string name="pref_smart_mark_as_played_title">סימון חכם כנוגנו</string>
+  <string name="pref_skip_keeps_episodes_sum">להשאיר פרקים למרות שדילגת עליהם</string>
+  <string name="pref_skip_keeps_episodes_title">להשאיר פרקים שדולגו</string>
+  <string name="pref_favorite_keeps_episodes_sum">להשאיר פרקים שסומנו כמועדפים</string>
+  <string name="pref_favorite_keeps_episodes_title">להשאיר פרקים מועדפים</string>
   <string name="playback_pref">ניגון</string>
   <string name="network_pref">רשת</string>
-  <string name="pref_downloadMediaOnWifiOnly_sum">הורד קבצי מדיה רק דרך חיבור אינטרנט אלחוטי</string>
+  <string name="pref_autoUpdateIntervallOrTime_title">זמן בין עדכונים או מועד ביום</string>
+  <string name="pref_autoUpdateIntervallOrTime_sum">נא לציין הפרש זמן או מועד ביום לרענון ההזנות אוטומטית</string>
+  <string name="pref_autoUpdateIntervallOrTime_message">ניתן להגדיר <i>הפרש זמן</i> כגון „כל שעתיים”, להגדיר <i>מועד ביום</i> כגון „7:00” או <i>להשבית</i> עדכונים אוטומטיים לאלתר.\n\n<small>לתשומת לבך: מועדי העדכון אינם מדויקים. יתכן עיכוב קל בפעולות.</small></string>
+  <string name="pref_autoUpdateIntervallOrTime_Disable">השבתה</string>
+  <string name="pref_autoUpdateIntervallOrTime_Interval">הגדרת הפרש זמן</string>
+  <string name="pref_autoUpdateIntervallOrTime_TimeOfDay">הגדרת הזמן ביום</string>
+  <string name="pref_autoUpdateIntervallOrTime_every">כל %1$s</string>
+  <string name="pref_autoUpdateIntervallOrTime_at">ב־%1$s</string>
+  <string name="pref_downloadMediaOnWifiOnly_sum">הורדת קובצי מדיה רק דרך רשת אלחוטית</string>
   <string name="pref_followQueue_title">ניגון מתמשך</string>
-  <string name="pref_downloadMediaOnWifiOnly_title">הורדת מדיה דרך אינטרנט אלחוטי</string>
+  <string name="pref_downloadMediaOnWifiOnly_title">הורדת מדיה דרך רשת אלחוטית</string>
   <string name="pref_pauseOnHeadsetDisconnect_title">ניתוק אוזניות</string>
   <string name="pref_unpauseOnHeadsetReconnect_title">חיבור אוזניות מחדש</string>
-  <string name="pref_mobileUpdate_title">עידכון דרך רשת סלולרית</string>
-  <string name="pref_mobileUpdate_sum">אפשר עידכונים דרך רשת סלולרית</string>
-  <string name="refreshing_label">מרענן</string>
+  <string name="pref_unpauseOnBluetoothReconnect_title">חיבור Bluetooth מחדש</string>
+  <string name="pref_mobileUpdate_title">עדכון דרך רשת סלולרית</string>
+  <string name="pref_mobileUpdate_sum">לאפשר עדכונים דרך רשת סלולרית</string>
+  <string name="refreshing_label">מתבצע רענון</string>
   <string name="flattr_settings_label">הגדרות Flattr</string>
-  <string name="pref_flattr_auth_title">כניסה ל-Fattr</string>
-  <string name="pref_flattr_auth_sum">היכנס לחשבון שלך לflattr לתרום ישירות מתוך האפליקציה.</string>
+  <string name="pref_flattr_auth_title">כניסה ל־Fattr</string>
+  <string name="pref_flattr_auth_sum">ניתן להיכנס לחשבון שלך ב־Flattr כדי לתרום ישירות מתוך היישומון.</string>
   <string name="pref_flattr_this_app_title">תרום באמצעות Flattr לאפליקציה זו</string>
-  <string name="pref_flattr_this_app_sum">תמוך בפיתוח אנטנה-פוד בתרומה עם Flattr. תודה!</string>
-  <string name="pref_revokeAccess_title">בטל גישה</string>
-  <string name="pref_revokeAccess_sum">בטל  הרשאת גישה לחשבון flattr ליישום זה.</string>
+  <string name="pref_flattr_this_app_sum">ניתן לתמוך בפיתוח של אנטנה־פּוֹד על ידי תרומה ב־Flattr. תודה!</string>
+  <string name="pref_revokeAccess_title">ביטול גישה גישה</string>
+  <string name="pref_revokeAccess_sum">שלילת הרשאות הגישה לחשבון ה־Flattr שלך מיישומון זה.</string>
   <string name="pref_auto_flattr_title">תרומות Flattr אוטומטיות</string>
-  <string name="pref_auto_flattr_sum">הגדר תרומות flattr אוטומטיות</string>
-  <string name="user_interface_label">ממשק משתמש</string>
-  <string name="pref_set_theme_title">בחר ערכת נושא</string>
-  <string name="pref_set_theme_sum">שנה את מראה אנטנה-פוד</string>
+  <string name="pref_auto_flattr_sum">הגדרת תרומות Flattr אוטומטיות</string>
+  <string name="user_interface_label">מנשק משתמש</string>
+  <string name="pref_set_theme_title">בחירת ערכת עיצוב</string>
+  <string name="pref_nav_drawer_title">התאמת מגירת הניווט</string>
+  <string name="pref_nav_drawer_sum">התאמת תצוגת מגירת הניווט.</string>
+  <string name="pref_nav_drawer_items_title">הגדרת פריטי מגירת ניווט</string>
+  <string name="pref_nav_drawer_items_sum">החלפת הפריטים שמופיעים במגירת הניווט.</string>
+  <string name="pref_nav_drawer_feed_order_title">הגדרת סדר מינויים</string>
+  <string name="pref_nav_drawer_feed_order_sum">שינוי סדר המינויים שלך</string>
+  <string name="pref_nav_drawer_feed_counter_title">הגדרת מונה מינויים</string>
+  <string name="pref_set_theme_sum">שינוי המראה של אנטנה־פּוֹד</string>
   <string name="pref_automatic_download_title">הורדה אוטומטית</string>
-  <string name="pref_automatic_download_sum">הגדר הורדה אטומטית של פרקים.</string>
-  <string name="pref_autodl_wifi_filter_title">אפשר סינון אינטרנט אלחוטי</string>
-  <string name="pref_autodl_wifi_filter_sum">אפשר הורדה אוטומטית דרך רשתות אלחוטייות נבחרות.</string>
-  <string name="pref_automatic_download_on_battery_title">הורדה כשלא טוען</string>
-  <string name="pref_automatic_download_on_battery_sum">אפשר הורדה אוטומטית כשהסוללה אינה נטענת</string>
+  <string name="pref_automatic_download_sum">הגדרת הורדה אטומטית של פרקים.</string>
+  <string name="pref_autodl_wifi_filter_title">הפעלת סינון רשתות אלחוטיות</string>
+  <string name="pref_autodl_wifi_filter_sum">לאפשר הורדה אוטומטית רק דרך רשתות אלחוטיות נבחרות.</string>
+  <string name="pref_autodl_allow_on_mobile_title">הורדה דרך רשת סלולרית</string>
+  <string name="pref_autodl_allow_on_mobile_sum">לאפשר הורדה אוטומטית דרך חיבור נתונים של רשת סלולרית.</string>
+  <string name="pref_automatic_download_on_battery_title">להוריד שלא בזמן טעינה</string>
+  <string name="pref_automatic_download_on_battery_sum">לאפשר הורדה אוטומטית כאשר הסוללה אינה בטעינה</string>
   <string name="pref_parallel_downloads_title">הורדות במקביל</string>
   <string name="pref_episode_cache_title">מטמון פרקים</string>
   <string name="pref_theme_title_light">בהיר</string>
@@ -252,128 +345,291 @@
   <string name="pref_update_interval_hours_singular">שעה</string>
   <string name="pref_update_interval_hours_manual">ידני</string>
   <string name="pref_gpodnet_authenticate_title">כניסה</string>
-  <string name="pref_gpodnet_authenticate_sum">כנס עם חשבון gpodder.net שלך על מנת לסנכרן את ההרשמות שלך.</string>
-  <string name="pref_gpodnet_logout_title">התנתקות</string>
-  <string name="pref_gpodnet_logout_toast">ההתנתקות הייתה מוצלחת</string>
-  <string name="pref_gpodnet_setlogin_information_title">שינוי פרטי התחברות</string>
-  <string name="pref_gpodnet_setlogin_information_sum">שנה פרטי התחברות של חשבון gpodder.net.</string>
+  <string name="pref_gpodnet_authenticate_sum">ניתן להיכנס לחשבונך ב־gpodder.net כדי לסנכרן את המינויים שלך.</string>
+  <string name="pref_gpodnet_logout_title">יציאה</string>
+  <string name="pref_gpodnet_logout_toast">הצלחת לצאת</string>
+  <string name="pref_gpodnet_setlogin_information_title">שינוי פרטי הכניסה</string>
+  <string name="pref_gpodnet_setlogin_information_sum">שינוי פרטי הכניסה לחשבון ה־gpodder.net שלך.</string>
+  <string name="pref_gpodnet_sync_changes_title">סנכרון השינויים כעת</string>
+  <string name="pref_gpodnet_sync_changes_sum">סנכרון שינויי מצב במינויים ובפרקים מול gpodder.net.</string>
+  <string name="pref_gpodnet_full_sync_title">סנכרון מלא כעת</string>
+  <string name="pref_gpodnet_full_sync_sum">סנכרון כל המינויים ומצבי הפרקים עם gpodder.net.</string>
+  <string name="pref_gpodnet_sync_sum_last_sync_line">ניסיון הסנכרון האחרון: %1$s (%2$s)</string>
+  <string name="pref_gpodnet_sync_started">הסנכרון התחיל</string>
+  <string name="pref_gpodnet_full_sync_started">החל סנכרון מלא</string>
+  <string name="pref_gpodnet_login_status"><![CDATA[נכנסת בשם <i>%1$s</i> עם ההתקן <i>%2$s</i>]]></string>
+  <string name="pref_gpodnet_notifications_title">הצגת התרעות שגיאות סנכרון</string>
+  <string name="pref_gpodnet_notifications_sum">הגדרה זו אינה חלה על שגיאות אימות.</string>
   <string name="pref_playback_speed_title">מהירויות ניגון</string>
-  <string name="pref_playback_speed_sum">התאמת המהיריות הזמינות לניגון במהירות משתנה</string>
-  <string name="pref_gpodnet_sethostname_title">הגדר שם שרת</string>
-  <string name="pref_gpodnet_sethostname_use_default_host">השתמש בשרת ברירת מידל</string>
-  <string name="pref_expandNotify_title">הרחב הודעה</string>
-  <string name="pref_expandNotify_sum">תמיד הרחב את ההודעה כדי להראות את לחצני הפעלה.</string>
-  <string name="pref_persistNotify_title">פקדי הפעלה קבועים</string>
-  <string name="pref_persistNotify_sum">שמר בקרי הודעה ומסך נעילה בעת השהיית השמעה.</string>
-  <string name="pref_expand_notify_unsupport_toast">גרסאות אנדרויד לפני 4.1 לא תומכות בהודעות מורחבות.</string>
-  <string name="pref_queueAddToFront_sum">הוסף פרקים חדשים לראש התור.</string>
-  <string name="pref_queueAddToFront_title">הוסף לראש התור.</string>
+  <string name="pref_playback_speed_sum">בחירת המהירויות הזמינות למהירות נגינה משתנה</string>
+  <string name="pref_fast_forward">זמן דילוג בהאצה קדימה</string>
+  <string name="pref_fast_forward_sum">התאמת מספר השניות של הקפיצה קדימה בעת לחיצה על כפתור ההאצה</string>
+  <string name="pref_rewind">זמן בקפיצה אחורה</string>
+  <string name="pref_rewind_sum">התאמת מספר השניות של הקפיצה אחורה בעת לחיצה על כפתור החזרה</string>
+  <string name="pref_gpodnet_sethostname_title">הגדרת שם מארח</string>
+  <string name="pref_gpodnet_sethostname_use_default_host">שימוש בשם מארח כבררת מחדל</string>
+  <string name="pref_persistNotify_title">פקדי נגינה קבועים</string>
+  <string name="pref_persistNotify_sum">להשאיר את פקדי ההתרעות ומסך הנעילה גם כשהנגינה מושהית.</string>
+  <string name="pref_compact_notification_buttons_title">הגדרת כפתורים במסך נעילה</string>
+  <string name="pref_compact_notification_buttons_sum">החלפת כפתור הנגינה במסך הנעילה. הכפתורים נגינה/השהיה תמיד נכללים.</string>
+  <string name="pref_compact_notification_buttons_dialog_title">בחירה עד %1$d פריטים</string>
+  <string name="pref_compact_notification_buttons_dialog_error">ניתן לבחור עד %1$d פריטים.</string>
+  <string name="pref_lockscreen_background_title">הגדרת רקע מסך הנעילה</string>
+  <string name="pref_lockscreen_background_sum">הגדרת רקע מסך הנעילה לתמונה של הפרק שמתנגן כעת. כתופעת לוואי, התמונה תופיע גם ביישומי צד שלישי.</string>
+  <string name="pref_showDownloadReport_title">הצגת דוח הורדה</string>
+  <string name="pref_showDownloadReport_sum">אם ההורדה נכשלת, יש ליצר דוח שמציג את פרטי הכשל.</string>
+  <string name="pref_expand_notify_unsupport_toast">גרסאות Android שקדמו ל־4.1 אינן תומכות בהתרעות מתרחבות.</string>
+  <string name="pref_queueAddToFront_sum">הוספת פרקים חדשים לראש התור.</string>
+  <string name="pref_queueAddToFront_title">הוספה לראש התור.</string>
+  <string name="pref_smart_mark_as_played_disabled">מושבת</string>
+  <string name="pref_image_cache_size_title">גודל מטמון התמונות</string>
+  <string name="pref_image_cache_size_sum">הנפח בכונן שעשוי לשמש למטמון של תמונות.</string>
+  <string name="crash_report_title">דיווח על קריסה</string>
+  <string name="crash_report_sum">שליחת דיווח הקריסה העדכני ביותר דרך דוא״ל</string>
+  <string name="send_email">שליחת דוא״ל</string>
+  <string name="experimental_pref">ניסיוני</string>
+  <string name="pref_current_value">ערך נוכחי: %1$s</string>
+  <string name="pref_proxy_title">מתווך</string>
+  <string name="pref_proxy_sum">הגדרת מתווך רשת</string>
+  <string name="pref_faq">שו״ת</string>
+  <string name="pref_known_issues">תקלות ידועות</string>
+  <string name="pref_no_browser_found">לא נמצא דפדפן.</string>
+  <string name="pref_cast_title">תמיכה ב־Chromecast</string>
+  <string name="pref_cast_message_play_flavor">הפעלת תמיכה בנגינת מדיה על התקני שידור מרוחקים (כגון Chromecast, רמקולים דיגיטליים או Android TV)</string>
+  <string name="pref_cast_message_free_flavor">לתמיכה ב־Chromecast נדרשות ספריות קנייניות מאת צד־שלישי שמושבתות בגרסה זו של אנטנה־פּוֹד</string>
+  <string name="pref_enqueue_downloaded_title">הוספת הורדות לתור</string>
+  <string name="pref_enqueue_downloaded_summary">הוספת פרקים שהתקבלו לתור</string>
   <!--Auto-Flattr dialog-->
-  <string name="auto_flattr_enable">הפעל תרומות flattr אוטומטיות</string>
-  <string name="auto_flattr_after_percent">תרום באמצעות flattr כשנוגן %d אחוזים מהפרק</string>
-  <string name="auto_flattr_ater_beginning">תרום באמצעות flattr כשניגון פרק מתחיל</string>
-  <string name="auto_flattr_ater_end">תרום באמצעות flattr כשניגון פרק מסתיים</string>
+  <string name="auto_flattr_enable">הפעלת תרומות Flattr אוטומטיות</string>
+  <string name="auto_flattr_after_percent">לתרום לפרק כאשר התנגנו %d אחוזים</string>
+  <string name="auto_flattr_ater_beginning">לתרום עם Flattr עם תחילת נגינת פרק</string>
+  <string name="auto_flattr_ater_end">לתרום עם Flattr עם סיום נגינת פרק</string>
   <!--Search-->
+  <string name="search_hint">חיפוש אחר פרקים</string>
+  <string name="found_in_shownotes_label">נמצא בהערות הפרק</string>
   <string name="found_in_chapters_label">נמצא בפרקים</string>
-  <string name="search_status_no_results">אין תוצאות</string>
+  <string name="search_status_no_results">לא נמצאו תוצאות</string>
   <string name="search_label">חיפוש</string>
   <string name="found_in_title_label">נמצא בכותרת</string>
+  <string name="no_results_for_query">לא נמצאו תוצאות עבור „%1$s”</string>
   <!--OPML import and export-->
-  <string name="opml_import_txtv_button_lable">קבצי OPML יאפשרו לכך לנייד פודקאסטים מלוכד פודקאסטים אחד למשנו.</string>
-  <string name="opml_import_explanation_1">בחר נתיב קובץ ספציפי במערכת הקבצים המקומית.</string>
-  <string name="opml_import_explanation_2">השתמש ביישומים חיצוניים כמו Dropbox, Google Drive או מנהל הקבצים האהוב עליך לפתוח קובץ OPML.</string>
-  <string name="opml_import_explanation_3">יישומים רבים כמו Google Mail, Dropbox, Google Drive ורוב מנהלי הקבצים יכולים <i>לפתוח</i> קבצי OPML <i>עם</i> אנטנה-פוד.</string>
-  <string name="start_import_label">התחל יבוא</string>
-  <string name="opml_import_label">יבוא OPML</string>
+  <string name="opml_import_txtv_button_lable">קובצי OPML מאפשרים לך להעביר את הפודקאסטים שלך ממכשיר אחד למשנהו.</string>
+  <string name="opml_import_option">אפשרות %1$d</string>
+  <string name="opml_import_explanation_1">נא לבחור נתיב קובץ מסוים ממערכת הקבצים המקומית.</string>
+  <string name="opml_import_explanation_2">ניתן להשתמש ביישומים חיצוניים כמו Dropbox,‏ Google Drive או מנהל הקבצים המועדף עליך כדי לפתוח קובץ OPML.</string>
+  <string name="opml_import_explanation_3">יישומים רבים כגון Google Mail,‏ Dropbox,‏ Google Drive ורוב מנהלי הקבצים יכולים <i>לפתוח</i> קובצי OPML <i>עם</i> אנטנה־פּוֹד.</string>
+  <string name="start_import_label">התחלת ייבוא</string>
+  <string name="opml_import_label">ייבוא OPML</string>
   <string name="opml_directory_error">שגיאה!</string>
-  <string name="reading_opml_label">קורא קובץ OPML</string>
-  <string name="select_all_label">בחר הכל</string>
-  <string name="deselect_all_label">בטל בחירות</string>
+  <string name="reading_opml_label">קריאת קובץ OPML</string>
+  <string name="opml_reader_error">אירעה שגיאה בעת קריאת מסמך ה־OPML:</string>
+  <string name="opml_import_error_no_file">לא נבחר קובץ!</string>
+  <string name="select_all_label">בחירת הכול</string>
+  <string name="deselect_all_label">ביטול הבחירה</string>
+  <string name="select_options_label">בחירה…</string>
   <string name="choose_file_from_filesystem">ממערכת הקבצים המקומית</string>
-  <string name="choose_file_from_external_application">השתמש באפליקציה חיצונית</string>
-  <string name="opml_export_label">יצוא OPML</string>
-  <string name="export_error_label">שגיאת יצוא</string>
-  <string name="opml_export_success_title">יצוא OPML הצליח.</string>
-  <string name="opml_export_success_sum">קובץ OPML נכתב ל:\u0020</string>
+  <string name="choose_file_from_external_application">שימוש ביישומון חיצוני</string>
+  <string name="opml_export_label">ייצוא OPML</string>
+  <string name="html_export_label">ייצוא HTML</string>
+  <string name="exporting_label">מתבצע ייצוא…</string>
+  <string name="export_error_label">שגיאת ייצוא</string>
+  <string name="export_success_title">הייצוא הצליח</string>
+  <string name="export_success_sum">הקובץ שייוצא נכתב אל:\n\n%1$s</string>
+  <string name="opml_import_ask_read_permission">נדרשת גישה לאחסון חיצוני כדי לקרוא את קובץ ה־OPML</string>
   <!--Sleep timer-->
-  <string name="set_sleeptimer_label">קבע טיימר שינה</string>
-  <string name="disable_sleeptimer_label">בטל טיימר שינה</string>
-  <string name="enter_time_here_label">קבע זמן</string>
-  <string name="sleep_timer_label">טיימר שינה</string>
-  <string name="time_left_label">זמן נותר:\u0020</string>
-  <string name="time_dialog_invalid_input">קלט לא חוקי, זמן חייב להיות מספר שלם</string>
+  <string name="set_sleeptimer_label">הגדרת מתזמן שינה</string>
+  <string name="disable_sleeptimer_label">השבתת מתזמן שינה</string>
+  <string name="enter_time_here_label">הגדרת שעה</string>
+  <string name="sleep_timer_label">מתזמן שינה</string>
+  <string name="time_left_label">זמן שנותר:\u0020</string>
+  <string name="time_dialog_invalid_input">קלט שגוי, השעה חייב להיות מספר שלם וחיובי</string>
+  <string name="timer_about_to_expire_label"><b>כאשר ספירת המתזמן עומדת להסתיים:</b></string>
+  <string name="shake_to_reset_label">לשקשק כדי לאפס את המתזמן</string>
+  <string name="timer_vibration_label">לרטוט</string>
+  <string name="time_seconds">שניות</string>
+  <string name="time_minutes">דקות</string>
+  <string name="time_hours">שעות</string>
+  <plurals name="time_seconds_quantified">
+    <item quantity="one">שנייה אחת</item>
+    <item quantity="two">%d שניות</item>
+    <item quantity="many">%d שניות</item>
+    <item quantity="other">%d שניות</item>
+  </plurals>
+  <plurals name="time_minutes_quantified">
+    <item quantity="one">דקה אחת</item>
+    <item quantity="two">%d דקות</item>
+    <item quantity="many">%d דקות</item>
+    <item quantity="other">%d דקות</item>
+  </plurals>
+  <plurals name="time_hours_quantified">
+    <item quantity="one">שעה</item>
+    <item quantity="two">שעתיים</item>
+    <item quantity="many">%d שעות</item>
+    <item quantity="other">%d שעות</item>
+  </plurals>
+  <string name="auto_enable_label">הפעלה אוטומטית</string>
+  <string name="sleep_timer_enabled_label">מתזמן השינה פעיל</string>
+  <string name="sleep_timer_disabled_label">מתזמן השינה מושבת</string>
   <!--gpodder.net-->
   <string name="gpodnet_taglist_header">קטגוריות</string>
-  <string name="gpodnet_toplist_header">פודקאסטים בכירים</string>
+  <string name="gpodnet_toplist_header">פודקאסטים מובילים</string>
   <string name="gpodnet_suggestions_header">המלצות</string>
-  <string name="gpodnet_search_hint">חפש ב-gpodder.net</string>
-  <string name="gpodnetauth_login_title">התחברות</string>
-  <string name="gpodnetauth_login_descr">ברוך הבא להתחברות ל-gpodder.net. ראשית, הקלד את פרטי הכניסה שלך:</string>
-  <string name="gpodnetauth_login_butLabel">התחברות</string>
-  <string name="gpodnetauth_login_register">אם אין לך עדיין חשבון, תוכל לפתוח אחד דרך: \nhttps://gpodder.net/register/</string>
-  <string name="username_label">שם משתמש:</string>
-  <string name="password_label">ססמה:</string>
+  <string name="gpodnet_search_hint">חיפוש ב־gpodder.net</string>
+  <string name="gpodnetauth_login_title">כניסה</string>
+  <string name="gpodnetauth_login_descr">ברוך בואך לתהליך הכניסה ל־gpodder.net. ראשית, עליך להקליד את פרטי הכניסה שלך:</string>
+  <string name="gpodnetauth_login_butLabel">כניסה</string>
+  <string name="gpodnetauth_login_register">אם עדיין אין לך חשבון, ניתן ליצור אחד כאן:‎\nhttps://gpodder.net/register/‎</string>
+  <string name="username_label">שם משתמש</string>
+  <string name="password_label">ססמה</string>
   <string name="gpodnetauth_device_title">בחירת מכשיר</string>
-  <string name="gpodnetauth_device_descr">צור מכשיר חדש לשימוש עבור חשבון gpodder.net או לבחר אחד קיים:</string>
+  <string name="gpodnetauth_device_descr">ניתן ליצור התקן חדש לשימוש עם החשבון שלך ב־gpodder.net או לבחור בהתקן חדש:</string>
   <string name="gpodnetauth_device_deviceID">מזהה מכשיר:\u0020</string>
   <string name="gpodnetauth_device_caption">כותרת</string>
-  <string name="gpodnetauth_device_butCreateNewDevice">צור מכשיר חדש</string>
-  <string name="gpodnetauth_device_chooseExistingDevice">בחר מכשיר קיים:</string>
-  <string name="gpodnetauth_device_errorEmpty">מזהה המכשיר אינו יכול להיות ריק</string>
-  <string name="gpodnetauth_device_errorAlreadyUsed">מזהה המכשיר בשימוש</string>
-  <string name="gpodnetauth_device_butChoose">בחר</string>
-  <string name="gpodnetauth_finish_title">התחברות מוצלחת!</string>
-  <string name="gpodnetauth_finish_descr">מזל טוב! חשבון gpodder.net שלך מקושר כעת עם המכשיר שלך. אנטנה-פוד מעתה יסנכרן באופן אוטומטי הרשמות במכשיר שלך עם חשבון gpodder.net שלך.</string>
-  <string name="gpodnetauth_finish_butsyncnow">התחל סנכרון כעת</string>
-  <string name="gpodnetauth_finish_butgomainscreen">עבור למסך הראשי</string>
-  <string name="gpodnetsync_auth_error_title">שגיאת אימות של gpodder.net</string>
+  <string name="gpodnetauth_device_butCreateNewDevice">יצירת מכשיר חדש</string>
+  <string name="gpodnetauth_device_chooseExistingDevice">בחירת מכשיר קיים:</string>
+  <string name="gpodnetauth_device_errorEmpty">מזהה המכשיר לא יכול להישאר ריק</string>
+  <string name="gpodnetauth_device_errorAlreadyUsed">מזהה המכשיר כבר בשימוש</string>
+  <string name="gpodnetauth_device_caption_errorEmpty">הכותרת לא יכולה להישאר ריקה</string>
+  <string name="gpodnetauth_device_butChoose">בחירה</string>
+  <string name="gpodnetauth_finish_title">נכנסת בהצלחה!</string>
+  <string name="gpodnetauth_finish_descr">מזל טוב! חשבון ה־gpodder.net שלך מקושר כעת עם המכשיר שלך. מעתה כל המינויים שלך יסונכרנו אוטומטית על ידי אנטנה־פּוֹד מהמכשיר שלך לחשבון ה־gpodder.net שלך.</string>
+  <string name="gpodnetauth_finish_butsyncnow">התחלת סנכרון כעת</string>
+  <string name="gpodnetauth_finish_butgomainscreen">מעבר למסך הראשי</string>
+  <string name="gpodnetsync_auth_error_title">שגיאת אימות מול gpodder.net</string>
   <string name="gpodnetsync_auth_error_descr">שם משתמש או ססמה שגויים</string>
-  <string name="gpodnetsync_error_title">שגיאת סנכרון של gpodder.net</string>
-  <string name="gpodnetsync_error_descr">שגיאה במהל סינכרון:\u0020</string>
+  <string name="gpodnetsync_error_title">שגיאת סנכרון מול gpodder.net</string>
+  <string name="gpodnetsync_error_descr">שגיאה במהלך סינכרון:\u0020</string>
+  <string name="gpodnetsync_pref_report_successful">מוצלח</string>
+  <string name="gpodnetsync_pref_report_failed">נכשל</string>
   <!--Directory chooser-->
-  <string name="selected_folder_label">תיקיה נבחרת:</string>
-  <string name="create_folder_label">צור תיקיה</string>
+  <string name="selected_folder_label">תיקייה נבחרת:</string>
+  <string name="create_folder_label">יצירת תיקייה</string>
   <string name="choose_data_directory">בחר תיקיית מידע</string>
-  <string name="create_folder_msg">צור תיקיה חדשה בשם \"%1$s\"?</string>
-  <string name="create_folder_success">תיקיה חדשה נוצרה</string>
-  <string name="create_folder_error_no_write_access">לא ניתן לכתוב לתיקה זו</string>
-  <string name="create_folder_error_already_exists">תיקה כבר קיימת</string>
-  <string name="create_folder_error">לא ניתן ליצור תיקיה</string>
-  <string name="folder_not_empty_dialog_title">התיקיה אינה ריקה</string>
-  <string name="folder_not_empty_dialog_msg">התיקייה שבחרת אינה ריקה. הורדות מדיה וקבצים אחרים יהיו ממוקמות ישירות בתיקייה זו. להמשיך בכל זאת?</string>
-  <string name="set_to_default_folder">בחר תיקיית ברירת מחדל</string>
-  <string name="pref_pausePlaybackForFocusLoss_sum">השהה ניגון במקום החלשת עוצמת שמע כשאפליקציה אחרת מנגנת</string>
-  <string name="pref_pausePlaybackForFocusLoss_title">השהה בזמן הפרעה</string>
+  <string name="choose_data_directory_message">נא לבחור את בסיס תיקיית הנתונים שלך. תת־התיקיות תיווצרנה על ידי אנטנה־פּוֹד בהתאם.</string>
+  <string name="choose_data_directory_permission_rationale">נדרשת גישה לאחסון חיצוני כדי לשנות את תיקיית הנתונים</string>
+  <string name="create_folder_msg">ליצור תיקייה חדשה בשם „%1$s”?</string>
+  <string name="create_folder_success">נוצרה תיקייה חדשה</string>
+  <string name="create_folder_error_no_write_access">לא ניתן לכתוב לתיקייה זו</string>
+  <string name="create_folder_error_already_exists">התיקייה כבר קיימת</string>
+  <string name="create_folder_error">לא ניתן ליצור תיקייה</string>
+  <string name="folder_does_not_exist_error">„%1$s” לא קיים</string>
+  <string name="folder_not_readable_error">„%1$s” אינו קריא</string>
+  <string name="folder_not_writable_error">„%1$s” חסום לכתיבה</string>
+  <string name="folder_not_empty_dialog_title">התיקייה אינה ריקה</string>
+  <string name="folder_not_empty_dialog_msg">התיקייה שבחרת אינה ריקה. הורדות מדיה וקבצים אחרים ימוקמו ישירות בתיקייה זו. להמשיך בכל זאת?</string>
+  <string name="set_to_default_folder">נא לבחור תיקיית בררת מחדל</string>
+  <string name="pref_pausePlaybackForFocusLoss_sum">השהיית הניגון במקום הנמכת עצמת השמע כאשר יישומון אחר מעוניין לנגן צלילים</string>
+  <string name="pref_pausePlaybackForFocusLoss_title">להשהות במהלך הפרעות</string>
+  <string name="pref_resumeAfterCall_sum">להמשיך בנגינה לאחר השלמת שיחת הטלפון</string>
+  <string name="pref_resumeAfterCall_title">להמשיך לאחר שיחה</string>
+  <string name="pref_restart_required">יש להפעיל את אנטנה־פּוֹד מחדש כדי שהשינויים ייכנסו לתוקף.</string>
   <!--Online feed view-->
-  <string name="subscribe_label">הרשם</string>
-  <string name="subscribed_label">נרשם</string>
+  <string name="subscribe_label">הרשמה</string>
+  <string name="subscribed_label">נרשמת</string>
+  <string name="downloading_label">מתבצעת הורדה…</string>
   <!--Content descriptions for image buttons-->
-  <string name="rewind_label">דלג לאחור</string>
-  <string name="fast_forward_label">הרץ קדימה</string>
+  <string name="rewind_label">חזרה לאחור</string>
+  <string name="fast_forward_label">הרצה קדימה</string>
   <string name="media_type_audio_label">שמע</string>
   <string name="media_type_video_label">וידאו</string>
-  <string name="navigate_upwards_label">נווט למעלה</string>
+  <string name="navigate_upwards_label">ניווט כלפי מעלה</string>
   <string name="status_downloading_label">הפרק יורד</string>
   <string name="in_queue_label">הפרק בתור</string>
   <string name="drag_handle_content_description">גרור לשינוי מיקום פריט זה</string>
-  <string name="load_next_page_label">טען את הדף הבא</string>
+  <string name="load_next_page_label">טעינת הדף הבא</string>
   <!--Feed information screen-->
   <string name="authentication_label">אימות</string>
-  <string name="authentication_descr">שנה את שם המשתמש והסיסמה שלך לפודקאסט ופרקים שלו.</string>
+  <string name="authentication_descr">שינוי שם המשתמש והססמה שלך לפודקאסט הזה ולפרקים שלו.</string>
+  <string name="auto_download_settings_label">הגדרות הורדה אוטומטית</string>
+  <string name="episode_filters_label">מסנן פרקים</string>
+  <string name="episode_filters_description">רשימת המונחים בהם יעשה שימוש כדי להחליט אם להכליל או להחריג פרק כלשהו במהלך הורדה אוטומטית</string>
+  <string name="episode_filters_include">להכליל</string>
+  <string name="episode_filters_exclude">להחריג</string>
+  <string name="episode_filters_hint">מילים בודדות \n\"אוסף מילים\"</string>
+  <string name="keep_updated">לשמור על עדכניות</string>
   <!--Progress information-->
+  <string name="progress_upgrading_database">מסד הנתונים משתדרג</string>
   <!--AntennaPodSP-->
-  <string name="sp_apps_importing_feeds_msg">מייבא רישום מאפליקציות יעודיות...</string>
-  <string name="search_itunes_label">חפש בiTunes</string>
+  <string name="sp_apps_importing_feeds_msg">מתבצע ייבוא מינויים מיישומונים ממוקדי מטרה…</string>
+  <string name="search_itunes_label">חיפוש ב־iTunes</string>
+  <string name="filter">מסנן</string>
+  <string name="search_fyyd_label">בחיפוש ב־fyyd</string>
   <!--Episodes apply actions-->
+  <string name="all_label">הכול</string>
+  <string name="selected_all_label">בחירת כל הפרקים</string>
+  <string name="none_label">ללא</string>
+  <string name="deselected_all_label">אף פרק לא נבחר</string>
+  <string name="played_label">נוגנו</string>
+  <string name="selected_played_label">בחירת פרקים שנוגנו</string>
+  <string name="unplayed_label">לא נוגנו</string>
+  <string name="selected_unplayed_label">בחירת פרקים שלא נוגנו</string>
+  <string name="downloaded_label">הורדו</string>
+  <string name="selected_downloaded_label">בחירת פרקים שהורדו</string>
+  <string name="not_downloaded_label">לא הורדו</string>
+  <string name="selected_not_downloaded_label">בחירת פרקים שלא הורדו</string>
+  <string name="queued_label">בתור</string>
+  <string name="selected_queued_label">בחירת פרקים בתור</string>
+  <string name="not_queued_label">לא בתור</string>
+  <string name="selected_not_queued_label">בחירת פרטים שאינם בתור</string>
+  <string name="has_media">יש מדיה</string>
+  <string name="selected_has_media_label">בחירת פרקים עם מדיה</string>
   <!--Sort-->
+  <string name="sort_title_a_z">כותרת (א \u2192 ת)</string>
+  <string name="sort_title_z_a">כותרת (ת \u2192 א)</string>
+  <string name="sort_date_new_old">תאריך (חדש \u2192 ישן)</string>
+  <string name="sort_date_old_new">תאריך (ישן \u2192 חדש)</string>
+  <string name="sort_duration_short_long">משך (קצר \u2192 ארוך)</string>
+  <string name="sort_duration_long_short">משך (קצר \u2192 ארוך)</string>
   <!--Rating dialog-->
-  <string name="rating_title">אוהבים את האפליקציה?</string>
+  <string name="rating_title">היישומון אנטנה־פּוֹד נושא חן בעיניך?</string>
+  <string name="rating_message">מאוד נשמח לקבל דירוג על אנטנה־פּוֹד אם יש לך זמן לכך.</string>
   <string name="rating_never_label">לא תודה</string>
   <string name="rating_later_label">פעם אחרת</string>
-  <string name="rating_now_label">בטח!</string>
+  <string name="rating_now_label">בטח, נלך על זה!</string>
   <!--Audio controls-->
+  <string name="audio_controls">פקדי שמע</string>
+  <string name="playback_speed">מהירות נגינה</string>
+  <string name="volume">עצמת שמע</string>
+  <string name="left_short">L</string>
+  <string name="right_short">R</string>
+  <string name="audio_effects">אפקטים של שמע</string>
+  <string name="stereo_to_mono">איחוד: סטריאו למונו</string>
+  <string name="sonic_only">Sonic בלבד</string>
   <!--proxy settings-->
+  <string name="proxy_type_label">סוג</string>
+  <string name="host_label">מארח</string>
+  <string name="port_label">פתחה</string>
+  <string name="optional_hint">(רשות)</string>
+  <string name="proxy_test_label">בדיקה</string>
+  <string name="proxy_checking">מתבצעת בדיקה…</string>
+  <string name="proxy_test_successful">הבדיקה לא הצליחה</string>
+  <string name="proxy_test_failed">הבדיקה נכשלה</string>
+  <string name="proxy_host_empty_error">המארח לא יכול להישאר ריק</string>
+  <string name="proxy_host_invalid_error">כתובת המארח אינה כתובת IP או שם מתחם תקניים</string>
+  <string name="proxy_port_invalid_error">הפתחה אינה תקנית</string>
   <!--Database import/export-->
+  <string name="import_export">ייבוא/ייצוא מסד נתונים</string>
+  <string name="import_export_warning">תכונה ניסיונית זו יכולה לשמש לטובת העברת המינויים והפרקים שניגנת להתקן אחר.\n\nניתן לייבא מסדי נתונים שיוצאו רק לאותה הגרסה של אנטנה־פּוֹד. אחרת, תכונה זו עשויה לגרור התנהגות בלתי צפויה.\n\nלאחר הייבוא, יתכן שחלק מהפרקים יופיעו כאילו כבר הורדת אותם למרות שבפועל לא עשית זאת. עליך פשוט ללחוץ על כפתור הנגינה של הפרקים כדי שאנטנה־פּוֹד יוכל לזהות זאת.</string>
+  <string name="label_import">ייבוא</string>
+  <string name="label_export">ייצוא</string>
+  <string name="import_select_file">בחירת קובץ לייבוא</string>
+  <string name="export_ok">הייצוא הצליח.</string>
+  <string name="import_ok">הייבוא הצליח.\n\nנא ללחוץ על אישור כדי להפעיל את אנטנה־פּוֹד מחדש</string>
   <!--Casting-->
+  <string name="cast_media_route_menu_title">ניגון דרך…</string>
+  <string name="cast_disconnect_label">ניתוק השידור</string>
+  <string name="cast_not_castable">המדיה הנבחרת אינה תואמת להתקן שידור</string>
+  <string name="cast_failed_to_play">התחלת נגינת המדיה נכשלה</string>
+  <string name="cast_failed_to_stop">עצירת נגינת המדיה נכשלה</string>
+  <string name="cast_failed_to_pause">השהיית נגינת המדיה נכשלה</string>
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <string name="cast_failed_setting_volume">הגדרת עצמת השמע נכשלה</string>
+  <string name="cast_failed_no_connection">אין חיבור להתקן שידור</string>
+  <string name="cast_failed_no_connection_trans">החיבור להתקן שידור אבד. היישומון מנסה להתחבר שוב, אם ניתן. נא להמתין מספר שניות ואז לנסות שוב.</string>
+  <string name="cast_failed_perform_action">ביצוע הפעולה נכשל</string>
+  <string name="cast_failed_status_request">הסנכרון עם התקן השידור נכשל</string>
+  <string name="cast_failed_seek">ההקפצה למיקום נגינה אחר בהתקן השידור נכשלה</string>
+  <string name="cast_failed_receiver_player_error">הנגן המקבל נתקל בשגיאה חמורה</string>
+  <string name="cast_failed_media_error_skipping">שגיאה בנגינת המדיה. מתבצע דילוג…</string>
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-ja/strings.xml b/core/src/main/res/values-ja/strings.xml
index c5ea6357f..566817243 100644
--- a/core/src/main/res/values-ja/strings.xml
+++ b/core/src/main/res/values-ja/strings.xml
@@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
+  <string name="feed_update_receiver_name">購読を更新</string>
   <string name="feeds_label">フィード</string>
   <string name="statistics_label">統計情報</string>
   <string name="add_feed_label">フィードを追加</string>
   <string name="episodes_label">エピソード</string>
   <string name="all_episodes_short_label">すべて</string>
+  <string name="new_episodes_label">新規</string>
   <string name="favorite_episodes_label">お気に入り</string>
   <string name="new_label">新</string>
   <string name="settings_label">設定</string>
@@ -18,10 +20,12 @@
   <string name="cancel_download_label">ダウンロードをキャンセル</string>
   <string name="playback_history_label">再生履歴</string>
   <string name="gpodnet_main_label">gpodder.net</string>
+  <string name="gpodnet_summary">他のデバイスと同期</string>
   <string name="gpodnet_auth_label">gpodder.net ログイン</string>
   <string name="free_space_label">%1$s 空き</string>
   <string name="episode_cache_full_title">エピソードキャッシュが一杯です</string>
   <string name="episode_cache_full_message">エピソードキャッシュが制限に達しました。設定でキャッシュサイズを増やすことができます。</string>
+  <string name="synchronizing">同期しています…</string>
   <!--Statistics fragment-->
   <string name="total_time_listened_to_podcasts">ポッドキャストを再生した合計時間:</string>
   <string name="statistics_details_dialog">%2$d から %1$d のエピソードが開始しました。\n\n%4$s から%3$s を再生しました。</string>
@@ -63,6 +67,7 @@
   <string name="cover_label">映像</string>
   <string name="error_label">エラー</string>
   <string name="error_msg_prefix">エラーが発生しました。</string>
+  <string name="needs_storage_permission">この操作にはストレージのアクセス許可が必要です</string>
   <string name="refresh_label">更新</string>
   <string name="external_storage_error_msg">外部ストレージが利用できません。アプリが正常に動作できるように、外部ストレージがマウントされていることを確認してください。</string>
   <string name="chapters_label">チャプター</string>
@@ -104,25 +109,28 @@
   <string name="mark_all_read_label">すべて再生済としてマーク</string>
   <string name="mark_all_read_msg">すべてのエピソードを再生済にしました</string>
   <string name="mark_all_read_confirmation_msg">再生済としてマークするすべてのエピソードを確認してください。</string>
-  <string name="mark_all_read_feed_confirmation_msg">再生済としてマークするこのフィードのすべてのエピソードを確認してください。</string>
+  <string name="mark_all_read_feed_confirmation_msg">再生済としてマークするこのポッドキャストのすべてのエピソードを確認してください。</string>
   <string name="mark_all_seen_label">すべて参照済としてマーク</string>
   <string name="mark_all_seen_msg">すべてのエピソードを参照済にしました</string>
   <string name="mark_all_seen_confirmation_msg">参照済としてマークするすべてのエピソードを確認してください。</string>
   <string name="show_info_label">情報を表示</string>
+  <string name="show_feed_settings_label">ポッドキャスト設定を表示</string>
+  <string name="feed_info_label">ポッドキャスト情報</string>
+  <string name="feed_settings_label">ポッドキャスト設定</string>
   <string name="rename_feed_label">ポッドキャストの名前を変更</string>
   <string name="remove_feed_label">ポッドキャストを削除</string>
   <string name="share_label">共有…</string>
-  <string name="share_link_label">Webサイトのリンクを共有</string>
+  <string name="share_link_label">エピソード URLを共有</string>
+  <string name="share_link_with_position_label">エピソード URL を位置と共に共有</string>
   <string name="share_file_label">ファイルを共有</string>
-  <string name="share_link_with_position_label">場所とリンクを共有</string>
   <string name="share_feed_url_label">フィード URLを共有</string>
-  <string name="share_item_url_label">エピソードファイル URLを共有</string>
-  <string name="share_item_url_with_position_label">エピソードファイル URL を位置と共に共有</string>
-  <string name="feed_delete_confirmation_msg">フィード \"%1$s\" と、このフィードのすべてのダウンロードしたエピソードを削除することを確認してください。</string>
-  <string name="feed_remover_msg">フィードの削除中</string>
-  <string name="load_complete_feed">フィードをすべて更新</string>
+  <string name="share_item_url_label">メディアファイル URLを共有</string>
+  <string name="share_item_url_with_position_label">メディアファイル URL を位置と共に共有</string>
+  <string name="feed_delete_confirmation_msg">ポッドキャスト \"%1$s\" とすべての（ダウンロード済を含む）エピソードを削除することを確認してください。</string>
+  <string name="feed_remover_msg">ポッドキャストを削除しています</string>
+  <string name="load_complete_feed">ポッドキャストをすべて更新</string>
   <string name="hide_episodes_title">エピソードを非表示にする</string>
-  <string name="episode_actions">操作を適用</string>
+  <string name="batch_edit">一括編集</string>
   <string name="hide_unplayed_episodes_label">未再生</string>
   <string name="hide_paused_episodes_label">一時停止しました</string>
   <string name="hide_played_episodes_label">再生しました</string>
@@ -131,6 +139,7 @@
   <string name="hide_downloaded_episodes_label">ダウンロードしました</string>
   <string name="hide_not_downloaded_episodes_label">ダウンロードしていません</string>
   <string name="hide_has_media_label">メディアあり</string>
+  <string name="hide_is_favorite_label">お気に入り</string>
   <string name="filtered_label">フィルターしました</string>
   <string name="refresh_failed_msg">{fa-exclamation-circle} 前回更新に失敗しました</string>
   <string name="open_podcast">ポッドキャストを開く</string>
@@ -144,6 +153,7 @@
   <string name="delete_label">削除</string>
   <string name="delete_failed">ファイルを削除できません。デバイスを再起動してみてください。</string>
   <string name="remove_episode_lable">エピソードを削除</string>
+  <string name="mark_as_seen_label">参照済</string>
   <string name="marked_as_seen_label">参照済としてマーク</string>
   <string name="mark_read_label">再生済としてマーク</string>
   <string name="marked_as_read_label">再生済としてマークしました</string>
@@ -167,6 +177,8 @@
   <string name="download_failed">失敗</string>
   <string name="download_pending">ダウンロードは保留中</string>
   <string name="download_running">ダウンロード実行中</string>
+  <string name="download_error_details">詳細</string>
+  <string name="download_error_details_message">%1$s \n\nファイル URL:\n%2$s</string>
   <string name="download_error_device_not_found">ストレージ デバイスが見つかりません</string>
   <string name="download_error_insufficient_space">スペースが不足しています</string>
   <string name="download_error_file_error">ファイルエラー</string>
@@ -216,6 +228,7 @@
   <string name="playback_error_unknown">不明なエラー</string>
   <string name="no_media_playing_label">再生するメディアがありません</string>
   <string name="player_buffering_msg">バッファー中</string>
+  <string name="player_go_to_picture_in_picture">ピクチャ-イン-ピクチャ モード</string>
   <string name="playbackservice_notification_title">ポッドキャストを再生中</string>
   <string name="unknown_media_key">AntennaPod - 不明なメディアキー: %1$d</string>
   <!--Queue operations-->
@@ -232,7 +245,9 @@
   <string name="date">日付</string>
   <string name="duration">継続時間</string>
   <string name="episode_title">エピソード タイトル</string>
-  <string name="feed_title">フィード タイトル</string>
+  <string name="feed_title">ポッドキャストのタイトル</string>
+  <string name="random">ランダム</string>
+  <string name="smart_shuffle">スマートシャッフル</string>
   <string name="ascending">昇順</string>
   <string name="descending">降順</string>
   <string name="clear_queue_confirmation_msg">クリアする、キューに含まれるすべてのエピソードを確認してください。</string>
@@ -270,7 +285,7 @@
   <string name="enable_sonic">Sonic を有効にする</string>
   <!--Empty list labels-->
   <string name="no_items_label">このリストにはアイテムがありません。</string>
-  <string name="no_feeds_label">まだフィードを何も購読していません。</string>
+  <string name="no_feeds_label">まだポッドキャストを何も購読していません。</string>
   <string name="no_chapters_label">このエピソードにチャプターはありません。</string>
   <string name="no_shownotes_label">このエピソードにショーノートはありません。</string>
   <!--Preferences-->
@@ -279,15 +294,23 @@
   <string name="other_pref">その他</string>
   <string name="about_pref">について</string>
   <string name="queue_label">キュー</string>
-  <string name="services_label">サービス</string>
+  <string name="integrations_label">統合</string>
   <string name="flattr_label">Flattr</string>
+  <string name="flattr_summary">マイクロペイメント サービス</string>
+  <string name="automation">自動</string>
+  <string name="download_pref_details">詳細</string>
+  <string name="import_export_pref">インポート/エクスポート</string>
+  <string name="appearance">外観</string>
+  <string name="external_elements">外部要素</string>
+  <string name="interruptions">割り込み</string>
+  <string name="buttons">再生コントロールボタン</string>
+  <string name="media_player">メディアプレーヤー</string>
   <string name="pref_episode_cleanup_title">エピソード クリーンアップ</string>
   <string name="pref_episode_cleanup_summary">キューに含まれておらず、お気に入りではないエピソードは、自動ダウンロードで新しいエピソードのためにスペースが必要な場合、除去の対象になります</string>
   <string name="pref_pauseOnDisconnect_sum">ヘッドフォンまたはBluetoothの接続が切断された時、再生を一時停止します</string>
   <string name="pref_unpauseOnHeadsetReconnect_sum">ヘッドフォンが再接続された時に再生を再開します</string>
   <string name="pref_unpauseOnBluetoothReconnect_sum">Bluetoothが再接続された時に再生を再開します</string>
   <string name="pref_hardwareForwardButtonSkips_title">早送りボタンでスキップ</string>
-  <string name="pref_hardwareForwardButtonSkips_sum">ハードウェアの早送りボタンを押したときに、早送りの代わりに次のエピソードにスキップします</string>
   <string name="pref_hardwarePreviousButtonRestarts_title">戻るボタンで再開</string>
   <string name="pref_hardwarePreviousButtonRestarts_sum">ハードウェアの戻るボタンを押したときに、巻き戻しの代わりに現在のエピソードの再生を再開します</string>
   <string name="pref_followQueue_sum">再生が完了した時に次のキューのアイテムに移動します</string>
@@ -336,7 +359,7 @@
   <string name="pref_nav_drawer_feed_order_title">購読注文をセット</string>
   <string name="pref_nav_drawer_feed_order_sum">購読の注文を変更します</string>
   <string name="pref_nav_drawer_feed_counter_title">購読カウンターをセット</string>
-  <string name="pref_nav_drawer_feed_counter_sum">購読カウンターで表示される情報を変更します</string>
+  <string name="pref_nav_drawer_feed_counter_sum">購読カウンターに表示される情報を変更します。 \'購読順\' が \'カウンター\' に設定されている場合は、購読の並び替えにも影響します。</string>
   <string name="pref_set_theme_sum">AntennaPodの外観を変更します。</string>
   <string name="pref_automatic_download_title">自動ダウンロード</string>
   <string name="pref_automatic_download_sum">エピソードの自動ダウンロードを構成します。</string>
@@ -350,6 +373,7 @@
   <string name="pref_episode_cache_title">エピソードキャッシュ</string>
   <string name="pref_theme_title_light">ライト</string>
   <string name="pref_theme_title_dark">ダーク</string>
+  <string name="pref_theme_title_trueblack">黒 (AMOLED 対応)</string>
   <string name="pref_episode_cache_unlimited">無制限</string>
   <string name="pref_update_interval_hours_plural">時間</string>
   <string name="pref_update_interval_hours_singular">時間</string>
@@ -378,8 +402,6 @@
   <string name="pref_rewind_sum">巻き戻しボタンがクリックされたときに後方にジャンプする秒数をカスタマイズします</string>
   <string name="pref_gpodnet_sethostname_title">ホスト名をセット</string>
   <string name="pref_gpodnet_sethostname_use_default_host">デフォルトホストを使用</string>
-  <string name="pref_expandNotify_title">拡張通知</string>
-  <string name="pref_expandNotify_sum">常に再生ボタンを表示するように通知を展開します。</string>
   <string name="pref_persistNotify_title">永続再生コントロール</string>
   <string name="pref_persistNotify_sum">再生が一時停止された時に、通知およびロック画面のコントロールを保持します。</string>
   <string name="pref_compact_notification_buttons_title">ロック画面ボタンを設定</string>
@@ -400,8 +422,7 @@
   <string name="crash_report_sum">メールで最新のクラッシュレポートを送信します</string>
   <string name="send_email">メールを送信</string>
   <string name="experimental_pref">実験的</string>
-  <string name="pref_sonic_title">Sonic メディアプレーヤー</string>
-  <string name="pref_sonic_message">Android 標準のメディアプレーヤーと Prestissimo の代わりに、内蔵のソニックメディアプレーヤーを使用します</string>
+  <string name="pref_media_player_message">ファイルを再生するメディアプレーヤーを選択</string>
   <string name="pref_current_value">現在の値: %1$s</string>
   <string name="pref_proxy_title">プロキシ</string>
   <string name="pref_proxy_sum">ネットワーク プロキシの設定</string>
@@ -413,6 +434,11 @@
   <string name="pref_cast_message_free_flavor">Chromecast は AntennaPod のこのバージョンで無効になっているサードパーティ独自のライブラリーが必要です</string>
   <string name="pref_enqueue_downloaded_title">ダウンロードのキューに入れる</string>
   <string name="pref_enqueue_downloaded_summary">ダウンロードしたエピソードをキューに追加します</string>
+  <string name="media_player_builtin">ビルトイン Android プレーヤー</string>
+  <string name="pref_videoBehavior_title">ビデオ終了時</string>
+  <string name="pref_videoBehavior_sum">ビデオ再生から遷移時の動作</string>
+  <string name="stop_playback">再生停止</string>
+  <string name="continue_playback">音声の再生を続ける</string>
   <!--Auto-Flattr dialog-->
   <string name="auto_flattr_enable">自動Flattrを有効にする</string>
   <string name="auto_flattr_after_percent">%d ％再生したらエピソードをFlattr </string>
@@ -423,7 +449,7 @@
   <string name="found_in_shownotes_label">ショーノートで見つかりました</string>
   <string name="found_in_chapters_label">チャプターで見つかりました</string>
   <string name="found_in_authors_label">作者で見つかりました</string>
-  <string name="found_in_feeds_label">フィードで見つかりました</string>
+  <string name="found_in_feeds_label">ポッドキャストで見つかりました</string>
   <string name="search_status_no_results">見つかりませんでした</string>
   <string name="search_label">検索</string>
   <string name="found_in_title_label">タイトルで見つかりました</string>
@@ -449,8 +475,8 @@
   <string name="html_export_label">HTML エクスポート</string>
   <string name="exporting_label">エクスポート中…</string>
   <string name="export_error_label">エクスポートエラー</string>
-  <string name="opml_export_success_title">OPMLをエクスポートしました。</string>
-  <string name="opml_export_success_sum">.opml ファイルを書き込みました:\u0020</string>
+  <string name="export_success_title">エクスポートしました</string>
+  <string name="export_success_sum">エクスポートしたファイルを書き込みました:\n\n%1$s</string>
   <string name="opml_import_ask_read_permission">OPML ファイルを読み込むために、外部ストレージへのアクセスが必要です</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">スリープタイマーをセット</string>
@@ -620,7 +646,7 @@
   <string name="label_import">インポート</string>
   <string name="label_export">エクスポート</string>
   <string name="import_select_file">インポートするファイルを選択してください</string>
-  <string name="export_ok">エクスポートが成功しました。データベースはSDカードに書き込まれました。</string>
+  <string name="export_ok">エクスポートしました。</string>
   <string name="import_ok">インポートが成功しました。\n\nOKを押してAntennaPodを再起動してください。</string>
   <!--Casting-->
   <string name="cast_media_route_menu_title">…で再生</string>
@@ -638,4 +664,13 @@
   <string name="cast_failed_seek">キャストデバイスの新しい位置への移動に失敗しました</string>
   <string name="cast_failed_receiver_player_error">レシーバープレーヤーで深刻なエラーが発生しました</string>
   <string name="cast_failed_media_error_skipping">メディアの再生時にエラーが発生しました。スキップしています…</string>
+  <!--Notification channels-->
+  <string name="notification_channel_user_action">操作が必要</string>
+  <string name="notification_channel_user_action_description">たとえばパスワードを入力する必要がある場合など、操作が必要な場合に表示されます。</string>
+  <string name="notification_channel_downloading">ダウンロード中</string>
+  <string name="notification_channel_downloading_description">現在のダウンロードが表示されます。</string>
+  <string name="notification_channel_playing">現在再生中</string>
+  <string name="notification_channel_playing_description">再生をコントロールできます。これはポッドキャスト再生中のメイン通知です。</string>
+  <string name="notification_channel_error">エラー</string>
+  <string name="notification_channel_error_description">ダウンロードや gpodder の同期に失敗した場合など、何か問題が発生した場合に表示されます。</string>
 </resources>
diff --git a/core/src/main/res/values-kn-rIN/strings.xml b/core/src/main/res/values-kn-rIN/strings.xml
index f62c6b2de..14ccf4e42 100644
--- a/core/src/main/res/values-kn-rIN/strings.xml
+++ b/core/src/main/res/values-kn-rIN/strings.xml
@@ -101,4 +101,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-ko-rKR/strings.xml b/core/src/main/res/values-ko-rKR/strings.xml
index acf3abe75..2d9481b84 100644
--- a/core/src/main/res/values-ko-rKR/strings.xml
+++ b/core/src/main/res/values-ko-rKR/strings.xml
@@ -36,4 +36,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-ko/strings.xml b/core/src/main/res/values-ko/strings.xml
index a3ec4de96..c776885ea 100644
--- a/core/src/main/res/values-ko/strings.xml
+++ b/core/src/main/res/values-ko/strings.xml
@@ -122,7 +122,6 @@
   <string name="feed_remover_msg">피드 삭제하는 중</string>
   <string name="load_complete_feed">전체 피드 새로고침</string>
   <string name="hide_episodes_title">에피소드 감추기</string>
-  <string name="episode_actions">동작 적용</string>
   <string name="hide_unplayed_episodes_label">재생 안 함</string>
   <string name="hide_paused_episodes_label">일시 중지</string>
   <string name="hide_played_episodes_label">재생함</string>
@@ -167,6 +166,8 @@
   <string name="download_failed">실패</string>
   <string name="download_pending">다운로드 지연 중</string>
   <string name="download_running">다운로드 실행 중</string>
+  <string name="download_error_details">자세히</string>
+  <string name="download_error_details_message">%1$s \n\n파일 URL:\n%2$s</string>
   <string name="download_error_device_not_found">저장 장치가 없습니다</string>
   <string name="download_error_insufficient_space">저장 공간이 부족합니다</string>
   <string name="download_error_file_error">파일 오류</string>
@@ -279,7 +280,6 @@
   <string name="other_pref">기타</string>
   <string name="about_pref">정보</string>
   <string name="queue_label">대기열</string>
-  <string name="services_label">서비스</string>
   <string name="flattr_label">Flattr</string>
   <string name="pref_episode_cleanup_title">에피소드 정리</string>
   <string name="pref_episode_cleanup_summary">대기열에 없고 즐겨찾기에 넣지 않은 에피소드는 자동 다운로드에서 새 에피소드에 공간이 필요할 경우 제거될 수 있습니다.</string>
@@ -400,8 +400,6 @@
   <string name="crash_report_sum">최근의 이상 종료 보고서를 이메일로 보냅니다.</string>
   <string name="send_email">이메일 보내기</string>
   <string name="experimental_pref">실험적 기능</string>
-  <string name="pref_sonic_title">소닉 미디어 플레이어</string>
-  <string name="pref_sonic_message">내장 소닉 미디어 플레이어를 안드로이드 고유 미디어 플레이어와 Prestissimo 대신 사용합니다.</string>
   <string name="pref_current_value">현재 값: %1$s</string>
   <string name="pref_proxy_title">프록시</string>
   <string name="pref_proxy_sum">네트워크 프록시 설정</string>
@@ -449,8 +447,8 @@
   <string name="html_export_label">HTML 내보내기</string>
   <string name="exporting_label">내보내는 중…</string>
   <string name="export_error_label">내보내기 오류</string>
-  <string name="opml_export_success_title">OPML 내보내기가 성공했습니다.</string>
-  <string name="opml_export_success_sum">OPML 파일을 다음에 저장했습니다:\u0020</string>
+  <string name="export_success_title">내보내기 성공</string>
+  <string name="export_success_sum">내보낸 파일을 다음에 저장했습니다:\n\n%1$s</string>
   <string name="opml_import_ask_read_permission">OPML 파일을 읽으려면 외부 저장소 접근이 필요합니다</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">취침 타이머 설정</string>
@@ -615,6 +613,13 @@
   <string name="proxy_host_invalid_error">호스트가 올바른 IP 주소 또는 도메인이 아닙니다</string>
   <string name="proxy_port_invalid_error">포트가 올바르지 않습니다</string>
   <!--Database import/export-->
+  <string name="import_export">데이터베이스 가져오기/내보내기</string>
+  <string name="import_export_warning">실험적인 기능으로 구독 정보와 재생한 에피소드 정보를 다른 장치로 옮기는데 사용합니다.\n\n내보낸 데이터베이스는 같은 버전의 안테나팟을 사용할 경우에만 가져올 수 있습니다. 같은 버전이 아니면 예상치 못하게 동작할 수 있습니다.\n\n가져온 후에 다운로드하지 않은 에피소드가 다운로드한 것으로 표시될 수 있습니다. 그 경우 해당 에피소드의 재생 버튼을 누르면 안테나팟에서 다운로드 여부를 확인해 줍니다.</string>
+  <string name="label_import">가져오기</string>
+  <string name="label_export">내보내기</string>
+  <string name="import_select_file">가져올 파일을 선택하십시오</string>
+  <string name="export_ok">내보내기 성공</string>
+  <string name="import_ok">내보내기 성공.\n\n안테나팟을 다시 시작하려면 확인을 누르십시오</string>
   <!--Casting-->
   <string name="cast_media_route_menu_title">다른 장치에서 재생...</string>
   <string name="cast_disconnect_label">캐스트 세션 연결 끊기</string>
@@ -631,4 +636,5 @@
   <string name="cast_failed_seek">캐스트 장치에 새 재생 위치로 이동하는데 실패했습니다</string>
   <string name="cast_failed_receiver_player_error">리시버 플레이어에서 심각한 오류가 발생했습니다</string>
   <string name="cast_failed_media_error_skipping">미디어 재생에 오류. 건너뜁니다...</string>
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-lt/strings.xml b/core/src/main/res/values-lt/strings.xml
index 7736c148b..3ca4270ce 100644
--- a/core/src/main/res/values-lt/strings.xml
+++ b/core/src/main/res/values-lt/strings.xml
@@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
+  <string name="feed_update_receiver_name">Atnaujinti prenumeratas</string>
   <string name="feeds_label">Sklaidos kanalai</string>
   <string name="statistics_label">Statistika</string>
   <string name="add_feed_label">Pridėti tinklalaidę</string>
   <string name="episodes_label">Epizodai</string>
   <string name="all_episodes_short_label">Visi</string>
+  <string name="new_episodes_label">Nauji</string>
   <string name="favorite_episodes_label">Mėgiami</string>
   <string name="new_label">Nauji</string>
   <string name="settings_label">Nustatymai</string>
@@ -56,7 +58,7 @@
   <string name="yes">Taip</string>
   <string name="no">Ne</string>
   <string name="reset">Nustatyti iš naujo</string>
-  <string name="author_label">Autorius</string>
+  <string name="author_label">Autorius (-iai)</string>
   <string name="language_label">Kalba</string>
   <string name="url_label">URL</string>
   <string name="podcast_settings_label">Nustatymai</string>
@@ -93,6 +95,7 @@
   <plurals name="episode_cleanup_days_after_listening">
     <item quantity="one">Praėjus 1 dienai nuo perklausymo</item>
     <item quantity="few">Praėjus %d dienoms nuo perklausymo</item>
+    <item quantity="many">Praėjus %d dienų nuo perklausymo</item>
     <item quantity="other">Praėjus %d dienų nuo perklausymo</item>
   </plurals>
   <!--'Add Feed' Activity labels-->
@@ -106,25 +109,21 @@
   <string name="mark_all_read_label">Pažymėti visus kaip perklausytus</string>
   <string name="mark_all_read_msg">Visi epizodai pažymėti kaip perklausyti</string>
   <string name="mark_all_read_confirmation_msg">Patvirtinkite, jog norite pažymėti visus epizodus kaip perklausytus.</string>
-  <string name="mark_all_read_feed_confirmation_msg">Patvirtinkite, jog norite pažymėti visus šio sklaidos kanalo epizodus kaip perklausytus.</string>
   <string name="mark_all_seen_label">Pažymėti visus kaip matytus</string>
-  <string name="mark_all_seen_msg">Visi epizodai pažymėti kaip matyti</string>
+  <string name="mark_all_seen_msg">Pažymėti visus epizodus kaip matytus</string>
   <string name="mark_all_seen_confirmation_msg">Patvirtinkite, jog norite pažymėti visus epizodus kaip matytus.</string>
   <string name="show_info_label">Rodyti informaciją</string>
+  <string name="feed_info_label">Tinklalaidės informacija</string>
   <string name="rename_feed_label">Pervadinti tinklalaidę</string>
   <string name="remove_feed_label">Pašalinti tinklalaidę</string>
   <string name="share_label">Dalintis...</string>
-  <string name="share_link_label">Dalintis nuoroda</string>
+  <string name="share_link_label">Dalintis epizodo URL</string>
+  <string name="share_link_with_position_label">Dalintis epizodo URL su pozicija</string>
   <string name="share_file_label">Dalintis failu</string>
-  <string name="share_link_with_position_label">Dalintis nuoroda su pozicija</string>
   <string name="share_feed_url_label">Dalintis sklaidos kanalo URL</string>
-  <string name="share_item_url_label">Dalintis epizodo failo URL</string>
-  <string name="share_item_url_with_position_label">Dalintis epizodo failo adresu su pozicija</string>
-  <string name="feed_delete_confirmation_msg">Patvirtinkite, jog norite ištrinti sklaidos kanalą „%1$s“ bei VISUS atsisiųstus šio sklaidos kanalo epizodus.</string>
-  <string name="feed_remover_msg">Šalinamas sklaidos kanalas</string>
-  <string name="load_complete_feed">Atnaujinti visą sklaidos kanalą</string>
+  <string name="share_item_url_label">Dalintis medijos failo URL</string>
+  <string name="share_item_url_with_position_label">Dalintis medijos failo adresu su pozicija</string>
   <string name="hide_episodes_title">Slėpti epizodus</string>
-  <string name="episode_actions">Pritaikyti veiksmus</string>
   <string name="hide_unplayed_episodes_label">Neperklausyti</string>
   <string name="hide_paused_episodes_label">Pristabdyti</string>
   <string name="hide_played_episodes_label">Perklausyti</string>
@@ -193,6 +192,7 @@
   <plurals name="downloads_left">
     <item quantity="one">Liko %d atsiuntimas</item>
     <item quantity="few">Liko %d atsiuntimai</item>
+    <item quantity="many">Liko %d atsiuntimų</item>
     <item quantity="other">Liko %d atsiuntimų</item>
   </plurals>
   <string name="downloads_processing">Apdorojami atsiuntimai</string>
@@ -236,7 +236,7 @@
   <string name="date">Data</string>
   <string name="duration">Trukmė</string>
   <string name="episode_title">Epizodo pavadinimas</string>
-  <string name="feed_title">Sklaidos kanalo pavadinimas</string>
+  <string name="feed_title">Tinklalaidės pavadinimas</string>
   <string name="ascending">Didėjančia tvarka</string>
   <string name="descending">Mažėjančia tvarka</string>
   <string name="clear_queue_confirmation_msg">Patvirtinkite, jog norite pašalinti VISUS epizodus iš perklausos eilės</string>
@@ -274,7 +274,6 @@
   <string name="enable_sonic">Įjungti „Sonic“</string>
   <!--Empty list labels-->
   <string name="no_items_label">Šiame sąraše nėra elementų.</string>
-  <string name="no_feeds_label">Kol kas neprenumeruojate jokio sklaidos kanalo.</string>
   <string name="no_chapters_label">Šis epizodas neturi skyrių.</string>
   <string name="no_shownotes_label">Šis epizodas neturi užrašų.</string>
   <!--Preferences-->
@@ -283,15 +282,16 @@
   <string name="other_pref">Kita</string>
   <string name="about_pref">Apie</string>
   <string name="queue_label">Eilė</string>
-  <string name="services_label">Paslaugos</string>
+  <string name="integrations_label">Integracijos</string>
   <string name="flattr_label">Flattr</string>
+  <string name="appearance">Išvaizda</string>
+  <string name="media_player">Medijos grotuvas</string>
   <string name="pref_episode_cleanup_title">Epizodų valymas</string>
   <string name="pref_episode_cleanup_summary">Epizodai, nesantys eilėje ar tarp mėgiamųjų, gali būti ištrinti automatinio atsiuntimo metu pritrūkus laisvos vietos naujiems epizodams </string>
   <string name="pref_pauseOnDisconnect_sum">Pristabdyti atkūrimą, kai atjungiamos ausinės ar „Bluetooth“</string>
   <string name="pref_unpauseOnHeadsetReconnect_sum">Pratęsti atkūrimą, kai ausinės pakartotinai prijungiamos</string>
   <string name="pref_unpauseOnBluetoothReconnect_sum">Pratęsti atkūrimą, kai pakartotinai prisijungiama prie „Bluetooth“</string>
   <string name="pref_hardwareForwardButtonSkips_title">Mygtukas „pirmyn“ peršoka epizodą</string>
-  <string name="pref_hardwareForwardButtonSkips_sum">Paspaudus aparatinį mygtuką „pirmyn“ peršokti į kitą epizodą vietoje greito persukimo į priekį.</string>
   <string name="pref_hardwarePreviousButtonRestarts_title">Mygtukas „ankstesnis“ paleidžia iš naujo</string>
   <string name="pref_hardwarePreviousButtonRestarts_sum">Paspaudus aparatinį mygtuką „ankstesnis“ paleisti dabartinį epizodą nuo pradžių vietoj epizodo peršokimo</string>
   <string name="pref_followQueue_sum">Atkūrimui pasibaigus peršokti į kitą eilės elementą</string>
@@ -340,7 +340,6 @@
   <string name="pref_nav_drawer_feed_order_title">Nustatyti prenumeratų tvarką</string>
   <string name="pref_nav_drawer_feed_order_sum">Keiskite prenumeratų tvarką</string>
   <string name="pref_nav_drawer_feed_counter_title">Nustatyti prenumeratų skaitliuką</string>
-  <string name="pref_nav_drawer_feed_counter_sum">Keisti prenumeratų skaitliuko rodomą informaciją</string>
   <string name="pref_set_theme_sum">Keisti AntennaPod išvaizdą.</string>
   <string name="pref_automatic_download_title">Automatinis atsiuntimas</string>
   <string name="pref_automatic_download_sum">Konfigūruoti automatinį epizodų atsiuntimą.</string>
@@ -382,8 +381,6 @@
   <string name="pref_rewind_sum">Derinkite, per kiek sekundžių šoktelėti atgal kai paspaudžiamas atsukimo atgal mygtukas</string>
   <string name="pref_gpodnet_sethostname_title">Nustatyti serverį</string>
   <string name="pref_gpodnet_sethostname_use_default_host">Naudoti numatytąjį serverį</string>
-  <string name="pref_expandNotify_title">Išplėsti pranešimus</string>
-  <string name="pref_expandNotify_sum">Išplėsti programos pranešimus, kad būtų atvaizduojami atkūrimo valdymo mygtukai.</string>
   <string name="pref_persistNotify_title">Pastovūs atkūrimo valdikliai</string>
   <string name="pref_persistNotify_sum">Pristabdžius atkūrimą palikti valdiklius ekrano užrakte bei programų pranešimuose. </string>
   <string name="pref_compact_notification_buttons_title">Nustatyti ekrano užrakto mygtukus</string>
@@ -404,8 +401,6 @@
   <string name="crash_report_sum">Siųsti paskiausios strigties pranešimą el. paštu</string>
   <string name="send_email">Siųsti el. laišką</string>
   <string name="experimental_pref">Eksperimentinis</string>
-  <string name="pref_sonic_title">„Sonic“ medijos leistuvė</string>
-  <string name="pref_sonic_message">Naudoti įtaisytąją „Sonic“ medijos leistuvę vietoje savosios „Android“ medijos leistuvės ir „Prestissimo“ </string>
   <string name="pref_current_value">Dabartinė reikšmė: %1$s</string>
   <string name="pref_proxy_title">Įgaliotasis serveris</string>
   <string name="pref_proxy_sum">Nustatyti įgaliotąjį tinklo serverį</string>
@@ -426,8 +421,6 @@
   <string name="search_hint">Ieškoti epizodų</string>
   <string name="found_in_shownotes_label">Rasta laidos užrašuose</string>
   <string name="found_in_chapters_label">Rasta skyriuose</string>
-  <string name="found_in_authors_label">Rasta autoriuose</string>
-  <string name="found_in_feeds_label">Rasta sklaidos kanaluose</string>
   <string name="search_status_no_results">Nieko nerasta</string>
   <string name="search_label">Paieška</string>
   <string name="found_in_title_label">Rasta pavadinime</string>
@@ -453,8 +446,6 @@
   <string name="html_export_label">HTML eksportas</string>
   <string name="exporting_label">Eksportuojama...</string>
   <string name="export_error_label">Eksporto klaida</string>
-  <string name="opml_export_success_title">OPML eksportas sėkmingas.</string>
-  <string name="opml_export_success_sum">.opml failas išsaugotas į:\u0020</string>
   <string name="opml_import_ask_read_permission">Norint nuskaityti OPML failą reikalinga prieiga prie nešiojamos atmintinės</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Nustatyti miego laikmatį</string>
@@ -472,16 +463,19 @@
   <plurals name="time_seconds_quantified">
     <item quantity="one">1 sekundė</item>
     <item quantity="few">%d sekundės</item>
+    <item quantity="many">%d sekundžių</item>
     <item quantity="other">%d sekundžių</item>
   </plurals>
   <plurals name="time_minutes_quantified">
     <item quantity="one">1 minutė</item>
     <item quantity="few">%d minutės</item>
+    <item quantity="many">%d minučių</item>
     <item quantity="other">%d minučių</item>
   </plurals>
   <plurals name="time_hours_quantified">
     <item quantity="one">1 valanda</item>
     <item quantity="few">%d valandos</item>
+    <item quantity="many">%d valandų</item>
     <item quantity="other">%d valandų</item>
   </plurals>
   <string name="auto_enable_label">Įjungti automatiškai</string>
@@ -634,7 +628,6 @@ Po importavimo, epizodai gali būti per klaidą pažymėti kaip atsisiųsti. Tie
   <string name="label_import">Importuoti</string>
   <string name="label_export">Eksportuoti</string>
   <string name="import_select_file">Pasirinkite failą, kurį norite importuoti</string>
-  <string name="export_ok">Eksportas sėkmingas. Duomenų bazė išsaugota SD kortelėje.</string>
   <string name="import_ok">Importuota sėkmingai.
 
 Spauskite „OK“, kad paleisti „AntennaPod“ iš naujo.</string>
@@ -654,4 +647,7 @@ Spauskite „OK“, kad paleisti „AntennaPod“ iš naujo.</string>
   <string name="cast_failed_seek">Peršokti į naują poziciją „Chromecast“ įrenginyje nepavyko</string>
   <string name="cast_failed_receiver_player_error">Imtuvo leistuvę ištiko rimta klaida</string>
   <string name="cast_failed_media_error_skipping">Įvyko medijos atkūrimo klaida. Praleidžiama...</string>
+  <!--Notification channels-->
+  <string name="notification_channel_downloading">Atsiunčiama</string>
+  <string name="notification_channel_error">Klaidos</string>
 </resources>
diff --git a/core/src/main/res/values-mk/strings.xml b/core/src/main/res/values-mk/strings.xml
new file mode 100644
index 000000000..1bb5aa651
--- /dev/null
+++ b/core/src/main/res/values-mk/strings.xml
@@ -0,0 +1,54 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--Activitiy and fragment titles-->
+  <string name="statistics_label">Статистики</string>
+  <string name="add_feed_label">Стави Подкаст</string>
+  <string name="episodes_label">Епизоди</string>
+  <string name="all_episodes_short_label">Сите</string>
+  <string name="new_episodes_label">Нови</string>
+  <string name="favorite_episodes_label">Омилени</string>
+  <!--Statistics fragment-->
+  <!--Main activity-->
+  <!--Webview actions-->
+  <!--Playback history-->
+  <!--Other-->
+  <string name="no">Не</string>
+  <string name="reset">Ресет</string>
+  <string name="author_label">Автор</string>
+  <string name="language_label">Јазик</string>
+  <string name="url_label">УРЛ</string>
+  <string name="chapters_label">Поглавја</string>
+  <!--'Add Feed' Activity labels-->
+  <!--Actions on feeds-->
+  <!--actions on feeditems-->
+  <string name="delete_label">Избриши</string>
+  <!--Download messages and labels-->
+  <!--Mediaplayer messages-->
+  <!--Queue operations-->
+  <string name="date">Датум</string>
+  <!--Flattr-->
+  <!--Flattr-->
+  <!--Variable Speed-->
+  <!--Empty list labels-->
+  <!--Preferences-->
+  <!--Auto-Flattr dialog-->
+  <!--Search-->
+  <!--OPML import and export-->
+  <!--Sleep timer-->
+  <!--gpodder.net-->
+  <!--Directory chooser-->
+  <!--Online feed view-->
+  <!--Content descriptions for image buttons-->
+  <!--Feed information screen-->
+  <!--Progress information-->
+  <!--AntennaPodSP-->
+  <!--Episodes apply actions-->
+  <!--Sort-->
+  <!--Rating dialog-->
+  <!--Audio controls-->
+  <!--proxy settings-->
+  <!--Database import/export-->
+  <!--Casting-->
+  <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
+</resources>
diff --git a/core/src/main/res/values-nb/strings.xml b/core/src/main/res/values-nb/strings.xml
index 65dc5565b..dafc7eb60 100644
--- a/core/src/main/res/values-nb/strings.xml
+++ b/core/src/main/res/values-nb/strings.xml
@@ -42,7 +42,6 @@
   <string name="cancel_label">Avbryt</string>
   <string name="yes">Ja</string>
   <string name="no">Nei</string>
-  <string name="author_label">Opphavsperson</string>
   <string name="language_label">Språk</string>
   <string name="url_label">URL</string>
   <string name="podcast_settings_label">Innstillinger</string>
@@ -85,17 +84,10 @@
   <string name="mark_all_read_label">Marker alle som avspilt</string>
   <string name="mark_all_read_msg">Marker alle episoder som avspilt</string>
   <string name="mark_all_read_confirmation_msg">Vennligst bekreft at du ønsker å markere alle episoder som avspilt.</string>
-  <string name="mark_all_read_feed_confirmation_msg">Vennligst bekreft at du ønsker å markere alle episoder i denne strømmen som avspilt.</string>
   <string name="mark_all_seen_label">Marker alle som sett</string>
   <string name="show_info_label">Vis informasjon</string>
-  <string name="remove_feed_label">Fjern podcast</string>
-  <string name="share_link_label">Del lenke</string>
-  <string name="share_link_with_position_label">Del lenke med plassering</string>
   <string name="share_feed_url_label">Del strømmens URL</string>
-  <string name="feed_remover_msg">Fjerner strøm</string>
-  <string name="load_complete_feed">Oppdater hele strømmen</string>
   <string name="hide_episodes_title">Skjul episoder</string>
-  <string name="episode_actions">Lagre handlinger</string>
   <string name="hide_unplayed_episodes_label">Ikke avspilt</string>
   <string name="hide_paused_episodes_label">Pauset</string>
   <string name="hide_played_episodes_label">Avspilt</string>
@@ -226,18 +218,15 @@
   <string name="enable_sonic">Skru på Sonic</string>
   <!--Empty list labels-->
   <string name="no_items_label">Det er ingen objekter på denne listen.</string>
-  <string name="no_feeds_label">Du abonnerer ikke på noen strømmer enda.</string>
   <!--Preferences-->
   <string name="other_pref">Annet</string>
   <string name="about_pref">Om</string>
   <string name="queue_label">Queue</string>
-  <string name="services_label">Tjenester</string>
   <string name="flattr_label">Flattr</string>
   <string name="pref_episode_cleanup_title">Episodeopprydding</string>
   <string name="pref_pauseOnDisconnect_sum">Sett playback på pause når hodetelefoner eller bluetooth er frakoblet</string>
   <string name="pref_unpauseOnHeadsetReconnect_sum">Gjenoppta avspilling når hodetelefoner gjeninnkoples</string>
   <string name="pref_unpauseOnBluetoothReconnect_sum">Fortsett avspilling når bluetooth er tilkoblet igjen</string>
-  <string name="pref_hardwareForwardButtonSkips_sum">Ved pressing av hardware forover-knapp hopp til neste episode istedenfor forover-spoling</string>
   <string name="pref_followQueue_sum">Hopp til neste element i køen når avspillingen er ferdig</string>
   <string name="pref_auto_delete_sum">Slett episode når avspillingen er ferdig</string>
   <string name="pref_auto_delete_title">Automatisk sletting</string>
@@ -279,7 +268,6 @@
   <string name="pref_nav_drawer_feed_order_title">Velg rekkefølge på abbonement</string>
   <string name="pref_nav_drawer_feed_order_sum">Endre rekkefølgen på abbonementene dine</string>
   <string name="pref_nav_drawer_feed_counter_title">Velg abbonementsteller</string>
-  <string name="pref_nav_drawer_feed_counter_sum">Endre informasjonen vist av abonnementstelleren</string>
   <string name="pref_set_theme_sum">Endre utseendet til AntennaPod</string>
   <string name="pref_automatic_download_title">Automatisk nedlasting</string>
   <string name="pref_automatic_download_sum">Konfigurer automatisk nedlasting av episoder.</string>
@@ -305,8 +293,6 @@
   <string name="pref_playback_speed_sum">Egendefiner hastighetene tilgjengelig for variabel avspillingshastighet</string>
   <string name="pref_gpodnet_sethostname_title">Sett vertsnavn</string>
   <string name="pref_gpodnet_sethostname_use_default_host">Bruk standard vert</string>
-  <string name="pref_expandNotify_title">Utvid varsel</string>
-  <string name="pref_expandNotify_sum">Utvider alltid varselet for å inkludere avspillingsknapper.</string>
   <string name="pref_persistNotify_title">Vedvarende avspillingskontroller</string>
   <string name="pref_persistNotify_sum">Behold varsel- og låseskjermkontroller når avspilling er satt på pause.</string>
   <string name="pref_lockscreen_background_title">Angi som bakgrunn på låseskjermen</string>
@@ -350,8 +336,6 @@
   <string name="choose_file_from_external_application">Bruk ekstern applikasjon</string>
   <string name="opml_export_label">OPML-eksportering</string>
   <string name="export_error_label">Eksporteringserror</string>
-  <string name="opml_export_success_title">OPML-import vellykket.</string>
-  <string name="opml_export_success_sum">.opml-filen ble skrevet til:\u0020</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Sett opp sovetimer</string>
   <string name="disable_sleeptimer_label">Deaktiver sovetimer</string>
@@ -480,4 +464,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-nl/strings.xml b/core/src/main/res/values-nl/strings.xml
index 2756adc53..b2b368e8a 100644
--- a/core/src/main/res/values-nl/strings.xml
+++ b/core/src/main/res/values-nl/strings.xml
@@ -1,38 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
+  <string name="feed_update_receiver_name">Abonnementen bijwerken</string>
   <string name="feeds_label">Feeds</string>
   <string name="statistics_label">Statistieken</string>
   <string name="add_feed_label">Podcast toevoegen</string>
   <string name="episodes_label">Afleveringen</string>
   <string name="all_episodes_short_label">Alle</string>
+  <string name="new_episodes_label">Nieuw</string>
   <string name="favorite_episodes_label">Favorieten</string>
   <string name="new_label">Nieuw</string>
   <string name="settings_label">Instellingen</string>
   <string name="downloads_label">Downloads</string>
   <string name="downloads_running_label">Bezig</string>
   <string name="downloads_completed_label">Voltooid</string>
-  <string name="downloads_log_label">Geschiedenis</string>
-  <string name="subscriptions_label">Feeds</string>
-  <string name="subscriptions_list_label">Lijst met feeds</string>
-  <string name="cancel_download_label">Annuleer download</string>
+  <string name="downloads_log_label">Logboek</string>
+  <string name="subscriptions_label">Abonnementen</string>
+  <string name="subscriptions_list_label">Lijst met abonnementen</string>
+  <string name="cancel_download_label">Download\nafbreken</string>
   <string name="playback_history_label">Afspeelgeschiedenis</string>
   <string name="gpodnet_main_label">gpodder.net</string>
-  <string name="gpodnet_auth_label">gpodder.net login</string>
+  <string name="gpodnet_summary">Synchroniseren met andere apparaten</string>
+  <string name="gpodnet_auth_label">Inloggen op gpodder.net</string>
   <string name="free_space_label">%1$s beschikbaar</string>
-  <string name="episode_cache_full_title">Afleveringen cache is vol</string>
-  <string name="episode_cache_full_message">Het maximum aantal gecachte afleveringen is bereikt. U kunt het maximum verhogen in de instellingen.</string>
+  <string name="episode_cache_full_title">Afleveringscache is vol</string>
+  <string name="episode_cache_full_message">Het maximum aantal gecachete afleveringen is bereikt. Je kunt het maximum verhogen in de instellingen.</string>
+  <string name="synchronizing">Bezig met synchroniseren…</string>
   <!--Statistics fragment-->
   <string name="total_time_listened_to_podcasts">Totale duur van afgespeelde podcasts:</string>
-  <string name="statistics_details_dialog">%1$d van de %2$d afleveringen gestart.\n\n%3$s van de %4$s afgespeeld.</string>
+  <string name="statistics_details_dialog">%1$d van %2$d afleveringen gestart.\n\n%3$s van %4$s afgespeeld.</string>
   <string name="statistics_mode">Rekenmethode</string>
-  <string name="statistics_mode_normal">Bereken de daadwerkelijke speeltijd. Tweemaal afspelen wordt twee keer gerekend; als \'afgespeeld\' markeren wordt niet meegeteld.</string>
-  <string name="statistics_mode_count_all">Duur van de podcasts optelle die als \'afgespeeld\' zijn gemarkeerd.</string>
-  <string name="statistics_speed_not_counted">Let op: Met de afspeelsnelheid wordt geen rekening gehouden.</string>
+  <string name="statistics_mode_normal">Bereken de daadwerkelijke speeltijd. Tweemaal afspelen wordt twee keer gerekend; gemarkeerd als \'afgespeeld\' wordt niet meegeteld.</string>
+  <string name="statistics_mode_count_all">Duur van de podcasts optellen die gemarkeerd zijn als \'afgespeeld\' zijn</string>
+  <string name="statistics_speed_not_counted">Let op: er wordt geen rekening gehouden met de afspeelsnelheid.</string>
   <!--Main activity-->
   <string name="drawer_open">Menu openen</string>
   <string name="drawer_close">Menu sluiten</string>
-  <string name="drawer_preferences">Menu voorkeuren</string>
+  <string name="drawer_preferences">Menuvoorkeuren</string>
   <string name="drawer_feed_order_unplayed_episodes">Op aantal afleveringen</string>
   <string name="drawer_feed_order_alphabetical">Op alfabetische volgorde</string>
   <string name="drawer_feed_order_last_update">Op datum van publicatie</string>
@@ -41,89 +45,93 @@
   <string name="drawer_feed_counter_new">Aantal nieuwe afleveringen</string>
   <string name="drawer_feed_counter_unplayed">Aantal onbeluisterde afleveringen</string>
   <string name="drawer_feed_counter_downloaded">Aantal gedownloade afleveringen</string>
-  <string name="drawer_feed_counter_none">Geen (alfabetisch sorteren)</string>
+  <string name="drawer_feed_counter_none">Geen</string>
   <!--Webview actions-->
-  <string name="open_in_browser_label">In de browser openen</string>
+  <string name="open_in_browser_label">Openen in browser</string>
   <string name="copy_url_label">URL kopiëren</string>
   <string name="share_url_label">URL delen</string>
-  <string name="copied_url_msg">URL naar klembord gekopieerd.</string>
-  <string name="go_to_position_label">Ga naar specifiek tijdstip</string>
+  <string name="copied_url_msg">URL is gekopieerd naar het klembord</string>
+  <string name="go_to_position_label">Ga naar deze positie</string>
   <!--Playback history-->
   <string name="clear_history_label">Geschiedenis wissen</string>
   <!--Other-->
-  <string name="confirm_label">Bevestig</string>
+  <string name="confirm_label">Bevestigen</string>
   <string name="cancel_label">Annuleren</string>
   <string name="yes">Ja</string>
   <string name="no">Nee</string>
-  <string name="reset">Reset</string>
-  <string name="author_label">Auteur</string>
+  <string name="reset">Standaardwaarden</string>
+  <string name="author_label">Maker(s)</string>
   <string name="language_label">Taal</string>
   <string name="url_label">URL</string>
   <string name="podcast_settings_label">Instellingen</string>
   <string name="cover_label">Beeld</string>
   <string name="error_label">Fout</string>
   <string name="error_msg_prefix">Er is een fout opgetreden:</string>
+  <string name="needs_storage_permission">Machtiging voor gebruik van opslag voor deze functie vereist</string>
   <string name="refresh_label">Verversen</string>
-  <string name="external_storage_error_msg">Geen externe opslag beschikbaar. Zorg ervoor dat de externe opslag gemonteerd is, zodat de app goed kan werken.</string>
+  <string name="external_storage_error_msg">Geen externe opslag beschikbaar. Zorg ervoor dat de externe opslag is aangekoppeld, zodat de app goed kan werken.</string>
   <string name="chapters_label">Hoofdstukken</string>
   <string name="chapter_duration">Duur: %1$s</string>
-  <string name="shownotes_label">Shownotes</string>
-  <string name="description_label">Beschrijving</string>
+  <string name="shownotes_label">Notities</string>
+  <string name="description_label">Omschrijving</string>
   <string name="most_recent_prefix">Meest recente aflevering:\u0020</string>
   <string name="episodes_suffix">\u0020afleveringen</string>
-  <string name="length_prefix">Lengte:\u0020</string>
+  <string name="length_prefix">Duur:\u0020</string>
   <string name="size_prefix">Grootte:\u0020</string>
-  <string name="processing_label">Aan het verwerken</string>
-  <string name="loading_label">Laden…</string>
+  <string name="processing_label">Bezig met verwerken...</string>
+  <string name="loading_label">Bezig met laden...</string>
   <string name="save_username_password_label">Gebruikersnaam en wachtwoord opslaan</string>
   <string name="close_label">Sluiten</string>
-  <string name="retry_label">Opnieuw proberen</string>
+  <string name="retry_label">Opnieuw</string>
   <string name="auto_download_label">Meenemen bij automatisch downloaden</string>
-  <string name="auto_download_apply_to_items_title">Toepassen op bestaande afleveringen</string>
-  <string name="auto_download_apply_to_items_message">De instelling voor <i>Automatisch downloaden</i> wordt automatisch toegepast op toekomstige afleveringen.\nWilt u het ook toepassen op eerder gepubliceerde afleveringen?</string>
-  <string name="auto_delete_label">Afleveringen automatisch\nverwijderen</string>
-  <string name="parallel_downloads_suffix">\u0020parallele downloads</string>
+  <string name="auto_download_apply_to_items_title">Toepassen op vorige afleveringen</string>
+  <string name="auto_download_apply_to_items_message">De instelling voor <i>Automatisch downloaden</i> wordt automatisch toegepast op toekomstige afleveringen.\nWil je het ook toepassen op eerder gepubliceerde afleveringen?</string>
+  <string name="auto_delete_label">Aflevering automatisch verwijderen</string>
+  <string name="parallel_downloads_suffix">\u0020gelijktijdige downloads</string>
   <string name="feed_auto_download_global">Standaardinstelling</string>
   <string name="feed_auto_download_always">Altijd</string>
   <string name="feed_auto_download_never">Nooit</string>
-  <string name="send_label">Versturen…</string>
+  <string name="send_label">Versturen...</string>
   <string name="episode_cleanup_never">Nooit</string>
-  <string name="episode_cleanup_queue_removal">Wanneer niet in de wachtrij</string>
-  <string name="episode_cleanup_after_listening">Wanneer aflevering volledig is afgespeeld</string>
+  <string name="episode_cleanup_queue_removal">Indien niet in de wachtrij</string>
+  <string name="episode_cleanup_after_listening">Als aflevering volledig is afgespeeld</string>
   <plurals name="episode_cleanup_days_after_listening">
-    <item quantity="one">1 dag nadat de aflevering als afgespeeld is gemarkeerd</item>
-    <item quantity="other">%d dagen nadat de aflevering als afgespeeld is gemarkeerd</item>
+    <item quantity="one">1 dag nadat de aflevering is gemarkeerd als afgespeeld</item>
+    <item quantity="other">%d dagen nadat de aflevering is gemarkeerd als afgespeeld</item>
   </plurals>
   <!--'Add Feed' Activity labels-->
-  <string name="feedurl_label">Feed URL</string>
+  <string name="feedurl_label">Feed-URL</string>
   <string name="etxtFeedurlHint">www.voorbeeld.nl/feed</string>
   <string name="txtvfeedurl_label">Podcast toevoegen via URL</string>
-  <string name="podcastdirectories_label">Podcast vinden in de gids</string>
-  <string name="podcastdirectories_descr">U kunt nieuwe podcasts zoeken op naam, categorie of populariteit in de gpodder.net database, of de iTunes winkel doorzoeken.</string>
-  <string name="browse_gpoddernet_label">gpodder.net doorbladeren</string>
+  <string name="podcastdirectories_label">Podcast zoeken in de gids</string>
+  <string name="podcastdirectories_descr">Je kunt nieuwe podcasts vinden op naam, categorie of populariteit in de gpodder.net-databank of via iTunes of fyyd.</string>
+  <string name="browse_gpoddernet_label">Blader door gpodder.net</string>
   <!--Actions on feeds-->
-  <string name="mark_all_read_label">Alles als afgespeeld markeren</string>
-  <string name="mark_all_read_msg">Alle afleveringen als afgespeeld markeren</string>
-  <string name="mark_all_read_confirmation_msg">Bevestig aub dat u alle afleveringen als afgespeeld wilt markeren.</string>
-  <string name="mark_all_read_feed_confirmation_msg">Bevestig aub dat u alle afleveringen van deze feed als afgespeeld wilt markeren.</string>
-  <string name="mark_all_seen_label">\'Nieuw\' label van alle afleveringen verwijderen.</string>
-  <string name="mark_all_seen_msg">\'Nieuw\' label van alle afleveringen verwijderend</string>
-  <string name="mark_all_seen_confirmation_msg">Bevestig aub dat u het \'nieuw\' label van alle afleveringen wilt verwijderen.</string>
-  <string name="show_info_label">Toon informatie</string>
-  <string name="rename_feed_label">Podcast hernoemen</string>
+  <string name="mark_all_read_label">Alles markeren als afgespeeld</string>
+  <string name="mark_all_read_msg">Alle afleveringen zijn gemarkeerd als afgespeeld</string>
+  <string name="mark_all_read_confirmation_msg">Bevestig dat je alle afleveringen wilt markeren als afgespeeld.</string>
+  <string name="mark_all_read_feed_confirmation_msg">Bevestig dat je alle afleveringen van deze podcast wilt markeren als afgespeeld.</string>
+  <string name="mark_all_seen_label">Alles markeren als bekeken</string>
+  <string name="mark_all_seen_msg">Alle afleveringen zijn gemarkeerd als bekeken</string>
+  <string name="mark_all_seen_confirmation_msg">Bevestig dat je alle afleveringen wilt markeren als bekeken.</string>
+  <string name="show_info_label">Informatie tonen</string>
+  <string name="show_feed_settings_label">Podcast-instellingen tonen</string>
+  <string name="feed_info_label">Podcast-informatie</string>
+  <string name="feed_settings_label">Podcast-instellingen</string>
+  <string name="rename_feed_label">Podcastnaam wijzigen</string>
   <string name="remove_feed_label">Podcast verwijderen</string>
-  <string name="share_label">Delen…</string>
-  <string name="share_link_label">Link van de aflevering delen</string>
-  <string name="share_file_label">Deel bestand</string>
-  <string name="share_link_with_position_label">Link van de aflevering met tijdstip delen</string>
-  <string name="share_feed_url_label">URL van de feed delen</string>
-  <string name="share_item_url_label">URL van het mediabestand delen</string>
-  <string name="share_item_url_with_position_label">URL van mediabestand met tijdstip delen</string>
-  <string name="feed_delete_confirmation_msg">Bevestig dat u de feed <i>%1$s</i> en ALLE (ook gedownloade) afleveringen van deze podcast wilt verwijderen.</string>
-  <string name="feed_remover_msg">Feed verwijderen</string>
-  <string name="load_complete_feed">Hele feed vernieuwen</string>
+  <string name="share_label">Delen...</string>
+  <string name="share_link_label">URL van aflevering delen</string>
+  <string name="share_link_with_position_label">URL van aflevering delen, op specifieke positie</string>
+  <string name="share_file_label">Bestand delen</string>
+  <string name="share_feed_url_label">URL van feed delen</string>
+  <string name="share_item_url_label">URL van mediabestand delen</string>
+  <string name="share_item_url_with_position_label">URL van mediabestand delen, op specifieke positie</string>
+  <string name="feed_delete_confirmation_msg">Bevestig dat je de podcast \"%1$s\" en ALLE (ook gedownloade) bijbehorende afleveringen wilt verwijderen.</string>
+  <string name="feed_remover_msg">Podcast verwijderen</string>
+  <string name="load_complete_feed">Gehele podcast verversen</string>
   <string name="hide_episodes_title">Afleveringen verbergen</string>
-  <string name="episode_actions">Afleveringen beheren</string>
+  <string name="batch_edit">Bulkbewerking</string>
   <string name="hide_unplayed_episodes_label">Niet afgespeeld</string>
   <string name="hide_paused_episodes_label">Gepauzeerd</string>
   <string name="hide_played_episodes_label">Afgespeeld</string>
@@ -132,335 +140,353 @@
   <string name="hide_downloaded_episodes_label">Gedownload</string>
   <string name="hide_not_downloaded_episodes_label">Niet gedownload</string>
   <string name="hide_has_media_label">Bevat media</string>
+  <string name="hide_is_favorite_label">Gemarkeerd als favoriet</string>
   <string name="filtered_label">Gefilterd</string>
-  <string name="refresh_failed_msg">{fa-exclamation-circle} Laatste vernieuwing mislukt</string>
-  <string name="open_podcast">Open podcast</string>
+  <string name="refresh_failed_msg">{fa-exclamation-circle} Vorige verversing mislukt</string>
+  <string name="open_podcast">Podcast openen</string>
   <!--actions on feeditems-->
-  <string name="download_label">Download</string>
-  <string name="play_label">Spelen</string>
-  <string name="pause_label">Pauze</string>
-  <string name="stop_label">Stop</string>
-  <string name="stream_label">Stream</string>
+  <string name="download_label">Downloaden</string>
+  <string name="play_label">Afspelen</string>
+  <string name="pause_label">Pauzeren</string>
+  <string name="stop_label">Stoppen</string>
+  <string name="stream_label">Streamen</string>
   <string name="remove_label">Verwijderen</string>
   <string name="delete_label">Verwijderen</string>
-  <string name="delete_failed">Kan bestand niet verwijderen. Het kan misschien helpen om je apparaat opnieuw op te starten.</string>
-  <string name="remove_episode_lable">Aflevering(en) verwijderen</string>
-  <string name="marked_as_seen_label">Verwijder \'nieuw\' label</string>
-  <string name="mark_read_label">Als afgespeeld markeren</string>
-  <string name="marked_as_read_label">Als afgespeeld gemarkeerd</string>
-  <string name="mark_unread_label">Als niet afgespeeld markeren</string>
-  <string name="add_to_queue_label">Voeg toe aan wachtrij</string>
-  <string name="added_to_queue_label">Aan wachtrij toegevoegd</string>
-  <string name="remove_from_queue_label">Verwijder van wachtrij</string>
+  <string name="delete_failed">Kan bestand niet verwijderen; start je apparaat opnieuw op.</string>
+  <string name="remove_episode_lable">Aflevering verwijderen</string>
+  <string name="mark_as_seen_label">Markeren als bekeken</string>
+  <string name="marked_as_seen_label">Gemarkeerd als bekeken</string>
+  <string name="mark_read_label">Markeren als afgespeeld</string>
+  <string name="marked_as_read_label">Gemarkeerd als afgespeeld</string>
+  <string name="mark_unread_label">Markeren als niet-afgespeeld</string>
+  <string name="add_to_queue_label">Toevoegen aan wachtrij</string>
+  <string name="added_to_queue_label">Toegevoegd aan wachtrij</string>
+  <string name="remove_from_queue_label">Verwijderen uit wachtrij</string>
   <string name="add_to_favorite_label">Toevoegen aan favorieten</string>
-  <string name="added_to_favorites">Aan favorieten toegevoegd</string>
+  <string name="added_to_favorites">Toegevoegd aan favorieten</string>
   <string name="remove_from_favorite_label">Verwijderen uit favorieten</string>
   <string name="removed_from_favorites">Verwijderd uit favorieten</string>
   <string name="visit_website_label">Website bezoeken</string>
   <string name="support_label">Flattr dit</string>
   <string name="skip_episode_label">Aflevering overslaan</string>
   <string name="activate_auto_download">Automatisch downloaden activeren</string>
-  <string name="deactivate_auto_download">Automatisch downloaden deactiveren</string>
-  <string name="reset_position">Afspeelpositie resetten</string>
+  <string name="deactivate_auto_download">Automatisch downloaden de-activeren</string>
+  <string name="reset_position">Afspeelpositie herstellen</string>
   <string name="removed_item">Aflevering verwijderd</string>
   <!--Download messages and labels-->
-  <string name="download_successful">succesvol</string>
+  <string name="download_successful">voltooid</string>
   <string name="download_failed">mislukt</string>
-  <string name="download_pending">Download in afwachting</string>
-  <string name="download_running">Aan het downloaden</string>
-  <string name="download_error_device_not_found">Opslagmedium niet gevonden</string>
+  <string name="download_pending">Download staat in wachtrij</string>
+  <string name="download_running">Bezig met downloaden</string>
+  <string name="download_error_details">Details</string>
+  <string name="download_error_details_message">%1$s \n\nURL van bestand:\n%2$s</string>
+  <string name="download_error_device_not_found">Opslagmedium niet aangetroffen</string>
   <string name="download_error_insufficient_space">Onvoldoende ruimte</string>
   <string name="download_error_file_error">Bestandsfout</string>
-  <string name="download_error_http_data_error">HTTP data fout</string>
+  <string name="download_error_http_data_error">HTTP-gegevensfout</string>
   <string name="download_error_error_unknown">Onbekende fout</string>
-  <string name="download_error_parser_exception">Parser Exception</string>
-  <string name="download_error_unsupported_type">Niet ondersteunde feed soort</string>
+  <string name="download_error_parser_exception">Verwerkingsuitzondering</string>
+  <string name="download_error_unsupported_type">Niet-ondersteunde feedsoort</string>
   <string name="download_error_connection_error">Verbindingsfout</string>
   <string name="download_error_unknown_host">Onbekende host</string>
-  <string name="download_error_unauthorized">Authenticatie fout</string>
-  <string name="download_error_file_type_type">Fout met bestandsformaat</string>
-  <string name="download_error_forbidden">Actie niet mogelijk</string>
-  <string name="cancel_all_downloads_label">Alle downloads annuleren</string>
-  <string name="download_canceled_msg">Download geannuleerd</string>
-  <string name="download_canceled_autodownload_enabled_msg">Downloaden geannuleerd\n<i>Automatisch downloaden</i> uitgezet voor deze aflevering</string>
-  <string name="download_report_title">Downloads afgerond met fouten</string>
+  <string name="download_error_unauthorized">Authenticatiefout</string>
+  <string name="download_error_file_type_type">Bestandssoortfout</string>
+  <string name="download_error_forbidden">Niet mogelijk</string>
+  <string name="cancel_all_downloads_label">Alle downloads afbreken</string>
+  <string name="download_canceled_msg">Download afgebroken</string>
+  <string name="download_canceled_autodownload_enabled_msg">Download afgebroken\n<i>Automatisch downloaden</i> uitgeschakeld voor deze aflevering</string>
+  <string name="download_report_title">Downloads afgerond, maar met fout(en)</string>
   <string name="download_report_content_title">Downloadrapport</string>
-  <string name="download_error_malformed_url">Misvormde URL</string>
-  <string name="download_error_io_error">IO fout</string>
-  <string name="download_error_request_error">Fout in de aanvraag</string>
-  <string name="download_error_db_access">Databasetoegangsfout</string>
+  <string name="download_error_malformed_url">Onjuist opgemaakte URL</string>
+  <string name="download_error_io_error">Invoer-/uitvoerfout</string>
+  <string name="download_error_request_error">Opvraagfout</string>
+  <string name="download_error_db_access">Fout bij databanktoegang</string>
   <plurals name="downloads_left">
     <item quantity="one">Nog %d download</item>
     <item quantity="other">Nog %d downloads</item>
   </plurals>
-  <string name="downloads_processing">Downloads verwerken</string>
-  <string name="download_notification_title">Podcastgegevens aan het downloaden</string>
-  <string name="download_report_content">%1$d downloads geslaagd, %2$d mislukt</string>
+  <string name="downloads_processing">Bezig met verwerken van downloads</string>
+  <string name="download_notification_title">Bezig met downloaden van podcastgegevens</string>
+  <string name="download_report_content">%1$d downloads voltooid, %2$d mislukt</string>
   <string name="download_log_title_unknown">Onbekende titel</string>
   <string name="download_type_feed">Feed</string>
   <string name="download_type_media">Mediabestand</string>
-  <string name="download_type_image">Beeld</string>
-  <string name="download_request_error_dialog_message_prefix">Er is een fout opgetreden bij het ​​downloaden van bestand:\u0020</string>
+  <string name="download_type_image">Afbeelding</string>
+  <string name="download_request_error_dialog_message_prefix">Er is een fout opgetreden bij het ​​downloaden van het bestand:\u0020</string>
   <string name="authentication_notification_title">Authenticatie vereist</string>
-  <string name="authentication_notification_msg">De opgevraagde bron vereist een gebruikersnaam en een wachtwoord</string>
-  <string name="confirm_mobile_download_dialog_title">Bevestig downloaden over mobiel netwerk</string>
-  <string name="confirm_mobile_download_dialog_message_not_in_queue">Het downloaden via mobiele verbindingen is uitgezet in de instellingen.\n\nU kunt er voor kiezen om slechts de aflevering aan de wachtrij toe te voegen, of om downloaden via mobiele netwerken tijdelijk toe te staan.\n<small>Uw keuze is 10 minuten geldig.</small></string>
-  <string name="confirm_mobile_download_dialog_message">Het downloaden via mobiele verbindingen is uitgezet in de instellingen.\n\nWilt u dit tijdelijk toestaan?\n<small>Uw keuze is 10 minuten geldig.</small></string>
+  <string name="authentication_notification_msg">De opgevraagde bron vereist een gebruikersnaam en wachtwoord</string>
+  <string name="confirm_mobile_download_dialog_title">Bevestig downloaden via mobiel internet</string>
+  <string name="confirm_mobile_download_dialog_message_not_in_queue">Downloaden via mobiel internet is uitgeschakeld in de instellingen.\n\nJe kunt er voor kiezen om de aflevering alleen toe te voegen aan de wachtrij of om downloaden via mobiele internet tijdelijk toe te staan.\n<small>Je keuze wordt 10 minuten onthouden.</small></string>
+  <string name="confirm_mobile_download_dialog_message">Downloaden via mobiel internet is uitgeschakeld in de instellingen.\n\nWil je dit tijdelijk toestaan?\n<small>Je keuze wordt 10 minuten onthouden.</small></string>
   <string name="confirm_mobile_download_dialog_only_add_to_queue">Toevoegen aan wachtrij</string>
   <string name="confirm_mobile_download_dialog_enable_temporarily">Tijdelijk toestaan</string>
   <!--Mediaplayer messages-->
   <string name="player_error_msg">Fout!</string>
   <string name="player_stopped_msg">Geen media aan het afspelen</string>
-  <string name="player_preparing_msg">Voorbereiding</string>
+  <string name="player_preparing_msg">Bezig met voorbereiden</string>
   <string name="player_ready_msg">Klaar</string>
-  <string name="player_seeking_msg">Aan het opzoeken</string>
-  <string name="playback_error_server_died">Server antwoord niet</string>
+  <string name="player_seeking_msg">Bezig met zoeken</string>
+  <string name="playback_error_server_died">Serververbinding verbroken</string>
   <string name="playback_error_unknown">Onbekende fout</string>
   <string name="no_media_playing_label">Geen media aan het afspelen</string>
-  <string name="player_buffering_msg">Buffering</string>
-  <string name="playbackservice_notification_title">Podcast aan het afspelen</string>
-  <string name="unknown_media_key">AntennaPod - Mediaknop onbekend: %1$d</string>
+  <string name="player_buffering_msg">Bezig met bufferen</string>
+  <string name="player_go_to_picture_in_picture">Picture-in-picture-modus</string>
+  <string name="playbackservice_notification_title">Bezig met afspelen van podcast</string>
+  <string name="unknown_media_key">AntennaPod - onbekende mediatoets: %1$d</string>
   <!--Queue operations-->
-  <string name="lock_queue">Wachtrij vastzetten</string>
+  <string name="lock_queue">Wachtrij vergrendelen</string>
   <string name="unlock_queue">Wachtrij ontgrendelen</string>
   <string name="queue_locked">Wachtrij vergrendeld</string>
   <string name="queue_unlocked">Wachtrij ontgrendeld</string>
-  <string name="clear_queue_label">Wachtrij leeg maken</string>
+  <string name="clear_queue_label">Wachtrij leegmaken</string>
   <string name="undo">Ongedaan maken</string>
   <string name="removed_from_queue">Item verwijderd</string>
   <string name="move_to_top_label">Naar boven verplaatsen</string>
   <string name="move_to_bottom_label">Naar beneden verplaatsen</string>
   <string name="sort">Sorteren</string>
   <string name="date">Datum</string>
-  <string name="duration">Lengte</string>
-  <string name="episode_title">Afleveringtitel</string>
-  <string name="feed_title">Feed-titel</string>
+  <string name="duration">Duur</string>
+  <string name="episode_title">Afleveringstitel</string>
+  <string name="feed_title">Podcast-titel</string>
+  <string name="random">Willekeurig</string>
+  <string name="smart_shuffle">Slim willekeurig afspelen</string>
   <string name="ascending">Oplopend</string>
   <string name="descending">Aflopend</string>
-  <string name="clear_queue_confirmation_msg">Bevestig aub dat u alle afleveringen uit de wachtrij wilt verwijderen</string>
+  <string name="clear_queue_confirmation_msg">Bevestig dat je ALLE afleveringen wilt verwijderen uit de wachtrij</string>
   <!--Flattr-->
-  <string name="flattr_auth_label">Flattr login</string>
-  <string name="flattr_auth_explanation">Druk op onderstaande knop om het verificatieproces te starten. U wordt doorgestuurd naar het Flattr inlogscherm in uw browser en u wordt gevraagd om toestemming aan AntennaPod te geven om dingen te Flattr\'en. Nadat u toestemming heeft gegeven, keert u automatisch terug naar dit scherm.</string>
+  <string name="flattr_auth_label">Inloggen op Flattr</string>
+  <string name="flattr_auth_explanation">Druk op onderstaande knop om het verificatieproces te starten. Het Flattr-inlogscherm wordt geopend in je browser en je wordt gevraagd om AntennaPod te machtigingen om dingen te Flattr\'en. Daarna keer je automatisch terug naar dit scherm.</string>
   <string name="authenticate_label">Authenticeren</string>
-  <string name="return_home_label">Terug naar de startscherm</string>
-  <string name="flattr_auth_success">Authenticatie is geslaagd! U kunt nu dingen vanuit de app Flattr\'en.</string>
-  <string name="no_flattr_token_title">Geen Flattr token gevonden</string>
-  <string name="no_flattr_token_notification_msg">Het lijkt er op dat uw Flattr account niet is verbonden met AntennaPod. Klik hier om te authenticeren.</string>
-  <string name="no_flattr_token_msg">Uw Flattr account lijkt niet aangesloten te zijn op AntennaPod. U kunt uw account aan AntennaPod sluiten om dingen vanuit de app te Flattr\'en, of u kunt op de website van het ding terecht om het daar te Flattr\'en.</string>
+  <string name="return_home_label">Terug naar startscherm</string>
+  <string name="flattr_auth_success">Authenticatie geslaagd! Je kunt nu dingen vanuit de app Flattr\'en.</string>
+  <string name="no_flattr_token_title">Geen Flattr-toegangssleutel gevonden</string>
+  <string name="no_flattr_token_notification_msg">Het lijkt er op dat je Flattr-account niet gekoppeld is aan AntennaPod. Druk hier om te authenticeren.</string>
+  <string name="no_flattr_token_msg">Je Flattr-account lijkt niet gekoppeld te zijn aan AntennaPod. Je kunt je account koppelen om dingen vanuit de app te Flattr\'en, of je kunt op de website van het ding terecht om het daar te Flattr\'en.</string>
   <string name="authenticate_now_label">Authenticeren</string>
-  <string name="action_forbidden_title">Actie verboden</string>
-  <string name="action_forbidden_msg">AntennaPod heeft geen toestemming voor deze actie. De reden hiervoor zou kunnen zijn dat de toegang token van AntennaPod voor uw account ingetrokken is. U kunt opnieuw authenticeren, of de website van het ding bezoeken.</string>
+  <string name="action_forbidden_title">Niet toegestaan</string>
+  <string name="action_forbidden_msg">AntennaPod heeft geen toestemming voor deze actie. De reden hiervoor zou kunnen zijn dat de toegangssleutel van AntennaPod voor je account is ingetrokken. Je kunt opnieuw authenticeren, of de website van het ding bezoeken.</string>
   <string name="access_revoked_title">Toegang ingetrokken</string>
-  <string name="access_revoked_info">U heeft met succes het toegangstoken van AntennaPod tot uw account ingetrokken. Om het proces te voltooien, moet u deze app uit de lijst van goedgekeurde applicaties in uw accountinstellingen op de Flattr website verwijderen.</string>
+  <string name="access_revoked_info">Je heb de toegangssleutel van AntennaPod tot je account ingetrokken. Om het proces te voltooien, moet je deze app verwijderen uit de lijst met goedgekeurde applicaties in je accountinstellingen op de Flattr-website.</string>
   <!--Flattr-->
-  <string name="flattr_click_success">Een ding geflattr\'d</string>
+  <string name="flattr_click_success">Een ding geflattr\'d!</string>
   <string name="flattr_click_success_count">%d dingen geflattr\'d!</string>
   <string name="flattr_click_success_queue">Geflattr\'d: %s.</string>
-  <string name="flattr_click_failure_count">Kon %d dingen niet flattr\'n!</string>
+  <string name="flattr_click_failure_count">Kan %d dingen niet flattr\'n!</string>
   <string name="flattr_click_failure">Niet geflattr\'d: %s.</string>
   <string name="flattr_click_enqueued">Ding wordt later geflattr\'d</string>
-  <string name="flattring_thing">%s aan het flattren</string>
+  <string name="flattring_thing">Bezig met flattr\'n van%s</string>
   <string name="flattring_label">AntennaPod is aan het flattren</string>
   <string name="flattrd_label">AntennaPod heeft geflattr\'d</string>
-  <string name="flattrd_failed_label">AntennaPod flattr niet gelukt</string>
-  <string name="flattr_retrieving_status">Geflattr\'de dingen aan het ontvangen</string>
+  <string name="flattrd_failed_label">AntennaPod-flattr mislukt</string>
+  <string name="flattr_retrieving_status">Bezig met ontvangen van geflattr\'de dingen</string>
   <!--Variable Speed-->
-  <string name="download_plugin_label">Plugin downloaden</string>
-  <string name="no_playback_plugin_title">Plugin niet geïnstalleerd</string>
-  <string name="no_playback_plugin_or_sonic_msg">Om variabele afspeelsnelheid te kunnen gebruiken, raden wij u aan om de ingebouwde Sonic mediaspeler te activeren [Android 4.1+]\n\nEventueel kunt u de externe plugin <i>Prestissimo</i> downloaden van de Play Store.\nProblemen bij het gebruik van deze plugin zijn niet de verantwoordelijkheid van AntennaPod en moeten gemeld worden bij de ontwikkelaar van de plugin.</string>
+  <string name="download_plugin_label">Plug-in downloaden</string>
+  <string name="no_playback_plugin_title">Plug-in niet geïnstalleerd</string>
+  <string name="no_playback_plugin_or_sonic_msg">Om variabele afspeelsnelheid te kunnen gebruiken, bevelen wij aan om de ingebouwde Sonic-mediaspeler te activeren [Android 4.1 en hoger]\n\nEvt. kun je de externe plug-in <i>Prestissimo</i> downloaden via de Play Store.\nWij zijn niet verantwoordelijk voor problemen met deze plug-in zijn; meld ze bij de plug-inontwikkelaar.</string>
   <string name="set_playback_speed_label">Afspeelsnelheden</string>
   <string name="enable_sonic">Sonic inschakelen</string>
   <!--Empty list labels-->
-  <string name="no_items_label">Er zijn geen items in deze lijst.</string>
-  <string name="no_feeds_label">U bent nog tot geen enkele feed geabonneerd.</string>
-  <string name="no_chapters_label">Deze aflevering heeft geen hoofdstukken.</string>
-  <string name="no_shownotes_label">Deze aflevering heeft geen shownotes.</string>
+  <string name="no_items_label">Er staan geen items op deze lijst.</string>
+  <string name="no_feeds_label">Je hebt nog geen abonnement op een podcast.</string>
+  <string name="no_chapters_label">Deze aflevering bevat geen hoofdstukken.</string>
+  <string name="no_shownotes_label">Deze aflevering bevat geen shownotities.</string>
   <!--Preferences-->
-  <string name="storage_pref">Geheugen</string>
+  <string name="storage_pref">Opslag</string>
   <string name="project_pref">Project</string>
   <string name="other_pref">Overig</string>
   <string name="about_pref">Over AntennaPod</string>
   <string name="queue_label">Wachtrij</string>
-  <string name="services_label">Services</string>
+  <string name="integrations_label">Integraties</string>
   <string name="flattr_label">Flattr</string>
+  <string name="flattr_summary">Dienst voor microbetalingen</string>
+  <string name="automation">Automatische acties</string>
+  <string name="download_pref_details">Details</string>
+  <string name="import_export_pref">Importeren/Exporteren</string>
+  <string name="appearance">Uiterlijk</string>
+  <string name="external_elements">Externe elementen</string>
+  <string name="interruptions">Onderbrekingen</string>
+  <string name="buttons">Knoppen voor afspeelbediening</string>
+  <string name="media_player">Mediaspeler</string>
   <string name="pref_episode_cleanup_title">Automatisch opschonen</string>
-  <string name="pref_episode_cleanup_summary">Afleveringen die niet in de wachtrij staan én niet als favoriet gemarkeerd zijn, mogen verwijderd worden als Automatisch Downloaden ruimte nodig heeft voor nieuwe afleveringen</string>
-  <string name="pref_pauseOnDisconnect_sum">Afspelen pauzeren wanneer de koptelefoon wordt losgekoppeld of de bluetooth verbinding wordt verbroken</string>
-  <string name="pref_unpauseOnHeadsetReconnect_sum">Afspelen hervatten wanneer de koptelefoon opnieuw wordt aangesloten</string>
-  <string name="pref_unpauseOnBluetoothReconnect_sum">Afspelen hervatten wanneer de bluetooth verbinding hervat wordt</string>
-  <string name="pref_hardwareForwardButtonSkips_title">\'Volgende\' knop voor overslaan</string>
-  <string name="pref_hardwareForwardButtonSkips_sum">Aflevering overslaan ipv vooruitspoelen wanneer op een fysieke \'volgende\' knop wordt gedrukt</string>
-  <string name="pref_hardwarePreviousButtonRestarts_title">Vorige voor opnieuw afspelen</string>
-  <string name="pref_hardwarePreviousButtonRestarts_sum">Aflevering afspelen vanaf het begin ipv terugspoelen wanneer op een fysieke \'vorige\' knop wordt gedrukt</string>
+  <string name="pref_episode_cleanup_summary">Afleveringen die niet op de wachtrij staan én geen favoriet zijn, mogen verwijderd worden als Automatisch downloaden ruimte nodig heeft voor nieuwe afleveringen</string>
+  <string name="pref_pauseOnDisconnect_sum">Afspelen pauzeren als de koptelefoon wordt losgekoppeld of de Bluetooth-verbinding wordt verbroken</string>
+  <string name="pref_unpauseOnHeadsetReconnect_sum">Afspelen hervatten als de koptelefoon opnieuw wordt aangesloten</string>
+  <string name="pref_unpauseOnBluetoothReconnect_sum">Afspelen hervatten als de Bluetooth-verbinding hervat wordt</string>
+  <string name="pref_hardwareForwardButtonSkips_title">\'Volgende\' voor overslaan</string>
+  <string name="pref_hardwarePreviousButtonRestarts_title">\'Vorige\' voor opnieuw afspelen</string>
+  <string name="pref_hardwarePreviousButtonRestarts_sum">Aflevering afspelen vanaf het begin i.p.v. terugspoelen als er op een fysieke \'vorige\'-knop wordt gedrukt</string>
   <string name="pref_followQueue_sum">Volgende item in de wachtrij afspelen als de aflevering voltooid is</string>
   <string name="pref_auto_delete_sum">Afleveringen verwijderen als ze zijn afgespeeld</string>
   <string name="pref_auto_delete_title">Automatisch verwijderen</string>
-  <string name="pref_smart_mark_as_played_sum">Afleveringen als afgespeeld markeren wanneer deze nog maar een bepaald aantal seconden duurt</string>
-  <string name="pref_smart_mark_as_played_title">Slimme afgespeeld markering</string>
-  <string name="pref_skip_keeps_episodes_sum">Afleveringen bewaren en in de wachtrij houden als u op \'overslaan\' klikt</string>
+  <string name="pref_smart_mark_as_played_sum">Afleveringen als afgespeeld markeren als deze nog maar een bepaald aantal seconden duren</string>
+  <string name="pref_smart_mark_as_played_title">Slimme afgespeeld-markering</string>
+  <string name="pref_skip_keeps_episodes_sum">Afleveringen bewaren als ze worden overgeslagen</string>
   <string name="pref_skip_keeps_episodes_title">Overgeslagen afleveringen bewaren</string>
   <string name="pref_favorite_keeps_episodes_sum">Afleveringen bewaren als ze als favoriet gemarkeerd zijn</string>
   <string name="pref_favorite_keeps_episodes_title">Favoriete afleveringen bewaren</string>
   <string name="playback_pref">Afspelen</string>
   <string name="network_pref">Netwerk</string>
-  <string name="pref_autoUpdateIntervallOrTime_title">Feed update interval of tijdstip</string>
-  <string name="pref_autoUpdateIntervallOrTime_sum">Specificeer een interval of tijdstip waarop feeds automatisch vernieuwd moeten worden</string>
-  <string name="pref_autoUpdateIntervallOrTime_message">U kunt een <i>interval</i> zoals \'elke twee uur\' of een specifiek <i>tijdstip</i> zoals \'07:00 uur\' instellen, of het automatisch verversen van feeds uitzetten.\n\n<small>Let op: tijdstippen voor updates zijn niet precies. Er kan een kleine vertraging plaatsvinden.</small></string>
+  <string name="pref_autoUpdateIntervallOrTime_title">Bijwerktussenpoos of -tijdstip</string>
+  <string name="pref_autoUpdateIntervallOrTime_sum">Geef een tussenpoos of tijdstip op waarop feeds automatisch ververst moeten worden</string>
+  <string name="pref_autoUpdateIntervallOrTime_message">Je kunt een <i>tussenpoos</i> zoals \'elke twee uur\' instellen, een specifiek <i>tijdstip</i> zoals \'07:00 uur\' of het automatisch verversen van feeds uitschakelen.\n\n<small>Let op: tijdstippen zijn niet precies; er kan een kleine vertraging zijn.</small></string>
   <string name="pref_autoUpdateIntervallOrTime_Disable">Uitschakelen</string>
-  <string name="pref_autoUpdateIntervallOrTime_Interval">Interval instellen</string>
+  <string name="pref_autoUpdateIntervallOrTime_Interval">Tussenpoos instellen</string>
   <string name="pref_autoUpdateIntervallOrTime_TimeOfDay">Tijdstip instellen</string>
   <string name="pref_autoUpdateIntervallOrTime_every">elke %1$s</string>
-  <string name="pref_autoUpdateIntervallOrTime_at">op %1$s</string>
-  <string name="pref_downloadMediaOnWifiOnly_sum">Download mediabestanden alleen via WiFi</string>
-  <string name="pref_followQueue_title">Continu afspelen</string>
-  <string name="pref_downloadMediaOnWifiOnly_title">WiFi download van media</string>
-  <string name="pref_pauseOnHeadsetDisconnect_title">Pauzeren bij loskoppeling</string>
-  <string name="pref_unpauseOnHeadsetReconnect_title">Aansluiten koptelefoon</string>
-  <string name="pref_unpauseOnBluetoothReconnect_title">Verbinden met bluetooth</string>
-  <string name="pref_mobileUpdate_title">Mobiele updates</string>
-  <string name="pref_mobileUpdate_sum">Updates toestaan ​​via de mobiele dataverbinding</string>
-  <string name="refreshing_label">Aan het verversen</string>
-  <string name="flattr_settings_label">Flattr settings</string>
-  <string name="pref_flattr_auth_title">Flattr accountgegevens</string>
-  <string name="pref_flattr_auth_sum">Log in je Flattr account om dingen rechtstreeks vanuit de app te flattr\'en.</string>
+  <string name="pref_autoUpdateIntervallOrTime_at">om %1$s</string>
+  <string name="pref_downloadMediaOnWifiOnly_sum">Mediabestanden alleen downloaden via Wi-Fi</string>
+  <string name="pref_followQueue_title">Doorlopend afspelen</string>
+  <string name="pref_downloadMediaOnWifiOnly_title">Media downloaden via Wi-Fi</string>
+  <string name="pref_pauseOnHeadsetDisconnect_title">Loskoppelen van hoofdtelefoon</string>
+  <string name="pref_unpauseOnHeadsetReconnect_title">Opnieuw aansluiten van hoofdtelefoon</string>
+  <string name="pref_unpauseOnBluetoothReconnect_title">Opnieuw verbinden met Bluetooth</string>
+  <string name="pref_mobileUpdate_title">Bijwerken via mobiel internet</string>
+  <string name="pref_mobileUpdate_sum">Bijwerken toestaan via mobiele internetverbinding</string>
+  <string name="refreshing_label">Bezig met verversen...</string>
+  <string name="flattr_settings_label">Flattr-instellingen</string>
+  <string name="pref_flattr_auth_title">Inloggen op Flattr</string>
+  <string name="pref_flattr_auth_sum">Log in op je Flattr-account om dingen vanuit de app te flattr\'en.</string>
   <string name="pref_flattr_this_app_title">Flattr deze app</string>
-  <string name="pref_flattr_this_app_sum">Ondersteun de ontwikkeling van AntennaPod door het te flattr\'en. Bedankt!</string>
-  <string name="pref_revokeAccess_title">Toegang intrekken</string>
-  <string name="pref_revokeAccess_sum">Trek de toegang van deze app in tot je Flattr account.</string>
-  <string name="pref_auto_flattr_title">Automatische Flattr</string>
+  <string name="pref_flattr_this_app_sum">Ondersteun de ontwikkeling van AntennaPod door te flattr\'en. Bedankt!</string>
+  <string name="pref_revokeAccess_title">Machtiging intrekken</string>
+  <string name="pref_revokeAccess_sum">Trek de machtiging van deze app in op je Flattr account.</string>
+  <string name="pref_auto_flattr_title">Automatisch flattr\'en</string>
   <string name="pref_auto_flattr_sum">Automatisch flattr\'en instellen</string>
-  <string name="user_interface_label">User Interface</string>
-  <string name="pref_set_theme_title">Kies kleurschema</string>
-  <string name="pref_nav_drawer_title">Menu aanpassen</string>
-  <string name="pref_nav_drawer_sum">Het uiterlijk en andere instellingen van het menu aanpassen.</string>
-  <string name="pref_nav_drawer_items_title">Menu-items instellen</string>
-  <string name="pref_nav_drawer_items_sum">Aanpassen welke items in het menu worden getoond</string>
-  <string name="pref_nav_drawer_feed_order_title">Feed volgorde instellen</string>
-  <string name="pref_nav_drawer_feed_order_sum">De volgorde van uw feeds instellen</string>
+  <string name="user_interface_label">Uiterlijk</string>
+  <string name="pref_set_theme_title">Thema kiezen</string>
+  <string name="pref_nav_drawer_title">Navigatiemenu aanpassen</string>
+  <string name="pref_nav_drawer_sum">Pas het uiterlijk van het navigatiemenu aan.</string>
+  <string name="pref_nav_drawer_items_title">Menu-items kiezen</string>
+  <string name="pref_nav_drawer_items_sum">Kies welke items moeten worden getoond in het navigatiemenu.</string>
+  <string name="pref_nav_drawer_feed_order_title">Abonnementsvolgorde instellen</string>
+  <string name="pref_nav_drawer_feed_order_sum">Stel de volgorde van je abonnementen in</string>
   <string name="pref_nav_drawer_feed_counter_title">Teller instellen</string>
-  <string name="pref_nav_drawer_feed_counter_sum">Pas aan welke aantallen in het menu worden getoond</string>
-  <string name="pref_set_theme_sum">Verander het uiterlijk van AntennaPod.</string>
+  <string name="pref_nav_drawer_feed_counter_sum">Wijzig de door de teller getoonde informatie. Is ook van toepassing op de sortering als \'Abonnementsvolgorde\' is ingesteld op \'Teller\'.</string>
+  <string name="pref_set_theme_sum">Pas het uiterlijk van AntennaPod aan.</string>
   <string name="pref_automatic_download_title">Automatisch downloaden</string>
-  <string name="pref_automatic_download_sum">Configureer het automatisch downloaden van afleveringen.</string>
-  <string name="pref_autodl_wifi_filter_title">Wi-Fi filter inschakelen</string>
-  <string name="pref_autodl_wifi_filter_sum">Automatisch downloaden alleen toestaan voor geselecteerde Wi-Fi-netwerken.</string>
-  <string name="pref_autodl_allow_on_mobile_title">Downloaden via mobiele verbinding</string>
-  <string name="pref_autodl_allow_on_mobile_sum">Het automatisch downloaden van afleveringen via een mobiele internetverbinding toestaan.</string>
-  <string name="pref_automatic_download_on_battery_title">Downloaden zonder opladen</string>
+  <string name="pref_automatic_download_sum">Stel het automatisch downloaden van afleveringen in.</string>
+  <string name="pref_autodl_wifi_filter_title">Wi-Fi-filter inschakelen</string>
+  <string name="pref_autodl_wifi_filter_sum">Automatisch downloaden alleen toestaan via gekozen Wi-Fi-netwerken.</string>
+  <string name="pref_autodl_allow_on_mobile_title">Downloaden via mobiel internet</string>
+  <string name="pref_autodl_allow_on_mobile_sum">Automatisch downloaden toestaan via een mobiele internetverbinding.</string>
+  <string name="pref_automatic_download_on_battery_title">Downloaden als het apparaat niet wordt opgeladen</string>
   <string name="pref_automatic_download_on_battery_sum">Downloaden toestaan als het apparaat niet wordt opgeladen</string>
   <string name="pref_parallel_downloads_title">Gelijktijdige downloads</string>
-  <string name="pref_episode_cache_title">Afleveringen cache</string>
+  <string name="pref_episode_cache_title">Afleveringscache</string>
   <string name="pref_theme_title_light">Licht</string>
   <string name="pref_theme_title_dark">Donker</string>
+  <string name="pref_theme_title_trueblack">Zwart (geschikt voor AMOLED)</string>
   <string name="pref_episode_cache_unlimited">Onbeperkt</string>
   <string name="pref_update_interval_hours_plural">uur</string>
   <string name="pref_update_interval_hours_singular">uur</string>
   <string name="pref_update_interval_hours_manual">Handmatig</string>
   <string name="pref_gpodnet_authenticate_title">Inloggen</string>
-  <string name="pref_gpodnet_authenticate_sum">Log in met je gpodder.net account om je abonnementen te synchroniseren.</string>
-  <string name="pref_gpodnet_logout_title">Log uit</string>
-  <string name="pref_gpodnet_logout_toast">Uitlog was succesvol</string>
-  <string name="pref_gpodnet_setlogin_information_title">Aanmeldingsgegevens wijzigen</string>
-  <string name="pref_gpodnet_setlogin_information_sum">Wijzig de aanmeldingsgegevens van je gpodder.net account.</string>
+  <string name="pref_gpodnet_authenticate_sum">Log in met je gpodder.net-account om je abonnementen te synchroniseren.</string>
+  <string name="pref_gpodnet_logout_title">Uitloggen</string>
+  <string name="pref_gpodnet_logout_toast">Uitgelogd</string>
+  <string name="pref_gpodnet_setlogin_information_title">Inloggegevens wijzigen</string>
+  <string name="pref_gpodnet_setlogin_information_sum">Wijzig de inloggegevens van je gpodder.net-account.</string>
   <string name="pref_gpodnet_sync_changes_title">Wijzigingen nu synchroniseren</string>
-  <string name="pref_gpodnet_sync_changes_sum">Synchroniseer veranderde abonnementen en aflevering-statussen met gpodder.net</string>
+  <string name="pref_gpodnet_sync_changes_sum">Synchroniseer gewijzigde abonnementen en afleveringsstatussen met gpodder.net.</string>
   <string name="pref_gpodnet_full_sync_title">Nu alles synchroniseren</string>
-  <string name="pref_gpodnet_full_sync_sum">Synchroniseer alle abonnementen en aflevering-statussen met gpodder.net</string>
-  <string name="pref_gpodnet_sync_sum_last_sync_line">Laatste synchronisatie:  %1$s (%2$s)</string>
+  <string name="pref_gpodnet_full_sync_sum">Synchroniseer alle abonnementen en afleveringsstatussen met gpodder.net.</string>
+  <string name="pref_gpodnet_sync_sum_last_sync_line">Vorige synchronisatie:  %1$s (%2$s)</string>
   <string name="pref_gpodnet_sync_started">Synchroniseren gestart</string>
   <string name="pref_gpodnet_full_sync_started">Volledige synchronisatie gestart</string>
   <string name="pref_gpodnet_login_status"><![CDATA[Ingelogd als <i>%1$s</i> met apparaat <i>%2$s</i>]]></string>
-  <string name="pref_gpodnet_notifications_title">Toon synchronisatiefouten in melding</string>
+  <string name="pref_gpodnet_notifications_title">Melding tonen bij synchronisatiefouten</string>
   <string name="pref_gpodnet_notifications_sum">Deze instelling is niet van toepassing op inlogfouten.</string>
   <string name="pref_playback_speed_title">Afspeelsnelheden</string>
-  <string name="pref_playback_speed_sum">Pas de beschikbare snelheden aan voor de variabele audio afspeelsnelheid</string>
+  <string name="pref_playback_speed_sum">Pas de beschikbare snelheden aan voor de variabele audio-afspeelsnelheid</string>
   <string name="pref_fast_forward">Snelheid van vooruitspoelen</string>
-  <string name="pref_fast_forward_sum">Pas het aantal seconden aan waarmee wordt vooruitgespoeld per klik op de knop</string>
-  <string name="pref_rewind">Snelheid terugspoelen</string>
-  <string name="pref_rewind_sum">Pas het aantal seconden aan waarmee wordt teruggespoeld per klik op de knop</string>
-  <string name="pref_gpodnet_sethostname_title">Definieer hostname</string>
-  <string name="pref_gpodnet_sethostname_use_default_host">Gebruik standaard host</string>
-  <string name="pref_expandNotify_title">Bedienen via melding</string>
-  <string name="pref_expandNotify_sum">Altijd de bedieningsknoppen tonen bij de melding in het notificatiecentrum.</string>
-  <string name="pref_persistNotify_title">Behoud bedieningsknoppen</string>
-  <string name="pref_persistNotify_sum">Ook bedieningsknoppen in het notificatiecentrum en op het vergrendelingsscherm behouden als het afspelen gepauzeerd wordt.</string>
+  <string name="pref_fast_forward_sum">Pas het aantal seconden aan waarmee wordt vooruitgespoeld per druk op de knop</string>
+  <string name="pref_rewind">Snelheid van terugspoelen</string>
+  <string name="pref_rewind_sum">Pas het aantal seconden aan waarmee wordt teruggespoeld per druk op de knop</string>
+  <string name="pref_gpodnet_sethostname_title">Hostnaam instellen</string>
+  <string name="pref_gpodnet_sethostname_use_default_host">Standaardhost gebruiken</string>
+  <string name="pref_persistNotify_title">Bedieningsknoppen behouden</string>
+  <string name="pref_persistNotify_sum">Ook bedieningsknoppen op het meldings- en vergrendelscherm behouden als het afspelen gepauzeerd wordt.</string>
   <string name="pref_compact_notification_buttons_title">Bedieningsknoppen vergrendelscherm</string>
-  <string name="pref_compact_notification_buttons_sum">Bedieningsknopppen voor op het vergrendelscherm kiezen. De play/pauze knop wordt altijd getoond.</string>
-  <string name="pref_compact_notification_buttons_dialog_title">Selecteer maximaal %1$d knoppen.</string>
-  <string name="pref_compact_notification_buttons_dialog_error">U kunt slechts maximaal %1$d knoppen selecteren.</string>
+  <string name="pref_compact_notification_buttons_sum">Kies de bedieningsknoppen voor het vergrendelscherm. De knop afspelen/pauzeren wordt altijd getoond.</string>
+  <string name="pref_compact_notification_buttons_dialog_title">Kies maximaal %1$d knoppen</string>
+  <string name="pref_compact_notification_buttons_dialog_error">Je kunt maximaal %1$d knoppen kiezen.</string>
   <string name="pref_lockscreen_background_title">Achtergrondafbeelding vergrendelscherm</string>
-  <string name="pref_lockscreen_background_sum">Laat de afbeelding van de huidige aflevering zien op het vergrendelscherm. Ten gevolge van deze functie is de afbeelding ook beschikbaar voor andere apps.</string>
-  <string name="pref_showDownloadReport_title">Laat downloadrapport zien</string>
-  <string name="pref_showDownloadReport_sum">Genereer een rapport met fout-details als downloads mislukken</string>
-  <string name="pref_expand_notify_unsupport_toast">Android versies lager dan 4.1 ondersteunen geen knoppen in het notificatiecentrum.</string>
+  <string name="pref_lockscreen_background_sum">Toon de afbeelding van de huidige aflevering op het vergrendelscherm. Hierdoor is de afbeelding ook beschikbaar voor andere apps.</string>
+  <string name="pref_showDownloadReport_title">Downloadrapportage tonen</string>
+  <string name="pref_showDownloadReport_sum">Genereer een rapport met foutdetails als downloads mislukken.</string>
+  <string name="pref_expand_notify_unsupport_toast">Android-versies lager dan 4.1 ondersteunen geen knoppen op meldingen.</string>
   <string name="pref_queueAddToFront_sum">Nieuwe afleveringen aan het begin van de wachtrij toevoegen.</string>
   <string name="pref_queueAddToFront_title">Bovenaan wachtrij toevoegen</string>
   <string name="pref_smart_mark_as_played_disabled">Uitgeschakeld</string>
-  <string name="pref_image_cache_size_title">Grootte cachegeheugen</string>
-  <string name="pref_image_cache_size_sum">De groote van het cachegeheugen voor afbeeldingen aanpassen.</string>
-  <string name="crash_report_title">Crashreport</string>
-  <string name="crash_report_sum">Verstuur laatste crashreport via email</string>
-  <string name="send_email">Verstuur email</string>
-  <string name="experimental_pref">Experimentele functie(s)</string>
-  <string name="pref_sonic_title">Sonic mediaspeler</string>
-  <string name="pref_sonic_message">Gebruik AntennaPod\'s ingebouwde Sonic mediaspeler als een alternatief voor Prestissimo en de mediaspeler van Android.</string>
+  <string name="pref_image_cache_size_title">Grootte van afbeeldingscache</string>
+  <string name="pref_image_cache_size_sum">Pas de grootte aan van het cachegeheugen voor afbeeldingen.</string>
+  <string name="crash_report_title">Crashrapportage</string>
+  <string name="crash_report_sum">Verstuur laatste crashrapportage via e-mail</string>
+  <string name="send_email">E-mail versturen</string>
+  <string name="experimental_pref">Experimenteel</string>
+  <string name="pref_media_player_message">Kies welke mediaspeler gebruikt moet worden voor het afspelen van bestanden</string>
   <string name="pref_current_value">Huidige instelling: %1$s</string>
   <string name="pref_proxy_title">Proxy</string>
   <string name="pref_proxy_sum">Netwerkproxy instellen</string>
-  <string name="pref_faq">FAQ - veelgestelde vragen</string>
-  <string name="pref_known_issues">Reeds bekende bugs</string>
-  <string name="pref_no_browser_found">Geen browser gevonden</string>
-  <string name="pref_cast_title">Chromecast</string>
-  <string name="pref_cast_message_play_flavor">Ondersteuning activeren voor draadloos afspelen via Cast apparaten (zoals Chromecast, Audio speakers en Android TV)</string>
-  <string name="pref_cast_message_free_flavor">Voor Chromecast is software van derden vereist die niet beschikbaar zijn in deze versie van AntennaPod</string>
+  <string name="pref_faq">Veelgestelde vragen</string>
+  <string name="pref_known_issues">Bekende problemen</string>
+  <string name="pref_no_browser_found">Geen browser aangetroffen.</string>
+  <string name="pref_cast_title">Chromecast-ondersteuning</string>
+  <string name="pref_cast_message_play_flavor">Ondersteuning activeren voor draadloos afspelen via Cast-apparaten (zoals Chromecast, luidsprekers of Android TV)</string>
+  <string name="pref_cast_message_free_flavor">Voor Chromecast is software van derden vereist die niet beschikbaar is in deze versie van AntennaPod</string>
   <string name="pref_enqueue_downloaded_title">Gedownloade afleveringen in wachtrij</string>
   <string name="pref_enqueue_downloaded_summary">Voeg gedownloade afleveringen toe aan de wachtrij</string>
+  <string name="media_player_builtin">Ingebouwde Android-speler</string>
+  <string name="pref_videoBehavior_title">Bij verlaten van video</string>
+  <string name="pref_videoBehavior_sum">Wat te doen bij het verlaten van een spelende video</string>
+  <string name="stop_playback">Afspelen stoppen</string>
+  <string name="continue_playback">Audio af blijven spelen</string>
   <!--Auto-Flattr dialog-->
-  <string name="auto_flattr_enable">Automatisch flattr\'en aanzetten</string>
-  <string name="auto_flattr_after_percent">Flattr een aflevering zodra %d procent is afgespeeld</string>
-  <string name="auto_flattr_ater_beginning">Flattr de aflevering bij afspelen</string>
-  <string name="auto_flattr_ater_end">Flattr aflevering als afspelen is gestopt</string>
+  <string name="auto_flattr_enable">Automatisch flattr\'en inschakelen</string>
+  <string name="auto_flattr_after_percent">Flattr een aflevering zodra deze %d procent is afgespeeld</string>
+  <string name="auto_flattr_ater_beginning">Flattr de aflevering als het afspelen begint</string>
+  <string name="auto_flattr_ater_end">Flattr de aflevering als afspelen is gestopt</string>
   <!--Search-->
   <string name="search_hint">Zoeken naar afleveringen</string>
-  <string name="found_in_shownotes_label">Gevonden in de shownotes</string>
+  <string name="found_in_shownotes_label">Gevonden in de shownotities</string>
   <string name="found_in_chapters_label">Gevonden in de hoofdstukken</string>
-  <string name="found_in_authors_label">Gevonden in de makers</string>
-  <string name="found_in_feeds_label">Gevonden in de feeds</string>
+  <string name="found_in_authors_label">Gevonden bij de maker(s)</string>
+  <string name="found_in_feeds_label">Gevonden in de podcast</string>
   <string name="search_status_no_results">Er zijn geen resultaten gevonden</string>
   <string name="search_label">Zoeken</string>
   <string name="found_in_title_label">Gevonden in de titel</string>
   <string name="no_results_for_query">Geen resultaten gevonden voor  \"%1$s\"</string>
   <!--OPML import and export-->
-  <string name="opml_import_txtv_button_lable">Met OPML-bestanden kan je podcasts van de ene naar de andere podcatcher verplaatsen.</string>
+  <string name="opml_import_txtv_button_lable">Met OPML-bestanden kun je podcasts van de ene naar de andere podcatcher verplaatsen.</string>
   <string name="opml_import_option">Optie  %1$d</string>
-  <string name="opml_import_explanation_1">Kies een bestand van een specifieke locatie via bestandsbeheer.</string>
-  <string name="opml_import_explanation_2">Kies een OPML bestand via een andere app, zoals Dropbox en Google Drive, of via uw bestandsbeheerder.</string>
-  <string name="opml_import_explanation_3">Ga naar een OPML bestand in apps zoals GMail, Dropbox en Google Drive om het met AntennaPod te openen.</string>
-  <string name="start_import_label">Start importeren</string>
+  <string name="opml_import_explanation_1">Kies een bestand via de bestandsbeheer.</string>
+  <string name="opml_import_explanation_2">Kies een OPML-bestand via een andere app, zoals Dropbox of Google Drive, of via je bestandsbeheerder.</string>
+  <string name="opml_import_explanation_3">Apps as Gmail, Dropbox, Google Drive en de meeste bestandsbeheerders kunnen OPML-bestanden <i>openen</i> <i>met</i> AntennaPod.</string>
+  <string name="start_import_label">Importeren starten</string>
   <string name="opml_import_label">OPML importeren</string>
   <string name="opml_directory_error">FOUT!</string>
-  <string name="reading_opml_label">OPML-bestand aan het lezen</string>
-  <string name="opml_reader_error">Er is iets misgegaan met het lezen van het OPML-bestand:</string>
-  <string name="opml_import_error_no_file">Geen bestand geselecteerd!</string>
+  <string name="reading_opml_label">Bezig met uitlezen van OPML-bestand...</string>
+  <string name="opml_reader_error">Er is iets misgegaan tijdens het lezen van het OPML-bestand:</string>
+  <string name="opml_import_error_no_file">Geen bestand gekozen!</string>
   <string name="select_all_label">Alles selecteren</string>
-  <string name="deselect_all_label">Alles deselecteren</string>
-  <string name="select_options_label">Selecteren…</string>
+  <string name="deselect_all_label">Alles de-selecteren</string>
+  <string name="select_options_label">Selecteren...</string>
   <string name="choose_file_from_filesystem">Via bestandsbeheer</string>
   <string name="choose_file_from_external_application">Via externe app</string>
-  <string name="opml_export_label">OPML export</string>
-  <string name="html_export_label">HTML export</string>
-  <string name="exporting_label">Exporteren…</string>
-  <string name="export_error_label">Export fout</string>
-  <string name="opml_export_success_title">OPML bestand succesvol geëxporteerd.</string>
-  <string name="opml_export_success_sum"> Het OPML-bestand is in \u0020 geplaatst</string>
+  <string name="opml_export_label">OPML exporteren</string>
+  <string name="html_export_label">HTML exporteren</string>
+  <string name="exporting_label">Bezig met exporteren...</string>
+  <string name="export_error_label">Exportfout</string>
+  <string name="export_success_title">Geëxporteerd</string>
+  <string name="export_success_sum">Het geëxporteerde bestand is opgeslagen in:\n\n%1$s</string>
   <string name="opml_import_ask_read_permission">Toegang tot externe locaties is nodig om het OPML-bestand te kunnen lezen</string>
   <!--Sleep timer-->
-  <string name="set_sleeptimer_label">Slaap timer instellen</string>
-  <string name="disable_sleeptimer_label">Slaap timer uitschakelen</string>
-  <string name="enter_time_here_label">Voer tijd in</string>
-  <string name="sleep_timer_label">Slaap timer</string>
+  <string name="set_sleeptimer_label">Slaaptimer instellen</string>
+  <string name="disable_sleeptimer_label">Slaaptimer uitschakelen</string>
+  <string name="enter_time_here_label">Voer een tijd in</string>
+  <string name="sleep_timer_label">Slaaptimer</string>
   <string name="time_left_label">Resterende tijd:\u0020</string>
-  <string name="time_dialog_invalid_input">Ongeldige invoer, de tijd moet een geheel getal zijn</string>
+  <string name="time_dialog_invalid_input">Ongeldige invoer; de tijd moet een geheel getal zijn</string>
   <string name="timer_about_to_expire_label"><b>Als de timer bijna afloopt:</b></string>
   <string name="shake_to_reset_label">Schudden om opnieuw in te stellen</string>
   <string name="timer_vibration_label">Trillen</string>
@@ -480,65 +506,65 @@
     <item quantity="other">%d uur</item>
   </plurals>
   <string name="auto_enable_label">Automatisch inschakelen</string>
-  <string name="sleep_timer_enabled_label">Slaap timer ingeschakeld</string>
-  <string name="sleep_timer_disabled_label">Slaap timer uitgeschakeld</string>
+  <string name="sleep_timer_enabled_label">Slaaptimer ingeschakeld</string>
+  <string name="sleep_timer_disabled_label">Slaaptimer uitgeschakeld</string>
   <!--gpodder.net-->
   <string name="gpodnet_taglist_header">CATEGORIEËN</string>
-  <string name="gpodnet_toplist_header">TOP PODCASTS</string>
+  <string name="gpodnet_toplist_header">POPULAIRE PODCASTS</string>
   <string name="gpodnet_suggestions_header">SUGGESTIES</string>
-  <string name="gpodnet_search_hint">Zoek gpodder.net</string>
-  <string name="gpodnetauth_login_title">Log in</string>
-  <string name="gpodnetauth_login_descr">Welkom bij het inlogproces van gpodder.net. Typ eerst je accountgegevens:</string>
-  <string name="gpodnetauth_login_butLabel">Log in</string>
-  <string name="gpodnetauth_login_register">Als u nog geen account heeft, kunt u er hier een aanmaken:\nhttps://gpodder.net/register/</string>
+  <string name="gpodnet_search_hint">gpodder.net doorzoeken</string>
+  <string name="gpodnetauth_login_title">Inloggen</string>
+  <string name="gpodnetauth_login_descr">Welkom bij het inlogproces van gpodder.net. Typ eerst je inloggegevens:</string>
+  <string name="gpodnetauth_login_butLabel">Inloggen</string>
+  <string name="gpodnetauth_login_register">Als je nog geen account hebt, dan kun je je hier registreren:\nhttps://gpodder.net/register/</string>
   <string name="username_label">Gebruikersnaam</string>
   <string name="password_label">Wachtwoord</string>
-  <string name="gpodnetauth_device_title">Apparaatselectie</string>
-  <string name="gpodnetauth_device_descr">Maak een nieuw apparaat aan om voor je gpodder.net account te gebruiken of kies een bestaande:</string>
-  <string name="gpodnetauth_device_deviceID">Device ID:\u0020</string>
-  <string name="gpodnetauth_device_caption">Apparaatnaam</string>
-  <string name="gpodnetauth_device_butCreateNewDevice">Maak een nieuw apparaat aan</string>
-  <string name="gpodnetauth_device_chooseExistingDevice">Kies een bestaand apparaat:</string>
-  <string name="gpodnetauth_device_errorEmpty">Apparaat ID mag niet leeg zijn</string>
-  <string name="gpodnetauth_device_errorAlreadyUsed">Apparaat ID al in gebruik</string>
-  <string name="gpodnetauth_device_caption_errorEmpty">Apparaatomschrijving kan niet leeg zijn</string>
-  <string name="gpodnetauth_device_butChoose">Kies</string>
-  <string name="gpodnetauth_finish_title">Login succesvol</string>
-  <string name="gpodnetauth_finish_descr">Gefeliciteerd! Jou gpodder.net account is nu verbonden met je apparaat. AntennaPod zal voortaan abonnementen op je apparaat automatisch met je gpodder.net account synchroniseren.</string>
-  <string name="gpodnetauth_finish_butsyncnow">Synchronisatie nu starten</string>
+  <string name="gpodnetauth_device_title">Apparaatkeuze</string>
+  <string name="gpodnetauth_device_descr">Creëer een nieuw apparaat voor je gpodder.net-account of kies een bestaand:</string>
+  <string name="gpodnetauth_device_deviceID">Apparaat-ID:\u0020</string>
+  <string name="gpodnetauth_device_caption">Omschrijving</string>
+  <string name="gpodnetauth_device_butCreateNewDevice">Nieuw apparaat creëren</string>
+  <string name="gpodnetauth_device_chooseExistingDevice">Bestaand apparaat kiezen:</string>
+  <string name="gpodnetauth_device_errorEmpty">Apparaat-ID mag niet blanco zijn</string>
+  <string name="gpodnetauth_device_errorAlreadyUsed">Apparaat-ID wordt al gebruikt</string>
+  <string name="gpodnetauth_device_caption_errorEmpty">Apparaatomschrijving mag niet blanco zijn</string>
+  <string name="gpodnetauth_device_butChoose">Kiezen</string>
+  <string name="gpodnetauth_finish_title">Ingelogd!</string>
+  <string name="gpodnetauth_finish_descr">Gefeliciteerd! Je gpodder.net-account is nu gekoppeld aan je apparaat. AntennaPod zal voortaan abonnementen automatisch synchroniseren met je gpodder.net-account.</string>
+  <string name="gpodnetauth_finish_butsyncnow">Nu synchroniseren</string>
   <string name="gpodnetauth_finish_butgomainscreen">Terug naar hoofdscherm</string>
-  <string name="gpodnetsync_auth_error_title">gpodder.net authenticatie fout</string>
-  <string name="gpodnetsync_auth_error_descr">Ongeldig gebruikersnaam of wachtwoord</string>
-  <string name="gpodnetsync_error_title">gpodder.net synchronisatie fout</string>
+  <string name="gpodnetsync_auth_error_title">gpodder.net - authenticatiefout</string>
+  <string name="gpodnetsync_auth_error_descr">Onjuiste gebruikersnaam of wachtwoord</string>
+  <string name="gpodnetsync_error_title">gpodder.net - synchronisatiefout</string>
   <string name="gpodnetsync_error_descr">Er is een fout opgetreden tijdens het synchroniseren:\u0020</string>
-  <string name="gpodnetsync_pref_report_successful">Succesvol</string>
-  <string name="gpodnetsync_pref_report_failed">Gefaald</string>
+  <string name="gpodnetsync_pref_report_successful">Voltooid</string>
+  <string name="gpodnetsync_pref_report_failed">Mislukt</string>
   <!--Directory chooser-->
-  <string name="selected_folder_label">Geselecteerde map:</string>
-  <string name="create_folder_label">Map aanmaken</string>
-  <string name="choose_data_directory">Kies data map</string>
-  <string name="choose_data_directory_message">Kies de hoofdmap voor uw data. AntennaPod zal de benodigde submappen creeëren.</string>
-  <string name="choose_data_directory_permission_rationale">Toegang tot de externe opslag is nodig om de data-map aan te passen</string>
-  <string name="create_folder_msg">Maak een nieuwe map aan met de naam \"%1$s\"?</string>
-  <string name="create_folder_success">Nieuwe map aangemaakt</string>
-  <string name="create_folder_error_no_write_access">Kan in deze map niet schrijven</string>
+  <string name="selected_folder_label">Gekozen map:</string>
+  <string name="create_folder_label">Map creëren</string>
+  <string name="choose_data_directory">Kies de gegevensmap</string>
+  <string name="choose_data_directory_message">Kies de hoofdmap voor je gegevens. AntennaPod zal de benodigde submappen creëren.</string>
+  <string name="choose_data_directory_permission_rationale">Toegang tot externe opslag is nodig om de gegevensmap te wijzigen</string>
+  <string name="create_folder_msg">Wil je een nieuwe map creëren met de naam \"%1$s\"?</string>
+  <string name="create_folder_success">Nieuwe map gecreëerd</string>
+  <string name="create_folder_error_no_write_access">Kan niet schrijven naar map</string>
   <string name="create_folder_error_already_exists">Map bestaat al</string>
-  <string name="create_folder_error">Kon map niet aanmaken</string>
+  <string name="create_folder_error">Kan map niet creëren</string>
   <string name="folder_does_not_exist_error">\"%1$s\" bestaat niet</string>
-  <string name="folder_not_readable_error">\"%1$s\" kan niet gelezen worden</string>
-  <string name="folder_not_writable_error">in \"%1$s\" kan geen data geschreven worden</string>
+  <string name="folder_not_readable_error">\"%1$s\" kan niet worden uitgelezen</string>
+  <string name="folder_not_writable_error">Kan niet wegschrijven naar \"%1$s\"</string>
   <string name="folder_not_empty_dialog_title">Map is niet leeg</string>
-  <string name="folder_not_empty_dialog_msg">De map die u heeft gekozen is niet leeg. Gedownloade media en andere bestanden zullen rechtstreeks in deze map geplaatst worden. Toch doorgaan?</string>
-  <string name="set_to_default_folder">Kies default map</string>
-  <string name="pref_pausePlaybackForFocusLoss_sum">Het afspelen onderbreken in plaats van het volume te verlagen wanneer er een andere app geluiden af wil spelen</string>
+  <string name="folder_not_empty_dialog_msg">De map die je hebt gekozen is niet leeg. Gedownloade media en andere bestanden worden rechtstreeks in deze map geplaatst. Wil je toch doorgaan?</string>
+  <string name="set_to_default_folder">Standaardmap kiezen</string>
+  <string name="pref_pausePlaybackForFocusLoss_sum">Het afspelen onderbreken in plaats van het volume te verlagen als een andere app geluiden wil afspelen</string>
   <string name="pref_pausePlaybackForFocusLoss_title">Pauzeren bij onderbrekingen</string>
-  <string name="pref_resumeAfterCall_sum">Afspelen hervatten na beëindigen telefoongesprek</string>
+  <string name="pref_resumeAfterCall_sum">Afspelen hervatten na beëindigen van telefoongesprek</string>
   <string name="pref_resumeAfterCall_title">Hervatten na gesprek</string>
-  <string name="pref_restart_required">AntennaPod moet opnieuw worden opgestart om deze wijziging door te voeren.</string>
+  <string name="pref_restart_required">AntennaPod moet opnieuw worden gestart om deze wijziging toe te passen.</string>
   <!--Online feed view-->
   <string name="subscribe_label">Abonneren</string>
   <string name="subscribed_label">Geabonneerd</string>
-  <string name="downloading_label">Downloaden…</string>
+  <string name="downloading_label">Bezig met downloaden...</string>
   <!--Content descriptions for image buttons-->
   <string name="rewind_label">Terugspoelen</string>
   <string name="fast_forward_label">Vooruitspoelen</string>
@@ -546,45 +572,45 @@
   <string name="media_type_video_label">Video</string>
   <string name="navigate_upwards_label">Navigeer naar boven</string>
   <string name="status_downloading_label">Aflevering wordt gedownload</string>
-  <string name="in_queue_label">Aflevering is in de queue</string>
-  <string name="drag_handle_content_description">Item verslepen om het te verplaatsen</string>
+  <string name="in_queue_label">Aflevering staat in de wachtrij</string>
+  <string name="drag_handle_content_description">Versleep dit item om de positie te veranderen</string>
   <string name="load_next_page_label">Volgende pagina laden</string>
   <!--Feed information screen-->
   <string name="authentication_label">Authenticatie</string>
-  <string name="authentication_descr">Gebruikersnaam en wachtwoord aanpassen voor deze podcast</string>
+  <string name="authentication_descr">Gebruikersnaam en wachtwoord wijzigen voor deze podcast en bijbehorende afleveringen.</string>
   <string name="auto_download_settings_label">Instellingen voor Automatisch downloaden</string>
-  <string name="episode_filters_label">Afleveringenfilter</string>
+  <string name="episode_filters_label">Afleveringsfilter</string>
   <string name="episode_filters_description">Lijst van zoektermen die bepalen of een aflevering meegenomen of uitgesloten wordt bij automatisch downloaden</string>
   <string name="episode_filters_include">Meenemen</string>
   <string name="episode_filters_exclude">Uitsluiten</string>
   <string name="episode_filters_hint">Losse woorden \n\"Meerdere tussen aanhalingstekens\"</string>
-  <string name="keep_updated">Up to date houden</string>
+  <string name="keep_updated">Bijgewerkt houden</string>
   <!--Progress information-->
-  <string name="progress_upgrading_database">Database upgraden</string>
+  <string name="progress_upgrading_database">Bezig met upgraden van databank...</string>
   <!--AntennaPodSP-->
-  <string name="sp_apps_importing_feeds_msg">Abonnementen aan het importeren vanuit single-purpose apps...</string>
-  <string name="search_itunes_label">Zoeken in iTunes</string>
+  <string name="sp_apps_importing_feeds_msg">Bezig met importeren van abonnementen uit eenmalige apps...</string>
+  <string name="search_itunes_label">iTunes doorzoeken</string>
   <string name="filter">Filter</string>
   <string name="search_fyyd_label">Fyyd doorzoeken</string>
   <!--Episodes apply actions-->
   <string name="all_label">Alle</string>
-  <string name="selected_all_label">Alle afleveringen selecteren</string>
+  <string name="selected_all_label">Alle afleveringen geselecteerd</string>
   <string name="none_label">Geen</string>
-  <string name="deselected_all_label">Alle afleveringen deselecteren</string>
+  <string name="deselected_all_label">Alle afleveringen gede-selecteerd</string>
   <string name="played_label">Afgespeeld</string>
-  <string name="selected_played_label">Alle afgespeelde afleveringen selecteren</string>
+  <string name="selected_played_label">Alle afgespeelde afleveringen geselecteerd</string>
   <string name="unplayed_label">Niet afgespeeld</string>
-  <string name="selected_unplayed_label">Niet afgespeelde afleveringen geselecteerd</string>
+  <string name="selected_unplayed_label">Niet-afgespeelde afleveringen geselecteerd</string>
   <string name="downloaded_label">Gedownload</string>
-  <string name="selected_downloaded_label">Gedownloadde afleveringen geselecteerd</string>
+  <string name="selected_downloaded_label">Gedownloade afleveringen geselecteerd</string>
   <string name="not_downloaded_label">Niet gedownload</string>
-  <string name="selected_not_downloaded_label">Niet gedownloadde afleveringen geselecteerd</string>
+  <string name="selected_not_downloaded_label">Niet-gedownloade afleveringen geselecteerd</string>
   <string name="queued_label">In de wachtrij</string>
-  <string name="selected_queued_label">Afleveringen in de wachtrij selecteren</string>
+  <string name="selected_queued_label">Afleveringen in de wachtrij geselecteerd</string>
   <string name="not_queued_label">Niet in de wachtrij</string>
   <string name="selected_not_queued_label">Afleveringen geselecteerd die niet in de wachtrij staan</string>
   <string name="has_media">Bevat media</string>
-  <string name="selected_has_media_label">Geselecteerde afleveringen met media</string>
+  <string name="selected_has_media_label">Afleveringen met media geselecteerd</string>
   <!--Sort-->
   <string name="sort_title_a_z">Titel (A \u2192 Z)</string>
   <string name="sort_title_z_a">Titel (A \u2192 A)</string>
@@ -593,9 +619,9 @@
   <string name="sort_duration_short_long">Lengte (kort \u2192 lang)</string>
   <string name="sort_duration_long_short">Lengte (lang \u2192 kort)</string>
   <!--Rating dialog-->
-  <string name="rating_title">Wat vind u van AntennaPod?</string>
-  <string name="rating_message">We zouden het op prijs stellen als u even de tijd kunt nemen om AntennaPod te beoordelen.</string>
-  <string name="rating_never_label">Nee, bedankt.</string>
+  <string name="rating_title">Wat vind je van AntennaPod?</string>
+  <string name="rating_message">We stellen het op prijs als je even de tijd neemt om AntennaPod te beoordelen.</string>
+  <string name="rating_never_label">Nee, bedankt</string>
   <string name="rating_later_label">Herinner me later</string>
   <string name="rating_now_label">Ja, doen we!</string>
   <!--Audio controls-->
@@ -604,43 +630,52 @@
   <string name="volume">Volume</string>
   <string name="left_short">L</string>
   <string name="right_short">R</string>
-  <string name="audio_effects">Terugmixen</string>
+  <string name="audio_effects">Audio-effecten</string>
   <string name="stereo_to_mono">Stereo terugmixen tot monogeluid op beide kanalen</string>
   <string name="sonic_only">Sonic vereist</string>
   <!--proxy settings-->
   <string name="proxy_type_label">Type</string>
   <string name="host_label">Host</string>
   <string name="port_label">Poort</string>
-  <string name="optional_hint">(Optioneel)</string>
+  <string name="optional_hint">(optioneel)</string>
   <string name="proxy_test_label">Testen</string>
-  <string name="proxy_checking">Controleren…</string>
-  <string name="proxy_test_successful">Test succesvol</string>
+  <string name="proxy_checking">Bezig met controleren...</string>
+  <string name="proxy_test_successful">Test geslaagd</string>
   <string name="proxy_test_failed">Test mislukt</string>
-  <string name="proxy_host_empty_error">Host kan niet leeg zijn</string>
-  <string name="proxy_host_invalid_error">Host is geen geldig IP-adres of domein</string>
-  <string name="proxy_port_invalid_error">Poortnummer ongeldig</string>
+  <string name="proxy_host_empty_error">Host mag niet blanco zijn</string>
+  <string name="proxy_host_invalid_error">Host is geen geldig IP-adres of domeinnaam</string>
+  <string name="proxy_port_invalid_error">Ongeldig poortnummer</string>
   <!--Database import/export-->
-  <string name="import_export">Database im-/exporteren</string>
-  <string name="import_export_warning">Hiermee kun je de podcasts waarop je geabonneerd bent en de afgespeelde afleveringen naar een ander apparaat kopiëren\n\nGeëxporteerde databases kunnen alleen geïmporteerd worden in dezelfde versie van AntennaPod (zie \'Over AntennaPod\' in de instellingen). Het importeren naar een andere versie kan onverwachte problemen opleveren.\n\nNa het importeren kunnen afleveringen als \'gedownload\' aangemerkt zijn, terwijl dit niet het geval is. Druk op de afspeelknop naast de afleveringen om AntennaPod dit te laten detecteren.</string>
+  <string name="import_export">Databank im-/exporteren</string>
+  <string name="import_export_warning">Met deze experimentele functie kun je je abonnementen en afgespeelde afleveringen overzetten naar een ander apparaat.\n\nGeëxporteerde databanken kunnen alleen worden geïmporteerd in dezelfde versie van AntennaPod, anders kunnen zich problemen voordoen.\n\nNa het importeren kunnen afleveringen als \'gedownload\' aangemerkt zijn, terwijl dit niet het geval is. Druk op de afspeelknop om AntennaPod dit te laten detecteren.</string>
   <string name="label_import">Importeren</string>
   <string name="label_export">Exporteren</string>
-  <string name="import_select_file">Selecteer bestand om te importeren</string>
-  <string name="export_ok">Succesvol geëxporteerd. De database is naar de SD-kaart geschreven.</string>
-  <string name="import_ok">Succesvol geïmporteerd\n\nDruk op OK om AntennaPod te herstarten.</string>
+  <string name="import_select_file">Kies een te importeren bestand</string>
+  <string name="export_ok">Export voltooid.</string>
+  <string name="import_ok">Geïmporteerd.\n\nDruk op Oké om AntennaPod opnieuw te starten.</string>
   <!--Casting-->
   <string name="cast_media_route_menu_title">Afspelen op…</string>
-  <string name="cast_disconnect_label">Cast loskoppelen</string>
-  <string name="cast_not_castable">Dit bestand kan niet afgespeeld woorden door het Cast apparaat</string>
-  <string name="cast_failed_to_play">Starten van afspelen is mislukt</string>
-  <string name="cast_failed_to_stop">Stoppen van afspelen is mislukt</string>
-  <string name="cast_failed_to_pause">Pauzeren van afspelen is mislukt</string>
+  <string name="cast_disconnect_label">Cast-verbinding verbreken</string>
+  <string name="cast_not_castable">De geselecteerde media is niet compatibel met het cast-apparaat</string>
+  <string name="cast_failed_to_play">Afspelen mislukt</string>
+  <string name="cast_failed_to_stop">Stoppen mislukt</string>
+  <string name="cast_failed_to_pause">Pauzeren mislukt</string>
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
-  <string name="cast_failed_setting_volume">Het aanpassen van het volume is mislukt</string>
-  <string name="cast_failed_no_connection">Er is geen verbinding met het Cast apparaat</string>
-  <string name="cast_failed_no_connection_trans">De verbinding met het Cast apparaat is verloren. Antennapod probeert de verbinding te herstellen. Wacht aub een paar seconden en probeer opnieuw.</string>
-  <string name="cast_failed_perform_action">Het uitvoeren van de actie is mislukt</string>
-  <string name="cast_failed_status_request">Het synchroniseren met het Cast apparaat is mislukt</string>
-  <string name="cast_failed_seek">Het opzoeken van het nieuwe tijdstip op het Cast apparaat is mislukt</string>
-  <string name="cast_failed_receiver_player_error">Ernstige fout opgetreden bij het afspelende Cast apparaat</string>
-  <string name="cast_failed_media_error_skipping">Er was een fout bij het afspelen; de aflevering wordt overgeslagen…</string>
+  <string name="cast_failed_setting_volume">Volume aanpassen mislukt</string>
+  <string name="cast_failed_no_connection">Er is geen verbinding met het Cast-apparaat</string>
+  <string name="cast_failed_no_connection_trans">De verbinding met het Cast-apparaat is verbroken; Antennapod probeert de verbinding te herstellen. Wacht een paar seconden en probeer het opnieuw.</string>
+  <string name="cast_failed_perform_action">Actie kan niet worden uitgevoerd</string>
+  <string name="cast_failed_status_request">Synchroniseren met Cast-apparaat mislukt</string>
+  <string name="cast_failed_seek">Opzoeken van nieuwe positie op Cast-apparaat mislukt</string>
+  <string name="cast_failed_receiver_player_error">Ernstige fout opgetreden op het afspelende Cast-apparaat</string>
+  <string name="cast_failed_media_error_skipping">Kan media niet afspelen. Bezig met overslaan...</string>
+  <!--Notification channels-->
+  <string name="notification_channel_user_action">Actie vereist</string>
+  <string name="notification_channel_user_action_description">Tonen als een actie vereist is, bijvoorbeeld als je een wachtwoord moet invoeren.</string>
+  <string name="notification_channel_downloading">Bezig met downloaden...</string>
+  <string name="notification_channel_downloading_description">Tonen als er iets wordt gedownload.</string>
+  <string name="notification_channel_playing">Nu aan het afspelen</string>
+  <string name="notification_channel_playing_description">Hiermee kun je het afspelen bedienen. Dit is de voornaamste melding tijdens het afspelen van een podcast.</string>
+  <string name="notification_channel_error">Foutmeldingen</string>
+  <string name="notification_channel_error_description">Tonen als er iets is misgegaan, bijvoorbeeld als downloaden of synchroniseren mislukt is.</string>
 </resources>
diff --git a/core/src/main/res/values-no-rNB/strings.xml b/core/src/main/res/values-no-rNB/strings.xml
index 2e3b9bd53..de0892b73 100644
--- a/core/src/main/res/values-no-rNB/strings.xml
+++ b/core/src/main/res/values-no-rNB/strings.xml
@@ -54,7 +54,6 @@
   <string name="yes">Ja</string>
   <string name="no">Nei</string>
   <string name="reset">Tilbakestill</string>
-  <string name="author_label">Opphavsperson</string>
   <string name="language_label">Språk</string>
   <string name="url_label">URL</string>
   <string name="podcast_settings_label">Innstillinger</string>
@@ -102,25 +101,13 @@
   <string name="mark_all_read_label">Marker alle som avspilt</string>
   <string name="mark_all_read_msg">Marker alle episoder som avspilt</string>
   <string name="mark_all_read_confirmation_msg">Vennligst bekreft at du ønsker å markere alle episoder som avspilt.</string>
-  <string name="mark_all_read_feed_confirmation_msg">Vennligst bekreft at du ønsker å markere alle episoder i denne strømmen som avspilt.</string>
   <string name="mark_all_seen_label">Marker alle som sett</string>
-  <string name="mark_all_seen_msg">Marker alle episoder som sett</string>
   <string name="mark_all_seen_confirmation_msg">Vennligst bekreft at du ønsker å markere alle episoder som sett.</string>
   <string name="show_info_label">Vis informasjon</string>
-  <string name="rename_feed_label">Endre navn på podcast</string>
-  <string name="remove_feed_label">Fjern podcast</string>
   <string name="share_label">Del ...</string>
-  <string name="share_link_label">Del lenke</string>
   <string name="share_file_label">Del fil</string>
-  <string name="share_link_with_position_label">Del lenke med plassering</string>
   <string name="share_feed_url_label">Del strømmens URL</string>
-  <string name="share_item_url_label">Del episodens URL</string>
-  <string name="share_item_url_with_position_label">Del episodens URL med posisjon</string>
-  <string name="feed_delete_confirmation_msg">Vennligst bekreft at du ønsker å slette strømmen \"%1$s\" og alle episoder fra denne strømmen som du har lastet ned.</string>
-  <string name="feed_remover_msg">Fjerner strøm</string>
-  <string name="load_complete_feed">Oppdater hele strømmen</string>
   <string name="hide_episodes_title">Skjul episoder</string>
-  <string name="episode_actions">Lagre handlinger</string>
   <string name="hide_unplayed_episodes_label">Ikke avspilt</string>
   <string name="hide_paused_episodes_label">Pauset</string>
   <string name="hide_played_episodes_label">Avspilt</string>
@@ -227,7 +214,6 @@
   <string name="date">På dato</string>
   <string name="duration">På varighet</string>
   <string name="episode_title">Episodetittel</string>
-  <string name="feed_title">Strømtittel</string>
   <string name="ascending">Økende</string>
   <string name="descending">Synkende</string>
   <string name="clear_queue_confirmation_msg">Vennligst bekreft at du ønsker å slette ALLE elementer i køen</string>
@@ -264,7 +250,6 @@
   <string name="enable_sonic">Skru på Sonic</string>
   <!--Empty list labels-->
   <string name="no_items_label">Det er ingen objekter på denne listen.</string>
-  <string name="no_feeds_label">Du abonnerer ikke på noen strømmer enda.</string>
   <string name="no_chapters_label">Denne episoden har ingen kapitler.</string>
   <string name="no_shownotes_label">Denne episoden har ingen shownotater</string>
   <!--Preferences-->
@@ -273,13 +258,11 @@
   <string name="other_pref">Annet</string>
   <string name="about_pref">Om</string>
   <string name="queue_label">Queue</string>
-  <string name="services_label">Tjenester</string>
   <string name="flattr_label">Flattr</string>
   <string name="pref_episode_cleanup_title">Episodeopprydding</string>
   <string name="pref_pauseOnDisconnect_sum">Sett playback på pause når hodetelefoner eller bluetooth er frakoblet</string>
   <string name="pref_unpauseOnHeadsetReconnect_sum">Gjenoppta avspilling når hodetelefoner gjeninnkoples</string>
   <string name="pref_unpauseOnBluetoothReconnect_sum">Fortsett avspilling når bluetooth er tilkoblet igjen</string>
-  <string name="pref_hardwareForwardButtonSkips_sum">Ved pressing av hardware forover-knapp hopp til neste episode istedenfor forover-spoling</string>
   <string name="pref_hardwarePreviousButtonRestarts_title">Forriv</string>
   <string name="pref_followQueue_sum">Hopp til neste element i køen når avspillingen er ferdig</string>
   <string name="pref_auto_delete_sum">Slett episode når avspillingen er ferdig</string>
@@ -327,7 +310,6 @@
   <string name="pref_nav_drawer_feed_order_title">Velg rekkefølge på abbonement</string>
   <string name="pref_nav_drawer_feed_order_sum">Endre rekkefølgen på abbonementene dine</string>
   <string name="pref_nav_drawer_feed_counter_title">Velg abbonementsteller</string>
-  <string name="pref_nav_drawer_feed_counter_sum">Endre informasjonen vist av abonnementstelleren</string>
   <string name="pref_set_theme_sum">Endre utseendet til AntennaPod</string>
   <string name="pref_automatic_download_title">Automatisk nedlasting</string>
   <string name="pref_automatic_download_sum">Konfigurer automatisk nedlasting av episoder.</string>
@@ -362,8 +344,6 @@
   <string name="pref_playback_speed_sum">Egendefiner hastighetene tilgjengelig for variabel avspillingshastighet</string>
   <string name="pref_gpodnet_sethostname_title">Sett vertsnavn</string>
   <string name="pref_gpodnet_sethostname_use_default_host">Bruk standard vert</string>
-  <string name="pref_expandNotify_title">Utvid varsel</string>
-  <string name="pref_expandNotify_sum">Utvider alltid varselet for å inkludere avspillingsknapper.</string>
   <string name="pref_persistNotify_title">Vedvarende avspillingskontroller</string>
   <string name="pref_persistNotify_sum">Behold varsel- og låseskjermkontroller når avspilling er satt på pause.</string>
   <string name="pref_compact_notification_buttons_title">Velg låseskjermsknapper</string>
@@ -381,8 +361,6 @@
   <string name="crash_report_sum">Send den siste kræsj-rapporten via e-post</string>
   <string name="send_email">Send e-post</string>
   <string name="experimental_pref">Eksperimentell</string>
-  <string name="pref_sonic_title">Sonic mediaspiller</string>
-  <string name="pref_sonic_message">Bruk innebygd Sonic mediaspiller som en erstatning for Androids mediaspiller og Prestissimo</string>
   <string name="pref_faq">FAQ</string>
   <string name="pref_known_issues">Kjente problemer</string>
   <string name="pref_no_browser_found">Ingen nettleser funnet.</string>
@@ -421,8 +399,6 @@
   <string name="html_export_label">HTML eksport</string>
   <string name="exporting_label">Eksporterer...</string>
   <string name="export_error_label">Eksporteringserror</string>
-  <string name="opml_export_success_title">OPML-import vellykket.</string>
-  <string name="opml_export_success_sum">.opml-filen ble skrevet til:\u0020</string>
   <string name="opml_import_ask_read_permission">Tilgang til ekstern lagring er nødvendig for å lese OPML filen</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Sett opp sovetimer</string>
@@ -592,4 +568,5 @@
   <string name="cast_failed_to_stop">Feilter å stoppe avspillingen av media</string>
   <string name="cast_failed_to_pause">Feilet å pause avspillingen av media</string>
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-no/strings.xml b/core/src/main/res/values-no/strings.xml
index acf3abe75..2d9481b84 100644
--- a/core/src/main/res/values-no/strings.xml
+++ b/core/src/main/res/values-no/strings.xml
@@ -36,4 +36,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-pl-rPL/strings.xml b/core/src/main/res/values-pl-rPL/strings.xml
index 4839ef60c..d77236577 100644
--- a/core/src/main/res/values-pl-rPL/strings.xml
+++ b/core/src/main/res/values-pl-rPL/strings.xml
@@ -22,6 +22,7 @@
   <string name="free_space_label">%1$s wolnego miejsca</string>
   <string name="episode_cache_full_title">Pełna pamięć cache</string>
   <string name="episode_cache_full_message">Limit pamięci cache został osiągnięty. Możesz zwiększyć pojemność cache w ustawieniach aplikacji.</string>
+  <string name="synchronizing">Synchronizowanie...</string>
   <!--Statistics fragment-->
   <string name="total_time_listened_to_podcasts">Całkowity czas trwania podcastów:</string>
   <string name="statistics_details_dialog">%1$d z %2$d odcinków rozpoczęto.\n\nZagrano %3$s z %4$s.</string>
@@ -56,7 +57,6 @@
   <string name="yes">Tak</string>
   <string name="no">Nie</string>
   <string name="reset">Reset</string>
-  <string name="author_label">Autor</string>
   <string name="language_label">Język</string>
   <string name="url_label">URL</string>
   <string name="podcast_settings_label">Ustawienia</string>
@@ -107,24 +107,13 @@
   <string name="mark_all_read_label">Oznacz wszystkie jako odtworzone</string>
   <string name="mark_all_read_msg">Wszystkie odcinki zaznaczono jako odtworzone</string>
   <string name="mark_all_read_confirmation_msg">Proszę potwierdzić, że chcesz zaznaczyć wszystkie odcinki do odtworzenia.</string>
-  <string name="mark_all_read_feed_confirmation_msg">Proszę potwierdzić, że chcesz zaznaczyć wszystkie odcinki na tym kanale do odtworzenia.</string>
   <string name="mark_all_seen_label">Oznacz wszystkie jako widziane</string>
-  <string name="mark_all_seen_msg">Zaznacz wszystkie Odcinki jako obejrzane</string>
   <string name="mark_all_seen_confirmation_msg">Proszę potwierdzić chęć zaznaczenia wszystkich odcinków jako obejrzanych.</string>
   <string name="show_info_label">Pokaż informacje</string>
-  <string name="rename_feed_label">Zmień nazwę podcast-u</string>
-  <string name="remove_feed_label">Usuń podcast</string>
   <string name="share_label">Udostępnij...</string>
-  <string name="share_link_label">Udostępnij stronę</string>
-  <string name="share_link_with_position_label">Udostępnij link z aktualną pozycją</string>
+  <string name="share_file_label">Udostępnij plik</string>
   <string name="share_feed_url_label">Udostępnij adres kanału</string>
-  <string name="share_item_url_label">Udostępnij plik URL odcinka</string>
-  <string name="share_item_url_with_position_label">Udostępnik plik URL odcinka z pozycją</string>
-  <string name="feed_delete_confirmation_msg">Potwierdź chęć usunięcia kanału \"%1$s\" wraz ze WSZYSTKIMI odcinkami, które zostały pobrane.</string>
-  <string name="feed_remover_msg">Usuwanie kanału</string>
-  <string name="load_complete_feed">Odśwież cały kanał</string>
   <string name="hide_episodes_title">Ukryj odcinki</string>
-  <string name="episode_actions">Zatwierdź czynności</string>
   <string name="hide_unplayed_episodes_label">Nieodtworzone</string>
   <string name="hide_paused_episodes_label">Zatrzymane</string>
   <string name="hide_played_episodes_label">Odtworzone</string>
@@ -144,6 +133,7 @@
   <string name="stream_label">Strumień</string>
   <string name="remove_label">Usuń</string>
   <string name="delete_label">Usuń</string>
+  <string name="delete_failed">Nie można usunąć pliku. Restart urządzenia może w tym pomóc.</string>
   <string name="remove_episode_lable">Usuń odcinek</string>
   <string name="marked_as_seen_label">Zaznaczono jako wyświetlone</string>
   <string name="mark_read_label">Oznacz jako odtworzone</string>
@@ -168,6 +158,9 @@
   <string name="download_failed">Operacja nie powiodła się</string>
   <string name="download_pending">Pobieranie w toku</string>
   <string name="download_running">Pobieram</string>
+  <string name="download_error_details">Szczegóły</string>
+  <string name="download_error_details_message">%1$s \n\nAdres pliku:\n%2$s
+</string>
   <string name="download_error_device_not_found">Nie znaleziono urządzenia docelowego</string>
   <string name="download_error_insufficient_space">Niewystarczająca ilość pamięci</string>
   <string name="download_error_file_error">Błąd pliku</string>
@@ -236,7 +229,6 @@
   <string name="date">Według daty</string>
   <string name="duration">Według długości</string>
   <string name="episode_title">Tytuł odcinka</string>
-  <string name="feed_title">Tytuł kanału</string>
   <string name="ascending">Rosnąco</string>
   <string name="descending">Malejąco</string>
   <string name="clear_queue_confirmation_msg">Potwierdź usunięcie WSZYSTKICH pozycji z kolejki</string>
@@ -274,7 +266,6 @@
   <string name="enable_sonic">Włącz Sonic</string>
   <!--Empty list labels-->
   <string name="no_items_label">Brak elementów na tej liście.</string>
-  <string name="no_feeds_label">Nie subskrybowałeś jeszcze żadnego kanału.</string>
   <string name="no_chapters_label">Ten odcinek nie ma rozdziałów.</string>
   <string name="no_shownotes_label">Ten epizod nie ma notatek.</string>
   <!--Preferences-->
@@ -283,7 +274,6 @@
   <string name="other_pref">Inne</string>
   <string name="about_pref">O...</string>
   <string name="queue_label">Kolejka</string>
-  <string name="services_label">Usługi</string>
   <string name="flattr_label">Flattr</string>
   <string name="pref_episode_cleanup_title">Usuwanie odcinków</string>
   <string name="pref_episode_cleanup_summary">Odcinki niebędące w kolejce i niebędące na liście ulubiobych powinny nadawać się do usunięcia, jeśli Automatyczne Pobieranie potrzebuje miejsca na nowe odcinki.</string>
@@ -291,7 +281,6 @@
   <string name="pref_unpauseOnHeadsetReconnect_sum">Wznów odtwarzanie kiedy słuchawki zostaną podłączone ponownie</string>
   <string name="pref_unpauseOnBluetoothReconnect_sum">Wznów odtwarzanie po przywróceniu połączenia Bluetooth</string>
   <string name="pref_hardwareForwardButtonSkips_title">Przycisk \'Do przodu\' pomija odcinek</string>
-  <string name="pref_hardwareForwardButtonSkips_sum">Przyciśnięcie fizycznego przycisku \'Do przodu\' przeskakuje do następnego odcinka zamiast przewijania</string>
   <string name="pref_hardwarePreviousButtonRestarts_title">Przycisk wstecz restartuje</string>
   <string name="pref_hardwarePreviousButtonRestarts_sum">Podczas odtwarzania przycisk wstecz restartuje zamiast przewijać</string>
   <string name="pref_followQueue_sum">Przeskocz do następnego elementu kolejki po zakończeniu odtwarzania</string>
@@ -301,6 +290,8 @@
   <string name="pref_smart_mark_as_played_title">Inteligentnie oznacz jako odtworzone</string>
   <string name="pref_skip_keeps_episodes_sum">Zachowuje pominięte odcinki w kolejce</string>
   <string name="pref_skip_keeps_episodes_title">Zachowaj pominięte odcinki</string>
+  <string name="pref_favorite_keeps_episodes_sum">Zachowaj odcinki gdy są oznaczone jako Ulubione</string>
+  <string name="pref_favorite_keeps_episodes_title">Zachowaj Ulubione Odcinki</string>
   <string name="playback_pref">Odtwarzanie</string>
   <string name="network_pref">Sieć</string>
   <string name="pref_autoUpdateIntervallOrTime_title">Częstotliwość aktualizacji lub Czas dnia</string>
@@ -338,12 +329,13 @@
   <string name="pref_nav_drawer_feed_order_title">Ustaw kolejność subskrypcji</string>
   <string name="pref_nav_drawer_feed_order_sum">Zmień kolejność subskrybowanych kanałów</string>
   <string name="pref_nav_drawer_feed_counter_title">Ustaw licznik subskrypcji</string>
-  <string name="pref_nav_drawer_feed_counter_sum">Zmień informację wyświetlaną przez licznik subskrypcji</string>
   <string name="pref_set_theme_sum">Zmień wygląd AntennaPod.</string>
   <string name="pref_automatic_download_title">Automatyczne pobieranie</string>
   <string name="pref_automatic_download_sum">Skonfiguruj automatyczne pobieranie odcinków.</string>
   <string name="pref_autodl_wifi_filter_title">Włącz filtr Wi-Fi</string>
   <string name="pref_autodl_wifi_filter_sum">Zezwól na automatyczne pobieranie tylko dla określonych sieci Wi-Fi.</string>
+  <string name="pref_autodl_allow_on_mobile_title">Pobierz przy użyciu komórkowego transferu danych</string>
+  <string name="pref_autodl_allow_on_mobile_sum">Zezwól na automatyczne pobieranie przy użyciu komórkowego transferu danych</string>
   <string name="pref_automatic_download_on_battery_title">Pobieraj, gdy nie ładuje</string>
   <string name="pref_automatic_download_on_battery_sum">Zezwól na automatyczne pobieranie, gdy bateria nie jest ładowana.</string>
   <string name="pref_parallel_downloads_title">Liczba równoległych pobierań</string>
@@ -378,8 +370,6 @@
   <string name="pref_rewind_sum">Dostosuj liczbę sekund do przeskoczenia przy kliknięciu przewijania do tyłu</string>
   <string name="pref_gpodnet_sethostname_title">Ustaw nazwę hosta</string>
   <string name="pref_gpodnet_sethostname_use_default_host">Użyj domyślnego hosta</string>
-  <string name="pref_expandNotify_title">Rozwiń Powiadomienia</string>
-  <string name="pref_expandNotify_sum">Zawsze rozwijaj powiadomienie żeby pokazać przyciski odtwarzacza.</string>
   <string name="pref_persistNotify_title">Stałe przyciski odtwarzacza</string>
   <string name="pref_persistNotify_sum">Utrzymuj powiadomienie i przyciski odtwarzania na ekranie blokady gdy odtwarzanie jest wstrzymane.</string>
   <string name="pref_compact_notification_buttons_title">Ustaw przyciski ekranu blokowania</string>
@@ -400,8 +390,6 @@
   <string name="crash_report_sum">Wyślij ostatni raport o błędach przez e-mail</string>
   <string name="send_email">Wyślij e-mail</string>
   <string name="experimental_pref">Eksperymentalne</string>
-  <string name="pref_sonic_title">Odtwarzacz mediów Sonic</string>
-  <string name="pref_sonic_message">Użyj wbudowanego odtwarzacza Sonic jako oprogramowanie zastępcze do natywnego odtwarzacza Android i Prestissimo</string>
   <string name="pref_current_value">Aktualna wartość: %1$s</string>
   <string name="pref_proxy_title">Proxy</string>
   <string name="pref_proxy_sum">Ustaw proxy sieciowe</string>
@@ -411,6 +399,7 @@
   <string name="pref_cast_title">Obsługa Chromecast</string>
   <string name="pref_cast_message_play_flavor">Uruchom obsługę dla zdalnego odtwarzania mediów na innych urządzeniach (takich jak Chromecast, Audio Speakers albo Android TV)</string>
   <string name="pref_cast_message_free_flavor">Chromecast wymagadodatkowych bibliotek, które są zablokowane w tej wersji AntennaPod</string>
+  <string name="pref_enqueue_downloaded_title">Rzeczy z kolejki pobrane</string>
   <string name="pref_enqueue_downloaded_summary">Dodaj pobrane odcinki do kolejki</string>
   <!--Auto-Flattr dialog-->
   <string name="auto_flattr_enable">Włącz automatyczne wspieranie na flattr.</string>
@@ -421,8 +410,6 @@
   <string name="search_hint">Szukaj odcinków</string>
   <string name="found_in_shownotes_label">Znalezione w notatkach dotyczących show</string>
   <string name="found_in_chapters_label">Znaleziono w rozdziałach</string>
-  <string name="found_in_authors_label">Znaleziono wśród autorów</string>
-  <string name="found_in_feeds_label">Znaleziono wśród kanałów</string>
   <string name="search_status_no_results">Brak wyników</string>
   <string name="search_label">Szukaj</string>
   <string name="found_in_title_label">Znaleziono w tytułach</string>
@@ -448,8 +435,8 @@
   <string name="html_export_label">Eksport HTML</string>
   <string name="exporting_label">Eksportowanie...</string>
   <string name="export_error_label">Błąd eksportu</string>
-  <string name="opml_export_success_title">Eksport OPML udany.</string>
-  <string name="opml_export_success_sum">Plik .opml został zapisany do:\u0020</string>
+  <string name="export_success_title">Export zakończony powodzeniem</string>
+  <string name="export_success_sum">Wyeksportowany plik został zapisany w:\n\n %1$s</string>
   <string name="opml_import_ask_read_permission">Dostęp do zewnętrznej pamięci jest potrzebny do odczytywania plików OPML</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Ustaw czas do wyłączenia</string>
@@ -624,6 +611,13 @@ https://gpodder.net/register/</string>
   <string name="proxy_host_invalid_error">Host nie jest prawidłowym adresem IP albo domeną</string>
   <string name="proxy_port_invalid_error">Błędny port</string>
   <!--Database import/export-->
+  <string name="import_export">Import/Export bazy danych</string>
+  <string name="import_export_warning">Ta eksperymentalna funkcja może zostać użyta do przeniesienia Twoich subskrypcji i już obejrzanych odcinków na inne urządzenie.\n\n Wyeksportowana baza może zostać zaimportowana jedynie taką samą wersją programu AntennaPod. W innym przypadku może to spowodować nieprzewidziane zachowanie programu.\n\n Po zaimportowaniu, odcinki mogą być pokazane jako pobrane pomimo tego iż nie zostały pobrane. Wystarczy kliknąć odtwórz odcinek aby AntennaPod wykrył poprawny stan pliku.</string>
+  <string name="label_import">Import</string>
+  <string name="label_export">Export</string>
+  <string name="import_select_file">Wybierz plik do Importowania</string>
+  <string name="export_ok">Export zakończony powodzeniem</string>
+  <string name="import_ok">Import zakończony powodzeniem.\n\nNaciśnij OK aby zrestartować AntennaPod</string>
   <!--Casting-->
   <string name="cast_media_route_menu_title">Odtwarzaj na...</string>
   <string name="cast_disconnect_label">Rozłącz sesję</string>
@@ -640,4 +634,5 @@ https://gpodder.net/register/</string>
   <string name="cast_failed_seek">Wystąpił błąd podczas szukania nowej pozycji na urządzeniu nadającym.</string>
   <string name="cast_failed_receiver_player_error">Urządzenie odbierające napotkało poważny problem</string>
   <string name="cast_failed_media_error_skipping">Błąd podczas odtwarzania, pomijanie...</string>
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-pl/strings.xml b/core/src/main/res/values-pl/strings.xml
index 097417900..6a640a0ee 100644
--- a/core/src/main/res/values-pl/strings.xml
+++ b/core/src/main/res/values-pl/strings.xml
@@ -67,7 +67,6 @@
   <!--Empty list labels-->
   <!--Preferences-->
   <string name="queue_label">Kolejka</string>
-  <string name="services_label">Usługi</string>
   <string name="pref_downloadMediaOnWifiOnly_sum">Pobieraj pliki tylko przez WiFi</string>
   <string name="refreshing_label">Odświeżanie</string>
   <string name="user_interface_label">Interfejs Użytkownika</string>
@@ -97,4 +96,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml
index fc8633b1f..57ec3573c 100644
--- a/core/src/main/res/values-pt-rBR/strings.xml
+++ b/core/src/main/res/values-pt-rBR/strings.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
+  <string name="feed_update_receiver_name">Atualizar Assinaturas</string>
   <string name="feeds_label">Feeds</string>
   <string name="statistics_label">Estatísticas</string>
   <string name="add_feed_label">Adicionar Podcast</string>
@@ -56,7 +57,6 @@
   <string name="yes">Sim</string>
   <string name="no">Não</string>
   <string name="reset">Resetar</string>
-  <string name="author_label">Autor</string>
   <string name="language_label">Idioma</string>
   <string name="url_label">URL</string>
   <string name="podcast_settings_label">Configurações</string>
@@ -105,24 +105,12 @@
   <string name="mark_all_read_label">Marcar todos como reproduzidos</string>
   <string name="mark_all_read_msg">Marcar todos Episódios como reproduzidos</string>
   <string name="mark_all_read_confirmation_msg">Por favor, confirme que você deseja marcar todos os episódios como já reproduzidos.</string>
-  <string name="mark_all_read_feed_confirmation_msg">Por favor confirme se você deseja marcar todos os episódios deste feed como já reproduzidos.</string>
   <string name="mark_all_seen_label">Marcar todos como vistos</string>
-  <string name="mark_all_seen_msg">Todos os episódios marcados como vistos</string>
   <string name="mark_all_seen_confirmation_msg">Confirme se deseja marcar todos os episódios como vistos.</string>
   <string name="show_info_label">Mostrar informação</string>
-  <string name="rename_feed_label">Renomear o Podcast</string>
-  <string name="remove_feed_label">Remover Podcast</string>
   <string name="share_label">Compartilhar...</string>
-  <string name="share_link_label">Compartilhar Link</string>
-  <string name="share_link_with_position_label">Compartilhar Link com posição</string>
   <string name="share_feed_url_label">Compartilhar Link do Feed</string>
-  <string name="share_item_url_label">Compartilhar URL do arquivo do episódio</string>
-  <string name="share_item_url_with_position_label">Compartilhar URL do arquivo do episódio com posição</string>
-  <string name="feed_delete_confirmation_msg">Confirme se deseja deletar o feed \"%1$s\" e todos os episódios baixados desse feed.</string>
-  <string name="feed_remover_msg">Removendo feed</string>
-  <string name="load_complete_feed">Atualizar feed completamente</string>
   <string name="hide_episodes_title">Ocultar Episódios</string>
-  <string name="episode_actions">Aplicar ações</string>
   <string name="hide_unplayed_episodes_label">Não reproduzido</string>
   <string name="hide_paused_episodes_label">Pausado</string>
   <string name="hide_played_episodes_label">Reproduzido</string>
@@ -232,7 +220,6 @@
   <string name="date">Data</string>
   <string name="duration">Duração</string>
   <string name="episode_title">Titulo do Episodio</string>
-  <string name="feed_title">Titulo do Feed</string>
   <string name="ascending">Crescente</string>
   <string name="descending">Decrescente</string>
   <string name="clear_queue_confirmation_msg">Por favor confirme que você deseja limpar TODOS episódios da fila</string>
@@ -270,7 +257,6 @@
   <string name="enable_sonic">Habilitar Sonic</string>
   <!--Empty list labels-->
   <string name="no_items_label">Não existem itens nesta lista.</string>
-  <string name="no_feeds_label">Você ainda não assinou nenhum feed.</string>
   <string name="no_chapters_label">Este episódio não possui capítulos</string>
   <string name="no_shownotes_label">Este episódio não possui notas.</string>
   <!--Preferences-->
@@ -279,7 +265,6 @@
   <string name="other_pref">Outros</string>
   <string name="about_pref">Sobre</string>
   <string name="queue_label">Fila</string>
-  <string name="services_label">Serviços</string>
   <string name="flattr_label">Flattr</string>
   <string name="pref_episode_cleanup_title">Limpar Episódio</string>
   <string name="pref_episode_cleanup_summary">Episódios que não estão na fila e não estão nos favoritos podem ser removidos se o Download Automático precisar de espaço para novos episódios</string>
@@ -287,7 +272,6 @@
   <string name="pref_unpauseOnHeadsetReconnect_sum">Continuar a reprodução quando os fones de ouvido forem reconectados</string>
   <string name="pref_unpauseOnBluetoothReconnect_sum">Continuar a reprodução quando o bluetooth reconectar</string>
   <string name="pref_hardwareForwardButtonSkips_title">Botão avançar pula</string>
-  <string name="pref_hardwareForwardButtonSkips_sum">Quando pressionar um botão físico, avançar para o próximo episódio ao invés de avançar a reprodução</string>
   <string name="pref_hardwarePreviousButtonRestarts_title">Botão anterior reinicia</string>
   <string name="pref_hardwarePreviousButtonRestarts_sum">Reinicia a reprodução atual ao pressionar o botão físico anterior ao invés de retroceder</string>
   <string name="pref_followQueue_sum">Pular para próximo item da fila quando a reprodução terminar</string>
@@ -333,8 +317,7 @@
   <string name="pref_nav_drawer_items_sum">Escolher quais itens irão aparecer na gaveta de navegação.</string>
   <string name="pref_nav_drawer_feed_order_title">Configurar Ordem de Assinaturas</string>
   <string name="pref_nav_drawer_feed_order_sum">Mudar a ordem de suas assinaturas</string>
-  <string name="pref_nav_drawer_feed_counter_title">Configurar um contador de assinaturas</string>
-  <string name="pref_nav_drawer_feed_counter_sum">Mudar a informação exibida pelo contador de assinaturas</string>
+  <string name="pref_nav_drawer_feed_counter_title">Configurar Contador de Assinaturas</string>
   <string name="pref_set_theme_sum">Altera a aparência do AntennaPod</string>
   <string name="pref_automatic_download_title">Download automático</string>
   <string name="pref_automatic_download_sum">Configurar download automático de episódios.</string>
@@ -374,8 +357,6 @@
   <string name="pref_rewind_sum">Personalize os segundos para voltar quando o botão retroceder for clicado</string>
   <string name="pref_gpodnet_sethostname_title">Configurar hostname</string>
   <string name="pref_gpodnet_sethostname_use_default_host">Usar host padrão</string>
-  <string name="pref_expandNotify_title">Expandir Notificação</string>
-  <string name="pref_expandNotify_sum">Sempre expandir a notificação para mostrar os botões de reprodução.</string>
   <string name="pref_persistNotify_title">Controles de Reprodução Persistentes</string>
   <string name="pref_persistNotify_sum">Manter a notificação e controles na tela de bloqueio enquanto a reprodução está pausada.</string>
   <string name="pref_compact_notification_buttons_title">Configurar Botões da tela de bloqueio</string>
@@ -396,8 +377,6 @@
   <string name="crash_report_sum">Enviar o relatório da última falha por e-mail</string>
   <string name="send_email">Enviar e-mail</string>
   <string name="experimental_pref">Experimental</string>
-  <string name="pref_sonic_title">Sonic Media Player</string>
-  <string name="pref_sonic_message">Utilizar o reprodutor de mídia Sonic no lugar do reprodutor de mídia nativo do Android e do Prestissimo</string>
   <string name="pref_current_value">Valor atual: %1$s</string>
   <string name="pref_proxy_title">Proxy</string>
   <string name="pref_proxy_sum">Configurar um proxy da rede</string>
@@ -417,8 +396,6 @@
   <string name="search_hint">Buscar por episódios</string>
   <string name="found_in_shownotes_label">Encontrados em exibir descrição</string>
   <string name="found_in_chapters_label">Encontrado nos capítulos</string>
-  <string name="found_in_authors_label">Encontrados em autores</string>
-  <string name="found_in_feeds_label">Encontrados em feeds</string>
   <string name="search_status_no_results">Nenhum resultado encontrado</string>
   <string name="search_label">Pesquisar</string>
   <string name="found_in_title_label">Encontrado no título</string>
@@ -444,8 +421,6 @@
   <string name="html_export_label">Exportar HTML</string>
   <string name="exporting_label">Exportando...</string>
   <string name="export_error_label">Erro na exportação</string>
-  <string name="opml_export_success_title">Exportação do OPML realizada com sucesso.</string>
-  <string name="opml_export_success_sum">O arquivo .opml foi gravado em:\u0020</string>
   <string name="opml_import_ask_read_permission">Acesso ao armazenamento externo é necessária para ler o arquivo OPML</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Configura desligamento automático</string>
@@ -629,4 +604,5 @@
   <string name="cast_failed_seek">Falha ao buscar uma nova posição no dispositivo cast</string>
   <string name="cast_failed_receiver_player_error">O receptor de reprodução encontrou um erro grave</string>
   <string name="cast_failed_media_error_skipping">Erro ao reproduzir mídia. Pulando...</string>
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-pt/strings.xml b/core/src/main/res/values-pt/strings.xml
index 8be0b8443..2f7941097 100644
--- a/core/src/main/res/values-pt/strings.xml
+++ b/core/src/main/res/values-pt/strings.xml
@@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
+  <string name="feed_update_receiver_name">Atualizar subscrições</string>
   <string name="feeds_label">Fontes</string>
   <string name="statistics_label">Estatísticas</string>
   <string name="add_feed_label">Adicionar podcast</string>
   <string name="episodes_label">Episódios</string>
   <string name="all_episodes_short_label">Todos</string>
+  <string name="new_episodes_label">Novos</string>
   <string name="favorite_episodes_label">Favoritos</string>
   <string name="new_label">Novos</string>
   <string name="settings_label">Definições</string>
@@ -18,10 +20,12 @@
   <string name="cancel_download_label">Cancelar\ndescarga</string>
   <string name="playback_history_label">Histórico de reprodução</string>
   <string name="gpodnet_main_label">gpodder.net</string>
+  <string name="gpodnet_summary">Sincronizar com outros dispositivos</string>
   <string name="gpodnet_auth_label">Dados gpodder.net</string>
   <string name="free_space_label">%1$s disponível</string>
   <string name="episode_cache_full_title">Cache de episódios cheia</string>
   <string name="episode_cache_full_message">Atingido o limite máximo de itens em cache. Pode aumentar o tamanho de cache nas definições.</string>
+  <string name="synchronizing">A sincronizar...</string>
   <!--Statistics fragment-->
   <string name="total_time_listened_to_podcasts">Tempo total dos podcasts reproduzidos:</string>
   <string name="statistics_details_dialog">%1$d de %2$d episódios iniciados.\n\nReproduzidos %3$s de %4$s.</string>
@@ -51,18 +55,19 @@
   <!--Playback history-->
   <string name="clear_history_label">Limpar histórico</string>
   <!--Other-->
-  <string name="confirm_label">Confirmar</string>
+  <string name="confirm_label">Confirmação</string>
   <string name="cancel_label">Cancelar</string>
   <string name="yes">Sim</string>
   <string name="no">Não</string>
   <string name="reset">Repor</string>
-  <string name="author_label">Autor</string>
+  <string name="author_label">Autor(es)</string>
   <string name="language_label">Idioma</string>
   <string name="url_label">URL</string>
   <string name="podcast_settings_label">Definições</string>
   <string name="cover_label">Imagem</string>
   <string name="error_label">Erro</string>
   <string name="error_msg_prefix">Ocorreu um erro:</string>
+  <string name="needs_storage_permission">Tem que permitir o acesso ao armazenamento para esta operação</string>
   <string name="refresh_label">Atualizar</string>
   <string name="external_storage_error_msg">Cartão SD não disponível. Certifique-se de que inseriu o cartão corretamente para que a aplicação funcione corretamente.</string>
   <string name="chapters_label">Capítulos</string>
@@ -105,25 +110,28 @@
   <string name="mark_all_read_label">Marcar tudo como reproduzido</string>
   <string name="mark_all_read_msg">Marcar todos os episódios como reproduzidos</string>
   <string name="mark_all_read_confirmation_msg">Tem a certeza de que deseja marcar todos os episódios como reproduzidos?</string>
-  <string name="mark_all_read_feed_confirmation_msg">Tem a certeza de que deseja marcar todos os episódios desta fonte como reproduzidos?</string>
-  <string name="mark_all_seen_label">Marcar tudo como visto</string>
-  <string name="mark_all_seen_msg">Marcar todos os episódios como vistos</string>
-  <string name="mark_all_seen_confirmation_msg">Confirma de que deseja marcar todos os episódios como vistos?</string>
+  <string name="mark_all_read_feed_confirmation_msg">Tem a certeza de que deseja marcar como reproduzidos todos os episódios deste podcast?</string>
+  <string name="mark_all_seen_label">Marcar tudo como reproduzido</string>
+  <string name="mark_all_seen_msg">Marcar todos como reproduzidos</string>
+  <string name="mark_all_seen_confirmation_msg">Tem a certeza de que deseja marcar todos os episódios como vistos?</string>
   <string name="show_info_label">Mostrar informações</string>
+  <string name="show_feed_settings_label">Mostrar definições do podcast</string>
+  <string name="feed_info_label">Informações do podcast</string>
+  <string name="feed_settings_label">Definições do podcast</string>
   <string name="rename_feed_label">Renomear podcast</string>
   <string name="remove_feed_label">Remover podcast</string>
   <string name="share_label">Partilhar...</string>
-  <string name="share_link_label">Partilhar ligação</string>
+  <string name="share_link_label">Partilhar URL do episódio</string>
+  <string name="share_link_with_position_label">Partilhar URL do episódio (com posição)</string>
   <string name="share_file_label">Partilhar ficheiro</string>
-  <string name="share_link_with_position_label">Partilhar ligação com posição</string>
   <string name="share_feed_url_label">Partilhar URL da fonte</string>
-  <string name="share_item_url_label">Partilhar URL do episódio</string>
-  <string name="share_item_url_with_position_label">Partilhar URL do episódio com posição</string>
-  <string name="feed_delete_confirmation_msg">Tem a certeza de que deseja remover a fonte  \"%1$s\" e TODOS os episódios descarregados?</string>
-  <string name="feed_remover_msg">Remover fonte</string>
-  <string name="load_complete_feed">Atualizar todas as páginas da fonte</string>
+  <string name="share_item_url_label">Partilhar URL do ficheiro multimédia</string>
+  <string name="share_item_url_with_position_label">Partilhar URL do ficheiro multimédia (com posição)</string>
+  <string name="feed_delete_confirmation_msg">Tem a certeza de que deseja remover o podcast  \"%1$s\" e TODOS os seus episódios (inclusive descarregados)?</string>
+  <string name="feed_remover_msg">A remover podcast</string>
+  <string name="load_complete_feed">Atualizar podcast</string>
   <string name="hide_episodes_title">Ocultar episódios</string>
-  <string name="episode_actions">Aplicar ações</string>
+  <string name="batch_edit">Edição em lote</string>
   <string name="hide_unplayed_episodes_label">Não reproduzidos</string>
   <string name="hide_paused_episodes_label">Em pausa</string>
   <string name="hide_played_episodes_label">Reproduzidos</string>
@@ -132,6 +140,7 @@
   <string name="hide_downloaded_episodes_label">Descarregados</string>
   <string name="hide_not_downloaded_episodes_label">Não descarregados</string>
   <string name="hide_has_media_label">Tem ficheiro</string>
+  <string name="hide_is_favorite_label">É favorito</string>
   <string name="filtered_label">Filtrados</string>
   <string name="refresh_failed_msg">{fa-exclamation-circle} Última atualização falhada</string>
   <string name="open_podcast">Abrir podcast</string>
@@ -145,7 +154,8 @@
   <string name="delete_label">Apagar</string>
   <string name="delete_failed">Episódio não apagado. Experimente reiniciar o dispositivo.</string>
   <string name="remove_episode_lable">Remover episódio</string>
-  <string name="marked_as_seen_label">Marcar como visto</string>
+  <string name="mark_as_seen_label">Marcar como reproduzido</string>
+  <string name="marked_as_seen_label">Marcar como reproduzido</string>
   <string name="mark_read_label">Marcar como reproduzido</string>
   <string name="marked_as_read_label">Marcado como reproduzido</string>
   <string name="mark_unread_label">Marcar como não reproduzido</string>
@@ -168,6 +178,8 @@
   <string name="download_failed">falha</string>
   <string name="download_pending">Descarga pendente</string>
   <string name="download_running">Descarga atual</string>
+  <string name="download_error_details">Detalhes</string>
+  <string name="download_error_details_message">%1$s \n\Ficheiro URL:\n%2$s</string>
   <string name="download_error_device_not_found">Cartão SD não encontrado</string>
   <string name="download_error_insufficient_space">Espaço insuficiente</string>
   <string name="download_error_file_error">Erro no ficheiro</string>
@@ -218,6 +230,7 @@
   <string name="playback_error_unknown">Erro desconhecido</string>
   <string name="no_media_playing_label">Nada em reprodução</string>
   <string name="player_buffering_msg">A processar...</string>
+  <string name="player_go_to_picture_in_picture">Modo \'picture-in-picture\'</string>
   <string name="playbackservice_notification_title">Reproduzir podcast</string>
   <string name="unknown_media_key">Tecla multimédia desconhecida: %1$d</string>
   <!--Queue operations-->
@@ -234,7 +247,9 @@
   <string name="date">Data</string>
   <string name="duration">Duração</string>
   <string name="episode_title">Título do episódio</string>
-  <string name="feed_title">Título da fonte</string>
+  <string name="feed_title">Título do podcast</string>
+  <string name="random">Aleatório</string>
+  <string name="smart_shuffle">Mistura inteligente</string>
   <string name="ascending">Crescente</string>
   <string name="descending">Decrescente</string>
   <string name="clear_queue_confirmation_msg">Tem a certeza de que deseja remover todos os episódios da fila de reprodução?</string>
@@ -272,7 +287,7 @@
   <string name="enable_sonic">Ativar Sonic</string>
   <!--Empty list labels-->
   <string name="no_items_label">Não existem itens nesta lista</string>
-  <string name="no_feeds_label">Ainda não possui quaisquer fontes</string>
+  <string name="no_feeds_label">Ainda não tem quaisquer podcasts subscritos.</string>
   <string name="no_chapters_label">Este episódio não tem capítulos.</string>
   <string name="no_shownotes_label">Este episódio não tem notas.</string>
   <!--Preferences-->
@@ -281,15 +296,23 @@
   <string name="other_pref">Outras</string>
   <string name="about_pref">Sobre</string>
   <string name="queue_label">Fila</string>
-  <string name="services_label">Serviços</string>
+  <string name="integrations_label">Integrações</string>
   <string name="flattr_label">Flattr</string>
+  <string name="flattr_summary">Serviço de micro pagamentos</string>
+  <string name="automation">Automatização</string>
+  <string name="download_pref_details">Detalhes</string>
+  <string name="import_export_pref">Importar/Exportar</string>
+  <string name="appearance">Aparência</string>
+  <string name="external_elements">Elementos externos</string>
+  <string name="interruptions">Interrupções</string>
+  <string name="buttons">Botões para controlo de reprodução</string>
+  <string name="media_player">Reprodutor multimédia</string>
   <string name="pref_episode_cleanup_title">Limpeza de episódios</string>
   <string name="pref_episode_cleanup_summary">Os episódios que não estejam na fila e não sejam favoritos podem ser elegíveis para serem removidos se a Descarga automática necessitar de espaço para novos episódios.</string>
   <string name="pref_pauseOnDisconnect_sum">Pausa na reprodução ao desligar os auscultadores ou o bluetooth</string>
   <string name="pref_unpauseOnHeadsetReconnect_sum">Continuar reprodução ao ligar os auscultadores</string>
   <string name="pref_unpauseOnBluetoothReconnect_sum">Continuar reprodução ao estabelecer a ligação bluetooth</string>
   <string name="pref_hardwareForwardButtonSkips_title">Botão para avançar</string>
-  <string name="pref_hardwareForwardButtonSkips_sum">Ao premir o botão Avançar, ir para o episódio seguinte em vez de avançar a reprodução</string>
   <string name="pref_hardwarePreviousButtonRestarts_title">Botão Anterior para reiniciar</string>
   <string name="pref_hardwarePreviousButtonRestarts_sum">Ao premir o botão do telefone, reiniciar o episódio atual em vez de recuar para o episódio anterior</string>
   <string name="pref_followQueue_sum">Ir para a episódio seguinte ao terminar a reprodução</string>
@@ -338,7 +361,7 @@
   <string name="pref_nav_drawer_feed_order_title">Definir ordem de subscrição</string>
   <string name="pref_nav_drawer_feed_order_sum">Alterar a ordem das suas subscrições</string>
   <string name="pref_nav_drawer_feed_counter_title">Definir contador de subscrições</string>
-  <string name="pref_nav_drawer_feed_counter_sum">Alterar a informação mostrada no contador de subscrições</string>
+  <string name="pref_nav_drawer_feed_counter_sum">Alterar a informação mostrada no contador de subscrições. Também afeta as subscrições se \'Ordem de subscrição\' estiver definida como \'Contador\'.</string>
   <string name="pref_set_theme_sum">Alterar a aparência do AntennaPod</string>
   <string name="pref_automatic_download_title">Descarga automática</string>
   <string name="pref_automatic_download_sum">Configurar a descarga automática dos episódios</string>
@@ -352,12 +375,13 @@
   <string name="pref_episode_cache_title">Cache de episódios</string>
   <string name="pref_theme_title_light">Claro</string>
   <string name="pref_theme_title_dark">Escuro</string>
+  <string name="pref_theme_title_trueblack">Preto (AMOLED)</string>
   <string name="pref_episode_cache_unlimited">Sem limite</string>
   <string name="pref_update_interval_hours_plural">horas</string>
   <string name="pref_update_interval_hours_singular">hora</string>
   <string name="pref_update_interval_hours_manual">Manual</string>
   <string name="pref_gpodnet_authenticate_title">Acesso</string>
-  <string name="pref_gpodnet_authenticate_sum">Aceda à sua conta gpodder.net para poder sincronizar as subscrições</string>
+  <string name="pref_gpodnet_authenticate_sum">Aceda à sua conta gpodder.net para poder sincronizar as subscrições.</string>
   <string name="pref_gpodnet_logout_title">Sair</string>
   <string name="pref_gpodnet_logout_toast">Sessão terminada</string>
   <string name="pref_gpodnet_setlogin_information_title">Alterar informação de acesso</string>
@@ -380,8 +404,6 @@
   <string name="pref_rewind_sum">Personalizar o número de segundos a recuar ao clicar no botão de recuo rápido</string>
   <string name="pref_gpodnet_sethostname_title">Definir nome de servidor</string>
   <string name="pref_gpodnet_sethostname_use_default_host">Utilizar predefinições</string>
-  <string name="pref_expandNotify_title">Expansão de notificação</string>
-  <string name="pref_expandNotify_sum">Expandir sempre a notificação para mostrar os botões de reprodução</string>
   <string name="pref_persistNotify_title">Controlos de reprodução</string>
   <string name="pref_persistNotify_sum">Manter controlos de notificação e ecrã de bloqueio ao colocar a reprodução em pausa</string>
   <string name="pref_compact_notification_buttons_title">Definir botões do ecrã de bloqueio</string>
@@ -402,8 +424,7 @@
   <string name="crash_report_sum">Enviar o relatório de erros por e-mail</string>
   <string name="send_email">Enviar e-mail</string>
   <string name="experimental_pref">Experimental</string>
-  <string name="pref_sonic_title">Reprodutor multimédia Sonic</string>
-  <string name="pref_sonic_message">Utilizar o Sonic Media Player como substituto do reprodutor nativo do Android e do Prestissimo</string>
+  <string name="pref_media_player_message">Selecione o reprodutor multimédia a utilizar</string>
   <string name="pref_current_value">Valor atual: %1$s</string>
   <string name="pref_proxy_title">Proxy</string>
   <string name="pref_proxy_sum">Definir um proxy de rede</string>
@@ -415,6 +436,11 @@
   <string name="pref_cast_message_free_flavor">O Chromecast necessita de bibliotecas proprietárias de terceiros que estão desativadas nesta versão do AntennaPod</string>
   <string name="pref_enqueue_downloaded_title">Colocar descargas na fila</string>
   <string name="pref_enqueue_downloaded_summary">Adicionar à fila os episódios descarregados</string>
+  <string name="media_player_builtin">Reprodutor nativo Android</string>
+  <string name="pref_videoBehavior_title">Ao sair do vídeo</string>
+  <string name="pref_videoBehavior_sum">Comportamento ao sair da reprodução do vídeo</string>
+  <string name="stop_playback">Parar reprodução</string>
+  <string name="continue_playback">Continuar reprodução de áudio</string>
   <!--Auto-Flattr dialog-->
   <string name="auto_flattr_enable">Ativar flattr automático</string>
   <string name="auto_flattr_after_percent">Flattr de episódios ao atingir %d porcento de reprodução</string>
@@ -424,8 +450,8 @@
   <string name="search_hint">Pesquisar por episódios</string>
   <string name="found_in_shownotes_label">Encontrado nas notas</string>
   <string name="found_in_chapters_label">Encontrado nos capítulos</string>
-  <string name="found_in_authors_label">Encontrado em autores</string>
-  <string name="found_in_feeds_label">Encontrado em fontes</string>
+  <string name="found_in_authors_label">Localizado em autor(es)</string>
+  <string name="found_in_feeds_label">Localizado em podcast</string>
   <string name="search_status_no_results">Nenhum resultado</string>
   <string name="search_label">Pesquisar</string>
   <string name="found_in_title_label">Encontrado no título</string>
@@ -451,8 +477,8 @@
   <string name="html_export_label">Exportação HTML</string>
   <string name="exporting_label">A exportar...</string>
   <string name="export_error_label">Erro de exportação</string>
-  <string name="opml_export_success_title">Exportação efetuada</string>
-  <string name="opml_export_success_sum">O ficheiro .opml foi guardado em:\u0020</string>
+  <string name="export_success_title">Exportação com sucesso</string>
+  <string name="export_success_sum">O ficheiro exportado foi guardado em:\n\n%1$s</string>
   <string name="opml_import_ask_read_permission">Requer acesso ao armazenamento externo para ler o ficheiro OPML</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Definir temporizador</string>
@@ -619,6 +645,14 @@
   <string name="proxy_host_empty_error">Servidor não pode estar vazio</string>
   <string name="proxy_host_invalid_error">O servidor não tem um endereço ou domínio válido</string>
   <string name="proxy_port_invalid_error">Porta inválido</string>
+  <!--Database import/export-->
+  <string name="import_export">Importação/exportação da base de dados</string>
+  <string name="import_export_warning">Esta função experimental  pode ser usada para transferir as suas subscrições e episódios para outros dispositivos.\n\nAs bases de dados exportadas apenas podem ser importadas se usar a mesma versão do AntennaPod. Caso contrário, esta função poderá produzir efeitos inesperados.\n\nDepois da importação, os episódios poderão ser apresentados como tendo sido descarregados mesmo que não seja verdade. Prima o botão de reprodução dos episódios para que o AntennaPod detete a situação.</string>
+  <string name="label_import">Importar</string>
+  <string name="label_export">Exportar</string>
+  <string name="import_select_file">Selecione o ficheiro a importar</string>
+  <string name="export_ok">Exportação com sucesso.</string>
+  <string name="import_ok">Importação bem sucedida.\n\nPor favor prima OK para reiniciar o AntennaPod</string>
   <!--Casting-->
   <string name="cast_media_route_menu_title">Reproduzir em...</string>
   <string name="cast_disconnect_label">Desligar da última sessão</string>
@@ -635,4 +669,13 @@
   <string name="cast_failed_seek">Falha ao procurar a nova posição no dispositivo</string>
   <string name="cast_failed_receiver_player_error">O reprodutor encontrou um erro crítico</string>
   <string name="cast_failed_media_error_skipping">Erro de reprodução. A ignorar...</string>
+  <!--Notification channels-->
+  <string name="notification_channel_user_action">Requer ação</string>
+  <string name="notification_channel_user_action_description">Mostrar se for necessária uma ação como, por exemplo, digitar uma palavra-passe.</string>
+  <string name="notification_channel_downloading">A descarregar</string>
+  <string name="notification_channel_downloading_description">Mostrar durante a descarga.</string>
+  <string name="notification_channel_playing">Reprodução atual</string>
+  <string name="notification_channel_playing_description">Permite o controlo da reprodução. Esta será a notificação que verá ao reproduzir um podcast.</string>
+  <string name="notification_channel_error">Erros</string>
+  <string name="notification_channel_error_description">Mostrar se ocorrerem erros como, por exemplo, não for possível a descarga.</string>
 </resources>
diff --git a/core/src/main/res/values-ro-rRO/strings.xml b/core/src/main/res/values-ro-rRO/strings.xml
index d39e48bbc..92b2da8f9 100644
--- a/core/src/main/res/values-ro-rRO/strings.xml
+++ b/core/src/main/res/values-ro-rRO/strings.xml
@@ -2,25 +2,38 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
   <string name="feeds_label">Feeduri</string>
+  <string name="statistics_label">Statistici</string>
+  <string name="add_feed_label">Adaugă podcast</string>
+  <string name="episodes_label">Episoade</string>
+  <string name="all_episodes_short_label">Toate</string>
+  <string name="favorite_episodes_label">Favorite</string>
   <string name="new_label">Nou</string>
   <string name="settings_label">Setări</string>
   <string name="downloads_label">Descărcări</string>
+  <string name="downloads_running_label">Active</string>
+  <string name="downloads_completed_label">Complete</string>
+  <string name="downloads_log_label">Jurnal</string>
   <string name="cancel_download_label">Anulează descărcare</string>
   <string name="playback_history_label">Istorie ascultare</string>
   <string name="gpodnet_main_label">gpodder.net</string>
   <string name="gpodnet_auth_label">autentificare gpodder.net</string>
   <!--Statistics fragment-->
   <!--Main activity-->
+  <string name="drawer_open">Deschide meniul</string>
+  <string name="drawer_close">Închide meniul</string>
   <!--Webview actions-->
   <string name="open_in_browser_label">Deschide în browser</string>
   <string name="copy_url_label">Copiază URL</string>
   <string name="share_url_label">Împarte URL</string>
   <string name="copied_url_msg">URL copiat în clipboard</string>
+  <string name="go_to_position_label">Mergi la poziția</string>
   <!--Playback history-->
   <string name="clear_history_label">Golește istoric</string>
   <!--Other-->
   <string name="confirm_label">Confirmă</string>
   <string name="cancel_label">Anulează</string>
+  <string name="yes">Da</string>
+  <string name="no">Nu</string>
   <string name="author_label">Autor</string>
   <string name="language_label">Limbă</string>
   <string name="podcast_settings_label">Setări</string>
@@ -29,6 +42,7 @@
   <string name="refresh_label">Reîncarcă</string>
   <string name="external_storage_error_msg">Nu exista stocare externă. Asigurați-vă că stocarea externă este conectată pentru ca aplicația să funcționeze corespunzător.</string>
   <string name="chapters_label">Capitole</string>
+  <string name="chapter_duration">Durata: %1$s</string>
   <string name="shownotes_label">Notițe</string>
   <string name="description_label">Descriere</string>
   <string name="most_recent_prefix">Cel mai recent episod:\u0020</string>
@@ -39,6 +53,13 @@
   <string name="save_username_password_label">Salvează numele de utilizator și parola</string>
   <string name="close_label">închide</string>
   <string name="retry_label">Reîncearcă</string>
+  <string name="auto_delete_label">Șterge epidosul automat</string>
+  <string name="feed_auto_download_always">Întotdeauna</string>
+  <string name="feed_auto_download_never">Niciodată</string>
+  <string name="send_label">Trimite...</string>
+  <string name="episode_cleanup_never">Niciodată</string>
+  <string name="episode_cleanup_queue_removal">Când nu e în coadă</string>
+  <string name="episode_cleanup_after_listening">După terminare</string>
   <!--'Add Feed' Activity labels-->
   <string name="feedurl_label">Adresă feed</string>
   <!--Actions on feeds-->
@@ -123,7 +144,6 @@
   <string name="other_pref">Altele</string>
   <string name="about_pref">Despre</string>
   <string name="queue_label">Coadă</string>
-  <string name="services_label">Servicii</string>
   <string name="flattr_label">Flattr</string>
   <string name="pref_followQueue_sum">Sari la următorul element din coadă cand se termină ascultarea</string>
   <string name="playback_pref">Ascultare</string>
@@ -174,7 +194,6 @@
   <string name="deselect_all_label">Deselectează toate</string>
   <string name="opml_export_label">Exportă OPML</string>
   <string name="export_error_label">Eroare exportare</string>
-  <string name="opml_export_success_sum">Fișierul .opml a fost scris în:\u0020</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Setează cronometru somn</string>
   <string name="disable_sleeptimer_label">Oprește cronometru somn</string>
@@ -227,4 +246,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-ru/strings.xml b/core/src/main/res/values-ru/strings.xml
index 5e7f8dd73..076a54048 100644
--- a/core/src/main/res/values-ru/strings.xml
+++ b/core/src/main/res/values-ru/strings.xml
@@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
+  <string name="feed_update_receiver_name">Обновить подписки</string>
   <string name="feeds_label">Каналы</string>
   <string name="statistics_label">Статистика</string>
   <string name="add_feed_label">Добавить подкаст</string>
   <string name="episodes_label">Выпуски</string>
   <string name="all_episodes_short_label">Все</string>
+  <string name="new_episodes_label">Новые</string>
   <string name="favorite_episodes_label">Избранное</string>
   <string name="new_label">Новые</string>
   <string name="settings_label">Настройки</string>
@@ -18,10 +20,12 @@
   <string name="cancel_download_label">Отменить загрузку</string>
   <string name="playback_history_label">Журнал</string>
   <string name="gpodnet_main_label">gpodder.net</string>
+  <string name="gpodnet_summary">Синхронизировать с другими устройствами</string>
   <string name="gpodnet_auth_label">Войти на gpodder.net</string>
   <string name="free_space_label">свободно %1$s</string>
   <string name="episode_cache_full_title">Кэш выпусков заполнен</string>
   <string name="episode_cache_full_message">Достигнут предел кэша выпусков. Объём кэша можно увеличить в Настройках.</string>
+  <string name="synchronizing">Синхронизация…</string>
   <!--Statistics fragment-->
   <string name="total_time_listened_to_podcasts">Общее время прослушивания подкастов:</string>
   <string name="statistics_details_dialog">%1$d из %2$d выпусков начато.\n\nПрослушано %3$s из %4$s.</string>
@@ -56,13 +60,14 @@
   <string name="yes">Да</string>
   <string name="no">Нет</string>
   <string name="reset">Сброс</string>
-  <string name="author_label">Автор</string>
+  <string name="author_label">Автор(ы)</string>
   <string name="language_label">Язык</string>
   <string name="url_label">Адрес</string>
   <string name="podcast_settings_label">Настройки</string>
   <string name="cover_label">Обложка</string>
   <string name="error_label">Ошибка</string>
   <string name="error_msg_prefix">Произошла ошибка:</string>
+  <string name="needs_storage_permission">Для выполнения этой операции нужно разрешить доступ к хранилищу</string>
   <string name="refresh_label">Обновить</string>
   <string name="external_storage_error_msg">Внешний носитель недоступен. Убедитесь что внешний носитель установлен, иначе приложение не сможет нормально работать.</string>
   <string name="chapters_label">Главы</string>
@@ -107,25 +112,28 @@
   <string name="mark_all_read_label">Отметить как прослушанное</string>
   <string name="mark_all_read_msg">Отметить все выпуски как прослушанные</string>
   <string name="mark_all_read_confirmation_msg">Подтвердите, что хотите пометить все эпизоды как прослушанные.</string>
-  <string name="mark_all_read_feed_confirmation_msg">Подтвердите, что хотите пометить все эпизоды в этом канале как прослушанные.</string>
+  <string name="mark_all_read_feed_confirmation_msg">Пожалуйста, подтвердите желание отметить все выпуски этого подкаста как прослушанные.</string>
   <string name="mark_all_seen_label">Отметить все как просмотренное</string>
   <string name="mark_all_seen_msg">Все выпуски отмечены как просмотренные</string>
   <string name="mark_all_seen_confirmation_msg">Пожалуйста, подтвердите намерение отметить все выпуски как просмотренные.</string>
   <string name="show_info_label">Показать информацию</string>
+  <string name="show_feed_settings_label">Показать настройки подкаста</string>
+  <string name="feed_info_label">Сведения о подкасте</string>
+  <string name="feed_settings_label">Настройки подкаста</string>
   <string name="rename_feed_label">Переименовать подкаст</string>
   <string name="remove_feed_label">Удалить подкаст</string>
   <string name="share_label">Поделиться…</string>
-  <string name="share_link_label">Поделиться ссылкой</string>
+  <string name="share_link_label">Поделиться ссылкой на выпуск</string>
+  <string name="share_link_with_position_label">Поделиться ссылкой на выпуск с отметкой времени</string>
   <string name="share_file_label">Поделиться файлом</string>
-  <string name="share_link_with_position_label">Поделиться ссылкой с отметкой времени</string>
   <string name="share_feed_url_label">Поделиться ссылкой на канал</string>
-  <string name="share_item_url_label">Поделиться ссылкой на файл выпуска</string>
-  <string name="share_item_url_with_position_label">Поделиться ссылкой на файл выпуска с отметкой времени</string>
-  <string name="feed_delete_confirmation_msg">Подтвердите, что хотите удалить канал \"%1$s\" и ВСЕ скачанные эпизоды этого канала.</string>
-  <string name="feed_remover_msg">Удаление канала</string>
-  <string name="load_complete_feed">Обновить весь канал</string>
+  <string name="share_item_url_label">Поделиться ссылкой на файл</string>
+  <string name="share_item_url_with_position_label">Поделиться ссылкой на файл с отметкой времени</string>
+  <string name="feed_delete_confirmation_msg">Подтвердите желание удалить подкаст \"%1$s\" и ВСЕ его эпизоды, в том числе и скачанные.</string>
+  <string name="feed_remover_msg">Удаление подкаста</string>
+  <string name="load_complete_feed">Обновить весь подкаст</string>
   <string name="hide_episodes_title">Скрыть выпуски</string>
-  <string name="episode_actions">Применить действия</string>
+  <string name="batch_edit">Групповая обработка</string>
   <string name="hide_unplayed_episodes_label">Непрослушанное</string>
   <string name="hide_paused_episodes_label">Приостановленное</string>
   <string name="hide_played_episodes_label">Прослушанное</string>
@@ -134,6 +142,7 @@
   <string name="hide_downloaded_episodes_label">Загружено</string>
   <string name="hide_not_downloaded_episodes_label">Не загружено</string>
   <string name="hide_has_media_label">С файлами</string>
+  <string name="hide_is_favorite_label">Избранные</string>
   <string name="filtered_label">Отфильтровано</string>
   <string name="refresh_failed_msg">{fa-exclamation-circle} Последнее обновление не удалось</string>
   <string name="open_podcast">Открыть подкаст</string>
@@ -147,6 +156,7 @@
   <string name="delete_label">Удалить</string>
   <string name="delete_failed">Невозможно удалить файл. Попробуйте перезагрузить устройство.</string>
   <string name="remove_episode_lable">Удалить выпуск</string>
+  <string name="mark_as_seen_label">Просмотрено</string>
   <string name="marked_as_seen_label">Отмечено как просмотренное</string>
   <string name="mark_read_label">Отметить как прослушанное</string>
   <string name="marked_as_read_label">Помечено как прослушанное</string>
@@ -170,6 +180,11 @@
   <string name="download_failed">не удалось</string>
   <string name="download_pending">Загрузка в ожидании</string>
   <string name="download_running">Загрузка в процессе</string>
+  <string name="download_error_details">Подробнее</string>
+  <string name="download_error_details_message">%1$s
+
+URL файла:
+%2$s</string>
   <string name="download_error_device_not_found">Устройство хранения не найдено</string>
   <string name="download_error_insufficient_space">Недостаточно места</string>
   <string name="download_error_file_error">Ошибка файла</string>
@@ -222,6 +237,7 @@
   <string name="playback_error_unknown">Неизвестная ошибка</string>
   <string name="no_media_playing_label">Ничего не воспроизводится</string>
   <string name="player_buffering_msg">Буферизация</string>
+  <string name="player_go_to_picture_in_picture">Картинка в картинке</string>
   <string name="playbackservice_notification_title">Воспроизведение подкаста</string>
   <string name="unknown_media_key">AntennaPod - неизвестный ключ носителя: %1$d</string>
   <!--Queue operations-->
@@ -238,7 +254,9 @@
   <string name="date">По дате</string>
   <string name="duration">По продолжительности</string>
   <string name="episode_title">Название выпуска</string>
-  <string name="feed_title">Название канала</string>
+  <string name="feed_title">Название подкаста</string>
+  <string name="random">Случайно</string>
+  <string name="smart_shuffle">Умное перемешивание</string>
   <string name="ascending">По возрастанию</string>
   <string name="descending">По убыванию</string>
   <string name="clear_queue_confirmation_msg">Подтвердите, что хотите очистить очередь от ВСЕХ эпизодов.</string>
@@ -276,7 +294,7 @@
   <string name="enable_sonic">Включить Sonic</string>
   <!--Empty list labels-->
   <string name="no_items_label">Список пуст</string>
-  <string name="no_feeds_label">Вы ещё не подписаны ни на один канал.</string>
+  <string name="no_feeds_label">Вы ещё не подписаны ни на один подкаст.</string>
   <string name="no_chapters_label">Этот выпуск не содержит оглавления.</string>
   <string name="no_shownotes_label">Этот выпуск не содержит примечаний.</string>
   <!--Preferences-->
@@ -285,15 +303,23 @@
   <string name="other_pref">Прочее</string>
   <string name="about_pref">О программе</string>
   <string name="queue_label">Очередь</string>
-  <string name="services_label">Сервисы</string>
+  <string name="integrations_label">Интеграция</string>
   <string name="flattr_label">Flattr</string>
+  <string name="flattr_summary">Услуга микроплатежей</string>
+  <string name="automation">Автоматизация</string>
+  <string name="download_pref_details">Подробнее</string>
+  <string name="import_export_pref">Импорт/экспорт</string>
+  <string name="appearance">Внешний вид</string>
+  <string name="external_elements">Внешние органы управления</string>
+  <string name="interruptions">Прерывания</string>
+  <string name="buttons">Кнопки управления воспроизведением</string>
+  <string name="media_player">Проигрыватель</string>
   <string name="pref_episode_cleanup_title">Удаление выпусков</string>
   <string name="pref_episode_cleanup_summary">Выпуски, которые не стоят в очереди и не отмечены как избранные могут быть удалены для освобождения места под Автозагрузку.</string>
   <string name="pref_pauseOnDisconnect_sum">Приостановить воспроизведение, когда наушники или bluetooth отключены</string>
   <string name="pref_unpauseOnHeadsetReconnect_sum">Продолжать воспроизведение после подключения наушников</string>
   <string name="pref_unpauseOnBluetoothReconnect_sum">Продолжать воспроизведение после восстановления bluetooth-соединения</string>
   <string name="pref_hardwareForwardButtonSkips_title">Пропускать кнопкой перемотки вперёд</string>
-  <string name="pref_hardwareForwardButtonSkips_sum">При нажатии на физическую кнопку перемотки вперёд переходить к следующему выпуску вместо перемотки</string>
   <string name="pref_hardwarePreviousButtonRestarts_title">В начало кнопкой перемотки назад</string>
   <string name="pref_hardwarePreviousButtonRestarts_sum">При нажатии на физическую кнопку перемотки назад переходить к началу выпуска вместо перемотки назад</string>
   <string name="pref_followQueue_sum">После завершения воспроизведения перейти к следующему в очереди</string>
@@ -342,7 +368,7 @@
   <string name="pref_nav_drawer_feed_order_title">Упорядочить подписки</string>
   <string name="pref_nav_drawer_feed_order_sum">Выбрать порядок отображения подписок</string>
   <string name="pref_nav_drawer_feed_counter_title">Выбрать счётчик подписок</string>
-  <string name="pref_nav_drawer_feed_counter_sum">Выбрать какую информацию показывать в счётчике подписок</string>
+  <string name="pref_nav_drawer_feed_counter_sum">Выбрать какую информацию показывать в счётчике подписок. Влияет также на очерёдность подписок, если сортировка подписок производится по счётчику.</string>
   <string name="pref_set_theme_sum">Изменить тему оформления AntennaPod</string>
   <string name="pref_automatic_download_title">Автоматическая загрузка</string>
   <string name="pref_automatic_download_sum">Настроить автоматическую загрузку выпусков.</string>
@@ -356,6 +382,7 @@
   <string name="pref_episode_cache_title">Кэш выпусков</string>
   <string name="pref_theme_title_light">Светлая</string>
   <string name="pref_theme_title_dark">Тёмная</string>
+  <string name="pref_theme_title_trueblack">Чёрная (для AMOLED)</string>
   <string name="pref_episode_cache_unlimited">Неограничен</string>
   <string name="pref_update_interval_hours_plural">ч.</string>
   <string name="pref_update_interval_hours_singular">ч.</string>
@@ -384,8 +411,6 @@
   <string name="pref_rewind_sum">Настройте длину шага в секундах при нажатии кнопки перемотки назад</string>
   <string name="pref_gpodnet_sethostname_title">Задать имя узла</string>
   <string name="pref_gpodnet_sethostname_use_default_host">Использовать узел по умолчанию</string>
-  <string name="pref_expandNotify_title">Развёрнутое уведомление</string>
-  <string name="pref_expandNotify_sum">Всегда разворачивать уведомление, показывая кнопки управления воспроизведением.</string>
   <string name="pref_persistNotify_title">Постоянные кнопки воспроизведения</string>
   <string name="pref_persistNotify_sum">Сохранять уведомление и кнопки воспроизведения на экране блокировки во время паузы.</string>
   <string name="pref_compact_notification_buttons_title">Выбрать кнопки экрана блокировки</string>
@@ -406,8 +431,7 @@
   <string name="crash_report_sum">Отослать последний отчёт о сбое по e-mail</string>
   <string name="send_email">Отправить Email</string>
   <string name="experimental_pref">Экспериментальные настройки</string>
-  <string name="pref_sonic_title">Проигрывать через Sonic</string>
-  <string name="pref_sonic_message">Задействовать встроенный медиа проигрыватель Sonic вместо стандартного из ОС Android и Prestissimo</string>
+  <string name="pref_media_player_message">Выберите каким проигрывателем следует воспроизводить файлы</string>
   <string name="pref_current_value">Текущее значение: %1$s</string>
   <string name="pref_proxy_title">Прокси</string>
   <string name="pref_proxy_sum">Настройки прокси</string>
@@ -419,6 +443,11 @@
   <string name="pref_cast_message_free_flavor">Для работы Chromecast требуются собственнические библиотеки третьей стороны, которые не включены в данную версию AntennaPod</string>
   <string name="pref_enqueue_downloaded_title">Добавлять загруженные в очередь</string>
   <string name="pref_enqueue_downloaded_summary">Добавлять загруженные выпуски в очередь</string>
+  <string name="media_player_builtin">Встроенный в Android проигрыватель</string>
+  <string name="pref_videoBehavior_title">При завершении видео</string>
+  <string name="pref_videoBehavior_sum">При сворачивании проигрывателя видео</string>
+  <string name="stop_playback">остановить воспроизведение</string>
+  <string name="continue_playback">Продолжить воспроизведение звука</string>
   <!--Auto-Flattr dialog-->
   <string name="auto_flattr_enable">Включить автоматическую поддержку через Flattr</string>
   <string name="auto_flattr_after_percent">Поддерживать через Flattr эпизоды, прослушанные на %d процентов</string>
@@ -428,8 +457,8 @@
   <string name="search_hint">Найти выпуски</string>
   <string name="found_in_shownotes_label">Найдено в примечаниях к выпуску</string>
   <string name="found_in_chapters_label">Найдено в главах</string>
-  <string name="found_in_authors_label">Найдено в авторах</string>
-  <string name="found_in_feeds_label">Найдено в каналах</string>
+  <string name="found_in_authors_label">Найдено среди авторов</string>
+  <string name="found_in_feeds_label">Найдено в подкастах</string>
   <string name="search_status_no_results">Ничего не найдено</string>
   <string name="search_label">Поиск</string>
   <string name="found_in_title_label">Найдено в заголовке</string>
@@ -455,8 +484,10 @@
   <string name="html_export_label">Экспорт в HTML</string>
   <string name="exporting_label">Экспортируется...</string>
   <string name="export_error_label">Ошибка экспорта</string>
-  <string name="opml_export_success_title">OPML успешно экспортирован.</string>
-  <string name="opml_export_success_sum">Файл OPML был записан в:\u0020</string>
+  <string name="export_success_title">Экспорт завершён успешно</string>
+  <string name="export_success_sum">Экспорт осуществлён в файл:
+
+%1$s</string>
   <string name="opml_import_ask_read_permission">Для чтения файла OPML необходим доступ к внешнему хранилищу</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Установить таймер сна</string>
@@ -635,7 +666,7 @@
   <string name="label_import">Импорт</string>
   <string name="label_export">Экспорт</string>
   <string name="import_select_file">Выберите импортируемый файл</string>
-  <string name="export_ok">Успешно экспортировано. База данных была записана на карту памяти.</string>
+  <string name="export_ok">Успешно экспортировано.</string>
   <string name="import_ok">Успешно импортировано.\n\nПожалуйста, нажмите OK, чтобы перезапустить AntennaPod</string>
   <!--Casting-->
   <string name="cast_media_route_menu_title">Воспроизвести на…</string>
@@ -653,4 +684,13 @@
   <string name="cast_failed_seek">Не удалось выполнить перемотку на устройстве Google cast</string>
   <string name="cast_failed_receiver_player_error">Серьёзная ошибка воспроизведения в устройстве Google cast</string>
   <string name="cast_failed_media_error_skipping">Ошибка воспроизведения. Пропускаю…</string>
+  <!--Notification channels-->
+  <string name="notification_channel_user_action">Требуется действие</string>
+  <string name="notification_channel_user_action_description">Показывается, когда требуется действие, например, для ввода пароля.</string>
+  <string name="notification_channel_downloading">Идёт загрузка</string>
+  <string name="notification_channel_downloading_description">Показывается во время загрузки.</string>
+  <string name="notification_channel_playing">Идёт воспроизведение</string>
+  <string name="notification_channel_playing_description">Позволяет управлять воспроизведением. Основное уведомление, показывается при воспроизведении подкаста.</string>
+  <string name="notification_channel_error">Ошибки</string>
+  <string name="notification_channel_error_description">Показывается если что-то пошло не так, к примеру, неудавшаяся загрузка или синхронизация с gpodder.</string>
 </resources>
diff --git a/core/src/main/res/values-sv-rSE/strings.xml b/core/src/main/res/values-sv-rSE/strings.xml
index cb7474ed4..d56307e07 100644
--- a/core/src/main/res/values-sv-rSE/strings.xml
+++ b/core/src/main/res/values-sv-rSE/strings.xml
@@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
+  <string name="feed_update_receiver_name">Uppdatera Prenumerationer</string>
   <string name="feeds_label">Flöden</string>
   <string name="statistics_label">Statistik</string>
   <string name="add_feed_label">Lägg till Podcast</string>
   <string name="episodes_label">Episoder</string>
   <string name="all_episodes_short_label">Alla</string>
+  <string name="new_episodes_label">Nytt</string>
   <string name="favorite_episodes_label">Favoriter</string>
   <string name="new_label">Nya</string>
   <string name="settings_label">Inställningar</string>
@@ -18,10 +20,12 @@
   <string name="cancel_download_label">Avbryt\nNedladdning</string>
   <string name="playback_history_label">Uppspelningshistorik</string>
   <string name="gpodnet_main_label">gpodder.net</string>
+  <string name="gpodnet_summary">Synkronisera med andra enheter</string>
   <string name="gpodnet_auth_label">Inloggning till gpodder.net</string>
   <string name="free_space_label">%1$s kvar</string>
   <string name="episode_cache_full_title">Episodcachen är full</string>
   <string name="episode_cache_full_message">Episodcachens gräns har nåtts. Du kan öka cachens storlek i inställningarna.</string>
+  <string name="synchronizing">Synkroniserar...</string>
   <!--Statistics fragment-->
   <string name="total_time_listened_to_podcasts">Total uppspelningstid:</string>
   <string name="statistics_details_dialog">%1$d av %2$d episoder startade.\n\nSpelat %3$s av %4$s.</string>
@@ -56,13 +60,14 @@
   <string name="yes">Ja</string>
   <string name="no">Nej</string>
   <string name="reset">Återställ</string>
-  <string name="author_label">Skapare</string>
+  <string name="author_label">Författare</string>
   <string name="language_label">Språk</string>
   <string name="url_label">URL</string>
   <string name="podcast_settings_label">Inställningar</string>
   <string name="cover_label">Bild</string>
   <string name="error_label">Fel</string>
   <string name="error_msg_prefix">Ett fel inträffade:</string>
+  <string name="needs_storage_permission">Lagringtillstånd behövs för denna åtgärd</string>
   <string name="refresh_label">Uppdatera</string>
   <string name="external_storage_error_msg">Ingen extern lagring är tillgänglig. Se till att montera en extern lagringsenhet så att appen kan fungera korrekt.</string>
   <string name="chapters_label">Kapitel</string>
@@ -105,25 +110,28 @@
   <string name="mark_all_read_label">Markera alla som spelade</string>
   <string name="mark_all_read_msg">Markera alla Episoder som spelade</string>
   <string name="mark_all_read_confirmation_msg">Bekräfta att du verkligen vill markera alla episoder som spelade.</string>
-  <string name="mark_all_read_feed_confirmation_msg">Bekräfta att du verkligen vill markera alla episoder i detta flöde som spelade.</string>
+  <string name="mark_all_read_feed_confirmation_msg">Bekräfta att du vill markera alla episider i denna podcast som spelade.</string>
   <string name="mark_all_seen_label">Markera alla som sedda</string>
-  <string name="mark_all_seen_msg">Markera alla Episoder som sedda</string>
+  <string name="mark_all_seen_msg">Markerade alla episoder som sedda</string>
   <string name="mark_all_seen_confirmation_msg">Bekräfta att du vill markera alla episoder som sedda.</string>
   <string name="show_info_label">Visa information</string>
-  <string name="rename_feed_label">Byt namn på Podcast</string>
-  <string name="remove_feed_label">Ta bort Podcast</string>
+  <string name="show_feed_settings_label">Visa podcastinställningar</string>
+  <string name="feed_info_label">Podcastinfo</string>
+  <string name="feed_settings_label">Podcastinställningar</string>
+  <string name="rename_feed_label">Byt namn på podcast</string>
+  <string name="remove_feed_label">Ta bort podcast</string>
   <string name="share_label">Dela…</string>
-  <string name="share_link_label">Dela Länk</string>
+  <string name="share_link_label">Dela Episod-URL</string>
+  <string name="share_link_with_position_label">Dela Episod-URL med Position</string>
   <string name="share_file_label">Dela Fil</string>
-  <string name="share_link_with_position_label">Dela Länk med Position</string>
   <string name="share_feed_url_label">Dela Flödets URL</string>
-  <string name="share_item_url_label">Dela Episoden Fil-URL</string>
-  <string name="share_item_url_with_position_label">Dela Episodens Fil-URL med Position</string>
-  <string name="feed_delete_confirmation_msg">Bekräfta att du vill ta bort flödet \"%1$s\" och ALLA episoder du laddat ned från detta flöde.</string>
-  <string name="feed_remover_msg">Tar bort Flöde</string>
-  <string name="load_complete_feed">Uppdatera hela Flödet</string>
+  <string name="share_item_url_label">Dela Mediafilens URL</string>
+  <string name="share_item_url_with_position_label">Dela Mediafilens URL med Position</string>
+  <string name="feed_delete_confirmation_msg">Bekräfta att du vill ta bort podcast \"%1$s\" och ALLA dess episoder (inklusive nedladdade episoder).</string>
+  <string name="feed_remover_msg">Tar bort podcast</string>
+  <string name="load_complete_feed">Uppdatera hela podcasten</string>
   <string name="hide_episodes_title">Dölj Episoder</string>
-  <string name="episode_actions">Applicera åtgärder</string>
+  <string name="batch_edit">Batchredigering</string>
   <string name="hide_unplayed_episodes_label">Ospelade</string>
   <string name="hide_paused_episodes_label">Pausade</string>
   <string name="hide_played_episodes_label">Spelad</string>
@@ -132,6 +140,7 @@
   <string name="hide_downloaded_episodes_label">Nedladdade</string>
   <string name="hide_not_downloaded_episodes_label">Ej nedladdade</string>
   <string name="hide_has_media_label">Har media</string>
+  <string name="hide_is_favorite_label">Är favorit</string>
   <string name="filtered_label">Filtrerad</string>
   <string name="refresh_failed_msg">{fa-exclamation-circle} Senaste uppdateringen misslyckades</string>
   <string name="open_podcast">Öppna Podcast</string>
@@ -145,6 +154,7 @@
   <string name="delete_label">Ta bort</string>
   <string name="delete_failed">Kunde inte ta bort filen. Testa att starta om enheten.</string>
   <string name="remove_episode_lable">Ta bort Episod</string>
+  <string name="mark_as_seen_label">Markera som sedd</string>
   <string name="marked_as_seen_label">Markera som sedd</string>
   <string name="mark_read_label">Markera som spelad</string>
   <string name="marked_as_read_label">Markera som spelad</string>
@@ -168,6 +178,8 @@
   <string name="download_failed">misslyckades</string>
   <string name="download_pending">Avvaktar nedladdning</string>
   <string name="download_running">Nedladdning pågår</string>
+  <string name="download_error_details">Detaljer</string>
+  <string name="download_error_details_message">%1$s \n\nFil-URL:\n%2$s</string>
   <string name="download_error_device_not_found">Hittade ingen lagringsenhet</string>
   <string name="download_error_insufficient_space">Otillräckligt Utrymme</string>
   <string name="download_error_file_error">Filfel</string>
@@ -218,6 +230,7 @@
   <string name="playback_error_unknown">Okänt fel</string>
   <string name="no_media_playing_label">Inget media spelar</string>
   <string name="player_buffering_msg">Buffrar</string>
+  <string name="player_go_to_picture_in_picture">Bild-i-bild läge</string>
   <string name="playbackservice_notification_title">Spelar podcast</string>
   <string name="unknown_media_key">AntannaPod - Okänd mediaknapp: %1$d</string>
   <!--Queue operations-->
@@ -234,7 +247,9 @@
   <string name="date">Datum</string>
   <string name="duration">Längd</string>
   <string name="episode_title">Episodtitel</string>
-  <string name="feed_title">Flödestitel</string>
+  <string name="feed_title">Podcasttitel</string>
+  <string name="random">Slumpa</string>
+  <string name="smart_shuffle">Smart Blandning</string>
   <string name="ascending">Stigande</string>
   <string name="descending">Fallande</string>
   <string name="clear_queue_confirmation_msg">Bekräfta att du vill rensa kön från ALLA episoder.</string>
@@ -272,7 +287,7 @@
   <string name="enable_sonic">Aktivera Sonic</string>
   <!--Empty list labels-->
   <string name="no_items_label">Det finns inget i denna lista.</string>
-  <string name="no_feeds_label">Du har inte prenumererat på något flöde ännu.</string>
+  <string name="no_feeds_label">Du har inte prenumererat på några podcasts än.</string>
   <string name="no_chapters_label">Denna episod har inga kapitel.</string>
   <string name="no_shownotes_label">Denna episod har inga shownotes.</string>
   <!--Preferences-->
@@ -281,15 +296,23 @@
   <string name="other_pref">Annat</string>
   <string name="about_pref">Om</string>
   <string name="queue_label">Kö</string>
-  <string name="services_label">Tjänster</string>
+  <string name="integrations_label">Integrationer</string>
   <string name="flattr_label">Flattr</string>
+  <string name="flattr_summary">Mikrobetalningstjänst</string>
+  <string name="automation">Automatisering</string>
+  <string name="download_pref_details">Detaljer</string>
+  <string name="import_export_pref">Importera/Exportera</string>
+  <string name="appearance">Utseende</string>
+  <string name="external_elements">Externa element</string>
+  <string name="interruptions">Avbrott</string>
+  <string name="buttons">Uppspelningsknappar</string>
+  <string name="media_player">Mediaspelare</string>
   <string name="pref_episode_cleanup_title">Episodupprensning</string>
   <string name="pref_episode_cleanup_summary">Episoder som inte är i kön och inte är favoriter kan tas bort om Automatisk Nedladdning behöver utrymme för nya episoder</string>
   <string name="pref_pauseOnDisconnect_sum">Pausa uppspelningen när hörlurar eller bluetooth kopplas ifrån.</string>
   <string name="pref_unpauseOnHeadsetReconnect_sum">Fortsätt uppspelningen när hörlurarna återansluts</string>
   <string name="pref_unpauseOnBluetoothReconnect_sum">Fortsätt uppspelningen när bluetooth återansluts</string>
   <string name="pref_hardwareForwardButtonSkips_title">Knappen spola fram hoppar</string>
-  <string name="pref_hardwareForwardButtonSkips_sum">Hoppa till nästa episod istället för att snabbspola vid tryck på hårdvaruknappen</string>
   <string name="pref_hardwarePreviousButtonRestarts_title">Knappen föregående startar om</string>
   <string name="pref_hardwarePreviousButtonRestarts_sum">Starta om den nuvarande episoden när du trycker på hårdvaruknappen för föregående istället för att spola tillbaka</string>
   <string name="pref_followQueue_sum">Hoppa till nästa i kön när uppspelningen är klar</string>
@@ -338,7 +361,7 @@
   <string name="pref_nav_drawer_feed_order_title">Välj Prenumerationsordning</string>
   <string name="pref_nav_drawer_feed_order_sum">Ändra ordningen på dina prenumerationer</string>
   <string name="pref_nav_drawer_feed_counter_title">Val För Prenumerationsräknaren</string>
-  <string name="pref_nav_drawer_feed_counter_sum">Ändra informationen som visas av prenumerationsräknaren</string>
+  <string name="pref_nav_drawer_feed_counter_sum">Ändra informationen som visas vid prenumerationsräknaren. Påverkar även sorteringen av prenumerationer om \'Prenumerationsordning\' är satt till \'Räknare\'.</string>
   <string name="pref_set_theme_sum">Ändra utseendet på AntennaPod.</string>
   <string name="pref_automatic_download_title">Automatisk Nedladdning</string>
   <string name="pref_automatic_download_sum">Konfigurera automatisk nedladdning av episoder.</string>
@@ -352,6 +375,7 @@
   <string name="pref_episode_cache_title">Episodcache</string>
   <string name="pref_theme_title_light">Ljust</string>
   <string name="pref_theme_title_dark">Mörkt</string>
+  <string name="pref_theme_title_trueblack">Svart (AMOLED redo)</string>
   <string name="pref_episode_cache_unlimited">Obegränsat</string>
   <string name="pref_update_interval_hours_plural">timmar</string>
   <string name="pref_update_interval_hours_singular">timme</string>
@@ -380,8 +404,6 @@
   <string name="pref_rewind_sum">Anpassa antalet sekunder att hoppa bakåt när snabbspolningsknappen bakåt används</string>
   <string name="pref_gpodnet_sethostname_title">Sätt värdnamn</string>
   <string name="pref_gpodnet_sethostname_use_default_host">Använd standardvärden</string>
-  <string name="pref_expandNotify_title">Expandera aviseringen</string>
-  <string name="pref_expandNotify_sum">Expandera alltid aviseringen för att visa uppspelningskontrollerna.</string>
   <string name="pref_persistNotify_title">Bestående Uppspelningskontroller</string>
   <string name="pref_persistNotify_sum">Behåll avisering och kontroller på låsskärmen när uppspelningen pausas.</string>
   <string name="pref_compact_notification_buttons_title">Sätt Låsskärmens Knappar</string>
@@ -402,8 +424,7 @@
   <string name="crash_report_sum">Sänd den senaste krashrapporten via e-post</string>
   <string name="send_email">Sänd e-post</string>
   <string name="experimental_pref">Experimentellt</string>
-  <string name="pref_sonic_title">Sonic Mediaspelare</string>
-  <string name="pref_sonic_message">Använd den inbyggda Sonic mediaspelare som ersättning för Androids egna mediaspelare och Prestissimo</string>
+  <string name="pref_media_player_message">Välj vilken mediaspelare som ska spela filer</string>
   <string name="pref_current_value">Nuvarande värde: %1$s</string>
   <string name="pref_proxy_title">Proxy</string>
   <string name="pref_proxy_sum">Använd en nätverksproxy</string>
@@ -415,6 +436,11 @@
   <string name="pref_cast_message_free_flavor">Chromecast kräver propretiära tredjepartsbibliotek som inte är inkluderade i denna version av AntennaPod</string>
   <string name="pref_enqueue_downloaded_title">Köa Nedladdade</string>
   <string name="pref_enqueue_downloaded_summary">Lägg nedladdade episoder i uppspelningskön</string>
+  <string name="media_player_builtin">Andriods inbyggda spelare</string>
+  <string name="pref_videoBehavior_title">Vid avslutande av video</string>
+  <string name="pref_videoBehavior_sum">Beteende när videouppspelning avslutas</string>
+  <string name="stop_playback">Stoppa uppspelning</string>
+  <string name="continue_playback">Fortsätt ljuduppspelning</string>
   <!--Auto-Flattr dialog-->
   <string name="auto_flattr_enable">Aktivera automatisk Flattring</string>
   <string name="auto_flattr_after_percent">Flattra episoden så snart %d procent har spelats</string>
@@ -424,8 +450,8 @@
   <string name="search_hint">Sök efter episoder</string>
   <string name="found_in_shownotes_label">Hittad i shownotes</string>
   <string name="found_in_chapters_label">Hittad i kapitel</string>
-  <string name="found_in_authors_label">Hittad i författare</string>
-  <string name="found_in_feeds_label">Hittad i flöden</string>
+  <string name="found_in_authors_label">Hittade i författare</string>
+  <string name="found_in_feeds_label">Hittade i podcast</string>
   <string name="search_status_no_results">Inga resultat hittades</string>
   <string name="search_label">Sök</string>
   <string name="found_in_title_label">Hittad i titeln</string>
@@ -451,8 +477,8 @@
   <string name="html_export_label">HTML export</string>
   <string name="exporting_label">Exporterar…</string>
   <string name="export_error_label">Exporteringsfel</string>
-  <string name="opml_export_success_title">OPML Exportering lyckades.</string>
-  <string name="opml_export_success_sum">.opml filen skrevs till:\u0020</string>
+  <string name="export_success_title">Exporten lyckades</string>
+  <string name="export_success_sum">Den exporterade filen skrevs till:\n\n%1$s</string>
   <string name="opml_import_ask_read_permission">Tillgång till extern lagring krävs för att läsa OPML-filen</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Ställ in sömntimer</string>
@@ -619,6 +645,14 @@
   <string name="proxy_host_empty_error">Värd måste fyllas i</string>
   <string name="proxy_host_invalid_error">Värd är inte en giltig IP adress eller domän</string>
   <string name="proxy_port_invalid_error">Porten är inte giltig</string>
+  <!--Database import/export-->
+  <string name="import_export">Databas-Import/Export</string>
+  <string name="import_export_warning">Denna experimentella funktion kan användas för att föra över dina prenumerationer och spelade episoder till en annan enhet.\n\nExporterade databaser kan bara importeras med samma version av AntennaPod. Annars kommer en import att leda till oförutsägbara konsekvenser.\n\nEfter en import kan episoder visas som nedladdade även om de inte är det. Tryck bara på uppspelningsknappen på episoden för att AntennaPod ska kolla det igen.</string>
+  <string name="label_import">Import</string>
+  <string name="label_export">Export</string>
+  <string name="import_select_file">Välj fil att importera</string>
+  <string name="export_ok">Exporten lyckades.</string>
+  <string name="import_ok">Importen lyckades.\n\nTryck OK för att starta om AntennaPod</string>
   <!--Casting-->
   <string name="cast_media_route_menu_title">Spela på...</string>
   <string name="cast_disconnect_label">Koppla loss castningen</string>
@@ -635,4 +669,13 @@
   <string name="cast_failed_seek">Misslyckades att söka till den nya positionen på cast-enheten</string>
   <string name="cast_failed_receiver_player_error">Mottagande uppspelaren har stött på ett allvarligt fel</string>
   <string name="cast_failed_media_error_skipping">Fel vid uppspelning av media. Hoppar över...</string>
+  <!--Notification channels-->
+  <string name="notification_channel_user_action">Åtgärd krävs</string>
+  <string name="notification_channel_user_action_description">Visas om din åtgärd är obligatorisk, till exempel om du behöver ange ett lösenord.</string>
+  <string name="notification_channel_downloading">Laddar ner</string>
+  <string name="notification_channel_downloading_description">Visas under tiden som nedladdning pågår.</string>
+  <string name="notification_channel_playing">Uppspelning pågår</string>
+  <string name="notification_channel_playing_description">Medger kontroll över uppspelning. Detta är huvudnotifieringen som du ser när en podcast spelas.</string>
+  <string name="notification_channel_error">Fel</string>
+  <string name="notification_channel_error_description">Visas om något blev fel, exempelvis om nedladdning eller gpodder synkronisering misslyckas.</string>
 </resources>
diff --git a/core/src/main/res/values-sw-rKE/strings.xml b/core/src/main/res/values-sw-rKE/strings.xml
index acf3abe75..2d9481b84 100644
--- a/core/src/main/res/values-sw-rKE/strings.xml
+++ b/core/src/main/res/values-sw-rKE/strings.xml
@@ -36,4 +36,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-te/strings.xml b/core/src/main/res/values-te/strings.xml
index 93db7b76f..d73db283a 100644
--- a/core/src/main/res/values-te/strings.xml
+++ b/core/src/main/res/values-te/strings.xml
@@ -3,6 +3,7 @@
   <!--Activitiy and fragment titles-->
   <string name="feeds_label">ఫీడులు</string>
   <string name="statistics_label">గణాంకాలు</string>
+  <string name="episodes_label">ఎపిసోడులు</string>
   <string name="all_episodes_short_label">అన్నీ</string>
   <string name="favorite_episodes_label">ఇష్టాలు</string>
   <string name="new_label">కొత్తది</string>
@@ -13,33 +14,63 @@
   <string name="downloads_log_label">చిట్టా</string>
   <string name="subscriptions_label">చందాలు</string>
   <string name="subscriptions_list_label">చందాల జాబితా</string>
+  <string name="cancel_download_label">దింపుకోలును\nరద్దుచేయి</string>
+  <string name="playback_history_label">ఆడింపు చరిత్ర</string>
+  <string name="gpodnet_main_label">gpodder.net</string>
+  <string name="gpodnet_auth_label">gpodder.net ప్రవేశం</string>
   <string name="free_space_label">%1$s ఖాళీ</string>
   <!--Statistics fragment-->
+  <string name="statistics_mode">గణాంకాల రీతి</string>
   <!--Main activity-->
+  <string name="drawer_open">మెనూని తెరువు</string>
+  <string name="drawer_close">మెనూని మూసివేయి</string>
   <string name="drawer_feed_counter_none">ఏమీలేవు</string>
   <!--Webview actions-->
   <!--Playback history-->
+  <string name="clear_history_label">చరిత్రను తుడిచివేయి</string>
   <!--Other-->
+  <string name="confirm_label">నిర్ధారించు</string>
   <string name="cancel_label">రద్దుచేయి</string>
   <string name="yes">అవును</string>
   <string name="no">కాదు</string>
   <string name="language_label">భాష</string>
   <string name="podcast_settings_label">అమరికలు</string>
+  <string name="cover_label">బొమ్మ</string>
+  <string name="error_label">పొరపాటు</string>
+  <string name="error_msg_prefix">పొరపాటు జరిగింది:</string>
+  <string name="chapters_label">చాప్టర్లు</string>
+  <string name="chapter_duration">నిడివి: %1$s</string>
   <string name="description_label">వివరణ</string>
+  <string name="most_recent_prefix">అత్యంత ఇటీవలి ఎపిసోడు:\u0020</string>
+  <string name="episodes_suffix">\u0020ఎపిసోడులు</string>
   <string name="length_prefix">నిడివి:\u0020</string>
+  <string name="size_prefix">పరిమాణం:\u0020</string>
   <string name="loading_label">వస్తోంది…</string>
+  <string name="save_username_password_label">వాడుకరి పేరునీ సంకేతపదాన్నీ భద్రపరచు</string>
   <string name="close_label">మూసివేయి</string>
+  <string name="retry_label">మళ్ళీ ప్రయత్నించు</string>
   <string name="feed_auto_download_always">ఎల్లప్పుడూ</string>
   <string name="send_label">పంపించు…</string>
+  <plurals name="episode_cleanup_days_after_listening">
+    <item quantity="one">ముగించిన 1 రోజు తర్వాత</item>
+    <item quantity="other">ముగించిన %d రోజుల తర్వాత</item>
+  </plurals>
   <!--'Add Feed' Activity labels-->
+  <string name="feedurl_label">ఫీడు చిరునామా</string>
+  <string name="etxtFeedurlHint">www.example.com/feed</string>
   <!--Actions on feeds-->
+  <string name="show_info_label">సమాచారం చూపించు</string>
   <string name="share_label">పంచుకోండి…</string>
   <!--actions on feeditems-->
+  <string name="download_label">దింపుకో</string>
   <string name="play_label">ఆడించు</string>
   <string name="pause_label">నిలుపు</string>
   <string name="stop_label">ఆపివేయి</string>
+  <string name="remove_label">తొలగించు</string>
   <string name="delete_label">తొలగించు</string>
   <!--Download messages and labels-->
+  <string name="download_error_details">వివరాలు</string>
+  <string name="download_type_feed">ఫీడు</string>
   <!--Mediaplayer messages-->
   <!--Queue operations-->
   <string name="date">తేదీ</string>
@@ -51,15 +82,22 @@
   <!--Variable Speed-->
   <!--Empty list labels-->
   <!--Preferences-->
+  <string name="other_pref">ఇతర</string>
   <string name="about_pref">గురించి</string>
-  <string name="services_label">సేవలు</string>
   <string name="network_pref">నెట్‌వర్క్</string>
+  <string name="pref_autoUpdateIntervallOrTime_Disable">అచేతనించు</string>
+  <string name="pref_autoUpdateIntervallOrTime_every">ప్రతీ %1$s</string>
+  <string name="pref_theme_title_light">లేత</string>
+  <string name="pref_theme_title_dark">నల్లని</string>
+  <string name="pref_episode_cache_unlimited">అపరిమితం</string>
   <string name="pref_update_interval_hours_plural">గంటలు</string>
   <string name="pref_update_interval_hours_singular">గంట</string>
   <string name="experimental_pref">ప్రయోగాత్మకం</string>
   <string name="pref_proxy_title">ప్రాక్సీ</string>
+  <string name="pref_known_issues">తెలిసిన సమస్యలు</string>
   <!--Auto-Flattr dialog-->
   <!--Search-->
+  <string name="search_label">వెతుకు</string>
   <!--OPML import and export-->
   <string name="select_all_label">అన్నీ ఎంచుకోండి</string>
   <!--Sleep timer-->
@@ -80,9 +118,14 @@
   </plurals>
   <!--gpodder.net-->
   <string name="gpodnet_taglist_header">వర్గాలు</string>
+  <string name="gpodnet_toplist_header">మేటి పాడ్‌కాస్టులు</string>
+  <string name="gpodnet_suggestions_header">సలహాలు</string>
   <string name="username_label">వాడుకరి పేరు</string>
   <string name="password_label">సంకేతపదం</string>
+  <string name="gpodnetsync_pref_report_successful">విజయవంతం</string>
+  <string name="gpodnetsync_pref_report_failed">విఫలమైంది</string>
   <!--Directory chooser-->
+  <string name="folder_not_empty_dialog_title">సంచయం ఖాళీగా లేదు</string>
   <!--Online feed view-->
   <!--Content descriptions for image buttons-->
   <!--Feed information screen-->
@@ -99,6 +142,10 @@
   <string name="proxy_type_label">రకం</string>
   <string name="optional_hint">(ఐచ్చికం)</string>
   <!--Database import/export-->
+  <string name="label_import">దిగుమతి</string>
+  <string name="label_export">దిగుమతి</string>
+  <string name="export_ok">ఎగుమతి విజయవంతం.</string>
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-tr/strings.xml b/core/src/main/res/values-tr/strings.xml
index 9d9aa95e8..a980a1224 100644
--- a/core/src/main/res/values-tr/strings.xml
+++ b/core/src/main/res/values-tr/strings.xml
@@ -48,7 +48,6 @@
   <string name="yes">Evet</string>
   <string name="no">Hayır</string>
   <string name="reset">Sıfırla</string>
-  <string name="author_label">Yayıncı</string>
   <string name="language_label">Dil</string>
   <string name="url_label">URL</string>
   <string name="podcast_settings_label">Ayarlar</string>
@@ -94,23 +93,12 @@
   <string name="mark_all_read_label">Hepsini oynatıldı olarak işaretle</string>
   <string name="mark_all_read_msg">Tüm bölümleri oynatıldı olarak işaretle</string>
   <string name="mark_all_read_confirmation_msg">Lütfen tüm bölümleri oynatıldı olarak işaretlemek istediğinizi onaylayın.</string>
-  <string name="mark_all_read_feed_confirmation_msg">Lütfen bu besleme içindeki tüm bölümleri oynatıldı olarak işaretlemek istediğinizi onaylayın.</string>
   <string name="mark_all_seen_label">Hepsini görüldü olarak işaretle</string>
-  <string name="mark_all_seen_msg">Tüm bölümler görüldü olarak işaretlendi</string>
   <string name="mark_all_seen_confirmation_msg">Lütfen tüm bölümleri görüldü olarak işaretlemek istediğinizi onaylayın.</string>
   <string name="show_info_label">Bilgiyi göster</string>
-  <string name="rename_feed_label">Cep yayınını yeniden adlandır</string>
-  <string name="remove_feed_label">Cep yayını kaldır</string>
   <string name="share_label">Paylaş...</string>
-  <string name="share_link_label">Link\'i paylaş</string>
-  <string name="share_link_with_position_label">Link\'i Konumla birlikte paylaş</string>
   <string name="share_feed_url_label">Besleme Adresini Paylaş</string>
-  <string name="share_item_url_label">Bölüm Dosyası Adresini Paylaş</string>
-  <string name="share_item_url_with_position_label">Bölüm Dosyası Adresini Konumla birlikte paylaş</string>
-  <string name="feed_remover_msg">Besleme kaldırılıyor</string>
-  <string name="load_complete_feed">Tüm beslemeyi yenile</string>
   <string name="hide_episodes_title">Bölümleri gizle</string>
-  <string name="episode_actions">Eylemleri uygula</string>
   <string name="hide_unplayed_episodes_label">Oynatılmadı</string>
   <string name="hide_paused_episodes_label">Duraklatıldı</string>
   <string name="hide_played_episodes_label">Oynatıldı</string>
@@ -220,7 +208,6 @@
   <string name="date">Tarih</string>
   <string name="duration">Süre</string>
   <string name="episode_title">Blüm başlığı</string>
-  <string name="feed_title">Besleme başlığı</string>
   <string name="ascending">Artan</string>
   <string name="descending">Azalan</string>
   <string name="clear_queue_confirmation_msg">Lütfen içerisindeki BÜTÜN ölümlerle birlikte kuyruğu temizleme isteğinizi onaylayın.</string>
@@ -257,14 +244,12 @@
   <string name="enable_sonic">Sonic\'i Etkinleştir</string>
   <!--Empty list labels-->
   <string name="no_items_label">Bu listede hiç öge yok.</string>
-  <string name="no_feeds_label">Henüz hiçbir beslemeye abone değilsiniz.</string>
   <!--Preferences-->
   <string name="storage_pref">Depolama</string>
   <string name="project_pref">Proje</string>
   <string name="other_pref">Diğer</string>
   <string name="about_pref">Hakkında</string>
   <string name="queue_label">Kuyruk</string>
-  <string name="services_label">Servisler</string>
   <string name="flattr_label">Flattr</string>
   <string name="pref_episode_cleanup_title">Bölüm Temizliği</string>
   <string name="pref_pauseOnDisconnect_sum">Kulaklıklar çıkarıldığında veya bluetooth bağlantısı kesildiğinde çalmayı duraklat</string>
@@ -330,8 +315,6 @@
   <string name="pref_playback_speed_sum">Değişken hızlı ses yürütmesi için kullanılabilir hızları özelleştirin</string>
   <string name="pref_gpodnet_sethostname_title">Sunucu ismini ayarla</string>
   <string name="pref_gpodnet_sethostname_use_default_host">Varsayılan sunucuyu kullan</string>
-  <string name="pref_expandNotify_title">Bildirimi Genişlet</string>
-  <string name="pref_expandNotify_sum">Çalma tuşlarını göstermek için bildirimi her zaman genişlet.</string>
   <string name="pref_persistNotify_title">Kalıcı oynatma kontrolleri</string>
   <string name="pref_persistNotify_sum">Çalma duraklatıldığında bildirim ve ekran kilidi ayarlarını sakla.</string>
   <string name="pref_showDownloadReport_title">İndirme Raporunu Göster</string>
@@ -374,8 +357,6 @@
   <string name="choose_file_from_external_application">Harici uygulama kullan</string>
   <string name="opml_export_label">OPML dışa aktar</string>
   <string name="export_error_label">Dışa aktarma hatası</string>
-  <string name="opml_export_success_title">Opml dışa aktarma başarılı.</string>
-  <string name="opml_export_success_sum">.opml dosyasy yazıldı: \u0020</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Zamanlayıcıyı ayarla</string>
   <string name="disable_sleeptimer_label">Zamanlayıcıyı devre dışı bırak</string>
@@ -508,4 +489,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-uk-rUA/strings.xml b/core/src/main/res/values-uk-rUA/strings.xml
index 18ca0713b..0afc1e8c2 100644
--- a/core/src/main/res/values-uk-rUA/strings.xml
+++ b/core/src/main/res/values-uk-rUA/strings.xml
@@ -1,11 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <!--Activitiy and fragment titles-->
+  <string name="feed_update_receiver_name">Оновити підписки</string>
   <string name="feeds_label">Канали</string>
   <string name="statistics_label">Статистика</string>
   <string name="add_feed_label">Додати подкаст</string>
   <string name="episodes_label">Епізоди</string>
   <string name="all_episodes_short_label">Всі</string>
+  <string name="new_episodes_label">Нові</string>
   <string name="favorite_episodes_label">Улюблені</string>
   <string name="new_label">Нові</string>
   <string name="settings_label">Налаштування</string>
@@ -15,18 +17,20 @@
   <string name="downloads_log_label">Журнал</string>
   <string name="subscriptions_label">Підписки</string>
   <string name="subscriptions_list_label">Перелік підписок</string>
-  <string name="cancel_download_label">Скасувати завантаження</string>
-  <string name="playback_history_label">Що грало</string>
+  <string name="cancel_download_label">Скасувати\nзавантаження</string>
+  <string name="playback_history_label">Історія відтворення</string>
   <string name="gpodnet_main_label">gpodder.net</string>
+  <string name="gpodnet_summary">Синхронизація з іншими пристроями</string>
   <string name="gpodnet_auth_label">gpodder.net логін</string>
   <string name="free_space_label">%1$s вільно</string>
   <string name="episode_cache_full_title">Кеш епізодів заповнений</string>
   <string name="episode_cache_full_message">Досягнута межа розміра кеша епізодів. Розмір кеша можна збільшити в налаштуваннях.</string>
+  <string name="synchronizing">Синхронізується…</string>
   <!--Statistics fragment-->
   <string name="total_time_listened_to_podcasts">Загальний час прослуханих подкастів:</string>
   <string name="statistics_details_dialog">%1$d з %2$d епізодів почато.\n\nПрослухано %3$s з %4$s.</string>
   <string name="statistics_mode">Режим статистики</string>
-  <string name="statistics_mode_normal">Обчислити тривалість прослуханого. Прослухане двічі враховується двічи, але просто позначене як прослухане не враховується </string>
+  <string name="statistics_mode_normal">Обчислити тривалість дійсно прослуханого. Прослухане двічі враховується двічі, але просто позначене як прослухане не враховується </string>
   <string name="statistics_mode_count_all">Підсумувати всі подкасти позначені як прослухані</string>
   <string name="statistics_speed_not_counted">Зауваження: Швидкість програвання не береться до уваги.</string>
   <!--Main activity-->
@@ -34,9 +38,9 @@
   <string name="drawer_close">Сховати меню</string>
   <string name="drawer_preferences">Настройки меню навігації</string>
   <string name="drawer_feed_order_unplayed_episodes">Сортувати за лічильником</string>
-  <string name="drawer_feed_order_alphabetical">Сортування за абеткою</string>
+  <string name="drawer_feed_order_alphabetical">Сортувати за абеткою</string>
   <string name="drawer_feed_order_last_update">Сортувати за датою публікації</string>
-  <string name="drawer_feed_order_most_played">Сортування за кількістю прослуханих епізодів</string>
+  <string name="drawer_feed_order_most_played">Сортувати за кількістю прослуханих епізодів</string>
   <string name="drawer_feed_counter_new_unplayed">Кількість нових та непрослуханих епізодів</string>
   <string name="drawer_feed_counter_new">Кількість нових епізодів</string>
   <string name="drawer_feed_counter_unplayed">Кількість непрослуханих епізодів</string>
@@ -49,20 +53,21 @@
   <string name="copied_url_msg">URL скопійовано в буфер</string>
   <string name="go_to_position_label">До цієї позиції</string>
   <!--Playback history-->
-  <string name="clear_history_label">Забути</string>
+  <string name="clear_history_label">Очистити історію</string>
   <!--Other-->
   <string name="confirm_label"> Підтвердити</string>
   <string name="cancel_label">Скасувати</string>
   <string name="yes">Так</string>
   <string name="no">Ні</string>
   <string name="reset">Перезапуск</string>
-  <string name="author_label">Автор</string>
+  <string name="author_label">Автор(и)</string>
   <string name="language_label">Мова</string>
   <string name="url_label">URL</string>
   <string name="podcast_settings_label">Налаштування</string>
   <string name="cover_label">Зображення</string>
   <string name="error_label">Помилка</string>
   <string name="error_msg_prefix">Трапилась помілка:</string>
+  <string name="needs_storage_permission">Для цієї операції потрібен дозвіл на доступ до пам’яті</string>
   <string name="refresh_label">Оновити</string>
   <string name="external_storage_error_msg">Немає доступної карти пам\'яті. Зовнішній носій потрібен для коректної роботи додатку</string>
   <string name="chapters_label">Глави</string>
@@ -80,10 +85,10 @@
   <string name="retry_label">Повторити знову</string>
   <string name="auto_download_label">Включити до автозавантаження</string>
   <string name="auto_download_apply_to_items_title">Застосувати до попередніх епізодів</string>
-  <string name="auto_download_apply_to_items_message">Нове налаштування <i>Автозагрузка</i> буде автоматично застосоване до нових епізодів.\nБажаєте також застосувати його до тих епізодів що було опубліковано раніше?</string>
+  <string name="auto_download_apply_to_items_message">Нове налаштування <i>Автозавантаження</i> буде автоматично застосоване до нових епізодів.\nБажаєте також застосувати його до тих епізодів що були опубліковані раніше?</string>
   <string name="auto_delete_label">Автовидалення епізода</string>
   <string name="parallel_downloads_suffix">\u0020паралельних завантажень</string>
-  <string name="feed_auto_download_global">За замовчанням</string>
+  <string name="feed_auto_download_global">За замовчуванням</string>
   <string name="feed_auto_download_always">Завжди</string>
   <string name="feed_auto_download_never">Ніколи</string>
   <string name="send_label">Відправити…</string>
@@ -93,6 +98,7 @@
   <plurals name="episode_cleanup_days_after_listening">
     <item quantity="one">1 день після закінчення</item>
     <item quantity="few">%d дні після закінчення</item>
+    <item quantity="many">%d днів після закінчення</item>
     <item quantity="other">%d днів після закінчення</item>
   </plurals>
   <!--'Add Feed' Activity labels-->
@@ -103,36 +109,42 @@
   <string name="podcastdirectories_descr">Нові подкасти можна шукати на iTunes або fyyd, або переглянути gpodder.net за іменами, категоріями або популярністю.</string>
   <string name="browse_gpoddernet_label">Переглянути gpodder.net</string>
   <!--Actions on feeds-->
-  <string name="mark_all_read_label">Позначити всі як грані</string>
-  <string name="mark_all_read_msg">Позначено всі епізоди як грані</string>
-  <string name="mark_all_read_confirmation_msg">Будь ласка, підтвердіть що ви бажаєте позначити всі епізоди як грані.</string>
-  <string name="mark_all_read_feed_confirmation_msg">Будь ласка, підтвердіть що ви бажаєте позначити всі епізоди цього канала як грані.</string>
+  <string name="mark_all_read_label">Позначити всі як відтворені</string>
+  <string name="mark_all_read_msg">Позначено всі епізоди як відтворені</string>
+  <string name="mark_all_read_confirmation_msg">Будь ласка, підтвердіть що ви бажаєте позначити всі епізоди як відтворені.</string>
+  <string name="mark_all_read_feed_confirmation_msg">Будь ласка, підтвердіть, що ви бажаєте позначити всі епізоди цього подкасту як відтворені. </string>
   <string name="mark_all_seen_label">Позначити всі як переглянуті</string>
   <string name="mark_all_seen_msg">Всі епізоди позначено як переглянуті</string>
   <string name="mark_all_seen_confirmation_msg">Будь ласка, підтвердіть що ви бажаєте позначити всі епізоди як переглянуті.</string>
   <string name="show_info_label">Інформація</string>
+  <string name="show_feed_settings_label">Показати налаштування подкасту</string>
+  <string name="feed_info_label">Інформація про подкаст</string>
+  <string name="feed_settings_label">Налаштування подкаста</string>
   <string name="rename_feed_label">Перейменувати подкаст</string>
   <string name="remove_feed_label">Видалити подкаст</string>
   <string name="share_label">Поділитися…</string>
-  <string name="share_link_label">Поділитися URL сайту</string>
+  <string name="share_link_label">Поділитись посиланням на епізод</string>
+  <string name="share_link_with_position_label">Поділіться посиланням на епізод з позицією</string>
   <string name="share_file_label">Поділитись файлом</string>
-  <string name="share_link_with_position_label">Поділитись посиланням на позицію</string>
   <string name="share_feed_url_label">Поділитись посиланням на канал</string>
-  <string name="share_item_url_label">Поділитись посиланням на файл епізода</string>
-  <string name="share_item_url_with_position_label">Поділитись посиланням на файл епізода з позицією</string>
-  <string name="feed_delete_confirmation_msg">Будь ласка, підтвердіть що ви бажаєте видалити канал \"%1$s\" і ВСІ епізоди цього канала які ви завантажили.</string>
-  <string name="feed_remover_msg">Удаляю канал</string>
-  <string name="load_complete_feed">Оновити канал цілком</string>
+  <string name="share_item_url_label">Поділитись посиланням на медіа-файл</string>
+  <string name="share_item_url_with_position_label">Поділитись посиланням на медіа-файл з позицією</string>
+  <string name="feed_delete_confirmation_msg">Будь ласка, підтвердіть що ви бажаєте видалити подкаст \"%1$s\" і ВСІ його епізоди (разом з завантаженими).</string>
+  <string name="feed_remover_msg">Видалення подкаста</string>
+  <string name="load_complete_feed">Оновити весь подкаст</string>
   <string name="hide_episodes_title">Приховати епізоди</string>
-  <string name="episode_actions">Застосувати дії</string>
-  <string name="hide_unplayed_episodes_label">Неграні</string>
-  <string name="hide_paused_episodes_label">На паузі</string>
-  <string name="hide_played_episodes_label">Грані</string>
+  <string name="batch_edit">Групове редагування</string>
+  <string name="select_all_above">Вибрати все вище</string>
+  <string name="select_all_below">Вибрати все нижче</string>
+  <string name="hide_unplayed_episodes_label">Невідтворені</string>
+  <string name="hide_paused_episodes_label">Призупинені</string>
+  <string name="hide_played_episodes_label">Відтворені</string>
   <string name="hide_queued_episodes_label">В черзі</string>
   <string name="hide_not_queued_episodes_label">Не в черзі</string>
   <string name="hide_downloaded_episodes_label">Завантажені</string>
   <string name="hide_not_downloaded_episodes_label">Не завантажені</string>
-  <string name="hide_has_media_label">Із звуком або відео</string>
+  <string name="hide_has_media_label">Зі звуком або відео</string>
+  <string name="hide_is_favorite_label">В улюблених</string>
   <string name="filtered_label">Фільтровані</string>
   <string name="refresh_failed_msg">{fa-exclamation-circle} Останнє оновлення було невдалим</string>
   <string name="open_podcast">Відкрити подкаст</string>
@@ -146,10 +158,11 @@
   <string name="delete_label">Видалити</string>
   <string name="delete_failed">Файл не видалено. Можливо, перезавантаження пристрою допоможе.</string>
   <string name="remove_episode_lable">Видалити епізод</string>
+  <string name="mark_as_seen_label">Позначити як переглянутий</string>
   <string name="marked_as_seen_label">Позначено як переглянутий</string>
-  <string name="mark_read_label">Позначити як граний</string>
-  <string name="marked_as_read_label">Позначено як граний</string>
-  <string name="mark_unread_label">Позначити як не граний</string>
+  <string name="mark_read_label">Позначити як відтворений</string>
+  <string name="marked_as_read_label">Позначено як відтворений</string>
+  <string name="mark_unread_label">Позначити як не відтворений</string>
   <string name="add_to_queue_label">Додати до черги</string>
   <string name="added_to_queue_label">Додано до черги</string>
   <string name="remove_from_queue_label">Видалити з черги</string>
@@ -162,24 +175,26 @@
   <string name="skip_episode_label">Пропустити епізод</string>
   <string name="activate_auto_download">Включити автозавантаження</string>
   <string name="deactivate_auto_download">Виключити автозавантаження</string>
-  <string name="reset_position">Вернути початкову позицію відтворення</string>
+  <string name="reset_position">Скинути позицію відтворення</string>
   <string name="removed_item">Видалено</string>
   <!--Download messages and labels-->
   <string name="download_successful">успішно</string>
   <string name="download_failed">з помилками</string>
   <string name="download_pending">Потрібно завантажити</string>
   <string name="download_running">Завантаження</string>
-  <string name="download_error_device_not_found">Немає куди зберігати</string>
-  <string name="download_error_insufficient_space">Мало місця</string>
+  <string name="download_error_details">Докладно</string>
+  <string name="download_error_details_message">%1$s \n\nПосилання на файл:\n%2$s</string>
+  <string name="download_error_device_not_found">Пристрій зберігання даних не знайдено</string>
+  <string name="download_error_insufficient_space">Недостатній простір для зберігання</string>
   <string name="download_error_file_error">Помилка файлу</string>
   <string name="download_error_http_data_error">Помилка HTTP</string>
   <string name="download_error_error_unknown">Щось трапилось</string>
   <string name="download_error_parser_exception">Помилка парсера</string>
-  <string name="download_error_unsupported_type">Не підтримую канали такого типа</string>
+  <string name="download_error_unsupported_type">Непідтримуваний тип каналу</string>
   <string name="download_error_connection_error">Помилка з\'єднання</string>
-  <string name="download_error_unknown_host">Невідомий host</string>
-  <string name="download_error_unauthorized">Помилка автентифікації</string>
-  <string name="download_error_file_type_type">Помилка типа файла</string>
+  <string name="download_error_unknown_host">Невідомий хост</string>
+  <string name="download_error_unauthorized">Помилка аутентифікації</string>
+  <string name="download_error_file_type_type">Помилка типу файлу</string>
   <string name="download_error_forbidden">Заборонено</string>
   <string name="cancel_all_downloads_label">Скасувати всі завантаження</string>
   <string name="download_canceled_msg">Завантаження скасоване</string>
@@ -193,21 +208,22 @@
   <plurals name="downloads_left">
     <item quantity="one">%d завантаження залишилось</item>
     <item quantity="few">%d завантаження залишилось</item>
+    <item quantity="many">%d завантажень залишилось</item>
     <item quantity="other">%d завантажень залишилось</item>
   </plurals>
   <string name="downloads_processing">Обробка завантаженого</string>
   <string name="download_notification_title">Завантаження даних подкасту</string>
   <string name="download_report_content">Завантажилось %1$d успішно, %2$d з помилками</string>
-  <string name="download_log_title_unknown">Невідома назва</string>
+  <string name="download_log_title_unknown">Невідомий заголовок</string>
   <string name="download_type_feed">Канал</string>
   <string name="download_type_media">Файл з медіа</string>
   <string name="download_type_image">Зображення</string>
   <string name="download_request_error_dialog_message_prefix">Помилка при завантажені файлу:\u0020</string>
   <string name="authentication_notification_title">Потрібна автентифікація</string>
   <string name="authentication_notification_msg">Для доступа до цього ресурса потрібні ім\'я та пароль </string>
-  <string name="confirm_mobile_download_dialog_title">Підтвердження мобільних завантажень</string>
-  <string name="confirm_mobile_download_dialog_message_not_in_queue">Завантаження через мобільний зв\'язок вимкнено в настройках.\n\nУвімкнути тимчасово або тільки додати до черги?\n\n<small>Ваш вибір буде запам\'ятовано на 10 хвилин.</small></string>
-  <string name="confirm_mobile_download_dialog_message">Завантаження через мобільний зв\'язок вимкнено в настройках.\n\nУвімкнути тимчасово?\n\n<small>Ваш вибір буде запам\'ятовано на 10 хвилин.</small></string>
+  <string name="confirm_mobile_download_dialog_title">Підтвердження завантажень через мобільні мережі</string>
+  <string name="confirm_mobile_download_dialog_message_not_in_queue">Завантаження через мобільні мережі вимкнено в настройках.\n\nВибрати додавання епізоду до черги чи тимчасове завантаження?\n\n<small>Ваш вибір запам\'ятається на 10 хвилин.</small></string>
+  <string name="confirm_mobile_download_dialog_message">Завантаження через мобільні мережі вимкнено в настройках.\n\nУвімкнути тимчасово?\n\n<small>Ваш вибір запам\'ятається на 10 хвилин.</small></string>
   <string name="confirm_mobile_download_dialog_only_add_to_queue">Лише додати до черги</string>
   <string name="confirm_mobile_download_dialog_enable_temporarily">Увімкнути тимчасово</string>
   <!--Mediaplayer messages-->
@@ -220,13 +236,14 @@
   <string name="playback_error_unknown">Невідома помилка</string>
   <string name="no_media_playing_label">Немає що грати</string>
   <string name="player_buffering_msg">Буферізую</string>
+  <string name="player_go_to_picture_in_picture">Режим зображення в зображенні</string>
   <string name="playbackservice_notification_title">Грає подкаст</string>
   <string name="unknown_media_key">AntennaPod - Невідомий медіа ключ: %1$d</string>
   <!--Queue operations-->
   <string name="lock_queue">Заблокувати чергу</string>
   <string name="unlock_queue">Розблокувати чергу</string>
   <string name="queue_locked">Чергу заблоковано</string>
-  <string name="queue_unlocked">Чергу разблоковано</string>
+  <string name="queue_unlocked">Чергу розблоковано</string>
   <string name="clear_queue_label">Очистити чергу</string>
   <string name="undo">Скасувати</string>
   <string name="removed_from_queue">Видалено</string>
@@ -235,8 +252,10 @@
   <string name="sort">Впорядкувати</string>
   <string name="date">За датою</string>
   <string name="duration">За тривалістю</string>
-  <string name="episode_title">Назва епізода</string>
-  <string name="feed_title">Назва канала</string>
+  <string name="episode_title">Назва епізоду</string>
+  <string name="feed_title">Назва подкаста</string>
+  <string name="random">Випадково</string>
+  <string name="smart_shuffle">Розумне перемішування</string>
   <string name="ascending">За зростанням</string>
   <string name="descending">За спаданням</string>
   <string name="clear_queue_confirmation_msg">Будь ласка, підтвердіть що ви бажаєте вилучити всі епізоди з черги.</string>
@@ -274,7 +293,7 @@
   <string name="enable_sonic">Включити Sonic</string>
   <!--Empty list labels-->
   <string name="no_items_label">Нічого в цьому списку</string>
-  <string name="no_feeds_label">Немає підписаних каналів </string>
+  <string name="no_feeds_label">Ви ще не підписалися на жодні подкасти.</string>
   <string name="no_chapters_label">В цьому епізоді немає розділів.</string>
   <string name="no_shownotes_label">До цього епізода немає нотаток.</string>
   <!--Preferences-->
@@ -283,40 +302,49 @@
   <string name="other_pref">Інше</string>
   <string name="about_pref">Про програму</string>
   <string name="queue_label">Черга</string>
-  <string name="services_label">Сервіси</string>
+  <string name="integrations_label">Інтеграції</string>
   <string name="flattr_label">Flattr</string>
-  <string name="pref_episode_cleanup_title">Чищення епізодів</string>
+  <string name="flattr_summary">Сервіс мікроплатежів</string>
+  <string name="automation">Автоматизація</string>
+  <string name="download_pref_details">Детально</string>
+  <string name="import_export_pref">Імпорт/Експорт</string>
+  <string name="appearance">Вигляд</string>
+  <string name="external_elements">Зовнішні елементи</string>
+  <string name="interruptions">Тимчасові паузи</string>
+  <string name="buttons">Кнопки керування відтворенням</string>
+  <string name="media_player">Медіа програвач</string>
+  <string name="pref_episode_cleanup_title">Очищення епізодів</string>
   <string name="pref_episode_cleanup_summary">Епізоди що не знаходяться в черзі та не помічені як улюблені можуть бути видалені якщо Автозавантажувач потребуватиме місце для нових епізодів.</string>
-  <string name="pref_pauseOnDisconnect_sum">Зупинятись коли навушники або блютуз від’єднано</string>
+  <string name="pref_pauseOnDisconnect_sum">Зупиняти відтворення коли навушники або блютуз від’єднано</string>
   <string name="pref_unpauseOnHeadsetReconnect_sum">Поновити відтворення коли навушники повторно під’єднано</string>
   <string name="pref_unpauseOnBluetoothReconnect_sum">Поновити відтворення коли блютуз повторно під’єднано</string>
   <string name="pref_hardwareForwardButtonSkips_title">Кнопка перемотки пропускає</string>
-  <string name="pref_hardwareForwardButtonSkips_sum">При натисканні апаратної кнопки перемотки перейти до наступного епізода замість перемотки.</string>
+  <string name="pref_hardwareForwardButtonSkips_sum">При натисканні кнопки вперед на блютус пристрої, переходьте до наступного епізоду замість швидкого перемотування</string>
   <string name="pref_hardwarePreviousButtonRestarts_title">Кнопка \"назад\" повертає до початку</string>
   <string name="pref_hardwarePreviousButtonRestarts_sum">При натисканні апаратної кнопки \"назад\", замість перемотки, розпочати програвання поточного епізода заново</string>
   <string name="pref_followQueue_sum">Перейти до наступного епізода в черзі коли поточний закінчено</string>
   <string name="pref_auto_delete_sum">Видалити епізод після повного відтворення</string>
   <string name="pref_auto_delete_title">Автовидалення</string>
-  <string name="pref_smart_mark_as_played_sum">Позначити епізоди як грані навіть якщо залишилось менш ніж зазначене число секунд до кінця відтворення</string>
+  <string name="pref_smart_mark_as_played_sum">Позначити епізоди як відтворені, навіть якщо залишилось менш ніж зазначене число секунд до кінця відтворення</string>
   <string name="pref_smart_mark_as_played_title">Розумне позначення прослуханих епізодів</string>
-  <string name="pref_skip_keeps_episodes_sum">Зберігати епізоди що пропущені при програванні  </string>
-  <string name="pref_skip_keeps_episodes_title">Зберігати пропущені при програванні епізоди </string>
+  <string name="pref_skip_keeps_episodes_sum">Зберігати пропущені  епізоди при програванні  </string>
+  <string name="pref_skip_keeps_episodes_title">Зберігати пропущені епізоди</string>
   <string name="pref_favorite_keeps_episodes_sum">Зберігати епізоди що помічені як улюблені</string>
   <string name="pref_favorite_keeps_episodes_title">Зберігати улюблені епізоди</string>
   <string name="playback_pref">Відтворення</string>
   <string name="network_pref">Мережа</string>
   <string name="pref_autoUpdateIntervallOrTime_title">Частота оновлень або оновлення в зазначений час</string>
-  <string name="pref_autoUpdateIntervallOrTime_sum">Визначити інтервал часу або визначити час щодня для автооновлення</string>
-  <string name="pref_autoUpdateIntervallOrTime_message">Можливо встановити <i>інтервал</i> як то \"кожні 2 години\", встановити <i>час щодня</i> як то \"7:00\" або <i>відключити</i> автоматичне оновлення взагалі.\n\n<small>Зверніть увагу: Час оновлення не є точним. Можливі короткі затримки.</small></string>
+  <string name="pref_autoUpdateIntervallOrTime_sum">Вкажіть інтервал або певний час доби, щоб оновити канали автоматично</string>
+  <string name="pref_autoUpdateIntervallOrTime_message">Можливо встановити <i>інтервал</i> як то \"кожні 2 години\", встановити <i>час дня</i> як то \"7:00\" або повністю <i>вимкнути</i> автоматичне оновлення.\n\n<small>Зверніть увагу: Часи оновлення не є точними. Можливі короткі затримки.</small></string>
   <string name="pref_autoUpdateIntervallOrTime_Disable">Вимкнути</string>
   <string name="pref_autoUpdateIntervallOrTime_Interval">Інтервал</string>
-  <string name="pref_autoUpdateIntervallOrTime_TimeOfDay">Встановити час щодня</string>
+  <string name="pref_autoUpdateIntervallOrTime_TimeOfDay">Встановити годину</string>
   <string name="pref_autoUpdateIntervallOrTime_every">кожні %1$s</string>
-  <string name="pref_autoUpdateIntervallOrTime_at">на %1$s</string>
+  <string name="pref_autoUpdateIntervallOrTime_at">о %1$s</string>
   <string name="pref_downloadMediaOnWifiOnly_sum">Завантажувати тільки через Wifi</string>
   <string name="pref_followQueue_title">Грати безперервно</string>
   <string name="pref_downloadMediaOnWifiOnly_title">Завантаження через Wifi</string>
-  <string name="pref_pauseOnHeadsetDisconnect_title">Навушники витягнуті</string>
+  <string name="pref_pauseOnHeadsetDisconnect_title">Навушники від\'єднані</string>
   <string name="pref_unpauseOnHeadsetReconnect_title">Повторне під’єднання навушників</string>
   <string name="pref_unpauseOnBluetoothReconnect_title">Повторне під’єднання блютуз</string>
   <string name="pref_mobileUpdate_title">Мобільне оновлення</string>
@@ -325,7 +353,7 @@
   <string name="flattr_settings_label">Налаштування Flattr</string>
   <string name="pref_flattr_auth_title">Увійти до Flattr</string>
   <string name="pref_flattr_auth_sum">Увійти в облікову flattr для підтримки авторів напряму з додатку</string>
-  <string name="pref_flattr_this_app_title">Flattr цій додаток</string>
+  <string name="pref_flattr_this_app_title">Підтримати цей додаток за допомогою Flattr</string>
   <string name="pref_flattr_this_app_sum">Підтримайте розробку AntennaPod за допомогою flattr. Дякую!</string>
   <string name="pref_revokeAccess_title">Відкликати доступ</string>
   <string name="pref_revokeAccess_sum">Відкликати дозвіл на доступ до вашого flattr з цього додатку</string>
@@ -340,20 +368,21 @@
   <string name="pref_nav_drawer_feed_order_title">Встановити порядок підписок</string>
   <string name="pref_nav_drawer_feed_order_sum">Змінити порядок ваших підписок</string>
   <string name="pref_nav_drawer_feed_counter_title">Налаштувати лічильник підписок</string>
-  <string name="pref_nav_drawer_feed_counter_sum">Змінити інформацію яку відображає лічильник підписок</string>
+  <string name="pref_nav_drawer_feed_counter_sum">Змініть інформацію, що відображається лічильником підписки. Також впливає на сортування підписок, якщо для параметра \"Порядок підписок\" встановлено значення \"Лічильник\".</string>
   <string name="pref_set_theme_sum">Змінити вигляд AntennaPod</string>
   <string name="pref_automatic_download_title">Автозавантаження</string>
   <string name="pref_automatic_download_sum">Налаштування автозавантаження епізодів</string>
   <string name="pref_autodl_wifi_filter_title">Увімкнути фільтр Wi-Fi</string>
   <string name="pref_autodl_wifi_filter_sum">Дозволити автозавантаження тільки в цих Wi-Fi мережах</string>
-  <string name="pref_autodl_allow_on_mobile_title">Завантажувати через мобільне з’єднання</string>
-  <string name="pref_autodl_allow_on_mobile_sum">Дозволити автоматичне завантаження через мобільне з’єднання.</string>
+  <string name="pref_autodl_allow_on_mobile_title">Завантажувати через мобільні мережі</string>
+  <string name="pref_autodl_allow_on_mobile_sum">Дозволити автоматичне завантаження через мобільні мережі.</string>
   <string name="pref_automatic_download_on_battery_title">Завантаження без зарядного пристрою</string>
-  <string name="pref_automatic_download_on_battery_sum">Дозволити автозавантаження коли зарядний пристрій не підключено</string>
+  <string name="pref_automatic_download_on_battery_sum">Дозволити автозавантаження коли зарядний пристрій не підключений</string>
   <string name="pref_parallel_downloads_title">Паралельні завантаження</string>
   <string name="pref_episode_cache_title">Кеш епізодів</string>
   <string name="pref_theme_title_light">Світла</string>
   <string name="pref_theme_title_dark">Темна</string>
+  <string name="pref_theme_title_trueblack">Чорна (для AMOLED)</string>
   <string name="pref_episode_cache_unlimited">Без обмежень</string>
   <string name="pref_update_interval_hours_plural">годин</string>
   <string name="pref_update_interval_hours_singular">година</string>
@@ -365,33 +394,33 @@
   <string name="pref_gpodnet_setlogin_information_title">Змінити інформацію для входу</string>
   <string name="pref_gpodnet_setlogin_information_sum">Змінити інформацію щодо облікового запису gpodder.net</string>
   <string name="pref_gpodnet_sync_changes_title">Синхронізувати зміни негайно</string>
-  <string name="pref_gpodnet_sync_changes_sum">Синхронізувати підписки та зміни стана епізодів з gpodder.net</string>
+  <string name="pref_gpodnet_sync_changes_sum">Синхронізувати підписки та зміни стану епізодів з gpodder.net</string>
   <string name="pref_gpodnet_full_sync_title">Виконати повну синхронізацію негайно</string>
   <string name="pref_gpodnet_full_sync_sum">Синхронізувати всі підписки та стан епізодів з gpodder.net.</string>
   <string name="pref_gpodnet_sync_sum_last_sync_line">Остання спроба синхронізації: %1$s (%2$s)</string>
   <string name="pref_gpodnet_sync_started">Cинхронізація почалась</string>
   <string name="pref_gpodnet_full_sync_started">Повну синхронізацію розпочато</string>
-  <string name="pref_gpodnet_login_status"><![CDATA[Ви увійшли як <i>%1$s</i> з пристроя <i>%2$s</i>]]></string>
+  <string name="pref_gpodnet_login_status"><![CDATA[Ви увійшли як <i>%1$s</i> з пристрою <i>%2$s</i>]]></string>
   <string name="pref_gpodnet_notifications_title">Повідомляти про помилки синхронізації</string>
   <string name="pref_gpodnet_notifications_sum">Це налаштування не застосовується до помилок автентифікації.</string>
   <string name="pref_playback_speed_title">Швидкість програвання</string>
   <string name="pref_playback_speed_sum">Налаштування швідкості доступно для змінної швидкості програвання</string>
-  <string name="pref_fast_forward">Час пропуска кнопкой перемотки вперед</string>
-  <string name="pref_fast_forward_sum">Налаштувати кількість секунд які пропускаються при натисканні кнопки перемотки вперед</string>
-  <string name="pref_rewind">Час пропуска кнопкой перемотки назад</string>
-  <string name="pref_rewind_sum">Налаштувати кількість секунд які відмотуються при натисканні кнопки перемотки назад</string>
+  <string name="pref_fast_forward">Час, що пропускається кнопкою перемотки вперед</string>
+  <string name="pref_fast_forward_sum">Налаштувати кількість секунд, які пропускаються при натисканні кнопки перемотки вперед</string>
+  <string name="pref_rewind">Час, що пропускається кнопкою відмотки назад</string>
+  <string name="pref_rewind_sum">Налаштувати кількість секунд які відмотуються при натисканні кнопки відмотки назад</string>
   <string name="pref_gpodnet_sethostname_title">Встановити ім\'я хоста</string>
   <string name="pref_gpodnet_sethostname_use_default_host">Використати хост по замовчанню</string>
-  <string name="pref_expandNotify_title">Розгорнути повідомлення</string>
-  <string name="pref_expandNotify_sum">Завжди розгортати повідомлення, щоб показати кнопки керування.</string>
+  <string name="pref_expandNotify_title">Високий пріоритет сповіщення</string>
+  <string name="pref_expandNotify_sum">Зазвичай це розширює сповіщення, щоб показати кнопки відтворення.</string>
   <string name="pref_persistNotify_title">Завжди показувати елементи керування відтворенням</string>
   <string name="pref_persistNotify_sum">Показувати повідомлення та елементи керування на екрані блокування в режимі паузи.</string>
   <string name="pref_compact_notification_buttons_title">Налаштувати кнопки на екрані блокування</string>
   <string name="pref_compact_notification_buttons_sum">Змінити кнопки на екрані блокування. Кнопки програвання/пауза завжди включені.</string>
   <string name="pref_compact_notification_buttons_dialog_title">Оберіть не більше ніж %1$d кнопок</string>
   <string name="pref_compact_notification_buttons_dialog_error">Ви можете обрати не більше ніж %1$d кнопок.</string>
-  <string name="pref_lockscreen_background_title">Змінювати фон екрана блокування</string>
-  <string name="pref_lockscreen_background_sum">Встановити картинку поточного епізода як фон екрана блокування. Побічний ефект - це зображення буде також видно в інших додатках.</string>
+  <string name="pref_lockscreen_background_title">Встановити фон екрана блокування</string>
+  <string name="pref_lockscreen_background_sum">Встановити картинку поточного епізоду як фон екрана блокування. Побічний ефект - це зображення також буде видимим в інших додатках.</string>
   <string name="pref_showDownloadReport_title">Показати звіт про завантаження</string>
   <string name="pref_showDownloadReport_sum">У разі помилки при завантаженні створити детальний звіт про помилку.</string>
   <string name="pref_expand_notify_unsupport_toast">Android до версії 4.1 не підтримує розширені повідомлення.</string>
@@ -404,8 +433,7 @@
   <string name="crash_report_sum">Надіслати е-пошту зі звітом про останній збій</string>
   <string name="send_email">Надіслати е-пошту</string>
   <string name="experimental_pref">Експериментальні</string>
-  <string name="pref_sonic_title">Sonic Media Player</string>
-  <string name="pref_sonic_message">Застосувати вбудований програвач sonic замість програвача Android та Prestissimo</string>
+  <string name="pref_media_player_message">Оберіть медіа плеєр для програвання файлів</string>
   <string name="pref_current_value">Поточне значення: %1$s</string>
   <string name="pref_proxy_title">Проксі</string>
   <string name="pref_proxy_sum">Застосувати проксі сервер</string>
@@ -417,6 +445,22 @@
   <string name="pref_cast_message_free_flavor">Для підтримки Chromecast потрібні бібліотеки які не включені в цю версію AntennaPod</string>
   <string name="pref_enqueue_downloaded_title">Додати завантаження до черги</string>
   <string name="pref_enqueue_downloaded_summary">Додавати завантажені епізоди до черги</string>
+  <string name="media_player_builtin">Стандартний плеєр Android</string>
+  <string name="pref_videoBehavior_title"> При виході з відеорежиму</string>
+  <string name="pref_videoBehavior_sum">Поведінка при виході з відео</string>
+  <string name="stop_playback">Зупинити програвання</string>
+  <string name="continue_playback">Продовжити відтворення аудіо</string>
+  <string name="behavior">Поведінка</string>
+  <string name="pref_back_button_behavior_title">Поведінка кнопки \"Назад\"</string>
+  <string name="pref_back_button_behavior_sum">Зміна поведінки кнопки \"Назад\".</string>
+  <string name="back_button_default">За замовчуванням</string>
+  <string name="back_button_open_drawer">Відкрити меню навігації</string>
+  <string name="back_button_double_tap">Натисніть двічі, щоб вийти</string>
+  <string name="back_button_show_prompt">Підтвердіть вихід</string>
+  <string name="close_prompt">Дійсно закрити AntennaPod?</string>
+  <string name="double_tap_toast">Натисніть кнопку назад ще раз, щоб вийти</string>
+  <string name="back_button_go_to_page">Перейти на сторінку…</string>
+  <string name="back_button_go_to_page_title">Вибрати сторінку</string>
   <!--Auto-Flattr dialog-->
   <string name="auto_flattr_enable">Включити автоматичне заохочення авторів через сервіс flattr</string>
   <string name="auto_flattr_after_percent">Заохотити автора через Flattr щойно %d відсотків епізода було відтворено</string>
@@ -427,7 +471,7 @@
   <string name="found_in_shownotes_label">Знайдено в нотатках епізода</string>
   <string name="found_in_chapters_label">Знайдено в главах</string>
   <string name="found_in_authors_label">Знайдено в авторах</string>
-  <string name="found_in_feeds_label">Знайдено в каналах</string>
+  <string name="found_in_feeds_label">Знайдено в подкасті</string>
   <string name="search_status_no_results">Жодних результатів немає</string>
   <string name="search_label">Пошук</string>
   <string name="found_in_title_label">Знайдено у назві</string>
@@ -435,15 +479,15 @@
   <!--OPML import and export-->
   <string name="opml_import_txtv_button_lable">OPML файли дозволяют вам перенести подкасти з однієї программи до іншої</string>
   <string name="opml_import_option">Варіант %1$d</string>
-  <string name="opml_import_explanation_1">Виберіть локальну папку.</string>
+  <string name="opml_import_explanation_1">Виберіть шлях до файлу з локальної файлової системи.</string>
   <string name="opml_import_explanation_2">Вибрати OPML файл за допомогою таких додатків як Dropbox, Google Drive або файловий менеджер.</string>
-  <string name="opml_import_explanation_3">Багато додатків таких як Google Mail, Dropbox, Google Drive та більшість файлових менеджерів здатні <i>відкрити</i> OPML файли <i>для</i> AntennaPod.</string>
+  <string name="opml_import_explanation_3">Багато додатків, таких як Google Mail, Dropbox, Google Drive та більшість файлових менеджерів, здатні <i>відкривати</i> OPML файли <i>за допомогою</i> AntennaPod.</string>
   <string name="start_import_label">Почати імпорт</string>
-  <string name="opml_import_label">OPML імпорт</string>
+  <string name="opml_import_label">Імпорт OPML</string>
   <string name="opml_directory_error">Помилка!</string>
   <string name="reading_opml_label">Читаємо OPML файл</string>
   <string name="opml_reader_error">Помилка при читанні документа OPML:</string>
-  <string name="opml_import_error_no_file">Жодного файла не обрано!</string>
+  <string name="opml_import_error_no_file">Жодного файлу не обрано!</string>
   <string name="select_all_label">Обрати все</string>
   <string name="deselect_all_label">Убрати виділення</string>
   <string name="select_options_label">Обрати…</string>
@@ -453,9 +497,9 @@
   <string name="html_export_label">Експорт до HTML</string>
   <string name="exporting_label">Експортується…</string>
   <string name="export_error_label">Помилка експорту</string>
-  <string name="opml_export_success_title">OPML експорт успішний</string>
-  <string name="opml_export_success_sum">OPML файл записаний в:\u0020</string>
-  <string name="opml_import_ask_read_permission">Щоб прочитати файл OPML потрібен доступ до зовнішньої пам’яти</string>
+  <string name="export_success_title">Успішний експорт</string>
+  <string name="export_success_sum">Файл було записано в:\n\n%1$s</string>
+  <string name="opml_import_ask_read_permission">Щоб прочитати файл OPML потрібен доступ до зовнішнього носія</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">Таймер сну</string>
   <string name="disable_sleeptimer_label">Вимкнути засинання</string>
@@ -472,16 +516,19 @@
   <plurals name="time_seconds_quantified">
     <item quantity="one">1 секунда</item>
     <item quantity="few">%d секунди</item>
+    <item quantity="many">%d секунд</item>
     <item quantity="other">%d секунд</item>
   </plurals>
   <plurals name="time_minutes_quantified">
     <item quantity="one">1 хвилина</item>
     <item quantity="few">%d хвилини</item>
+    <item quantity="many">%d хвилин</item>
     <item quantity="other">%d хвилин</item>
   </plurals>
   <plurals name="time_hours_quantified">
     <item quantity="one">1 година</item>
     <item quantity="few">%d години</item>
+    <item quantity="many">%d годин</item>
     <item quantity="other">%d годин</item>
   </plurals>
   <string name="auto_enable_label">Увімкнути автоматично</string>
@@ -522,7 +569,7 @@
   <string name="selected_folder_label">Обрати папку:</string>
   <string name="create_folder_label">Нова папка</string>
   <string name="choose_data_directory">Обрати папку</string>
-  <string name="choose_data_directory_message">Оберіть, будь ласка, базовий каталог для даних. AntennaPod створить відповідні підрозділи. </string>
+  <string name="choose_data_directory_message">Оберіть, будь ласка, базовий каталог даних. AntennaPod створить відповідні підрозділи.</string>
   <string name="choose_data_directory_permission_rationale">Для зміни папки зберігання даних потрібен доступ до зовнішнього носія</string>
   <string name="create_folder_msg">Створити папку з ім\'ям \"%1$s\"?</string>
   <string name="create_folder_success">Створена нова папка</string>
@@ -537,8 +584,8 @@
   <string name="set_to_default_folder">Обрати папку по замовчанню</string>
   <string name="pref_pausePlaybackForFocusLoss_sum">Призупиняти програвання замість зниження гучності коли інша програма хоче програти звук</string>
   <string name="pref_pausePlaybackForFocusLoss_title">Пауза в разі переривання</string>
-  <string name="pref_resumeAfterCall_sum">Відновити відтворення після закінчення дзвінка</string>
-  <string name="pref_resumeAfterCall_title">Відновити після дзвінка</string>
+  <string name="pref_resumeAfterCall_sum">Поновити відтворення після закінчення дзвінка</string>
+  <string name="pref_resumeAfterCall_title">Поновити після дзвінка</string>
   <string name="pref_restart_required">Для застосування змін потрібно перезапустити AntennaPod</string>
   <!--Online feed view-->
   <string name="subscribe_label">Підписатися</string>
@@ -559,10 +606,10 @@
   <string name="authentication_descr">Змінити ваші логін та пароль для подкаста та епізодів</string>
   <string name="auto_download_settings_label">Налаштування автозавантаження</string>
   <string name="episode_filters_label">Фільтр епізодів</string>
-  <string name="episode_filters_description">Перелік термінів що використовуються для вирішення чи завантажувати епізод автоматично</string>
+  <string name="episode_filters_description">Перелік термінів, що використовуються для вирішення чи слід завантажувати епізод автоматично</string>
   <string name="episode_filters_include">Включити</string>
-  <string name="episode_filters_exclude">Вилучити</string>
-  <string name="episode_filters_hint">Окремі слова \n\"Слова Разом\"</string>
+  <string name="episode_filters_exclude">Виключити</string>
+  <string name="episode_filters_hint">Окремі слова \n\"Кілька слів\"</string>
   <string name="keep_updated">Підтримувати оновленим</string>
   <!--Progress information-->
   <string name="progress_upgrading_database">Оновлення бази даних</string>
@@ -575,11 +622,11 @@
   <string name="all_label">Всі</string>
   <string name="selected_all_label">Обрано всі епізоди</string>
   <string name="none_label">Жодного</string>
-  <string name="deselected_all_label">Жодного епізода обрано</string>
-  <string name="played_label">Переглянуті</string>
-  <string name="selected_played_label">Обрано переглянуті епізоди</string>
-  <string name="unplayed_label">Непереглянуті</string>
-  <string name="selected_unplayed_label">Обрано непереглянуті епізоди</string>
+  <string name="deselected_all_label">Жодного епізода не обрано</string>
+  <string name="played_label">Відтворені</string>
+  <string name="selected_played_label">Обрано відтворені епізоди</string>
+  <string name="unplayed_label">Невідтворені</string>
+  <string name="selected_unplayed_label">Обрано невідтворені епізоди</string>
   <string name="downloaded_label">Завантажені</string>
   <string name="selected_downloaded_label">Обрано завантажені епізоди</string>
   <string name="not_downloaded_label">Незавантажені</string>
@@ -588,8 +635,8 @@
   <string name="selected_queued_label">Обрано епізоди що в черзі</string>
   <string name="not_queued_label">Не в черзі</string>
   <string name="selected_not_queued_label">Обрано епізоди що не в черзі</string>
-  <string name="has_media">Із звуком або відео</string>
-  <string name="selected_has_media_label">Обрано епізоди із звуком або відео</string>
+  <string name="has_media">Зі звуком або відео</string>
+  <string name="selected_has_media_label">Обрано епізоди зі звуком або відео</string>
   <!--Sort-->
   <string name="sort_title_a_z">Назва (А \u2192 Я)</string>
   <string name="sort_title_z_a">Назва (Я \u2192 А)</string>
@@ -598,7 +645,7 @@
   <string name="sort_duration_short_long">Тривалість (Короткі \u2192 Довгі)</string>
   <string name="sort_duration_long_short">Тривалість (Довгі \u2192 Короткі)</string>
   <!--Rating dialog-->
-  <string name="rating_title">Оцінити AntennaPod?</string>
+  <string name="rating_title">Подобається AntennaPod?</string>
   <string name="rating_message">Ми будемо вдячні якщо ви поставите свою оцінку AntennaPod.</string>
   <string name="rating_never_label">Не зараз</string>
   <string name="rating_later_label">Нагадати згодом</string>
@@ -623,10 +670,18 @@
   <string name="proxy_test_failed">Протестовано з помилками</string>
   <string name="proxy_host_empty_error">Хост не може бути пустим</string>
   <string name="proxy_host_invalid_error">Хост не є правильною IP-адресою або доменним ім’ям</string>
-  <string name="proxy_port_invalid_error">Неправильний порт</string>
+  <string name="proxy_port_invalid_error">Порт недійсний</string>
+  <!--Database import/export-->
+  <string name="import_export">Імпортувати/Експортувати базу данних</string>
+  <string name="import_export_warning">Ця експериментальна функція використовується для перенесення ваших підписок та вже прослуханих епізодів до іншого пристрою.\n\nЕкспортована база даних може бути імпортована тією ж самою версією AntennaPod. Інакше, результат може бути непередбаченим.\n\nПісля імпортування, епізоди можуть відображатися як завантажені, навіть якщо вони такими не є.  Просто натисніть кнопку відтворення епізодів, щоб AntennaPod виявив це.</string>
+  <string name="label_import">Імпортувати</string>
+  <string name="label_export">Експортувати</string>
+  <string name="import_select_file">Обрати файл для імпорту</string>
+  <string name="export_ok">Успішний експорт</string>
+  <string name="import_ok">Імпорт пройшов успішно.\n\nБудь ласка, натисніть ОК щоб перезапустити AntennaPod</string>
   <!--Casting-->
   <string name="cast_media_route_menu_title">Грати на…</string>
-  <string name="cast_disconnect_label">Від’єднатись від пристроя програвання</string>
+  <string name="cast_disconnect_label">Від’єднатись від пристрою програвання</string>
   <string name="cast_not_castable">Обраний файл не сумісний з пристроєм програвання</string>
   <string name="cast_failed_to_play">Помилка програвання файла</string>
   <string name="cast_failed_to_stop">Помилка спроби зупинки програвання</string>
@@ -634,10 +689,19 @@
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
   <string name="cast_failed_setting_volume">Помилка встановлення гучності</string>
   <string name="cast_failed_no_connection">Немає з’єднання з пристроєм програвання</string>
-  <string name="cast_failed_no_connection_trans">Зв’язок з пристроєм програвання втрачено. Програма намагається поновити зв’язок, якщо це можливо. Будь ласка зачекайте кілька секунд і спробуйте знов.</string>
+  <string name="cast_failed_no_connection_trans">Зв’язок з пристроєм програвання втрачено. Програма намагається поновити з\'єднання, якщо це можливо. Будь ласка зачекайте кілька секунд і спробуйте знов.</string>
   <string name="cast_failed_perform_action">Помилка виконання дії</string>
   <string name="cast_failed_status_request">Помилка синхронизації з пристроєм програвання</string>
   <string name="cast_failed_seek">Помилка перехода на нову позицію програвання на пристрої.</string>
   <string name="cast_failed_receiver_player_error">Серйозна помилка програвання на пристрої</string>
   <string name="cast_failed_media_error_skipping">Помилка програвання файла. Пропускаю...</string>
+  <!--Notification channels-->
+  <string name="notification_channel_user_action">Потрібна дія</string>
+  <string name="notification_channel_user_action_description">Відображається, якщо потрібна ваша дія, наприклад, якщо потрібно ввести пароль.</string>
+  <string name="notification_channel_downloading">Завантаження</string>
+  <string name="notification_channel_downloading_description">Показується під час завантаження.</string>
+  <string name="notification_channel_playing">Програється зараз</string>
+  <string name="notification_channel_playing_description">Дозволяє керувати відтворенням. Це основне сповіщення, яке ви бачите під час відтворення подкасту.</string>
+  <string name="notification_channel_error">Помилки</string>
+  <string name="notification_channel_error_description">Відображається, якщо щось пішло не так, наприклад, якщо не вдалося завантажити або синхронізувати з gpodder.</string>
 </resources>
diff --git a/core/src/main/res/values-v21/styles.xml b/core/src/main/res/values-v21/styles.xml
index 503337c95..c53000c4f 100644
--- a/core/src/main/res/values-v21/styles.xml
+++ b/core/src/main/res/values-v21/styles.xml
@@ -6,6 +6,19 @@
     <style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark">
         <item name="android:windowContentTransitions">true</item>
     </style>
+    <style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack">
+        <item name="android:windowContentTransitions">true</item>
+        <item name="android:navigationBarColor">@color/black</item>
+        <item name="android:colorAccent">@color/white</item>
+        <item name="android:colorPrimary">@color/black</item>
+        <item name="android:colorPrimaryDark">@color/black</item>
+    </style>
+    <style name="Theme.AntennaPod.TrueBlack.NoTitle" parent="Theme.Base.AntennaPod.TrueBlack.NoTitle">
+        <item name="android:navigationBarColor">@color/black</item>
+        <item name="android:colorAccent">@color/white</item>
+        <item name="android:colorPrimary">@color/black</item>
+        <item name="android:colorPrimaryDark">@color/black</item>
+    </style>
 
     <style name="Widget.AntennaPod.Button" parent="Widget.AppCompat.Button">
         <item name="textAllCaps">true</item>
diff --git a/core/src/main/res/values-v23/styles.xml b/core/src/main/res/values-v23/styles.xml
new file mode 100644
index 000000000..5cd274e68
--- /dev/null
+++ b/core/src/main/res/values-v23/styles.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.AntennaPod.Light.NoTitle" parent="Theme.Base.AntennaPod.Light.NoTitle">
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="colorPrimaryDark">@color/primary_light</item>
+    </style>
+
+    <style name="Theme.AntennaPod.Light" parent="Theme.Base.AntennaPod.Light">
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="colorPrimaryDark">@color/primary_light</item>
+    </style>
+</resources>
diff --git a/core/src/main/res/values-vi-rVN/strings.xml b/core/src/main/res/values-vi-rVN/strings.xml
index acf3abe75..2d9481b84 100644
--- a/core/src/main/res/values-vi-rVN/strings.xml
+++ b/core/src/main/res/values-vi-rVN/strings.xml
@@ -36,4 +36,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-vi/strings.xml b/core/src/main/res/values-vi/strings.xml
index 00ed733d1..0982d2b14 100644
--- a/core/src/main/res/values-vi/strings.xml
+++ b/core/src/main/res/values-vi/strings.xml
@@ -48,7 +48,6 @@
   <string name="yes">Có</string>
   <string name="no">Không</string>
   <string name="reset">Đặt lại</string>
-  <string name="author_label">Tác giả</string>
   <string name="language_label">Ngôn ngữ</string>
   <string name="url_label">Liên kết</string>
   <string name="podcast_settings_label">Thiết lập</string>
@@ -93,20 +92,11 @@
   <string name="mark_all_read_msg">Đánh dấu đã nghe tất cả các tập</string>
   <string name="mark_all_read_confirmation_msg">Hãy xác nhận bạn muốn đánh dấu đã nghe tất cả các tập.</string>
   <string name="mark_all_seen_label">Đánh dấu đã xem tất cả</string>
-  <string name="mark_all_seen_msg">Đánh dấu đã xem tất cả các tập</string>
   <string name="mark_all_seen_confirmation_msg">Hãy xác nhận bạn muốn đánh dấu đã xem tất cả các tập.</string>
   <string name="show_info_label">Hiện thông tin</string>
-  <string name="rename_feed_label">Đổi tên podcast</string>
-  <string name="remove_feed_label">Xoá podcast</string>
   <string name="share_label">Chia sẻ…</string>
-  <string name="share_link_label">Chia sẻ liên kết</string>
-  <string name="share_link_with_position_label">Chia sẻ liên kết cùng vị trí phát</string>
   <string name="share_feed_url_label">Chia sẻ liên kết feed</string>
-  <string name="share_item_url_label">Chia sẻ liên kết của tập này</string>
-  <string name="share_item_url_with_position_label">Chia sẻ liên kết và vị trí phát tập này</string>
-  <string name="feed_remover_msg">Đang xoá feed</string>
   <string name="hide_episodes_title">Ẩn các tập</string>
-  <string name="episode_actions">Áp dụng hành động</string>
   <string name="hide_unplayed_episodes_label">Chưa nghe</string>
   <string name="hide_paused_episodes_label">Đang tạm dừng</string>
   <string name="hide_played_episodes_label">Đã nghe</string>
@@ -204,7 +194,6 @@
   <string name="date">Ngày</string>
   <string name="duration">Thời lượng</string>
   <string name="episode_title">Tiêu đề tập</string>
-  <string name="feed_title">Tiêu đề feed</string>
   <string name="ascending">Tăng dần</string>
   <string name="descending">Giảm dần</string>
   <!--Flattr-->
@@ -233,7 +222,6 @@
   <string name="pref_pauseOnDisconnect_sum">Tạm dừng khi tai nghe hoặc thiết bị Bluetooth bị ngắt kết nối</string>
   <string name="pref_unpauseOnHeadsetReconnect_sum">Tiếp tục phát khi tai nghe được kết nối lại</string>
   <string name="pref_unpauseOnBluetoothReconnect_sum">Tiếp tục phát khi thiết bị Bluetooth được kết nối lại</string>
-  <string name="pref_hardwareForwardButtonSkips_sum">Khi ấn nút tua nhanh (nút cứng), không tua mà chuyến sang tập tiếp theo</string>
   <string name="pref_hardwarePreviousButtonRestarts_title">Nghe lại khi ấn nút tua lại</string>
   <string name="pref_hardwarePreviousButtonRestarts_sum">Khi ấn nút tua lại (nút cứng), không tua lại mà phát lại tập đang nghe</string>
   <string name="pref_followQueue_sum">Chuyển đến mục đợi phát tiếp theo khi nghe xong</string>
@@ -309,4 +297,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-zh-rCN/strings.xml b/core/src/main/res/values-zh-rCN/strings.xml
index 3eda888f9..02e78171c 100644
--- a/core/src/main/res/values-zh-rCN/strings.xml
+++ b/core/src/main/res/values-zh-rCN/strings.xml
@@ -18,17 +18,19 @@
   <string name="cancel_download_label">取消下载</string>
   <string name="playback_history_label">播放历史</string>
   <string name="gpodnet_main_label">gpodder.net</string>
+  <string name="gpodnet_summary">与其他设备同步</string>
   <string name="gpodnet_auth_label">gpodder.net 登录</string>
-  <string name="free_space_label">%1$s可用</string>
+  <string name="free_space_label">%1$s 可用</string>
   <string name="episode_cache_full_title">曲目缓存已满</string>
   <string name="episode_cache_full_message">已达到曲目缓存限制，可以在设置中提高缓存大小。</string>
+  <string name="synchronizing">正在同步…</string>
   <!--Statistics fragment-->
   <string name="total_time_listened_to_podcasts">总播放时长：</string>
-  <string name="statistics_details_dialog">%1$d out of %2$d episodes started.\n\nPlayed %3$s out of %4$s.</string>
+  <string name="statistics_details_dialog">听过了总计 %2$d 期播客中的 %1$d 期。\n\n播放了总计 %4$s 中的 %3$s。</string>
   <string name="statistics_mode">统计模式</string>
-  <string name="statistics_mode_normal">计算实际播放时长。播放两次的情况被正确识别为两次，但是被标记为未播放状态的都没有被正确识别收听次数。</string>
-  <string name="statistics_mode_count_all">统计所有带有已播放播客标记的数量</string>
-  <string name="statistics_speed_not_counted">注意：回放速度不在考虑范围之内。</string>
+  <string name="statistics_mode_normal">计算实际上的播放次数与时长。播放过两次则将被识别为两次，但是被手动标记为已播放状态的不算。</string>
+  <string name="statistics_mode_count_all">统计播放次数时仅统计所有带有已播放播客标记的数量</string>
+  <string name="statistics_speed_not_counted">注意：播放速度不在考虑范围之内。</string>
   <!--Main activity-->
   <string name="drawer_open">打开菜单</string>
   <string name="drawer_close">关闭菜单</string>
@@ -63,10 +65,11 @@
   <string name="cover_label">图片</string>
   <string name="error_label">错误</string>
   <string name="error_msg_prefix">出错:</string>
+  <string name="needs_storage_permission">此操作需要存储权限。</string>
   <string name="refresh_label">刷新</string>
   <string name="external_storage_error_msg">没有可用的外部存储. 请确保安装外部存储器, 这样本应用才可以正常工作.</string>
   <string name="chapters_label">章节</string>
-  <string name="chapter_duration">时长： %1$s</string>
+  <string name="chapter_duration">时长：%1$s</string>
   <string name="shownotes_label">笔记</string>
   <string name="description_label">描述</string>
   <string name="most_recent_prefix">最近曲目:\u0020</string>
@@ -74,13 +77,13 @@
   <string name="length_prefix">长度:\u0020</string>
   <string name="size_prefix">大小:\u0020</string>
   <string name="processing_label">处理中</string>
-  <string name="loading_label">正在加载</string>
+  <string name="loading_label">正在加载…</string>
   <string name="save_username_password_label">保存用户名密码</string>
   <string name="close_label">关闭</string>
   <string name="retry_label">重试</string>
   <string name="auto_download_label">包含到自动下载</string>
   <string name="auto_download_apply_to_items_title"> 应用到之前的曲目中</string>
-  <string name="auto_download_apply_to_items_message">新的 <i>自动下载</i> 的设定将会自动应用到新曲目中。\n你想应用到之前的曲目吗？</string>
+  <string name="auto_download_apply_to_items_message">新的 <i>自动下载</i> 设置将会自动应用到新的节目上。\n你想应用到之前的节目吗？</string>
   <string name="auto_delete_label">自动删除剧集</string>
   <string name="parallel_downloads_suffix">\u0020 并行下载</string>
   <string name="feed_auto_download_global">全局默认</string>
@@ -104,25 +107,13 @@
   <string name="mark_all_read_label">全部标识已读</string>
   <string name="mark_all_read_msg">将所有曲目标记为已播放</string>
   <string name="mark_all_read_confirmation_msg">请确认您要将所有曲目标为已播放</string>
-  <string name="mark_all_read_feed_confirmation_msg">请确认您要将该订阅下的所有曲目标为已播放</string>
   <string name="mark_all_seen_label">所有可见</string>
-  <string name="mark_all_seen_msg">将所有曲目标记为已读</string>
   <string name="mark_all_seen_confirmation_msg">请确认您要将所有曲目标记为已读。</string>
   <string name="show_info_label">查看信息</string>
-  <string name="rename_feed_label">重命名播客</string>
-  <string name="remove_feed_label">删除播客</string>
   <string name="share_label">分享</string>
-  <string name="share_link_label">分享网站链接</string>
   <string name="share_file_label">分享文件</string>
-  <string name="share_link_with_position_label">分享网站链接与位置</string>
   <string name="share_feed_url_label">分享订阅地址</string>
-  <string name="share_item_url_label">分享剧集文件URL</string>
-  <string name="share_item_url_with_position_label">分享剧集文件URL及其状态</string>
-  <string name="feed_delete_confirmation_msg">请确认您要删除订阅 \"%1$s\" 包括 所有 此订阅中的已下载曲目。</string>
-  <string name="feed_remover_msg">删除订阅</string>
-  <string name="load_complete_feed">刷新全部订阅</string>
   <string name="hide_episodes_title">隐藏曲目</string>
-  <string name="episode_actions">启用</string>
   <string name="hide_unplayed_episodes_label">未播放</string>
   <string name="hide_paused_episodes_label">已暂停</string>
   <string name="hide_played_episodes_label">已播放</string>
@@ -231,7 +222,6 @@
   <string name="date">按日期</string>
   <string name="duration">按时长</string>
   <string name="episode_title">剧集标题</string>
-  <string name="feed_title">订阅标题</string>
   <string name="ascending">升序</string>
   <string name="descending">降序</string>
   <string name="clear_queue_confirmation_msg">请确认您要清除队列中的全部曲目</string>
@@ -268,7 +258,6 @@
   <string name="enable_sonic">允许声音</string>
   <!--Empty list labels-->
   <string name="no_items_label">列表为空.</string>
-  <string name="no_feeds_label">还没有任何订阅.</string>
   <string name="no_chapters_label">此曲目没有章节信息</string>
   <string name="no_shownotes_label">本集不包含展示信息</string>
   <!--Preferences-->
@@ -277,7 +266,6 @@
   <string name="other_pref">其他</string>
   <string name="about_pref">关于</string>
   <string name="queue_label">播放列表</string>
-  <string name="services_label">服务</string>
   <string name="flattr_label">Flattr</string>
   <string name="pref_episode_cleanup_title">清理曲目</string>
   <string name="pref_pauseOnDisconnect_sum">暂停播放曲目当耳机或蓝牙重新连接</string>
@@ -326,7 +314,6 @@
   <string name="pref_nav_drawer_feed_order_title">设置订阅的排序方式</string>
   <string name="pref_nav_drawer_feed_order_sum">改变你的订阅的排序方式</string>
   <string name="pref_nav_drawer_feed_counter_title">设定订阅数</string>
-  <string name="pref_nav_drawer_feed_counter_sum">改变订阅数所代表的信息</string>
   <string name="pref_set_theme_sum">改变 AntennaPod 外观</string>
   <string name="pref_automatic_download_title">自动下载</string>
   <string name="pref_automatic_download_sum">配置自动下载的曲目</string>
@@ -362,8 +349,6 @@
   <string name="pref_rewind_sum">自定义每次倒回节目的秒数</string>
   <string name="pref_gpodnet_sethostname_title">设置主机名</string>
   <string name="pref_gpodnet_sethostname_use_default_host">使用默认主机</string>
-  <string name="pref_expandNotify_title">扩展通知</string>
-  <string name="pref_expandNotify_sum">总是扩展通知以显示播放按钮</string>
   <string name="pref_persistNotify_title">保持播放控制</string>
   <string name="pref_persistNotify_sum">在暂停时保持通知和锁屏界面的控制。</string>
   <string name="pref_compact_notification_buttons_title">设置锁屏按钮</string>
@@ -384,8 +369,6 @@
   <string name="crash_report_sum">通过 E-mail 发送最后崩溃报告</string>
   <string name="send_email">发送 E-mail</string>
   <string name="experimental_pref">实验性</string>
-  <string name="pref_sonic_title">音频媒体播放器</string>
-  <string name="pref_sonic_message">使用内置音频媒体播放器代替 Android 原生媒体播放器</string>
   <string name="pref_current_value">当前值：%1$s</string>
   <string name="pref_proxy_title">代理</string>
   <string name="pref_proxy_sum">选择一个网络代理</string>
@@ -404,7 +387,6 @@
   <!--Search-->
   <string name="search_hint">查找节目</string>
   <string name="found_in_chapters_label">章节中查找</string>
-  <string name="found_in_feeds_label">Feeds 中查找</string>
   <string name="search_status_no_results">没有找到任何结果</string>
   <string name="search_label">搜索</string>
   <string name="found_in_title_label">标题中查找</string>
@@ -430,8 +412,6 @@
   <string name="html_export_label">导出为 HTML 文件</string>
   <string name="exporting_label">正在导出</string>
   <string name="export_error_label">导出出错</string>
-  <string name="opml_export_success_title">OPML 导出成功.</string>
-  <string name="opml_export_success_sum">.opml 文件已保存到:\u0020</string>
   <string name="opml_import_ask_read_permission">读取 OPML 文件需要访问外部存储的权限</string>
   <!--Sleep timer-->
   <string name="set_sleeptimer_label">设置休眠计时器</string>
@@ -598,4 +578,5 @@
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
   <string name="cast_failed_setting_volume">音量设置失败</string>
   <string name="cast_failed_media_error_skipping">媒体播放出错.跳转中...</string>
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-zh-rHK/strings.xml b/core/src/main/res/values-zh-rHK/strings.xml
index acf3abe75..2d9481b84 100644
--- a/core/src/main/res/values-zh-rHK/strings.xml
+++ b/core/src/main/res/values-zh-rHK/strings.xml
@@ -36,4 +36,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values-zh-rTW/strings.xml b/core/src/main/res/values-zh-rTW/strings.xml
index 87f749c37..f00904eda 100644
--- a/core/src/main/res/values-zh-rTW/strings.xml
+++ b/core/src/main/res/values-zh-rTW/strings.xml
@@ -56,7 +56,6 @@
   <string name="yes">是</string>
   <string name="no">否</string>
   <string name="reset">重置</string>
-  <string name="author_label">作者</string>
   <string name="language_label">語言</string>
   <string name="url_label">鏈接</string>
   <string name="podcast_settings_label">設置</string>
@@ -104,25 +103,13 @@
   <string name="mark_all_read_label">全部標記為已播放</string>
   <string name="mark_all_read_msg">全部劇集標記為已播放</string>
   <string name="mark_all_read_confirmation_msg">請確認你要將所有劇集標記為已播放。</string>
-  <string name="mark_all_read_feed_confirmation_msg">請確認你要將此播放源的所有劇集標記為已播放。</string>
   <string name="mark_all_seen_label">標記為已讀</string>
-  <string name="mark_all_seen_msg">全部劇集標記為已讀</string>
   <string name="mark_all_seen_confirmation_msg">請確認你要將所有劇集標記為已讀。</string>
   <string name="show_info_label">顯示資料</string>
-  <string name="rename_feed_label">重命名播客</string>
-  <string name="remove_feed_label">移除播客</string>
   <string name="share_label">分享</string>
-  <string name="share_link_label">分享鏈接</string>
   <string name="share_file_label">分享文件</string>
-  <string name="share_link_with_position_label">分享鏈接與位置</string>
   <string name="share_feed_url_label">分享播客源鏈接</string>
-  <string name="share_item_url_label">分享劇集文件鏈接</string>
-  <string name="share_item_url_with_position_label">分享劇集文件鏈接和位置</string>
-  <string name="feed_delete_confirmation_msg">請確認您即將刪除播客源\"%1$s\" 和它所有的劇集。</string>
-  <string name="feed_remover_msg">移除播客源</string>
-  <string name="load_complete_feed">刷新完成播客源</string>
   <string name="hide_episodes_title">隱藏劇集</string>
-  <string name="episode_actions">應用</string>
   <string name="hide_unplayed_episodes_label">未播放</string>
   <string name="hide_paused_episodes_label">暫停</string>
   <string name="hide_played_episodes_label">已播放</string>
@@ -232,7 +219,6 @@
   <string name="date">日期</string>
   <string name="duration">時長</string>
   <string name="episode_title">劇集標題</string>
-  <string name="feed_title">源標題</string>
   <string name="ascending">升序</string>
   <string name="descending">降序</string>
   <string name="clear_queue_confirmation_msg">請確認您要清除隊列以及其中所有的劇集</string>
@@ -270,7 +256,6 @@
   <string name="enable_sonic">啟用Sonic</string>
   <!--Empty list labels-->
   <string name="no_items_label">列表裡沒有項目。</string>
-  <string name="no_feeds_label">您還未訂閱任何源。</string>
   <string name="no_chapters_label">本劇集沒有章節。</string>
   <string name="no_shownotes_label">本劇集沒有筆記。</string>
   <!--Preferences-->
@@ -279,7 +264,6 @@
   <string name="other_pref">其他</string>
   <string name="about_pref">關於</string>
   <string name="queue_label">隊列</string>
-  <string name="services_label">服務</string>
   <string name="flattr_label">Flattr</string>
   <string name="pref_episode_cleanup_title">劇集清理</string>
   <string name="pref_episode_cleanup_summary">如果自動下載需要空間用於新的劇集，則不在隊列中並且不是最愛的劇集將被移除。</string>
@@ -287,7 +271,6 @@
   <string name="pref_unpauseOnHeadsetReconnect_sum">當耳機再次連接時繼續播放</string>
   <string name="pref_unpauseOnBluetoothReconnect_sum">當藍牙再次連接時繼續播放</string>
   <string name="pref_hardwareForwardButtonSkips_title">快進按鈕跳過</string>
-  <string name="pref_hardwareForwardButtonSkips_sum">當按下一個實體的快進按鈕時，跳過下一個劇集而不進行快進</string>
   <string name="pref_hardwarePreviousButtonRestarts_title">後退鍵重新播放</string>
   <string name="pref_hardwarePreviousButtonRestarts_sum">當按下一個實體鍵的後退按鈕時，重新播放本劇集而不是後退</string>
   <string name="pref_followQueue_sum">當播放完畢時自動跳至列表中的下一個項目</string>
@@ -319,4 +302,5 @@
   <!--Database import/export-->
   <!--Casting-->
   <!--<string name="cast_failed_to_connect">Could not connect to the device</string>-->
+  <!--Notification channels-->
 </resources>
diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml
index 9d9a2453d..6d310e0e5 100644
--- a/core/src/main/res/values/arrays.xml
+++ b/core/src/main/res/values/arrays.xml
@@ -55,6 +55,18 @@
         <item>-1</item>
     </string-array>
 
+    <string-array name="mobile_update_entries">
+        <item>@string/pref_mobileUpdate_nothing</item>
+        <item>@string/pref_mobileUpdate_images</item>
+        <item>@string/pref_mobileUpdate_everything</item>
+    </string-array>
+
+    <string-array name="mobile_update_values">
+        <item>nothing</item>
+        <item>images</item>
+        <item>everything</item>
+    </string-array>
+
     <string-array name="episode_cleanup_entries">
         <item>@string/episode_cleanup_queue_removal</item>
         <item>0</item>
@@ -68,10 +80,11 @@
     <string-array name="episode_cleanup_values">
         <item>-1</item>
         <item>0</item>
-        <item>1</item>
-        <item>3</item>
-        <item>5</item>
-        <item>7</item>
+        <item>12</item>
+        <item>24</item>
+        <item>72</item>
+        <item>120</item>
+        <item>168</item>
         <item>-2</item>
     </string-array>
 
@@ -137,10 +150,12 @@
     <string-array name="theme_options">
         <item>@string/pref_theme_title_light</item>
         <item>@string/pref_theme_title_dark</item>
+        <item>@string/pref_theme_title_trueblack</item>
     </string-array>
     <string-array name="theme_values">
         <item>0</item>
         <item>1</item>
+        <item>2</item>
     </string-array>
 
     <string-array name="nav_drawer_titles">
@@ -181,6 +196,28 @@
         <item>3</item>
     </string-array>
 
+    <string-array name="media_player_options">
+        <item>@string/media_player_builtin</item>
+        <item>@string/media_player_sonic</item>
+        <item>@string/media_player_exoplayer</item>
+    </string-array>
+
+    <string-array name="media_player_values">
+        <item>builtin</item>
+        <item>sonic</item>
+        <item>exoplayer</item>
+    </string-array>
+
+    <string-array name="media_player_options_no_sonic">
+        <item>@string/media_player_builtin</item>
+        <item>@string/media_player_exoplayer</item>
+    </string-array>
+
+    <string-array name="media_player_values_no_sonic">
+        <item>builtin</item>
+        <item>exoplayer</item>
+    </string-array>
+
     <string-array name="episode_filter_options">
         <item>@string/hide_unplayed_episodes_label</item>
         <item>@string/hide_paused_episodes_label</item>
@@ -190,6 +227,7 @@
         <item>@string/hide_downloaded_episodes_label</item>
         <item>@string/hide_not_downloaded_episodes_label</item>
         <item>@string/hide_has_media_label</item>
+        <item>@string/hide_is_favorite_label</item>
     </string-array>
 
     <string-array name="episode_filter_values">
@@ -201,6 +239,7 @@
         <item>downloaded</item>
         <item>not_downloaded</item>
         <item>has_media</item>
+        <item>is_favorite</item>
     </string-array>
 
     <string-array name="image_cache_size_options">
@@ -246,4 +285,37 @@
         <item>stop</item>
         <item>continue</item>
     </string-array>
+
+    <string-array name="batch_long_press_options">
+        <item>@string/select_all_above</item>
+        <item>@string/select_all_below</item>
+    </string-array>
+
+    <string-array name="back_button_behavior_options">
+        <item>@string/back_button_default</item>
+        <item>@string/back_button_go_to_page</item>
+        <item>@string/back_button_open_drawer</item>
+        <item>@string/back_button_double_tap</item>
+        <item>@string/back_button_show_prompt</item>
+    </string-array>
+
+    <string-array name="back_button_behavior_values">
+        <item>default</item>
+        <item>page</item>
+        <item>drawer</item>
+        <item>doubletap</item>
+        <item>prompt</item>
+    </string-array>
+
+    <string-array name="back_button_go_to_pages">
+        <item>@string/queue_label</item>
+        <item>@string/episodes_label</item>
+        <item>@string/subscriptions_label</item>
+    </string-array>
+
+    <string-array name="back_button_go_to_pages_tags">
+        <item>QueueFragment</item>
+        <item>EpisodesFragment</item>
+        <item>SubscriptionFragment</item>
+    </string-array>
 </resources>
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index b005d4dc3..5311d6cd2 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -12,6 +12,7 @@
     <attr name="av_rewind" format="reference"/>
     <attr name="content_discard" format="reference"/>
     <attr name="content_new" format="reference"/>
+    <attr name="content_remove_from_queue" format="reference"/>
     <attr name="storage" format="reference"/>
     <attr name="statistics" format="reference"/>
     <attr name="feed" format="reference"/>
@@ -47,19 +48,29 @@
     <attr name="ic_sleep" format="reference"/>
     <attr name="ic_sleep_off" format="reference"/>
     <attr name="checkbox_multiple" format="reference"/>
-    <attr name="ic_check_box" format="reference"/>
-    <attr name="ic_check_box_outline" format="reference"/>
-    <attr name="ic_indeterminate_check_box" format="reference"/>
+    <attr name="ic_select_all" format="reference"/>
+    <attr name="ic_select_none" format="reference"/>
     <attr name="ic_sort" format="reference"/>
     <attr name="ic_sd_storage" format="reference"/>
     <attr name="ic_create_new_folder" format="reference"/>
     <attr name="ic_cast_disconnect" format="reference"/>
     <attr name="ic_swap" format="reference"/>
+    <attr name="ic_cellphone_text" format="reference"/>
+    <attr name="ic_question_answer" format="reference" />
+    <attr name="ic_bug" format="reference" />
+    <attr name="ic_known_issues" format="reference" />
     <attr name="master_switch_background" format="color"/>
+    <attr name="currently_playing_background" format="color"/>
 
     <!-- Used in itemdescription -->
     <attr name="non_transparent_background" format="reference"/>
     <attr name="overlay_background" format="color"/>
 
     <attr name="nav_drawer_background" format="color"/>
+    <attr name="drawer_activated_color" format="color"/>
+
+    <attr name="about_screen_background" format="color"/>
+    <attr name="about_screen_card_background" format="color"/>
+    <attr name="about_screen_card_border" format="color"/>
+    <attr name="about_screen_font_color" format="color"/>
 </resources>
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index c9a5b3d6a..5d820f3cf 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -22,14 +22,18 @@
     <color name="image_readability_tint">#80000000</color>
     <color name="feed_image_bg">#50000000</color>
 
+    <color name="selection_background_color_trueblack">#286E8A</color>
     <color name="selection_background_color_dark">#286E8A</color>
     <color name="selection_background_color_light">#81CFEA</color>
 
     <!-- Theme colors -->
     <color name="primary_light">#FFFFFF</color>
-
+    <color name="primary_darktheme">#212121</color>
+    <color name="nav_drawer_background_dark">#3B3B3B</color>
+    <color name="nav_drawer_highlighted_dark">#212121</color>
     <color name="highlight_light">#DDDDDD</color>
     <color name="highlight_dark">#414141</color>
+    <color name="highlight_trueblack">#414141</color>
 
     <color name="antennapod_blue">#147BAF</color>
 
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 44288b24a..3d730516e 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -70,13 +70,14 @@
     <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>
     <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>
@@ -104,10 +105,15 @@
     <string name="episode_cleanup_never">Never</string>
     <string name="episode_cleanup_queue_removal">When not in queue</string>
     <string name="episode_cleanup_after_listening">After finishing</string>
+    <plurals name="episode_cleanup_hours_after_listening">
+        <item quantity="one">1 hour after finishing</item>
+        <item quantity="other">%d hours after finishing</item>
+    </plurals>
     <plurals name="episode_cleanup_days_after_listening">
         <item quantity="one">1 day after finishing</item>
         <item quantity="other">%d days after finishing</item>
     </plurals>
+    <string name="num_selected_label">%d selected</string>
 
     <!-- 'Add Feed' Activity labels -->
     <string name="feedurl_label">Feed URL</string>
@@ -121,28 +127,30 @@
     <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_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="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>
-    <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="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="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 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="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>
@@ -151,12 +159,17 @@
     <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>
 
     <!-- actions on feeditems -->
     <string name="download_label">Download</string>
+    <plurals name="downloading_batch_label">
+        <item quantity="one">Downloading %d episode.</item>
+        <item quantity="other">Downloading %d episodes.</item>
+    </plurals>
     <string name="play_label">Play</string>
     <string name="pause_label">Pause</string>
     <string name="stop_label">Stop</string>
@@ -164,14 +177,35 @@
     <string name="remove_label">Remove</string>
     <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="delete_episode_label">Delete Episode</string>
+    <plurals name="deleted_episode_batch_label">
+        <item quantity="one">%d episode deleted.</item>
+        <item quantity="other">%d episodes deleted.</item>
+    </plurals>
+    <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>
+    <plurals name="marked_read_batch_label">
+        <item quantity="one">%d episode marked as played.</item>
+        <item quantity="other">%d episodes marked as played.</item>
+    </plurals>
     <string name="mark_unread_label">Mark as unplayed</string>
+    <plurals name="marked_unread_batch_label">
+        <item quantity="one">%d episode marked as unplayed.</item>
+        <item quantity="other">%d episodes marked as unplayed.</item>
+    </plurals>
     <string name="add_to_queue_label">Add to Queue</string>
     <string name="added_to_queue_label">Added to Queue</string>
+    <plurals name="added_to_queue_batch_label">
+        <item quantity="one">%d episode added to queue.</item>
+        <item quantity="other">%d episodes added to queue.</item>
+    </plurals>
     <string name="remove_from_queue_label">Remove from Queue</string>
+    <plurals name="removed_from_queue_batch_label">
+        <item quantity="one">%d episode removed from queue.</item>
+        <item quantity="other">%d episodes removed from queue.</item>
+    </plurals>
     <string name="add_to_favorite_label">Add to Favorites</string>
     <string name="added_to_favorites">Added to Favorites</string>
     <string name="remove_from_favorite_label">Remove from Favorites</string>
@@ -224,6 +258,7 @@
     <string name="download_type_media">Media file</string>
     <string name="download_type_image">Image</string>
     <string name="download_request_error_dialog_message_prefix">An error occurred when trying to download the file:\u0020</string>
+    <string name="null_value_podcast_error">No podcast was provided that could be shown.</string>
     <string name="authentication_notification_title">Authentication required</string>
     <string name="authentication_notification_msg">The resource you requested requires a username and a password</string>
     <string name="confirm_mobile_download_dialog_title">Confirm Mobile Download</string>
@@ -261,7 +296,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>
@@ -304,10 +339,25 @@
     <string name="enable_sonic">Enable Sonic</string>
 
     <!-- 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_items_header_label">No queued episodes</string>
+    <string name="no_items_label">You can add episodes to the queue by long-pressing or downloading them.</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>
+    <string name="no_run_downloads_head_label">No downloads running</string>
+    <string name="no_run_downloads_label">You can download episodes on the podcast details screen.</string>
+    <string name="no_comp_downloads_head_label">No downloaded episodes</string>
+    <string name="no_comp_downloads_label">You can download episodes on the podcast details screen.</string>
+    <string name="no_log_downloads_head_label">No download log</string>
+    <string name="no_log_downloads_label">Download logs will appear here when available.</string>
+    <string name="no_history_head_label">No History</string>
+    <string name="no_history_label">After you listen to an episode, it will appear here.</string>
+    <string name="no_all_episodes_head_label">No Episodes</string>
+    <string name="no_all_episodes_label">When you add a podcast, the episodes will be shown here.</string>
+    <string name="no_new_episodes_head_label">No new episodes</string>
+    <string name="no_new_episodes_label">When new episodes arrive, they will be shown here.</string>
+    <string name="no_fav_episodes_head_label">No favorite episodes</string>
+    <string name="no_fav_episodes_label">You can add episodes to the favorites by long-pressing them.</string>
 
     <!-- Preferences -->
     <string name="storage_pref">Storage</string>
@@ -321,10 +371,11 @@
     <string name="automation">Automation</string>
     <string name="download_pref_details">Details</string>
     <string name="import_export_pref">Import/Export</string>
+    <string name="import_export_search_keywords">backup, restore</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="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>
@@ -332,7 +383,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>
@@ -362,6 +413,9 @@
     <string name="pref_unpauseOnBluetoothReconnect_title">Bluetooth Reconnect</string>
     <string name="pref_mobileUpdate_title">Mobile Updates</string>
     <string name="pref_mobileUpdate_sum">Allow updates over the mobile data connection</string>
+    <string name="pref_mobileUpdate_nothing">Nothing</string>
+    <string name="pref_mobileUpdate_images">Images only</string>
+    <string name="pref_mobileUpdate_everything">Everything</string>
     <string name="refreshing_label">Refreshing</string>
     <string name="flattr_settings_label">Flattr settings</string>
     <string name="pref_flattr_auth_title">Flattr sign-in</string>
@@ -381,7 +435,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>
@@ -395,6 +449,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">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>
@@ -423,8 +478,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>
@@ -445,8 +500,7 @@
     <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_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>
@@ -458,10 +512,27 @@
     <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="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_skip_silence_title">Skip Silence in Audio</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>
+    <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>
+    <string name="back_button_go_to_page">Go to page…</string>
+    <string name="back_button_go_to_page_title">Select page</string>
+    <string name="pref_delete_removes_from_queue_title">Delete removes from Queue</string>
+    <string name="pref_delete_removes_from_queue_sum">Automatically remove an episode from the queue when it is deleted.</string>
 
     <!-- Auto-Flattr dialog -->
     <string name="auto_flattr_enable">Enable automatic flattring</string>
@@ -473,8 +544,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 feeds</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>
@@ -672,6 +743,7 @@
     <string name="audio_effects">Audio Effects</string>
     <string name="stereo_to_mono">Downmix: Stereo to mono</string>
     <string name="sonic_only">Sonic only</string>
+    <string name="exoplayer_only">ExoPlayer only</string>
 
     <!-- proxy settings -->
     <string name="proxy_type_label">Type</string>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 3a215588e..e9a7a2f64 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -26,6 +26,7 @@
         <item type="attr" name="av_rewind">@drawable/ic_fast_rewind_grey600_24dp</item>
         <item type="attr" name="content_discard">@drawable/ic_delete_grey600_24dp</item>
         <item type="attr" name="content_new">@drawable/ic_add_grey600_24dp</item>
+        <item type="attr" name="content_remove_from_queue">@drawable/ic_remove_grey600</item>
         <item type="attr" name="feed">@drawable/ic_feed_grey600_24dp</item>
         <item type="attr" name="location_web_site">@drawable/ic_web_grey600_24dp</item>
         <item type="attr" name="navigation_accept">@drawable/ic_done_grey600_24dp</item>
@@ -43,6 +44,7 @@
         <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item>
         <item type="attr" name="dragview_float_background">@color/white</item>
         <item type="attr" name="nav_drawer_background">@color/white</item>
+        <item type="attr" name="drawer_activated_color">@color/highlight_light</item>
         <item type="attr" name="ic_new">@drawable/ic_new_releases_grey600_24dp</item>
         <item type="attr" name="ic_history">@drawable/ic_history_grey600_24dp</item>
         <item type="attr" name="ic_folder">@drawable/ic_folder_grey600_24dp</item>
@@ -59,15 +61,26 @@
         <item type="attr" name="ic_filter">@drawable/ic_filter_grey600_24dp</item>
         <item type="attr" name="ic_sleep">@drawable/ic_sleep_grey600_24dp</item>
         <item type="attr" name="ic_sleep_off">@drawable/ic_sleep_off_grey600_24dp</item>
-        <item type="attr" name="ic_check_box">@drawable/ic_check_box_grey600_24dp</item>
-        <item type="attr" name="ic_check_box_outline">@drawable/ic_check_box_outline_blank_grey600_24dp</item>
-        <item type="attr" name="ic_indeterminate_check_box">@drawable/ic_indeterminate_check_box_grey600_24dp</item>
+        <item type="attr" name="ic_select_all">@drawable/ic_select_all_grey600</item>
+        <item type="attr" name="ic_select_none">@drawable/ic_select_none_grey600</item>
         <item type="attr" name="ic_sort">@drawable/ic_sort_grey600_24dp</item>
         <item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_grey600_36dp</item>
         <item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_grey600_24dp</item>
         <item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_grey600_36dp</item>
+        <item type="attr" name="ic_cellphone_text">@drawable/ic_cellphone_text_grey600_24dp</item>
+        <item type="attr" name="ic_question_answer">@drawable/ic_forum_grey600_24dp</item>
+        <item type="attr" name="ic_bug">@drawable/ic_bug_grey600_24dp</item>
+        <item type="attr" name="ic_known_issues">@drawable/ic_format_list_bulleted_grey600_24dp</item>
+
         <item type="attr" name="master_switch_background">@color/master_switch_background_light</item>
+        <item type="attr" name="currently_playing_background">@color/highlight_light</item>
+
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+
+        <item type="attr" name="about_screen_background">#e5e5e5</item>
+        <item type="attr" name="about_screen_card_background">#ffffff</item>
+        <item type="attr" name="about_screen_card_border">#d2d2d2</item>
+        <item type="attr" name="about_screen_font_color">#000000</item>
     </style>
 
     <style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark">
@@ -76,6 +89,8 @@
 
     <style name="Theme.Base.AntennaPod.Dark" parent="Theme.AppCompat">
         <item name="colorAccent">@color/holo_blue_dark</item>
+        <item name="colorPrimary">@color/primary_darktheme</item>
+        <item name="colorPrimaryDark">@color/primary_darktheme</item>
         <item name="colorControlNormal">@color/white</item>
         <item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
         <item name="progressBarTheme">@style/ProgressBarDark</item>
@@ -95,6 +110,7 @@
         <item type="attr" name="av_rewind">@drawable/ic_fast_rewind_white_24dp</item>
         <item type="attr" name="content_discard">@drawable/ic_delete_white_24dp</item>
         <item type="attr" name="content_new">@drawable/ic_add_white_24dp</item>
+        <item type="attr" name="content_remove_from_queue">@drawable/ic_remove_white</item>
         <item type="attr" name="feed">@drawable/ic_feed_white_24dp</item>
         <item type="attr" name="location_web_site">@drawable/ic_web_white_24dp</item>
         <item type="attr" name="navigation_accept">@drawable/ic_done_white_24dp</item>
@@ -111,7 +127,8 @@
         <item type="attr" name="overlay_drawable">@drawable/overlay_drawable_dark</item>
         <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
         <item type="attr" name="dragview_float_background">@color/black</item>
-        <item type="attr" name="nav_drawer_background">#3B3B3B</item>
+        <item type="attr" name="nav_drawer_background">@color/nav_drawer_background_dark</item>
+        <item type="attr" name="drawer_activated_color">@color/nav_drawer_highlighted_dark</item>
         <item type="attr" name="ic_new">@drawable/ic_new_releases_white_24dp</item>
         <item type="attr" name="ic_history">@drawable/ic_history_white_24dp</item>
         <item type="attr" name="ic_folder">@drawable/ic_folder_white_24dp</item>
@@ -128,17 +145,49 @@
         <item type="attr" name="ic_filter">@drawable/ic_filter_white_24dp</item>
         <item type="attr" name="ic_sleep">@drawable/ic_sleep_white_24dp</item>
         <item type="attr" name="ic_sleep_off">@drawable/ic_sleep_off_white_24dp</item>
-        <item type="attr" name="ic_check_box">@drawable/ic_check_box_white_24dp</item>
-        <item type="attr" name="ic_check_box_outline">@drawable/ic_check_box_outline_blank_white_24dp</item>
-        <item type="attr" name="ic_indeterminate_check_box">@drawable/ic_indeterminate_check_box_white_24dp</item>
+        <item type="attr" name="ic_select_all">@drawable/ic_select_all_white</item>
+        <item type="attr" name="ic_select_none">@drawable/ic_select_none_white</item>
         <item type="attr" name="ic_sort">@drawable/ic_sort_white_24dp</item>
         <item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_white_36dp</item>
         <item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_white_24dp</item>
         <item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item>
+        <item type="attr" name="ic_cellphone_text">@drawable/ic_cellphone_text_white_24dp</item>
+        <item type="attr" name="ic_question_answer">@drawable/ic_baseline_question_answer_white_24dp</item>
+        <item type="attr" name="ic_bug">@drawable/ic_bug_white_24dp</item>
+        <item type="attr" name="ic_known_issues">@drawable/ic_format_list_bulleted_white_24dp</item>
         <item type="attr" name="master_switch_background">@color/master_switch_background_dark</item>
+        <item type="attr" name="currently_playing_background">@color/highlight_dark</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+
+        <item type="attr" name="about_screen_background">#303030</item>
+        <item type="attr" name="about_screen_card_background">#424242</item>
+        <item type="attr" name="about_screen_card_border">#262626</item>
+        <item type="attr" name="about_screen_font_color">#ffffff</item>
+    </style>
+
+    <style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack">
+        <!-- Room for API dependent attributes -->
     </style>
 
+    <style name="Theme.Base.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.Dark">
+        <item name="progressBarTheme">@style/ProgressBarTrueBlack</item>
+        <item type="attr" name="non_transparent_background">@color/black</item>
+        <item type="attr" name="overlay_background">@color/black</item>
+        <item type="attr" name="overlay_drawable">@drawable/overlay_drawable_dark_trueblack</item>
+        <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
+        <item type="attr" name="dragview_float_background">@color/black</item>
+        <item type="attr" name="nav_drawer_background">@color/black</item>
+        <item type="attr" name="drawer_activated_color">@color/highlight_trueblack</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:color">@color/white</item>
+        <item name="android:colorBackground">@color/black</item>
+        <item name="android:windowBackground">@color/black</item>
+        <item name="android:actionBarStyle">@color/black</item>
+        <item name="colorPrimary">@color/black</item>
+        <item name="colorPrimaryDark">@color/black</item>
+    </style>
+
+
     <style name="Theme.AntennaPod.Light.NoTitle" parent="Theme.Base.AntennaPod.Light.NoTitle">
         <!-- Room for API dependent attributes -->
     </style>
@@ -165,6 +214,7 @@
         <item type="attr" name="av_rewind">@drawable/ic_fast_rewind_grey600_24dp</item>
         <item type="attr" name="content_discard">@drawable/ic_delete_grey600_24dp</item>
         <item type="attr" name="content_new">@drawable/ic_add_grey600_24dp</item>
+        <item type="attr" name="content_remove_from_queue">@drawable/ic_remove_grey600</item>
         <item type="attr" name="feed">@drawable/ic_feed_grey600_24dp</item>
         <item type="attr" name="location_web_site">@drawable/ic_web_grey600_24dp</item>
         <item type="attr" name="navigation_accept">@drawable/ic_done_grey600_24dp</item>
@@ -182,6 +232,7 @@
         <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item>
         <item type="attr" name="dragview_float_background">@color/white</item>
         <item type="attr" name="nav_drawer_background">@color/white</item>
+        <item type="attr" name="drawer_activated_color">@color/highlight_light</item>
         <item type="attr" name="ic_new">@drawable/ic_new_releases_grey600_24dp</item>
         <item type="attr" name="ic_history">@drawable/ic_history_grey600_24dp</item>
         <item type="attr" name="ic_folder">@drawable/ic_folder_grey600_24dp</item>
@@ -198,15 +249,24 @@
         <item type="attr" name="ic_filter">@drawable/ic_filter_grey600_24dp</item>
         <item type="attr" name="ic_sleep">@drawable/ic_sleep_grey600_24dp</item>
         <item type="attr" name="ic_sleep_off">@drawable/ic_sleep_off_grey600_24dp</item>
-        <item type="attr" name="ic_check_box">@drawable/ic_check_box_grey600_24dp</item>
-        <item type="attr" name="ic_check_box_outline">@drawable/ic_check_box_outline_blank_grey600_24dp</item>
-        <item type="attr" name="ic_indeterminate_check_box">@drawable/ic_indeterminate_check_box_grey600_24dp</item>
+        <item type="attr" name="ic_select_all">@drawable/ic_select_all_grey600</item>
+        <item type="attr" name="ic_select_none">@drawable/ic_select_none_grey600</item>
         <item type="attr" name="ic_sort">@drawable/ic_sort_grey600_24dp</item>
         <item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_grey600_36dp</item>
         <item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_grey600_24dp</item>
         <item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_grey600_36dp</item>
+        <item type="attr" name="ic_cellphone_text">@drawable/ic_cellphone_text_grey600_24dp</item>
+        <item type="attr" name="ic_question_answer">@drawable/ic_forum_grey600_24dp</item>
+        <item type="attr" name="ic_bug">@drawable/ic_bug_grey600_24dp</item>
+        <item type="attr" name="ic_known_issues">@drawable/ic_format_list_bulleted_grey600_24dp</item>
         <item type="attr" name="master_switch_background">@color/master_switch_background_light</item>
+        <item type="attr" name="currently_playing_background">@color/highlight_light</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+
+        <item type="attr" name="about_screen_background">#e5e5e5</item>
+        <item type="attr" name="about_screen_card_background">#ffffff</item>
+        <item type="attr" name="about_screen_card_border">#d2d2d2</item>
+        <item type="attr" name="about_screen_font_color">#000000</item>
     </style>
 
     <style name="Theme.AntennaPod.Dark.NoTitle" parent="Theme.Base.AntennaPod.Dark.NoTitle">
@@ -218,6 +278,8 @@
         <item name="windowActionModeOverlay">true</item>
         <item name="progressBarTheme">@style/ProgressBarDark</item>
         <item name="colorAccent">@color/holo_blue_dark</item>
+        <item name="colorPrimary">@color/primary_darktheme</item>
+        <item name="colorPrimaryDark">@color/primary_darktheme</item>
         <item name="colorControlNormal">@color/white</item>
         <item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
         <item name="alertDialogTheme">@style/AntennaPod.Dialog.Dark</item>
@@ -236,6 +298,7 @@
         <item type="attr" name="content_discard">@drawable/ic_delete_white_24dp</item>
         <item type="attr" name="content_new">@drawable/ic_add_white_24dp</item>
         <item type="attr" name="feed">@drawable/ic_feed_white_24dp</item>
+        <item type="attr" name="content_remove_from_queue">@drawable/ic_remove_white</item>
         <item type="attr" name="location_web_site">@drawable/ic_web_white_24dp</item>
         <item type="attr" name="navigation_accept">@drawable/ic_done_white_24dp</item>
         <item type="attr" name="navigation_cancel">@drawable/ic_cancel_white_24dp</item>
@@ -251,7 +314,8 @@
         <item type="attr" name="overlay_drawable">@drawable/overlay_drawable_dark</item>
         <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
         <item type="attr" name="dragview_float_background">@color/black</item>
-        <item type="attr" name="nav_drawer_background">#3B3B3B</item>
+        <item type="attr" name="nav_drawer_background">@color/nav_drawer_background_dark</item>
+        <item type="attr" name="drawer_activated_color">@color/nav_drawer_highlighted_dark</item>
         <item type="attr" name="ic_new">@drawable/ic_new_releases_white_24dp</item>
         <item type="attr" name="ic_history">@drawable/ic_history_white_24dp</item>
         <item type="attr" name="ic_folder">@drawable/ic_folder_white_24dp</item>
@@ -268,19 +332,54 @@
         <item type="attr" name="ic_filter">@drawable/ic_filter_white_24dp</item>
         <item type="attr" name="ic_sleep">@drawable/ic_sleep_white_24dp</item>
         <item type="attr" name="ic_sleep_off">@drawable/ic_sleep_off_white_24dp</item>
-        <item type="attr" name="ic_check_box">@drawable/ic_check_box_white_24dp</item>
-        <item type="attr" name="ic_check_box_outline">@drawable/ic_check_box_outline_blank_white_24dp</item>
-        <item type="attr" name="ic_indeterminate_check_box">@drawable/ic_indeterminate_check_box_white_24dp</item>
+        <item type="attr" name="ic_select_all">@drawable/ic_select_all_white</item>
+        <item type="attr" name="ic_select_none">@drawable/ic_select_none_white</item>
         <item type="attr" name="ic_sort">@drawable/ic_sort_white_24dp</item>
         <item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_white_36dp</item>
         <item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_white_24dp</item>
         <item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item>
+        <item type="attr" name="ic_cellphone_text">@drawable/ic_cellphone_text_white_24dp</item>
+        <item type="attr" name="ic_question_answer">@drawable/ic_baseline_question_answer_white_24dp</item>
+        <item type="attr" name="ic_bug">@drawable/ic_bug_white_24dp</item>
+        <item type="attr" name="ic_known_issues">@drawable/ic_format_list_bulleted_white_24dp</item>
         <item type="attr" name="master_switch_background">@color/master_switch_background_dark</item>
+        <item type="attr" name="currently_playing_background">@color/highlight_dark</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+
+        <item type="attr" name="about_screen_background">#303030</item>
+        <item type="attr" name="about_screen_card_background">#424242</item>
+        <item type="attr" name="about_screen_card_border">#262626</item>
+        <item type="attr" name="about_screen_font_color">#ffffff</item>
+    </style>
+
+    <style name="Theme.AntennaPod.TrueBlack.NoTitle" parent="Theme.Base.AntennaPod.TrueBlack.NoTitle">
+        <!-- Room for API dependent attributes -->
     </style>
 
+    <style name="Theme.Base.AntennaPod.TrueBlack.NoTitle" parent="Theme.Base.AntennaPod.Dark.NoTitle">
+        <item name="progressBarTheme">@style/ProgressBarTrueBlack</item>
+        <item type="attr" name="non_transparent_background">@color/black</item>
+        <item type="attr" name="overlay_background">@color/black</item>
+        <item type="attr" name="overlay_drawable">@drawable/overlay_drawable_dark_trueblack</item>
+        <item type="attr" name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
+        <item type="attr" name="dragview_float_background">@color/black</item>
+        <item type="attr" name="nav_drawer_background">@color/black</item>
+        <item type="attr" name="drawer_activated_color">@color/highlight_trueblack</item>
+        <item type="attr" name="currently_playing_background">@color/highlight_trueblack</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:color">@color/white</item>
+        <item name="android:colorBackground">@color/black</item>
+        <item name="android:windowBackground">@color/black</item>
+        <item name="android:actionBarStyle">@color/black</item>
+        <item name="colorPrimary">@color/black</item>
+        <item name="colorPrimaryDark">@color/black</item>
+    </style>
+
+
     <style name="Theme.AntennaPod.Dark.Splash" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowBackground">@drawable/bg_splash</item>
+        <item name="colorPrimary">@color/ic_launcher_background</item>
+        <item name="colorPrimaryDark">@color/ic_launcher_background</item>
     </style>
 
     <style name="Theme.AntennaPod.VideoPlayer" parent="@style/Theme.AntennaPod.Dark">
@@ -366,4 +465,9 @@
         <item name="android:progressDrawable">@drawable/progress_bar_horizontal_dark</item>
     </style>
 
+    <style name="ProgressBarTrueBlack">
+        <item name="android:indeterminateOnly">false</item>
+        <item name="android:progressDrawable">@drawable/progress_bar_horizontal_trueblack</item>
+    </style>
+
 </resources>