diff options
author | Kenneth Skovhede <kenneth@hexad.dk> | 2015-01-20 23:07:24 +0300 |
---|---|---|
committer | Kenneth Skovhede <kenneth@hexad.dk> | 2015-01-20 23:07:24 +0300 |
commit | 16c791f0b518197361cef99c40964caa4a69830d (patch) | |
tree | c7160834f923725932babad4b08393dfb4408838 /Duplicati/Library/Backend/SSHv2 | |
parent | a8bf04444b6cc8a950426c2cd910a697c7889524 (diff) |
Removed all resx files, now using Duplicati.Library.Localization exclusively
Diffstat (limited to 'Duplicati/Library/Backend/SSHv2')
9 files changed, 41 insertions, 759 deletions
diff --git a/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj b/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj index 762b417e5..ef40bc7ec 100644 --- a/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj +++ b/Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj @@ -50,19 +50,9 @@ <ItemGroup>
<Compile Include="SSHv2Backend.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Strings\SSHv2Backend.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>SSHv2Backend.resx</DependentUpon>
- </Compile>
<Compile Include="KeyGenerator.cs" />
- <Compile Include="Strings\KeyGenerator.Designer.cs">
- <DependentUpon>KeyGenerator.resx</DependentUpon>
- </Compile>
<Compile Include="KeyUploader.cs" />
- <Compile Include="Strings\KeyUploader.Designer.cs">
- <DependentUpon>KeyUploader.resx</DependentUpon>
- </Compile>
+ <Compile Include="Strings.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Interface\Duplicati.Library.Interface.csproj">
@@ -73,24 +63,14 @@ <Project>{DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}</Project>
<Name>Duplicati.Library.Utility</Name>
</ProjectReference>
+ <ProjectReference Include="..\..\Localization\Duplicati.Library.Localization.csproj">
+ <Project>{B68F2214-951F-4F78-8488-66E1ED3F50BF}</Project>
+ <Name>Duplicati.Library.Localization</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="Duplicati.snk" />
</ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Strings\SSHv2Backend.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>SSHv2Backend.Designer.cs</LastGenOutput>
- </EmbeddedResource>
- <EmbeddedResource Include="Strings\KeyGenerator.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>KeyGenerator.Designer.cs</LastGenOutput>
- </EmbeddedResource>
- <EmbeddedResource Include="Strings\KeyUploader.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>KeyUploader.Designer.cs</LastGenOutput>
- </EmbeddedResource>
- </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Duplicati/Library/Backend/SSHv2/SSHv2Backend.cs b/Duplicati/Library/Backend/SSHv2/SSHv2Backend.cs index 447d91b06..ef5a38171 100644 --- a/Duplicati/Library/Backend/SSHv2/SSHv2Backend.cs +++ b/Duplicati/Library/Backend/SSHv2/SSHv2Backend.cs @@ -137,7 +137,7 @@ namespace Duplicati.Library.Backend new CommandLineArgument("auth-password", CommandLineArgument.ArgumentType.Password, Strings.SSHv2Backend.DescriptionAuthPasswordShort, Strings.SSHv2Backend.DescriptionAuthPasswordLong),
new CommandLineArgument("auth-username", CommandLineArgument.ArgumentType.String, Strings.SSHv2Backend.DescriptionAuthUsernameShort, Strings.SSHv2Backend.DescriptionAuthUsernameLong),
new CommandLineArgument(SSH_KEYFILE_OPTION, CommandLineArgument.ArgumentType.Path, Strings.SSHv2Backend.DescriptionSshkeyfileShort, Strings.SSHv2Backend.DescriptionSshkeyfileLong),
- new CommandLineArgument(SSH_KEYFILE_INLINE, CommandLineArgument.ArgumentType.Password, Strings.SSHv2Backend.DescriptionSshkeyShort, string.Format(Strings.SSHv2Backend.DescriptionSshkeyLong, KEYFILE_URI)),
+ new CommandLineArgument(SSH_KEYFILE_INLINE, CommandLineArgument.ArgumentType.Password, Strings.SSHv2Backend.DescriptionSshkeyShort, Strings.SSHv2Backend.DescriptionSshkeyLong(KEYFILE_URI)),
});
}
@@ -214,7 +214,7 @@ namespace Duplicati.Library.Backend }
catch (Exception ex)
{
- throw new Interface.FolderMissingException(string.Format(Strings.SSHv2Backend.FolderNotFoundManagedError, m_path, ex.Message), ex);
+ throw new Interface.FolderMissingException(Strings.SSHv2Backend.FolderNotFoundManagedError(m_path, ex.Message), ex);
}
if (changeDir)
diff --git a/Duplicati/Library/Backend/SSHv2/Strings.cs b/Duplicati/Library/Backend/SSHv2/Strings.cs new file mode 100644 index 000000000..e7b31352c --- /dev/null +++ b/Duplicati/Library/Backend/SSHv2/Strings.cs @@ -0,0 +1,34 @@ +using Duplicati.Library.Localization.Short; +namespace Duplicati.Library.Backend.Strings { + internal static class KeyGenerator { + public static string Description { get { return LC.L(@"Module for generating SSH private/public keys"); } } + public static string DisplayName { get { return LC.L(@"SSH Key Generator"); } } + public static string KeyUsernameShort { get { return LC.L(@"Public key username"); } } + public static string KeyUsernameLong { get { return LC.L(@"A username to append to the public key"); } } + public static string KeyTypeShort { get { return LC.L(@"The key type"); } } + public static string KeyTypeLong { get { return LC.L(@"Determines the type of key to generate"); } } + public static string KeyLenShort { get { return LC.L(@"The key length"); } } + public static string KeyLenLong { get { return LC.L(@"The length of the key in bits"); } } + } + internal static class KeyUploader { + public static string Description { get { return LC.L(@"Module for uploading SSH public keys"); } } + public static string DisplayName { get { return LC.L(@"SSH Key Uploader"); } } + public static string UrlShort { get { return LC.L(@"The SSH connection URL"); } } + public static string UrlLong { get { return LC.L(@"The SSH connection URL used to establish the connection"); } } + public static string PubkeyShort { get { return LC.L(@"The SSH public key to append"); } } + public static string PubkeyLong { get { return LC.L(@"The SSH public key must be a valid SSH string, which is appended to the .ssh/authorized_keys file"); } } + } + internal static class SSHv2Backend { + public static string Description { get { return LC.L(@"This backend can read and write data to an SSH based backend, using SFTP. Allowed formats are ""ssh://hostname/folder"" or ""ssh://username:password@hostname/folder""."); } } + 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 DescriptionSshkeyfileLong { get { return LC.L(@"Points to a valid OpenSSH keyfile. If the file is encrypted, the password supplied is used to decrypt the keyfile. If this option is supplied, the password is not used to authenticate. This option only works when using the managed SSH client."); } } + public static string DescriptionSshkeyfileShort { get { return LC.L(@"Uses a SSH private key to authenticate"); } } + public static string DescriptionSshkeyLong(string urlprefix) { return LC.L(@"An url-encoded SSH private key. The private key must be prefixed with {0}. If the file is encrypted, the password supplied is used to decrypt the keyfile. If this option is supplied, the password is not used to authenticate. This option only works when using the managed SSH client.", urlprefix); } + public static string DescriptionSshkeyShort { get { return LC.L(@"Uses a SSH private key to authenticate"); } } + public static string DisplayName { get { return LC.L(@"SFTP (SSH)"); } } + public static string FolderNotFoundManagedError(string foldername, string message) { return LC.L(@"Unable to set folder to {0}, error message: {1}", foldername, message); } + } +} diff --git a/Duplicati/Library/Backend/SSHv2/Strings/KeyGenerator.Designer.cs b/Duplicati/Library/Backend/SSHv2/Strings/KeyGenerator.Designer.cs deleted file mode 100644 index 5003e53f5..000000000 --- a/Duplicati/Library/Backend/SSHv2/Strings/KeyGenerator.Designer.cs +++ /dev/null @@ -1,97 +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 KeyGenerator { - - private static System.Resources.ResourceManager resourceMan; - - private static System.Globalization.CultureInfo resourceCulture; - - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal KeyGenerator() { - } - - [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.KeyGenerator", typeof(KeyGenerator).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 KeyLenShort { - get { - return ResourceManager.GetString("KeyLenShort", resourceCulture); - } - } - - internal static string KeyTypeShort { - get { - return ResourceManager.GetString("KeyTypeShort", resourceCulture); - } - } - - internal static string Description { - get { - return ResourceManager.GetString("Description", resourceCulture); - } - } - - internal static string DisplayName { - get { - return ResourceManager.GetString("DisplayName", resourceCulture); - } - } - - internal static string KeyTypeLong { - get { - return ResourceManager.GetString("KeyTypeLong", resourceCulture); - } - } - - internal static string KeyUsernameShort { - get { - return ResourceManager.GetString("KeyUsernameShort", resourceCulture); - } - } - - internal static string KeyLenLong { - get { - return ResourceManager.GetString("KeyLenLong", resourceCulture); - } - } - - internal static string KeyUsernameLong { - get { - return ResourceManager.GetString("KeyUsernameLong", resourceCulture); - } - } - } -} diff --git a/Duplicati/Library/Backend/SSHv2/Strings/KeyGenerator.resx b/Duplicati/Library/Backend/SSHv2/Strings/KeyGenerator.resx deleted file mode 100644 index 2427feaeb..000000000 --- a/Duplicati/Library/Backend/SSHv2/Strings/KeyGenerator.resx +++ /dev/null @@ -1,144 +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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <data name="Description" xml:space="preserve">
- <value>Module for generating SSH private/public keys</value>
- </data>
- <data name="DisplayName" xml:space="preserve">
- <value>SSH Key Generator</value>
- </data>
- <data name="KeyUsernameShort" xml:space="preserve">
- <value>Public key username</value>
- </data>
- <data name="KeyUsernameLong" xml:space="preserve">
- <value>A username to append to the public key</value>
- </data>
- <data name="KeyTypeShort" xml:space="preserve">
- <value>The key type</value>
- </data>
- <data name="KeyTypeLong" xml:space="preserve">
- <value>Determines the type of key to generate</value>
- </data>
- <data name="KeyLenShort" xml:space="preserve">
- <value>The key length</value>
- </data>
- <data name="KeyLenLong" xml:space="preserve">
- <value>The length of the key in bits</value>
- </data>
-</root>
\ No newline at end of file diff --git a/Duplicati/Library/Backend/SSHv2/Strings/KeyUploader.Designer.cs b/Duplicati/Library/Backend/SSHv2/Strings/KeyUploader.Designer.cs deleted file mode 100644 index 78a4fcfe5..000000000 --- a/Duplicati/Library/Backend/SSHv2/Strings/KeyUploader.Designer.cs +++ /dev/null @@ -1,85 +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 KeyUploader { - - private static System.Resources.ResourceManager resourceMan; - - private static System.Globalization.CultureInfo resourceCulture; - - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal KeyUploader() { - } - - [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.KeyUploader", typeof(KeyUploader).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 Description { - get { - return ResourceManager.GetString("Description", resourceCulture); - } - } - - internal static string DisplayName { - get { - return ResourceManager.GetString("DisplayName", resourceCulture); - } - } - - internal static string UrlShort { - get { - return ResourceManager.GetString("UrlShort", resourceCulture); - } - } - - internal static string PubkeyLong { - get { - return ResourceManager.GetString("PubkeyLong", resourceCulture); - } - } - - internal static string PubkeyShort { - get { - return ResourceManager.GetString("PubkeyShort", resourceCulture); - } - } - - internal static string UrlLong { - get { - return ResourceManager.GetString("UrlLong", resourceCulture); - } - } - } -} diff --git a/Duplicati/Library/Backend/SSHv2/Strings/KeyUploader.resx b/Duplicati/Library/Backend/SSHv2/Strings/KeyUploader.resx deleted file mode 100644 index 0dea62b0b..000000000 --- a/Duplicati/Library/Backend/SSHv2/Strings/KeyUploader.resx +++ /dev/null @@ -1,138 +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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <data name="Description" xml:space="preserve">
- <value>Module for uploading SSH public keys</value>
- </data>
- <data name="DisplayName" xml:space="preserve">
- <value>SSH Key Uploader</value>
- </data>
- <data name="UrlShort" xml:space="preserve">
- <value>The SSH connection URL</value>
- </data>
- <data name="UrlLong" xml:space="preserve">
- <value>The SSH connection URL used to establish the connection</value>
- </data>
- <data name="PubkeyShort" xml:space="preserve">
- <value>The SSH public key to append</value>
- </data>
- <data name="PubkeyLong" xml:space="preserve">
- <value>The SSH public key must be a valid SSH string, which is appended to the .ssh/authorized_keys file</value>
- </data>
-</root>
\ No newline at end of file diff --git a/Duplicati/Library/Backend/SSHv2/Strings/SSHv2Backend.Designer.cs b/Duplicati/Library/Backend/SSHv2/Strings/SSHv2Backend.Designer.cs deleted file mode 100644 index 0a3e43073..000000000 --- a/Duplicati/Library/Backend/SSHv2/Strings/SSHv2Backend.Designer.cs +++ /dev/null @@ -1,115 +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 SSHv2Backend { - - private static System.Resources.ResourceManager resourceMan; - - private static System.Globalization.CultureInfo resourceCulture; - - [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal SSHv2Backend() { - } - - [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.SSHv2Backend", typeof(SSHv2Backend).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 DescriptionAuthPasswordShort { - get { - return ResourceManager.GetString("DescriptionAuthPasswordShort", resourceCulture); - } - } - - internal static string DescriptionSshkeyLong { - get { - return ResourceManager.GetString("DescriptionSshkeyLong", resourceCulture); - } - } - - internal static string DescriptionAuthUsernameShort { - get { - return ResourceManager.GetString("DescriptionAuthUsernameShort", resourceCulture); - } - } - - internal static string DescriptionSshkeyfileLong { - get { - return ResourceManager.GetString("DescriptionSshkeyfileLong", resourceCulture); - } - } - - internal static string DescriptionAuthPasswordLong { - get { - return ResourceManager.GetString("DescriptionAuthPasswordLong", resourceCulture); - } - } - - internal static string FolderNotFoundManagedError { - get { - return ResourceManager.GetString("FolderNotFoundManagedError", resourceCulture); - } - } - - internal static string Description { - get { - return ResourceManager.GetString("Description", resourceCulture); - } - } - - internal static string DescriptionSshkeyShort { - get { - return ResourceManager.GetString("DescriptionSshkeyShort", resourceCulture); - } - } - - internal static string DescriptionAuthUsernameLong { - get { - return ResourceManager.GetString("DescriptionAuthUsernameLong", resourceCulture); - } - } - - internal static string DisplayName { - get { - return ResourceManager.GetString("DisplayName", resourceCulture); - } - } - - internal static string DescriptionSshkeyfileShort { - get { - return ResourceManager.GetString("DescriptionSshkeyfileShort", resourceCulture); - } - } - } -} diff --git a/Duplicati/Library/Backend/SSHv2/Strings/SSHv2Backend.resx b/Duplicati/Library/Backend/SSHv2/Strings/SSHv2Backend.resx deleted file mode 100644 index 24df58dfe..000000000 --- a/Duplicati/Library/Backend/SSHv2/Strings/SSHv2Backend.resx +++ /dev/null @@ -1,153 +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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <data name="Description" xml:space="preserve">
- <value>This backend can read and write data to an SSH based backend, using SFTP. Allowed formats are "ssh://hostname/folder" or "ssh://username:password@hostname/folder".</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="DescriptionSshkeyfileLong" xml:space="preserve">
- <value>Points to a valid OpenSSH keyfile. If the file is encrypted, the password supplied is used to decrypt the keyfile. If this option is supplied, the password is not used to authenticate. This option only works when using the managed SSH client.</value>
- </data>
- <data name="DescriptionSshkeyfileShort" xml:space="preserve">
- <value>Uses a SSH private key to authenticate</value>
- </data>
- <data name="DescriptionSshkeyLong" xml:space="preserve">
- <value>An url-encoded SSH private key. The private key must be prefixed with {0}. If the file is encrypted, the password supplied is used to decrypt the keyfile. If this option is supplied, the password is not used to authenticate. This option only works when using the managed SSH client.</value>
- </data>
- <data name="DescriptionSshkeyShort" xml:space="preserve">
- <value>Uses a SSH private key to authenticate</value>
- </data>
- <data name="DisplayName" xml:space="preserve">
- <value>SFTP (SSH)</value>
- </data>
- <data name="FolderNotFoundManagedError" xml:space="preserve">
- <value>Unable to set folder to {0}, error message: {1}</value>
- </data>
-</root>
\ No newline at end of file |