Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Conflicts:
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Api.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.ApiInteraction.Javascript.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.Sqlite.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.WorldWeatherOnline.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.WebDashboard.dll

3 files changed, 53 insertions, 6 deletions

diff --git a/MediaBrowser.Controller/Localization/BaseStrings.cs b/MediaBrowser.Controller/Localization/BaseStrings.cs
index c76df7c7c..22486d90d 100644
--- a/MediaBrowser.Controller/Localization/BaseStrings.cs
+++ b/MediaBrowser.Controller/Localization/BaseStrings.cs
@@ -1,9 +1,6 @@
-using MediaBrowser.Common.Localization;
-using System.ComponentModel.Composition;
-
+
 namespace MediaBrowser.Controller.Localization
 {
-    [Export(typeof(LocalizedStringData))]
     public class BaseStrings : LocalizedStringData
     {
         public BaseStrings()
diff --git a/MediaBrowser.Controller/Localization/LocalizedStringData.cs b/MediaBrowser.Controller/Localization/LocalizedStringData.cs
new file mode 100644
index 000000000..71200b8c8
--- /dev/null
+++ b/MediaBrowser.Controller/Localization/LocalizedStringData.cs
@@ -0,0 +1,51 @@
+using System.IO;
+using System.Xml.Serialization;
+
+namespace MediaBrowser.Controller.Localization
+{
+    /// <summary>
+    /// Class LocalizedStringData
+    /// </summary>
+    public class LocalizedStringData
+    {
+        /// <summary>
+        /// The this version
+        /// </summary>
+        [XmlIgnore]
+        public string ThisVersion = "1.0000";
+        /// <summary>
+        /// The prefix
+        /// </summary>
+        [XmlIgnore]
+        public string Prefix = "";
+        /// <summary>
+        /// The file name
+        /// </summary>
+        public string FileName; //this is public so it will serialize and we know where to save ourselves
+        /// <summary>
+        /// The version
+        /// </summary>
+        public string Version = ""; //this will get saved so we can check it against us for changes
+
+        /// <summary>
+        /// Saves this instance.
+        /// </summary>
+        public void Save()
+        {
+            Save(FileName);
+        }
+
+        /// <summary>
+        /// Saves the specified file.
+        /// </summary>
+        /// <param name="file">The file.</param>
+        public void Save(string file)
+        {
+            var xs = new XmlSerializer(GetType());
+            using (var fs = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None))
+            {
+                xs.Serialize(fs, this);
+            }
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/Localization/LocalizedStrings.cs b/MediaBrowser.Controller/Localization/LocalizedStrings.cs
index 01b259591..6405be5f8 100644
--- a/MediaBrowser.Controller/Localization/LocalizedStrings.cs
+++ b/MediaBrowser.Controller/Localization/LocalizedStrings.cs
@@ -1,5 +1,4 @@
-using MediaBrowser.Common.Localization;
-using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Concurrent;
 using System.Globalization;