Removed all resx files, now using Duplicati.Library.Localization exclusively

5 files changed, 32 insertions, 331 deletions

diff --git a/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj b/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj
index 0883ef9d7..e05139d3e 100644
--- a/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj
+++ b/Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj
@@ -44,13 +44,9 @@
     <Reference Include="System.Xml" />

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="Strings\WEBDAV.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>WEBDAV.resx</DependentUpon>

-    </Compile>

     <Compile Include="WEBDAV.cs" />

     <Compile Include="Properties\AssemblyInfo.cs" />

+    <Compile Include="Strings.cs" />

   </ItemGroup>

   <ItemGroup>

     <ProjectReference Include="..\..\Modules\Builtin\Duplicati.Library.Modules.Builtin.csproj">

@@ -65,13 +61,10 @@
       <Project>{C5899F45-B0FF-483C-9D38-24A9FCAAB237}</Project>

       <Name>Duplicati.Library.Interface</Name>

     </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <EmbeddedResource Include="Strings\WEBDAV.resx">

-      <SubType>Designer</SubType>

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>WEBDAV.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

+    <ProjectReference Include="..\..\Localization\Duplicati.Library.Localization.csproj">

+      <Project>{B68F2214-951F-4F78-8488-66E1ED3F50BF}</Project>

+      <Name>Duplicati.Library.Localization</Name>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <None Include="app.config" />

