Merge branch 'master' into studios-images-plugin

# Conflicts:
#	MediaBrowser.Providers/MediaBrowser.Providers.csproj

1 files changed, 0 insertions, 22 deletions

diff --git a/MediaBrowser.Controller/Plugins/ILocalizablePlugin.cs b/MediaBrowser.Controller/Plugins/ILocalizablePlugin.cs
deleted file mode 100644
index bf15fe040..000000000
--- a/MediaBrowser.Controller/Plugins/ILocalizablePlugin.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma warning disable CS1591
-
-using System.IO;
-using System.Reflection;
-
-namespace MediaBrowser.Controller.Plugins
-{
-    public interface ILocalizablePlugin
-    {
-        Stream GetDictionary(string culture);
-    }
-
-    public static class LocalizablePluginHelper
-    {
-        public static Stream GetDictionary(Assembly assembly, string manifestPrefix, string culture)
-        {
-            // Find all dictionaries using GetManifestResourceNames, start start with the prefix
-            // Return the one for the culture if exists, otherwise return the default
-            return null;
-        }
-    }
-}