diff --git a/Duplicati.Library.RestAPI/Strings.cs b/Duplicati.Library.RestAPI/Strings.cs index b55a01b13..5c7a07588 100644 --- a/Duplicati.Library.RestAPI/Strings.cs +++ b/Duplicati.Library.RestAPI/Strings.cs @@ -14,7 +14,7 @@ Error message: {0}", message); } "); } } public static string HelpDisplayFormat(string optionname, string optiontext) { return LC.L(@"--{0}: {1}", optionname, optiontext); } - public static string ParametersFileOptionLong2 { get { return LC.L(@"This option can be used to store some or all of the options given to the commandline client. The file must be a plain text file, UTF-8 encoding is preferred. Each line in the file should be of the format --option=value. The special options --{0} and --{1} can be used to override the localpath and the remote destination uri, respectively. The options in this file take precedence over the options provided on the commandline. You cannot specify filters in both the file and on the commandline. Instead, you can use the special --{2}, --{3}, or --{4} options to specify filters inside the parameter file. Each filter must be prefixed with either a + or a -, and multiple filters must be joined with {5} ", "source", "target", "replace-filter", "append-filter", "prepend-filter", System.IO.Path.PathSeparator); } } + public static string ParametersFileOptionLong2 { get { return LC.L(@"This option can be used to store some or all of the options given to the commandline client. The file must be a plain text file, and UTF-8 encoding is preferred. Each line in the file should be of the format --option=value. The special options --{0} and --{1} can be used to override the localpath and the remote destination uri, respectively. The options in this file take precedence over the options provided on the commandline. You cannot specify filters in both the file and on the commandline. Instead, you can use the special --{2}, --{3}, or --{4} options to specify filters inside the parameter file. Each filter must be prefixed with either a + or a -, and multiple filters must be joined with {5} ", "source", "target", "replace-filter", "append-filter", "prepend-filter", System.IO.Path.PathSeparator); } } public static string ParametersFileOptionShort { get { return LC.L(@"Path to a file with parameters"); } } public static string FiltersCannotBeUsedWithFileError2 { get { return LC.L(@"Filters cannot be specified on the commandline if filters are also present in the parameter file. Use the special --{0}, --{1}, or --{2} options to specify filters inside the parameter file. Each filter must be prefixed with either a + or a -, and multiple filters must be joined with {3}", "replace-filter", "append-filter", "prepend-filter", System.IO.Path.PathSeparator); } } public static string FailedToParseParametersFileError(string path, string message) { return LC.L(@"Unable to read the parameters file ""{0}"", reason: {1}", path, message); } @@ -23,7 +23,7 @@ Error message: {0}", message); } public static string LoglevelCommandDescription { get { return LC.L(@"Determines the amount of information written in the log file"); } } public static string PortablemodeCommandDescription { get { return LC.L(@"Activates portable mode where the database is placed below the program executable"); } } public static string SeriousError(string message) { return LC.L(@"A serious error occurred in Duplicati: {0}", message); } - public static string StartupFailure(System.Exception error) { return LC.L(@"Unable to start up, perhaps another process is already running? + public static string StartupFailure(System.Exception error) { return LC.L(@"Unable to start up. Perhaps another process is already running? Error message: {0}", error); } public static string UnencrypteddatabaseCommandDescription { get { return LC.L(@"Disables database encryption"); } } public static string WrongSQLiteVersion(System.Version actualversion, string expectedversion) { return LC.L(@"Unsupported version of SQLite detected ({0}), must be {1} or higher", actualversion, expectedversion); } diff --git a/Duplicati/CommandLine/CLI/Strings.cs b/Duplicati/CommandLine/CLI/Strings.cs index afb2065a9..78c956034 100644 --- a/Duplicati/CommandLine/CLI/Strings.cs +++ b/Duplicati/CommandLine/CLI/Strings.cs @@ -41,13 +41,13 @@ namespace Duplicati.CommandLine.Strings public static string FailedToParseParametersFileError(string path, string message) { return LC.L(@"Unable to read the parameters file ""{0}"", reason: {1}", path, message); } public static string FiltersCannotBeUsedWithFileError2 { get { return LC.L(@"Filters cannot be specified on the commandline if filters are also present in the parameter file. Use the special --{0}, --{1}, or --{2} options to specify filters inside the parameter file. Each filter must be prefixed with either a + or a -, and multiple filters must be joined with {3}.", "replace-filter", "append-filter", "prepend-filter", System.IO.Path.PathSeparator); } } public static string InternalOptionUsedError(string optionname) { return LC.L(@"The option --{0} was supplied, but it is reserved for internal use and may not be set on the commandline.", optionname); } - public static string ParametersFileOptionLong2 { get { return LC.L(@"This option can be used to store some or all of the options given to the commandline client. The file must be a plain text file, UTF-8 encoding is preferred. Each line in the file should be of the format --option=value. The special options --{0} and --{1} can be used to override the localpath and the remote destination uri, respectively. The options in this file take precedence over the options provided on the commandline. You cannot specify filters in both the file and on the commandline. Instead, you can use the special --{2}, --{3}, or --{4} options to specify filters inside the parameter file. Each filter must be prefixed with either a + or a -, and multiple filters must be joined with {5}.", "source", "target", "replace-filter", "append-filter", "prepend-filter", System.IO.Path.PathSeparator); } } + public static string ParametersFileOptionLong2 { get { return LC.L(@"This option can be used to store some or all of the options given to the commandline client. The file must be a plain text file, and UTF-8 encoding is preferred. Each line in the file should be of the format --option=value. The special options --{0} and --{1} can be used to override the localpath and the remote destination uri, respectively. The options in this file take precedence over the options provided on the commandline. You cannot specify filters in both the file and on the commandline. Instead, you can use the special --{2}, --{3}, or --{4} options to specify filters inside the parameter file. Each filter must be prefixed with either a + or a -, and multiple filters must be joined with {5}.", "source", "target", "replace-filter", "append-filter", "prepend-filter", System.IO.Path.PathSeparator); } } public static string ParametersFileOptionShort { get { return LC.L(@"Path to a file with parameters"); } } public static string UnhandledException(string message) { return LC.L(@"An error occured: {0}", message); } public static string UnhandledInnerException(string message) { return LC.L(@"The inner error message is: {0}", message); } - public static string IncludeLong { get { return LC.L(@"Include files that match this filter. The special character * means any number of character, and the special character ? means any single character, use *.txt to include all files with a txt extension. Regular expressions are also supported and can be supplied by using hard braces, e.g. [.*\.txt]. Filter groups (which encapsulate a built-in set of well-known files and folders) can be specified by using curly braces, e.g. {{Applications}}."); } } + public static string IncludeLong { get { return LC.L(@"Include files that match this filter. The special character * means any number of character, and the special character ? means any single character. Use *.txt to include all files with a txt extension. Regular expressions are also supported and can be supplied by using hard braces, e.g. [.*\.txt]. Filter groups (which encapsulate a built-in set of well-known files and folders) can be specified by using curly braces, e.g. {{Applications}}."); } } public static string IncludeShort { get { return LC.L(@"Include files"); } } - public static string ExcludeLong { get { return LC.L(@"Exclude files that match this filter. The special character * means any number of character, and the special character ? means any single character, use *.txt to exclude all files with a txt extension. Regular expressions are also supported and can be supplied by using hard braces, e.g. [.*\.txt]. Filter groups (which encapsulate a built-in set of well-known files and folders) can be specified by using curly braces, e.g. {{TemporaryFiles}}."); } } + public static string ExcludeLong { get { return LC.L(@"Exclude files that match this filter. The special character * means any number of character, and the special character ? means any single character. Use *.txt to exclude all files with a txt extension. Regular expressions are also supported and can be supplied by using hard braces, e.g. [.*\.txt]. Filter groups (which encapsulate a built-in set of well-known files and folders) can be specified by using curly braces, e.g. {{TemporaryFiles}}."); } } public static string ExcludeShort { get { return LC.L(@"Exclude files"); } } public static string ControlFilesOptionLong { get { return LC.L(@"If this option is used with a backup operation, it is interpreted as a list of files to add to the filesets. When used with list or restore, it will list or restore the control files instead of the normal files."); } } public static string ControlFilesOptionShort { get { return LC.L(@"Use control files"); } } diff --git a/Duplicati/Library/Backend/CloudFiles/Strings.cs b/Duplicati/Library/Backend/CloudFiles/Strings.cs index 2f00d9f66..87e4f01c8 100644 --- a/Duplicati/Library/Backend/CloudFiles/Strings.cs +++ b/Duplicati/Library/Backend/CloudFiles/Strings.cs @@ -23,23 +23,23 @@ namespace Duplicati.Library.Backend.Strings { internal static class CloudFiles { public static string Description_v2 { get { return LC.L(@"Supports connections to the CloudFiles backend. Allowed formats is ""cloudfiles://container/folder""."); } } public static string DisplayName { get { return LC.L(@"Rackspace CloudFiles"); } } - public static string DescriptionAuthenticationURLLong_v2(string optionname) { return LC.L(@"CloudFiles use different servers for authentication based on where the account resides, use this option to set an alternate authentication URL. This option overrides --{0}.", optionname); } + public static string DescriptionAuthenticationURLLong_v2(string optionname) { return LC.L(@"CloudFiles use different servers for authentication based on where the account resides. Use this option to set an alternate authentication URL. This option overrides --{0}.", optionname); } public static string DescriptionAuthenticationURLShort { get { return LC.L(@"Provide another authentication URL"); } } 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 DescriptionPasswordLong { get { return LC.L(@"Supplies the API Access Key used to authenticate with CloudFiles."); } } + public static string DescriptionPasswordLong { get { return LC.L(@"The API Access Key used to authenticate with CloudFiles."); } } public static string DescriptionPasswordShort { get { return LC.L(@"Supplies the access key used to connect to the server"); } } - public static string DescriptionUKAccountLong(string optionname, string optionvalue) { return LC.L(@"Duplicati will assume that the credentials given are for a US account, use this option if the account is a UK based account. Note that this is equivalent to setting --{0}={1}.", optionname, optionvalue); } + public static string DescriptionUKAccountLong(string optionname, string optionvalue) { return LC.L(@"Duplicati will assume that the credentials given are for a US account. Use this option if the account is a UK based account. Note that this is equivalent to setting --{0}={1}.", optionname, optionvalue); } public static string DescriptionUKAccountShort { get { return LC.L(@"Use a UK account"); } } - public static string DescriptionUsernameLong { get { return LC.L(@"Supplies the username used to authenticate with CloudFiles."); } } + public static string DescriptionUsernameLong { get { return LC.L(@"The username used to authenticate with CloudFiles."); } } public static string DescriptionUsernameShort { get { return LC.L(@"Supplies the username used to authenticate with CloudFiles"); } } public static string ETagVerificationError { get { return LC.L(@"MD5 Hash (ETag) verification failed"); } } public static string FileDeleteError { get { return LC.L(@"Failed to delete file"); } } public static string FileUploadError { get { return LC.L(@"Failed to upload file"); } } public static string NoAPIKeyError { get { return LC.L(@"No CloudFiles API Access Key given"); } } public static string NoUserIDError { get { return LC.L(@"No CloudFiles userID given"); } } - public static string UnexpectedResponseError { get { return LC.L(@"Unexpected CloudFiles response, perhaps the API has changed?"); } } + public static string UnexpectedResponseError { get { return LC.L(@"Unexpected CloudFiles response. Perhaps the API has changed?"); } } } } diff --git a/Duplicati/Library/Backend/FTP/Strings.cs b/Duplicati/Library/Backend/FTP/Strings.cs index 3294c5e76..2fe104816 100644 --- a/Duplicati/Library/Backend/FTP/Strings.cs +++ b/Duplicati/Library/Backend/FTP/Strings.cs @@ -26,15 +26,15 @@ namespace Duplicati.Library.Backend.Strings { internal static class FTPBackend { public static string Description { get { return LC.L(@"This backend can read and write data to an FTP based backend. Allowed formats are ""ftp://hostname/folder"" or ""ftp://username:password@hostname/folder""."); } } public static string DisplayName { get { return LC.L(@"FTP"); } } - public static string DescriptionFTPActiveLong { get { return LC.L(@"If this flag is set, the FTP connection is made in active mode. Even if the ""ftp-passive"" flag is also set, the connection will be made in active mode."); } } + public static string DescriptionFTPActiveLong { get { return LC.L(@"Activate this option to make the FTP connection in active mode. Even if the option --{0} is also set, the connection will be made in active mode.", "ftp-passive"); } } public static string DescriptionFTPActiveShort { get { return LC.L(@"Toggles the FTP connections method"); } } - public static string DescriptionFTPPassiveLong { get { return LC.L(@"If this flag is set, the FTP connection is made in passive mode, which works better with some firewalls. If the ""ftp-regular"" flag is also set, this flag is ignored."); } } + public static string DescriptionFTPPassiveLong { get { return LC.L(@"Activate this option to make the FTP connection in passive mode, which works better with some firewalls. If the option --{0} is set, this option is ignored.", "ftp-regular"); } } public static string DescriptionFTPPassiveShort { get { return LC.L(@"Toggles the FTP connections 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 DescriptionUseSSLLong { get { return LC.L(@"Use this flag to communicate using Secure Socket Layer (SSL) over ftp (ftps)."); } } + public static string DescriptionUseSSLLong { get { return LC.L(@"Use this option to communicate using Secure Socket Layer (SSL) over ftp (ftps)."); } } public static string DescriptionUseSSLShort { get { return LC.L(@"Instructs Duplicati to use an SSL (ftps) connection"); } } public static string DescriptionDisableUploadVerifyLong { get { return LC.L(@"To protect against network failures, every upload will be attempted verified. Use this option to disable this verification to make the upload faster but less reliable."); } } public static string DescriptionDisableUploadVerifyShort { get { return LC.L(@"Disable upload verification"); } } diff --git a/Duplicati/Library/Backend/GoogleServices/Strings.cs b/Duplicati/Library/Backend/GoogleServices/Strings.cs index e2104f51a..8a8f7b81b 100644 --- a/Duplicati/Library/Backend/GoogleServices/Strings.cs +++ b/Duplicati/Library/Backend/GoogleServices/Strings.cs @@ -26,7 +26,7 @@ namespace Duplicati.Library.Backend.Strings internal static class GoogleCloudStorage { public static string Description { get { return LC.L(@"This backend can read and write data to Google Cloud Storage. Supported format is ""gcs://bucket/folder""."); } } public static string DisplayName { get { return LC.L(@"Google Cloud Storage"); } } - public static string MissingAuthID(string url) { return LC.L(@"You need an AuthID, you can get it from: {0}", url); } + public static string MissingAuthID(string url) { return LC.L(@"You need an AuthID. You can get it from: {0}", url); } public static string ProjectIDMissingError(string projectoption) { return LC.L(@"You must supply a project ID with --{0} for creating a bucket.", projectoption); } public static string AuthidLong(string url) { return LC.L(@"The authorization token retrieved from {0}", url); } public static string AuthidShort { get { return LC.L(@"The authorization code"); } } diff --git a/Duplicati/Library/Backend/Jottacloud/Strings.cs b/Duplicati/Library/Backend/Jottacloud/Strings.cs index d9baa23c8..4ffd9bdc4 100644 --- a/Duplicati/Library/Backend/Jottacloud/Strings.cs +++ b/Duplicati/Library/Backend/Jottacloud/Strings.cs @@ -27,7 +27,7 @@ namespace Duplicati.Library.Backend.Strings { public static string AuthidLong(string url) { return LC.L(@"The authorization token retrieved from {0}", url); } public static string AuthidShort { get { return LC.L(@"The authorization code"); } } public static string NoUsernameError { get { return LC.L(@"No username found"); } } - public static string NoPathError { get { return LC.L(@"No path given, cannot upload files to the root folder"); } } + public static string NoPathError { get { return LC.L(@"No path given. Files cannot be uploaded to the root folder"); } } public static string IllegalMountPoint { get { return LC.L(@"Illegal mount point given."); } } public static string FileUploadError { get { return LC.L(@"Failed to upload file"); } } public static string DescriptionDeviceLong(string mountPointOption) { return LC.L(@"The backup device to use. Will be created if not already exists. You can manage your devices from the backup panel in the Jottacloud web interface. When you specify a custom device you should also specify the mount point to use on this device with the ""{0}"" option.", mountPointOption); } diff --git a/Duplicati/Library/Backend/OAuthHelper/Strings.cs b/Duplicati/Library/Backend/OAuthHelper/Strings.cs index 3e639cf86..597563abd 100644 --- a/Duplicati/Library/Backend/OAuthHelper/Strings.cs +++ b/Duplicati/Library/Backend/OAuthHelper/Strings.cs @@ -23,11 +23,11 @@ using Duplicati.Library.Localization.Short; namespace Duplicati.Library.Strings { public static class OAuthHelper { - public static string MissingAuthID(string url) { return LC.L(@"You need an AuthID, you can get it from: {0}", url); } + public static string MissingAuthID(string url) { return LC.L(@"You need an AuthID. You can get it from: {0}", url); } public static string AuthorizationFailure(string message, string url) { return LC.L(@"Failed to authorize using the OAuth service: {0}. If the problem persists, try generating a new authid token from: {1}", message, url); } public static string UnexpectedError(System.Net.HttpStatusCode statuscode, string description) { return LC.L(@"Unexpected error code: {0} - {1}", statuscode, description); } public static string AuthidLong(string url) { return LC.L(@"The authorization token retrieved from {0}", url); } public static string AuthidShort { get { return LC.L(@"The authorization code"); } } - public static string OverQuotaError { get { return LC.L(@"The OAuth service is currently over quota, try again in a few hours"); } } + public static string OverQuotaError { get { return LC.L(@"The OAuth service is currently over quota. Try again in a few hours"); } } } } diff --git a/Duplicati/Library/Backend/OpenStack/Strings.cs b/Duplicati/Library/Backend/OpenStack/Strings.cs index af521f0e1..f1ba7cace 100644 --- a/Duplicati/Library/Backend/OpenStack/Strings.cs +++ b/Duplicati/Library/Backend/OpenStack/Strings.cs @@ -39,7 +39,7 @@ namespace Duplicati.Library.Backend.Strings public static string ApikeyOptionShort { get { return LC.L(@"Supplies the API key used to connect to the server"); } } public static string AuthuriOptionLong(string providers) { return LC.L(@"The authentication URL is used to authenticate the user and find the storage service. The URL commonly ends with ""/v2.0"". Known providers are: {0}{1}", System.Environment.NewLine, providers); } public static string AuthuriOptionShort { get { return LC.L(@"Supplies the authentication URL"); } } - public static string VersionOptionLong { get { return LC.L(@"The keystone API version to use, valid values are 'v2' and 'v3'."); } } + public static string VersionOptionLong { get { return LC.L(@"The keystone API version to use. Valid values are 'v2' and 'v3'."); } } public static string VersionOptionShort { get { return LC.L(@"The keystone API version to use"); } } public static string RegionOptionLong { get { return LC.L(@"This option is only used when creating a container, and is used to indicate where the container should be placed. Consult your provider for a list of valid regions, or leave empty for the default region."); } } public static string RegionOptionShort { get { return LC.L(@"Supplies the region used for creating a container"); } } diff --git a/Duplicati/Library/Backend/S3/Strings.cs b/Duplicati/Library/Backend/S3/Strings.cs index 5345f3582..15649c49a 100644 --- a/Duplicati/Library/Backend/S3/Strings.cs +++ b/Duplicati/Library/Backend/S3/Strings.cs @@ -43,7 +43,7 @@ namespace Duplicati.Library.Backend.Strings public static string S3ServerNameDescriptionShort { get { return LC.L(@"Specifies an alternate S3 server name"); } } public static string S3ClientDescriptionLong { get { return LC.L(@"Set either to aws or minio. Then either the AWS SDK or Minio SDK will be used to communicate with S3 services."); } } public static string S3ClientDescriptionShort { get { return LC.L(@"Specifies the S3 client library to use"); } } - public static string DescriptionUseSSLLong { get { return LC.L(@"Use this flag to communicate using Secure Socket Layer (SSL) over http (https). Note that bucket names containing a period has problems with SSL connections."); } } + public static string DescriptionUseSSLLong { get { return LC.L(@"Use this option to communicate using Secure Socket Layer (SSL) over http (https). Note that bucket names containing a period has problems with SSL connections."); } } public static string DescriptionUseSSLShort { get { return LC.L(@"Instructs Duplicati to use an SSL (https) connection"); } } public static string DescriptionDisableChunkEncodingLong { get { return LC.L(@"This disables chunk encoding for the aws client, which is not supported by all S3 providers."); } } public static string DescriptionDisableChunkEncodingShort { get { return LC.L(@"Disable chunk encoding (aws client only)"); } } diff --git a/Duplicati/Library/Backend/TahoeLAFS/Strings.cs b/Duplicati/Library/Backend/TahoeLAFS/Strings.cs index b290fb94e..735df6729 100644 --- a/Duplicati/Library/Backend/TahoeLAFS/Strings.cs +++ b/Duplicati/Library/Backend/TahoeLAFS/Strings.cs @@ -23,7 +23,7 @@ namespace Duplicati.Library.Backend.Strings { internal static class TahoeBackend { public static string Description { get { return LC.L(@"This backend can read and write data to a Tahoe-LAFS based backend. Allowed format is ""tahoe://hostname:port/uri/$DIRCAP""."); } } public static string Displayname { get { return LC.L(@"Tahoe-LAFS"); } } - public static string DescriptionUseSSLLong { get { return LC.L(@"Use this flag to communicate using Secure Socket Layer (SSL) over http (https)."); } } + public static string DescriptionUseSSLLong { get { return LC.L(@"Use this option 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 MissingFolderError(string foldername, string message) { return LC.L(@"The folder {0} was not found, message: {1}", foldername, message); } public static string UnrecognizedUriError { get { return LC.L(@"Unsupported URL format, must start with ""uri/URI:DIR2:"""); } } diff --git a/Duplicati/Library/Backend/TencentCOS/Strings.cs b/Duplicati/Library/Backend/TencentCOS/Strings.cs index 7c03c126d..e8a1b0615 100644 --- a/Duplicati/Library/Backend/TencentCOS/Strings.cs +++ b/Duplicati/Library/Backend/TencentCOS/Strings.cs @@ -34,7 +34,7 @@ namespace Duplicati.Library.Backend.Strings public static string COSAPISecretKeyDescriptionShort { get { return LC.L(@"Secret Key"); } } public static string COSBucketDescriptionLong { get { return LC.L(@"Bucket, format: BucketName-APPID"); } } public static string COSBucketDescriptionShort { get { return LC.L(@"Bucket"); } } - public static string COSLocationDescriptionLong { get { return LC.L(@"Region is the distribution area of ​​the Tencent cloud hosting machine room, the object storage COS data is stored in the storage buckets of these regions. https://intl.cloud.tencent.com/document/product/436/6224."); } } + public static string COSLocationDescriptionLong { get { return LC.L(@"Region is the distribution area of ​​the Tencent cloud hosting machine room. The object storage COS data is stored in the storage buckets of these regions. https://intl.cloud.tencent.com/document/product/436/6224."); } } public static string COSLocationDescriptionShort { get { return LC.L(@"Specifies COS location constraints"); } } public static string COSStorageClassDescriptionLong { get { return LC.L(@"Storage class of the object; check enumerated values at https://intl.cloud.tencent.com/document/product/436/30925."); } } public static string COSStorageClassDescriptionShort { get { return LC.L(@"Storage class of the object"); } } diff --git a/Duplicati/Library/Backend/WEBDAV/Strings.cs b/Duplicati/Library/Backend/WEBDAV/Strings.cs index 100084033..638f2ddc2 100644 --- a/Duplicati/Library/Backend/WEBDAV/Strings.cs +++ b/Duplicati/Library/Backend/WEBDAV/Strings.cs @@ -23,7 +23,7 @@ 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 DisplayName { get { return LC.L(@"WebDAV"); } } - 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 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 option, 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"); } } @@ -36,7 +36,7 @@ namespace Duplicati.Library.Backend.Strings { 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 DescriptionUseSSLLong { get { return LC.L(@"Use this option 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/Compression/Strings.cs b/Duplicati/Library/Compression/Strings.cs index f255e0ef8..f71114fe1 100644 --- a/Duplicati/Library/Compression/Strings.cs +++ b/Duplicati/Library/Compression/Strings.cs @@ -28,7 +28,7 @@ namespace Duplicati.Library.Compression.Strings { public static string CompressionlevelShort { get { return LC.L(@"Sets the Zip compression level"); } } public static string CompressionmethodLong(string optionname) { return LC.L(@"This option can be used to set an alternative compressor method, such as LZMA. Note that using another value than Deflate will cause the {0} option to be ignored.", optionname); } public static string CompressionmethodShort { get { return LC.L(@"Sets the Zip compression method"); } } - public static string Compressionzip64Long { get { return LC.L(@"The zip64 format is required for files larger than 4GiB. Use this flag to toggle it."); } } + public static string Compressionzip64Long { get { return LC.L(@"The zip64 format is required for files larger than 4GiB. Use this option to toggle it."); } } public static string Compressionzip64Short { get { return LC.L(@"Toggles Zip64 support"); } } public static string FileNotFoundError(string filename) { return LC.L(@"File not found: {0}", filename); } } diff --git a/Duplicati/Library/Main/Strings.cs b/Duplicati/Library/Main/Strings.cs index 1ae7647a6..93c234d7a 100644 --- a/Duplicati/Library/Main/Strings.cs +++ b/Duplicati/Library/Main/Strings.cs @@ -28,13 +28,13 @@ namespace Duplicati.Library.Main.Strings public static string HashMismatchError(string filename, string recordedhash, string actualhash) { return LC.L(@"Hash mismatch on file ""{0}"", recorded hash: {1}, actual hash {2}", filename, recordedhash, actualhash); } public static string DownloadedFileSizeError(string filename, long actualsize, long expectedsize) { return LC.L(@"The file {0} was downloaded and had size {1} but the size was expected to be {2}", filename, actualsize, expectedsize); } public static string DeprecatedOptionUsedWarning(string optionname, string message) { return LC.L(@"The option {0} is deprecated: {1}", optionname, message); } - public static string DuplicateOptionNameWarning(string optionname) { return LC.L(@"The option --{0} exists more than once, please report this to the developers", optionname); } + public static string DuplicateOptionNameWarning(string optionname) { return LC.L(@"The option --{0} exists more than once. Please report this to the developers", optionname); } public static string NoSourceFoldersError { get { return LC.L(@"No source folders specified for backup"); } } public static string SourceIsMissingError(string foldername) { return LC.L(@"Backup aborted since the source path {0} does not exist. Please verify that the source path exists, or remove the source path from the backup configuration, or set the allow-missing-source option.", foldername); } public static string SourceUnauthorizedError(string foldername) { return LC.L(@"Unauthorized to access source folder {0}, aborting backup", foldername); } - public static string UnsupportedBooleanValue(string optionname, string value) { return LC.L(@"The value ""{1}"" supplied to --{0} does not parse into a valid boolean, this will be treated as if it was set to ""true""", optionname, value); } - public static string UnsupportedEnumerationValue(string optionname, string value, string[] values) { return LC.L(@"The option --{0} does not support the value ""{1}"", supported values are: {2}", optionname, value, string.Join(", ", values)); } - public static string UnsupportedFlagsValue(string optionname, string value, string[] values) { return LC.L(@"The option --{0} does not support the value ""{1}"", supported flag values are: {2}", optionname, value, string.Join(", ", values)); } + public static string UnsupportedBooleanValue(string optionname, string value) { return LC.L(@"The value ""{1}"" supplied to --{0} does not parse into a valid boolean. This will be treated as if it was set to ""true""", optionname, value); } + public static string UnsupportedEnumerationValue(string optionname, string value, string[] values) { return LC.L(@"The option --{0} does not support the value ""{1}"". Supported values are: {2}", optionname, value, string.Join(", ", values)); } + public static string UnsupportedFlagsValue(string optionname, string value, string[] values) { return LC.L(@"The option --{0} does not support the value ""{1}"". Supported flag values are: {2}", optionname, value, string.Join(", ", values)); } public static string UnsupportedIntegerValue(string optionname, string value) { return LC.L(@"The value ""{1}"" supplied to --{0} does not represent a valid integer", optionname, value); } public static string UnsupportedOptionDisabledModuleWarning(string optionname, string modulename) { return LC.L(@"The option --{0} is not supported because the module {1} is not currently loaded", optionname, modulename); } public static string UnsupportedOptionWarning(string optionname) { return LC.L(@"The supplied option --{0} is not supported and will be ignored", optionname); } @@ -53,11 +53,11 @@ namespace Duplicati.Library.Main.Strings internal static class Options { - public static string AutocleanupLong { get { return LC.L(@"If a backup is interrupted there will likely be partial files present on the backend. Using this flag, Duplicati will automatically remove such files when encountered."); } } - public static string AutocleanupShort { get { return LC.L(@"A flag indicating that Duplicati should remove unused files"); } } + public static string AutocleanupLong { get { return LC.L(@"If a backup is interrupted there will likely be partial files present on the backend. Using this option, Duplicati will automatically remove such files when encountered."); } } + public static string AutocleanupShort { get { return LC.L(@"Remove unused files"); } } public static string PrefixLong { get { return LC.L(@"A string used to prefix the filenames of the remote volumes, can be used to store multiple backups in the same remote folder. The prefix cannot contain a hyphen (-), but can contain all other characters allowed by the remote storage."); } } public static string PrefixShort { get { return LC.L(@"Remote filename prefix"); } } - public static string DisablefiletimecheckLong { get { return LC.L(@"The operating system keeps track of the last time a file was written. Using this information, Duplicati can quickly determine if the file has been modified. If some application deliberately modifies this information, Duplicati won't work correctly unless this flag is set."); } } + public static string DisablefiletimecheckLong { get { return LC.L(@"The operating system keeps track of the last time a file was written. Using this information, Duplicati can quickly determine if the file has been modified. If some application deliberately modifies this information, Duplicati won't work correctly unless this option is set."); } } public static string DisablefiletimecheckShort { get { return LC.L(@"Disable checks based on file time"); } } public static string RestorepathLong { get { return LC.L(@"By default, files will be restored in the source folders. Use this option to restore to another folder."); } } public static string RestorepathShort { get { return LC.L(@"Restore to another folder"); } } @@ -73,9 +73,9 @@ namespace Duplicati.Library.Main.Strings public static string NumberofretriesShort { get { return LC.L(@"Number of times to retry a failed transmission"); } } public static string PassphraseLong { get { return LC.L(@"Supply a passphrase that Duplicati will use to encrypt the backup volumes, making them unreadable without the passphrase. This variable can also be supplied through the environment variable PASSPHRASE."); } } public static string PassphraseShort { get { return LC.L(@"Passphrase used to encrypt backups"); } } - public static string TimeLong { get { return LC.L(@"By default, Duplicati will list and restore files from the most recent backup, use this option to select another item. You may use relative times, like ""-2M"" for a backup from two months ago."); } } + public static string TimeLong { get { return LC.L(@"By default, Duplicati will list and restore files from the most recent backup. Use this option to select another item. You may use relative times, like ""-2M"" for a backup from two months ago."); } } public static string TimeShort { get { return LC.L(@"The time to list/restore files"); } } - public static string VersionLong { get { return LC.L(@"By default, Duplicati will list and restore files from the most recent backup, use this option to select another item. You may enter multiple values separated with comma, and ranges using -, e.g. ""0,2-4,7"" ."); } } + public static string VersionLong { get { return LC.L(@"By default, Duplicati will list and restore files from the most recent backup. Use this option to select another item. You may enter multiple values separated with comma, and ranges using -, e.g. ""0,2-4,7"" ."); } } public static string VersionShort { get { return LC.L(@"The version to list/restore files"); } } public static string AllversionsLong { get { return LC.L(@"When searching for files, only the most recent backup is searched. Use this option to show all previous versions too."); } } public static string AllversionsShort { get { return LC.L(@"Show all versions"); } } @@ -89,8 +89,8 @@ namespace Duplicati.Library.Main.Strings public static string RetrywithexponentialbackoffShort { get { return LC.L(@"Exponential backoff for backend errors"); } } public static string ControlfilesLong { get { return LC.L(@"Use this option to attach extra files to the newly uploaded filelists."); } } public static string ControlfilesShort { get { return LC.L(@"Set control files"); } } - public static string SkipfilehashchecksLong { get { return LC.L(@"If the hash for the volume does not match, Duplicati will refuse to use the backup. Supply this flag to allow Duplicati to proceed anyway."); } } - public static string SkipfilehashchecksShort { get { return LC.L(@"Set this flag to skip hash checks"); } } + public static string SkipfilehashchecksLong { get { return LC.L(@"If the hash for the volume does not match, Duplicati will refuse to use the backup. Activate this option to allow Duplicati to proceed anyway."); } } + public static string SkipfilehashchecksShort { get { return LC.L(@"Skip hash checks"); } } public static string SkipfileslargerthanLong { get { return LC.L(@"This option allows you to exclude files that are larger than the given value. Use this to prevent backups becoming extremely large."); } } public static string SkipfileslargerthanShort { get { return LC.L(@"Limit the size of files being backed up"); } } public static string TempdirLong { get { return LC.L(@"This option can be used to supply an alternative folder for temporary storage. By default the system default temporary folder is used. Note that also SQLite will put temporary files in this temporary folder."); } } @@ -119,7 +119,7 @@ namespace Duplicati.Library.Main.Strings public static string AsynchronousuploadlimitShort { get { return LC.L(@"The number of volumes to create ahead of time"); } } public static string AsynchronousconcurrentuploadlimitLong { get { return LC.L(@"When performing asynchronous uploads, the maximum number of concurrent uploads allowed. Set to zero to disable the limit."); } } public static string AsynchronousconcurrentuploadlimitShort { get { return LC.L(@"The number of concurrent uploads allowed"); } } - public static string DebugoutputLong { get { return LC.L(@"Activating this option will make some error messages more verbose, which may help you track down a particular issue."); } } + public static string DebugoutputLong { get { return LC.L(@"Activate this option to make some error messages more verbose, which may help you track down a particular issue."); } } public static string DebugoutputShort { get { return LC.L(@"Enables debugging output"); } } public static string LogfileLong { get { return LC.L(@"Logs information to the file specified."); } } public static string LogfileShort { get { return LC.L(@"Log internal information to a file"); } } @@ -136,7 +136,7 @@ namespace Duplicati.Library.Main.Strings public static string DisabletimetoleranceShort { get { return LC.L(@"Deactivates tolerance when comparing times"); } } public static string ListverifyuploadsLong { get { return LC.L(@"Use this option to verify uploads by listing contents."); } } public static string ListverifyuploadsShort { get { return LC.L(@"Verify uploads by listing contents"); } } - public static string SynchronousuploadLong { get { return LC.L(@"Duplicati will upload files while scanning the disk and producing volumes, which usually makes the backup faster. Use this flag to turn the behavior off, so that Duplicati will wait for each volume to complete."); } } + public static string SynchronousuploadLong { get { return LC.L(@"Duplicati will upload files while scanning the disk and producing volumes, which usually makes the backup faster. Use this option to turn the behavior off, so that Duplicati will wait for each volume to complete."); } } public static string SynchronousuploadShort { get { return LC.L(@"Upload files synchronously"); } } public static string NoconnectionreuseLong { get { return LC.L(@"Duplicati will attempt to perform multiple operations on a single connection, as this avoids repeated login attempts, and thus speeds up the process. This option can be used to ensure that each operation is performed on a seperate connection."); } } public static string NoconnectionreuseShort { get { return LC.L(@"Do not re-use connections"); } } @@ -179,7 +179,7 @@ namespace Duplicati.Library.Main.Strings public static string DisablefilepathcacheDeprecated { get { return LC.L(@"The option --{0} is no longer used and has been deprecated.", "disable-filepath-cache"); } } public static string UseblockcacheLong { get { return LC.L(@"This option can be used to increase speed in exchange for extra memory use."); } } public static string UseblockcacheShort { get { return LC.L(@"Store an in-memory block cache"); } } - public static string NobackendverificationLong { get { return LC.L(@"If this flag is set, the local database is not compared to the remote filelist on startup. The intended usage for this option is to work correctly in cases where the filelisting is broken or unavailable."); } } + public static string NobackendverificationLong { get { return LC.L(@"If this option is set, the local database is not compared to the remote filelist on startup. The intended usage for this option is to work correctly in cases where the filelisting is broken or unavailable."); } } public static string NobackendverificationShort { get { return LC.L(@"Do not query backend at startup"); } } public static string IndexfilepolicyLong { get { return LC.L(@"The index files are used to limit the need for downloading dblock files when there is no local database present. The more information is recorded in the index files, the faster operations can proceed without the database. The tradeoff is that larger index files take up more remote space and which may never be used."); } } public static string IndexfilepolicyShort { get { return LC.L(@"Determines usage of index files"); } } @@ -210,7 +210,7 @@ namespace Duplicati.Library.Main.Strings public static string RetentionPolicyShort { get { return LC.L(@"Reduce number of versions by deleting old intermediate backups"); } } public static string AllowmissingsourceLong { get { return LC.L(@"Use this option to continue even if some source entries are missing."); } } public static string AllowmissingsourceShort { get { return LC.L(@"Ignore missing source elements"); } } - public static string OverwriteLong { get { return LC.L(@"Use this option to overwrite target files when restoring, if this option is not set the files will be restored with a timestamp and a number appended."); } } + public static string OverwriteLong { get { return LC.L(@"Use this option to overwrite target files when restoring. If this option is not set, the files will be restored with a timestamp and a number appended."); } } public static string OverwriteShort { get { return LC.L(@"Overwrite files when restoring"); } } public static string VerboseLong { get { return LC.L(@"Use this option to increase the amount of output generated when running an option. Generally this option will produce a line for each file processed."); } } public static string VerboseShort { get { return LC.L(@"Output more progress information"); } } @@ -223,7 +223,7 @@ namespace Duplicati.Library.Main.Strings public static string BackendtestsamplesShort { get { return LC.L(@"The number of samples to test after a backup"); } } public static string BackendtestpercentageLong { get { return LC.L(@"After a backup is completed, some (dblock, dindex, dlist) files from the remote backend are selected for verification. Use this option to specify the percentage (between 0 and 100) of files to test. If the option --{0} is also provided, the number of samples tested is the maximum implied by the two options. If the option --{1} is provided, no remote files are verified.", "backup-test-samples", "no-backend-verification"); } } public static string BackendtestpercentageShort { get { return LC.L(@"The percentage of samples to test after a backup"); } } - public static string FullremoteverificationLong(string optionname) { return LC.L(@"After a backup is completed, some (dblock, dindex, dlist) files from the remote backend are selected for verification. Use this option to turn on full verification, which will decrypt the files and examine the insides of each volume, instead of simply verifying the external hash, If the option --{0} is set, no remote files are verified. This option is automatically set when then verification is performed directly. ListAndIndexes is like True but only dlist and index volumes are handled.", optionname); } + public static string FullremoteverificationLong(string optionname) { return LC.L(@"After a backup is completed, some (dblock, dindex, dlist) files from the remote backend are selected for verification. Use this option to turn on full verification, which will decrypt the files and examine the insides of each volume, instead of simply verifying the external hash. If the option --{0} is set, no remote files are verified. This option is automatically set when then verification is performed directly. ListAndIndexes is like True but only dlist and index volumes are handled.", optionname); } public static string FullremoteverificationShort { get { return LC.L(@"Activates in-depth verification of files"); } } public static string FilereadbuffersizeLong { get { return LC.L(@"Use this size to control how many bytes are read from a file before processing."); } } public static string FilereadbuffersizeShort { get { return LC.L(@"Size of the file read buffer"); } } @@ -255,7 +255,7 @@ namespace Duplicati.Library.Main.Strings public static string ForcelocaleShort { get { return LC.L(@"Force the locale setting"); } } public static string ForceActualDateLong { get { return LC.L(@"By default, dates are displayed in the calendar format, meaning ""Today"" or ""Last Thursday"". By setting this option, only the actual dates are displayed, ""Nov 12, 2018, 8:01 AM"" for example."); } } public static string ForceActualDateShort { get { return LC.L(@"Forces the display of the actual date instead of calendar date"); } } - public static string DisablepipingLong { get { return LC.L(@"Use this option to disable multithreaded handling of up- and downloads, that can significantly speed up backend operations depending on the hardware you're running on and the transfer rate of your backend."); } } + public static string DisablepipingLong { get { return LC.L(@"Use this option to disable multithreaded handling of up- and downloads. That can significantly speed up backend operations depending on the hardware you're running on and the transfer rate of your backend."); } } public static string DisablepipingShort { get { return LC.L(@"Handle file communication with backend using threaded pipes"); } } public static string ConcurrencymaxthreadsLong { get { return LC.L(@"Use this option to set the maximum number of threads used. Setting this value to zero or less will dynamically balance the number of active threads to fit the hardware."); } } public static string ConcurrencymaxthreadsShort { get { return LC.L(@"Limit number of concurrent threads"); } } @@ -265,19 +265,19 @@ namespace Duplicati.Library.Main.Strings public static string ConcurrencycompressorsShort { get { return LC.L(@"Specify the number of concurrent compression processes"); } } public static string DisablesyntehticfilelistLong { get { return LC.L(@"If Duplicati detects that the previous backup did not complete, it will generate a filelist that is a merge of the last completed backup and the contents that were uploaded in the incomplete backup session."); } } public static string DisablesyntheticfilelistShort { get { return LC.L(@"Disables synthetic filelist"); } } - public static string CheckfiletimeonlyLong { get { return LC.L(@"This flag instructs Duplicati to not look at metadata or filesize when deciding to scan a file for changes. Use this option if you have a large number of files and notice that the scanning takes a long time with unmodified files."); } } + public static string CheckfiletimeonlyLong { get { return LC.L(@"This option instructs Duplicati to not look at metadata or filesize when deciding to scan a file for changes. Use this option if you have a large number of files and notice that the scanning takes a long time with unmodified files."); } } public static string CheckfiletimeonlyShort { get { return LC.L(@"Checks only file lastmodified"); } } - public static string DontcompressrestorepathsLong { get { return LC.L(@"When restore a subset of a backup into a new folder, the shortest possible path is used to avoid generating deep paths with empty folders. Use this flag to skip this compression, such that the entire original folder structure is preserved, including upper level empty folders."); } } + public static string DontcompressrestorepathsLong { get { return LC.L(@"When restore a subset of a backup into a new folder, the shortest possible path is used to avoid generating deep paths with empty folders. Use this option to skip this compression, such that the entire original folder structure is preserved, including upper level empty folders."); } } public static string DontcompressrestorepathsShort { get { return LC.L(@"Disables path compression on restore"); } } - public static string AllowfullremovalLong { get { return LC.L(@"By default, the last fileset cannot be removed. This is a safeguard to make sure that all remote data is not deleted by a configuration mistake. Use this flag to disable that protection, such that all filesets can be deleted."); } } + public static string AllowfullremovalLong { get { return LC.L(@"By default, the last fileset cannot be removed. This is a safeguard to make sure that all remote data is not deleted by a configuration mistake. Use this option to disable that protection, such that all filesets can be deleted."); } } public static string AllowfullremovalShort { get { return LC.L(@"Allow removing all filesets"); } } public static string AutoVacuumLong { get { return LC.L(@"Some operations that manipulate the local database leave unused entries behind. These entries are not deleted from a hard drive until a VACUUM operation is run. This operation saves disk space in the long run but needs to temporarily create a copy of all valid entries in the database. Setting this to true will allow Duplicati to perform VACUUM operations at its discretion."); } } public static string AutoVacuumShort { get { return LC.L(@"Allow automatic rebuilding of local database to save space"); } } - public static string DisablefilescannerLong { get { return LC.L(@"When this flag is enabled, the scanner that computes the size of source files is disabled, and instead the reported size is read from the database. Using this flag can speed up the backup by reducing disk access, but will give a less accurate progress indicator."); } } + public static string DisablefilescannerLong { get { return LC.L(@"When this flag is enabled, the scanner that computes the size of source files is disabled, and instead the reported size is read from the database. Using this option can speed up the backup by reducing disk access, but will give a less accurate progress indicator."); } } public static string DisablefilescannerShort { get { return LC.L(@"Disable the read-ahead scanner"); } } public static string DisablefilelistconsistencychecksLong { get { return LC.L(@"In backups with a large number of filesets, the verification can take up a large part of the backup time. If you disable the checks, make sure you run regular check commands to ensure that everything is working as expected."); } } public static string DisablefilelistconsistencychecksShort { get { return LC.L(@"Disable filelist consistency checks"); } } - public static string DisableOnBatteryLong { get { return LC.L("When this flag is enabled, a scheduled backup will not run if the system is detected to be running on battery power (manual or command line backups will still be run). If the detected power source is mains (e.g., AC) or unknown, then scheduled backups will proceed as normal."); } } + public static string DisableOnBatteryLong { get { return LC.L("Use this option to run a scheduled backup if the system is detected to be running on battery power (manual or command line backups will still be run). If the detected power source is mains (e.g., AC) or unknown, then scheduled backups will proceed as normal."); } } public static string DisableOnBatteryShort { get { return LC.L("Disable the backup when on battery power"); } } public static string LogfileloglevelLong { get { return LC.L(@"Specifies the amount of log information to write into the file specified by the option --{0}.", "log-file"); } } @@ -289,7 +289,7 @@ namespace Duplicati.Library.Main.Strings public static string ConsolelogfiltersLong(string delimiter) { return LogfilelogfiltersLong(delimiter); } public static string ConsolelogfiltersShort { get { return LC.L(@"Applies filters to the console log data"); } } - public static string UsebackgroundiopriorityLong { get { return LC.L("This option instructions the operating system to set the current process to use the lowest IO priority level, which can make operations run slower but will interfere less with other operations running at the same time."); } } + public static string UsebackgroundiopriorityLong { get { return LC.L("This option instructs the operating system to set the current process to use the lowest IO priority level, which can make operations run slower but will interfere less with other operations running at the same time."); } } public static string UsebackgroundiopriorityShort { get { return LC.L("Sets the process to use low IO priority"); } } public static string ExcludeemptyfoldersLong { get { return LC.L("Use this option to remove all empty folders from a backup."); } } diff --git a/Duplicati/Library/Modules/Builtin/Strings.cs b/Duplicati/Library/Modules/Builtin/Strings.cs index 4b304efde..213651cad 100644 --- a/Duplicati/Library/Modules/Builtin/Strings.cs +++ b/Duplicati/Library/Modules/Builtin/Strings.cs @@ -87,14 +87,14 @@ namespace Duplicati.Library.Modules.Builtin.Strings public static string StdErrorReport(string script, string message) { return LC.L(@"The script ""{0}"" reported error messages: {1}", script, message); } public static string TimeoutoptionLong { get { return LC.L(@"Sets the maximum time a script is allowed to execute. If the script has not completed within this time, it will continue to execute but the operation will continue too, and no script output will be processed."); } } public static string TimeoutoptionShort { get { return LC.L(@"Sets the script timeout"); } } - public static string EnableArgumentsLong { get { return LC.L(@"This option enables the use of script arguments. If this option is enabled, the script arguments are treated as commandline strings. Use single or double quotes to separate arguments."); } } + public static string EnableArgumentsLong { get { return LC.L(@"This option enables the use of script arguments. If this option is set, the script arguments are treated as commandline strings. Use single or double quotes to separate arguments."); } } public static string EnableArgumentsShort { get { return LC.L(@"Enable script arguments"); } } } internal static class SendMail { public static string Description { get { return LC.L(@"This module can send email after an operation completes"); } } public static string Displayname { get { return LC.L(@"Send mail"); } } - public static string FailedToLookupMXServer(string optionname) { return LC.L(@"Unable to find the destination mail server through MX lookup, please use the option {0} to specify what smtp server to use.", optionname); } + public static string FailedToLookupMXServer(string optionname) { return LC.L(@"Unable to find the destination mail server through MX lookup. Please use the option {0} to specify what smtp server to use.", optionname); } public static string OptionBodyLong { get { return LC.L(@"This value can be a filename. If the file exists, the file contents will be used as the message body. In the message body, certain tokens are replaced: @@ -158,7 +158,7 @@ All command line options are also reported within %value%, e.g. %volsize%. Any u public static string SendxmpplevelLong(string success, string warning, string error, string fatal, string all) { return LC.L(@"You can specify one of ""{0}"", ""{1}"", ""{2}"", ""{3}"". You can supply multiple options with a comma separator, e.g. ""{0},{1}"". The special value ""{4}"" is a shorthand for ""{0},{1},{2},{3}"" and will cause all backup operations to send a message.", success, warning, error, fatal, all); } public static string SendxmpplevelShort { get { return LC.L(@"The messages to send"); } } - public static string SendxmppanyoperationLong { get { return LC.L(@"By default, messages will only be sent after a Backup operation. Use this option to send messages for all operations."); } } + public static string SendxmppanyoperationLong { get { return LC.L(@"By default, messages will only be sent after a backup operation. Use this option to send messages for all operations."); } } public static string SendxmppanyoperationShort { get { return LC.L(@"Send messages for all operations"); } } public static string LoginTimeoutError { get { return LC.L(@"Timeout occurred while logging in to jabber server"); } } } @@ -186,7 +186,7 @@ All command line options are also reported within %value%, e.g. %volsize%. Any u public static string SendhttplevelLong(string success, string warning, string error, string fatal, string all) { return LC.L(@"You can specify one of ""{0}"", ""{1}"", ""{2}"", ""{3}"". You can supply multiple options with a comma separator, e.g. ""{0},{1}"". The special value ""{4}"" is a shorthand for ""{0},{1},{2},{3}"" and will cause all backup operations to send a message.", success, warning, error, fatal, all); } public static string SendhttplevelShort { get { return LC.L(@"The messages to send"); } } - public static string SendhttpanyoperationLong { get { return LC.L(@"By default, messages will only be sent after a Backup operation. Use this option to send messages for all operations."); } } + public static string SendhttpanyoperationLong { get { return LC.L(@"By default, messages will only be sent after a backup operation. Use this option to send messages for all operations."); } } public static string SendhttpanyoperationShort { get { return LC.L(@"Send messages for all operations"); } } public static string HttpverbLong { get { return LC.L(@"Use this option to change the default HTTP verb used to submit a report."); } } public static string HttpverbShort { get { return LC.L(@"Sets the HTTP verb to use"); } } diff --git a/Duplicati/Server/webroot/ngax/templates/addoredit.html b/Duplicati/Server/webroot/ngax/templates/addoredit.html index cdaa981c3..f8111d520 100644 --- a/Duplicati/Server/webroot/ngax/templates/addoredit.html +++ b/Duplicati/Server/webroot/ngax/templates/addoredit.html @@ -255,7 +255,7 @@

Schedule

- +
If a date was missed, the job will run as soon as possible.
diff --git a/Duplicati/Server/webroot/ngax/templates/delete.html b/Duplicati/Server/webroot/ngax/templates/delete.html index b500b825e..be0e3f4c3 100644 --- a/Duplicati/Server/webroot/ngax/templates/delete.html +++ b/Duplicati/Server/webroot/ngax/templates/delete.html @@ -19,7 +19,7 @@
- WARNING: The remote database is found to be in use by the commandline library + WARNING: The remote database is found to be in use by the commandline library.
@@ -29,7 +29,7 @@

Export configuration

-
If you want to use the backup later, you can export the configuration before deleting it
+
If you want to use the backup later, you can export the configuration before deleting it.
diff --git a/Duplicati/Server/webroot/ngax/templates/export.html b/Duplicati/Server/webroot/ngax/templates/export.html index 87ffbca69..a89ad2f47 100644 --- a/Duplicati/Server/webroot/ngax/templates/export.html +++ b/Duplicati/Server/webroot/ngax/templates/export.html @@ -46,7 +46,7 @@
-
If the backup file was not downloaded automatically, right click and choose "Save as …"
+
If the backup file was not downloaded automatically, right click and choose "Save as …".
diff --git a/Duplicati/Server/webroot/ngax/templates/notificationarea.html b/Duplicati/Server/webroot/ngax/templates/notificationarea.html index eb6e869aa..d5904747d 100644 --- a/Duplicati/Server/webroot/ngax/templates/notificationarea.html +++ b/Duplicati/Server/webroot/ngax/templates/notificationarea.html @@ -4,7 +4,7 @@
{{item.Message}}
-
If the backup file was not downloaded automatically, right click and choose "Save as …"
+
If the backup file was not downloaded automatically, right click and choose "Save as …".
Dismiss diff --git a/Duplicati/Server/webroot/ngax/templates/settings.html b/Duplicati/Server/webroot/ngax/templates/settings.html index ba24edc97..0a402aa71 100644 --- a/Duplicati/Server/webroot/ngax/templates/settings.html +++ b/Duplicati/Server/webroot/ngax/templates/settings.html @@ -122,7 +122,7 @@ -

Usage reports help us improve the user experience and evaluate impact of new features. We use them to generate {{'public usage statistics' | translate}}

+

Usage reports help us improve the user experience and evaluate impact of new features. We use them to generate {{'public usage statistics' | translate}}.

All usage reports are sent anonymously and do not contain any personal information. They contain information about hardware and operating system, the type of backend, backup duration, overall size of source data and similar data. They do not contain paths, filenames, usernames, passwords or similar sensitive information.

@@ -140,7 +140,7 @@

Default options

-

Options added here are applied to all backups, but can be overridden in each individual backup

+

Options added here are applied to all backups, but can be overridden in each individual backup.

Edit as list