diff --git a/Duplicati/Library/Backend/WEBDAV/Strings.cs b/Duplicati/Library/Backend/WEBDAV/Strings.cs
new file mode 100644
index 000000000..d505dc729
--- /dev/null
+++ b/Duplicati/Library/Backend/WEBDAV/Strings.cs
@@ -0,0 +1,23 @@
+using Duplicati.Library.Localization.Short;
+namespace Duplicati.Library.Backend.Strings {
+    internal static class WEBDAV {
+        public static string Description { get { return LC.L(@"Supports connections to a WEBDAV enabled web server, using the HTTP protocol. Allowed formats are ""webdav://hostname/folder"" or ""webdav://username:password@hostname/folder""."); } }
+        public static string DescriptionForceDigestLong { get { return LC.L(@"Using the HTTP Digest authentication method allows the user to authenticate with the server, without sending the password in clear. However, a man-in-the-middle attack is easy, because the HTTP protocol specifies a fallback to Basic authentication, which will make the client send the password to the attacker. Using this flag, the client does not accept this, and always uses Digest authentication or fails to connect."); } }
+        public static string DescriptionForceDigestShort { get { return LC.L(@"Force the use of the HTTP Digest authentication method"); } }
+        public static string DescriptionAuthPasswordLong { get { return LC.L(@"The password used to connect to the server. This may also be supplied as the environment variable ""AUTH_PASSWORD""."); } }
+        public static string DescriptionAuthPasswordShort { get { return LC.L(@"Supplies the password used to connect to the server"); } }
+        public static string DescriptionAuthUsernameLong { get { return LC.L(@"The username used to connect to the server. This may also be supplied as the environment variable ""AUTH_USERNAME""."); } }
+        public static string DescriptionAuthUsernameShort { get { return LC.L(@"Supplies the username used to connect to the server"); } }
+        public static string DescriptionIntegratedAuthenticationLong { get { return LC.L(@"If the server and client both supports integrated authentication, this option enables that authentication method. This is likely only available with windows servers and clients."); } }
+        public static string DescriptionIntegratedAuthenticationShort { get { return LC.L(@"Use windows integrated authentication to connect to the server"); } }
+        public static string DisplayName { get { return LC.L(@"WebDAV"); } }
+        public static string MissingFolderError(string foldername, string message) { return LC.L(@"The folder {0} was not found, message: {1}", foldername, message); }
+        public static string SeenThenNotFoundError(string foldername, string filename, string extension, string errormessage) { return LC.L(@"When listing the folder {0} the file {1} was listed, but the server now reports that the file is not found.
+This can be because the file is deleted or unavailable, but it can also be because the file extension {2} is blocked by the web server. IIS blocks unknown extensions by default.
+Error message: {3}", foldername, filename, extension, errormessage); }
+        public static string DescriptionUseSSLLong { get { return LC.L(@"Use this flag to communicate using Secure Socket Layer (SSL) over http (https)."); } }
+        public static string DescriptionUseSSLShort { get { return LC.L(@"Instructs Duplicati to use an SSL (https) connection"); } }
+        public static string DescriptionDebugPropfindLong { get { return LC.L(@"To aid in debugging issues, it is possible to set a path to a file that will be overwritten with the PROPFIND response"); } }
+        public static string DescriptionDebugPropfindShort { get { return LC.L(@"Dump the PROPFIND response"); } }
+    }
+}
diff --git a/Duplicati/Library/Backend/WEBDAV/Strings/WEBDAV.Designer.cs b/Duplicati/Library/Backend/WEBDAV/Strings/WEBDAV.Designer.cs
deleted file mode 100644
index 9a8c3d588..000000000
--- a/Duplicati/Library/Backend/WEBDAV/Strings/WEBDAV.Designer.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 4.0.30319.17020
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
-
-namespace Duplicati.Library.Backend.Strings {
-    using System;
-    
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class WEBDAV {
-        
-        private static System.Resources.ResourceManager resourceMan;
-        
-        private static System.Globalization.CultureInfo resourceCulture;
-        
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal WEBDAV() {
-        }
-        
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.Equals(null, resourceMan)) {
-                    System.Resources.ResourceManager temp = new System.Resources.ResourceManager("Duplicati.Library.Backend.Strings.WEBDAV", typeof(WEBDAV).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        internal static string DescriptionIntegratedAuthenticationLong {
-            get {
-                return ResourceManager.GetString("DescriptionIntegratedAuthenticationLong", resourceCulture);
-            }
-        }
-        
-        internal static string DescriptionAuthPasswordShort {
-            get {
-                return ResourceManager.GetString("DescriptionAuthPasswordShort", resourceCulture);
-            }
-        }
-        
-        internal static string SeenThenNotFoundError {
-            get {
-                return ResourceManager.GetString("SeenThenNotFoundError", resourceCulture);
-            }
-        }
-        
-        internal static string DescriptionAuthUsernameShort {
-            get {
-                return ResourceManager.GetString("DescriptionAuthUsernameShort", resourceCulture);
-            }
-        }
-        
-        internal static string DescriptionIntegratedAuthenticationShort {
-            get {
-                return ResourceManager.GetString("DescriptionIntegratedAuthenticationShort", resourceCulture);
-            }
-        }
-        
-        internal static string DescriptionDebugPropfindLong {
-            get {
-                return ResourceManager.GetString("DescriptionDebugPropfindLong", resourceCulture);
-            }
-        }
-        
-        internal static string MissingFolderError {
-            get {
-                return ResourceManager.GetString("MissingFolderError", resourceCulture);
-            }
-        }
-        
-        internal static string DescriptionAuthPasswordLong {
-            get {
-                return ResourceManager.GetString("DescriptionAuthPasswordLong", resourceCulture);
-            }
-        }
-        
-        internal static string DescriptionUseSSLLong {
-            get {
-                return ResourceManager.GetString("DescriptionUseSSLLong", resourceCulture);
-            }
-        }
-        
-        internal static string DescriptionForceDigestShort {
-            get {
-                return ResourceManager.GetString("DescriptionForceDigestShort", resourceCulture);
-            }
-        }
-        
-        internal static string DescriptionDebugPropfindShort {
-            get {
-                return ResourceManager.GetString("DescriptionDebugPropfindShort", resourceCulture);
-            }
-        }
-        
-        internal static string Description {
-            get {
-                return ResourceManager.GetString("Description", resourceCulture);
-            }
-        }
-        
-        internal static string DescriptionForceDigestLong {
-            get {
-                return ResourceManager.GetString("DescriptionForceDigestLong", resourceCulture);
-            }
-        }
-        
-        internal static string DescriptionAuthUsernameLong {
-            get {
-                return ResourceManager.GetString("DescriptionAuthUsernameLong", resourceCulture);
-            }
-        }
-        
-        internal static string DisplayName {
-            get {
-                return ResourceManager.GetString("DisplayName", resourceCulture);
-            }
-        }
-        
-        internal static string DescriptionUseSSLShort {
-            get {
-                return ResourceManager.GetString("DescriptionUseSSLShort", resourceCulture);
-            }
-        }
-    }
-}
diff --git a/Duplicati/Library/Backend/WEBDAV/Strings/WEBDAV.resx b/Duplicati/Library/Backend/WEBDAV/Strings/WEBDAV.resx
deleted file mode 100644
index 3dc4cd743..000000000
--- a/Duplicati/Library/Backend/WEBDAV/Strings/WEBDAV.resx
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<root>

-  <!-- 

-    Microsoft ResX Schema 

-    

-    Version 2.0

-    

-    The primary goals of this format is to allow a simple XML format 

-    that is mostly human readable. The generation and parsing of the 

-    various data types are done through the TypeConverter classes 

-    associated with the data types.

-    

-    Example:

-    

-    ... ado.net/XML headers & schema ...

-    <resheader name="resmimetype">text/microsoft-resx</resheader>

-    <resheader name="version">2.0</resheader>

-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>

-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>

-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>

-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>

-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">

-        <value>[base64 mime encoded serialized .NET Framework object]</value>

-    </data>

-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>

-        <comment>This is a comment</comment>

-    </data>

-                

-    There are any number of "resheader" rows that contain simple 

-    name/value pairs.

-    

-    Each data row contains a name, and value. The row also contains a 

-    type or mimetype. Type corresponds to a .NET class that support 

-    text/value conversion through the TypeConverter architecture. 

-    Classes that don't support this are serialized and stored with the 

-    mimetype set.

-    

-    The mimetype is used for serialized objects, and tells the 

-    ResXResourceReader how to depersist the object. This is currently not 

-    extensible. For a given mimetype the value must be set accordingly:

-    

-    Note - application/x-microsoft.net.object.binary.base64 is the format 

-    that the ResXResourceWriter will generate, however the reader can 

-    read any of the formats listed below.

-    

-    mimetype: application/x-microsoft.net.object.binary.base64

-    value   : The object must be serialized with 

-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter

-            : and then encoded with base64 encoding.

-    

-    mimetype: application/x-microsoft.net.object.soap.base64

-    value   : The object must be serialized with 

-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

-            : and then encoded with base64 encoding.

-

-    mimetype: application/x-microsoft.net.object.bytearray.base64

-    value   : The object must be serialized into a byte array 

-            : using a System.ComponentModel.TypeConverter

-            : and then encoded with base64 encoding.

-    -->

-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">

-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />

-    <xsd:element name="root" msdata:IsDataSet="true">

-      <xsd:complexType>

-        <xsd:choice maxOccurs="unbounded">

-          <xsd:element name="metadata">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" />

-              </xsd:sequence>

-              <xsd:attribute name="name" use="required" type="xsd:string" />

-              <xsd:attribute name="type" type="xsd:string" />

-              <xsd:attribute name="mimetype" type="xsd:string" />

-              <xsd:attribute ref="xml:space" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="assembly">

-            <xsd:complexType>

-              <xsd:attribute name="alias" type="xsd:string" />

-              <xsd:attribute name="name" type="xsd:string" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="data">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />

-              </xsd:sequence>

-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />

-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />

-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />

-              <xsd:attribute ref="xml:space" />

-            </xsd:complexType>

-          </xsd:element>

-          <xsd:element name="resheader">

-            <xsd:complexType>

-              <xsd:sequence>

-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

-              </xsd:sequence>

-              <xsd:attribute name="name" type="xsd:string" use="required" />

-            </xsd:complexType>

-          </xsd:element>

-        </xsd:choice>

-      </xsd:complexType>

-    </xsd:element>

-  </xsd:schema>

-  <resheader name="resmimetype">

-    <value>text/microsoft-resx</value>

-  </resheader>

-  <resheader name="version">

-    <value>2.0</value>

-  </resheader>

-  <resheader name="reader">

-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </resheader>

-  <resheader name="writer">

-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

-  </resheader>

-  <data name="Description" xml:space="preserve">

-    <value>Supports connections to a WEBDAV enabled web server, using the HTTP protocol. Allowed formats are "webdav://hostname/folder" or "webdav://username:password@hostname/folder".</value>

-  </data>

-  <data name="DescriptionForceDigestLong" xml:space="preserve">

-    <value>Using the HTTP Digest authentication method allows the user to authenticate with the server, without sending the password in clear. However, a man-in-the-middle attack is easy, because the HTTP protocol specifies a fallback to Basic authentication, which will make the client send the password to the attacker. Using this flag, the client does not accept this, and always uses Digest authentication or fails to connect.</value>

-  </data>

-  <data name="DescriptionForceDigestShort" xml:space="preserve">

-    <value>Force the use of the HTTP Digest authentication method</value>

-  </data>

-  <data name="DescriptionAuthPasswordLong" xml:space="preserve">

-    <value>The password used to connect to the server. This may also be supplied as the environment variable "AUTH_PASSWORD".</value>

-  </data>

-  <data name="DescriptionAuthPasswordShort" xml:space="preserve">

-    <value>Supplies the password used to connect to the server</value>

-  </data>

-  <data name="DescriptionAuthUsernameLong" xml:space="preserve">

-    <value>The username used to connect to the server. This may also be supplied as the environment variable "AUTH_USERNAME".</value>

-  </data>

-  <data name="DescriptionAuthUsernameShort" xml:space="preserve">

-    <value>Supplies the username used to connect to the server</value>

-  </data>

-  <data name="DescriptionIntegratedAuthenticationLong" xml:space="preserve">

-    <value>If the server and client both supports integrated authentication, this option enables that authentication method. This is likely only available with windows servers and clients.</value>

-  </data>

-  <data name="DescriptionIntegratedAuthenticationShort" xml:space="preserve">

-    <value>Use windows integrated authentication to connect to the server</value>

-  </data>

-  <data name="DisplayName" xml:space="preserve">

-    <value>WebDAV</value>

-  </data>

-  <data name="MissingFolderError" xml:space="preserve">

-    <value>The folder {0} was not found, message: {1}</value>

-  </data>

-  <data name="SeenThenNotFoundError" xml:space="preserve">

-    <value>When listing the folder {0} the file {1} was listed, but the server now reports that the file is not found.

-This can be because the file is deleted or unavailable, but it can also be because the file extension {2} is blocked by the web server. IIS blocks unknown extensions by default.

-Error message: {3}</value>

-  </data>

-  <data name="DescriptionUseSSLLong" xml:space="preserve">

-    <value>Use this flag to communicate using Secure Socket Layer (SSL) over http (https).</value>

-  </data>

-  <data name="DescriptionUseSSLShort" xml:space="preserve">

-    <value>Instructs Duplicati to use an SSL (https) connection</value>

-  </data>

-  <data name="DescriptionDebugPropfindLong" xml:space="preserve">

-    <value>To aid in debugging issues, it is possible to set a path to a file that will be overwritten with the PROPFIND response</value>

-  </data>

-  <data name="DescriptionDebugPropfindShort" xml:space="preserve">

-    <value>Dump the PROPFIND response</value>

-  </data>

-</root>
\ No newline at end of file
diff --git a/Duplicati/Library/Backend/WEBDAV/WEBDAV.cs b/Duplicati/Library/Backend/WEBDAV/WEBDAV.cs
index 0e2ee1e28..57e62ed87 100644
--- a/Duplicati/Library/Backend/WEBDAV/WEBDAV.cs
+++ b/Duplicati/Library/Backend/WEBDAV/WEBDAV.cs
@@ -233,7 +233,7 @@ namespace Duplicati.Library.Backend
             {

                 if (wex.Response as System.Net.HttpWebResponse != null &&

                         ((wex.Response as System.Net.HttpWebResponse).StatusCode == System.Net.HttpStatusCode.NotFound || (wex.Response as System.Net.HttpWebResponse).StatusCode == System.Net.HttpStatusCode.Conflict))

-                    throw new Interface.FolderMissingException(string.Format(Strings.WEBDAV.MissingFolderError, m_path, wex.Message), wex);

+                    throw new Interface.FolderMissingException(Strings.WEBDAV.MissingFolderError(m_path, wex.Message), wex);

 

                 throw;

             }

@@ -382,7 +382,7 @@ namespace Duplicati.Library.Backend
                 //Convert to better exception

                 if (wex.Response as System.Net.HttpWebResponse != null)

                     if ((wex.Response as System.Net.HttpWebResponse).StatusCode == System.Net.HttpStatusCode.Conflict || (wex.Response as System.Net.HttpWebResponse).StatusCode == System.Net.HttpStatusCode.NotFound)

-                        throw new Interface.FolderMissingException(string.Format(Strings.WEBDAV.MissingFolderError, m_path, wex.Message), wex);

+                        throw new Interface.FolderMissingException(Strings.WEBDAV.MissingFolderError(m_path, wex.Message), wex);

 

                 throw;

             }

@@ -411,7 +411,7 @@ namespace Duplicati.Library.Backend
                 if (wex.Response as System.Net.HttpWebResponse != null)

                 {

                     if ((wex.Response as System.Net.HttpWebResponse).StatusCode == System.Net.HttpStatusCode.Conflict)

-                        throw new Interface.FolderMissingException(string.Format(Strings.WEBDAV.MissingFolderError, m_path, wex.Message), wex);

+                        throw new Interface.FolderMissingException(Strings.WEBDAV.MissingFolderError(m_path, wex.Message), wex);

 

                     if

                     (

@@ -421,7 +421,7 @@ namespace Duplicati.Library.Backend
                         &&

                         m_filenamelist.Contains(remotename)

                     )

-                        throw new Exception(string.Format(Strings.WEBDAV.SeenThenNotFoundError, m_path, remotename, System.IO.Path.GetExtension(remotename), wex.Message), wex);

+                        throw new Exception(Strings.WEBDAV.SeenThenNotFoundError(m_path, remotename, System.IO.Path.GetExtension(remotename), wex.Message), wex);

                 }

 

                 throw;