From 68d79ce435fe02c943fdffb7d98bb468213a9fa5 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Wed, 24 Jul 2024 13:41:09 -0400 Subject: [PATCH 1/5] Sort strings on Box/Strings.cs --- Duplicati/Library/Backend/Box/Strings.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Duplicati/Library/Backend/Box/Strings.cs b/Duplicati/Library/Backend/Box/Strings.cs index c0976f7a2..c796384b2 100644 --- a/Duplicati/Library/Backend/Box/Strings.cs +++ b/Duplicati/Library/Backend/Box/Strings.cs @@ -24,11 +24,9 @@ namespace Duplicati.Library.Backend.Strings internal static class Box { public static string Description { get { return LC.L(@"This backend can read and write data to Box.com. Supported format is ""box://folder/subfolder""."); } } public static string DisplayName { get { return LC.L(@"Box.com"); } } - public static string AuthidShort { get { return LC.L(@"The authorization code"); } } public static string AuthidLong(string url) { return LC.L(@"The authorization token retrieved from {0}", url); } - public static string ReallydeleteShort { get { return LC.L(@"Force delete files"); } } + public static string AuthidShort { get { return LC.L(@"The authorization code"); } } public static string ReallydeleteLong { get { return LC.L(@"After deleting a file, it may end up in the trash folder where it will be deleted after a grace period. Use this command to force immediate removal of delete files."); } } - + public static string ReallydeleteShort { get { return LC.L(@"Force delete files"); } } } } - From 18c2b1d4fac532eca138821414c4a274251da02a Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Wed, 24 Jul 2024 13:41:51 -0400 Subject: [PATCH 2/5] Sort strings on Dropbox/Strings.cs --- Duplicati/Library/Backend/Dropbox/Strings.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Duplicati/Library/Backend/Dropbox/Strings.cs b/Duplicati/Library/Backend/Dropbox/Strings.cs index e710ee62f..5319250f2 100644 --- a/Duplicati/Library/Backend/Dropbox/Strings.cs +++ b/Duplicati/Library/Backend/Dropbox/Strings.cs @@ -26,9 +26,7 @@ namespace Duplicati.Library.Backend.Strings { public static string Description { get { return LC.L(@"This backend can read and write data to Dropbox. Supported format is ""dropbox://folder/subfolder""."); } } public static string DisplayName { get { return LC.L(@"Dropbox"); } } - public static string AuthidShort { get { return LC.L(@"The authorization code"); } } 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"); } } } } - From ca99c1f4d5b311a1e2fc4ce355122e5e8a45b025 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Wed, 24 Jul 2024 13:47:16 -0400 Subject: [PATCH 3/5] Sort strings on OAuthHelper/Strings.cs --- Duplicati/Library/Backend/OAuthHelper/Strings.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Duplicati/Library/Backend/OAuthHelper/Strings.cs b/Duplicati/Library/Backend/OAuthHelper/Strings.cs index a43965943..3e639cf86 100644 --- a/Duplicati/Library/Backend/OAuthHelper/Strings.cs +++ b/Duplicati/Library/Backend/OAuthHelper/Strings.cs @@ -26,9 +26,8 @@ namespace Duplicati.Library.Strings 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 AuthidShort { get { return LC.L(@"The authorization code"); } } 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"); } } } } - From 80edc82f04784cf4931d6b65569338b1ffff8246 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Wed, 24 Jul 2024 13:44:16 -0400 Subject: [PATCH 4/5] Sort strings on GoogleServices/Strings.cs --- Duplicati/Library/Backend/GoogleServices/Strings.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Duplicati/Library/Backend/GoogleServices/Strings.cs b/Duplicati/Library/Backend/GoogleServices/Strings.cs index b17eaed90..997011817 100644 --- a/Duplicati/Library/Backend/GoogleServices/Strings.cs +++ b/Duplicati/Library/Backend/GoogleServices/Strings.cs @@ -28,8 +28,8 @@ namespace Duplicati.Library.Backend.Strings 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 ProjectIDMissingError(string projectoption) { return LC.L(@"You must supply a project ID with --{0} for creating a bucket", projectoption); } - public static string AuthidShort { get { return LC.L(@"The authorization code"); } } 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 LocationDescriptionLong(string regions) { return LC.L(@"This option is only used when creating new buckets. Use this option to change what region the data is stored in. Charges vary with bucket location. Known bucket locations: {0}", regions); } @@ -37,19 +37,18 @@ namespace Duplicati.Library.Backend.Strings public static string StorageclassDescriptionLong(string classes) { return LC.L(@"This option is only used when creating new buckets. Use this option to change what storage type the bucket has. Charges and functionality vary with bucket storage class. Known storage classes: {0}", classes); } public static string StorageclassDescriptionShort { get { return LC.L(@"Specifies storage class for creating a bucket"); } } - public static string ProjectDescriptionShort { get { return LC.L(@"Specifies project for creating a bucket"); } } public static string ProjectDescriptionLong { get { return LC.L(@"This option is only used when creating new buckets. Use this option to supply the project ID that the bucket is attached to. The project determines where usage charges are applied"); } } + public static string ProjectDescriptionShort { get { return LC.L(@"Specifies project for creating a bucket"); } } } internal static class GoogleDrive { public static string Description { get { return LC.L(@"This backend can read and write data to Google Drive. Supported format is ""googledrive://folder/subfolder""."); } } - public static string AuthidShort { get { return LC.L(@"The authorization code"); } } 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 DisplayName { get { return LC.L(@"Google Drive"); } } public static string MultipleEntries(string folder, string parent) { return LC.L(@"There is more than one item named ""{0}"" in the folder ""{1}""", folder, parent); } - public static string TeamDriveIdShort { get { return LC.L("Team drive ID"); } } public static string TeamDriveIdLong { get { return LC.L("This option sets the team drive to use. Leaving it empty uses the personal drive"); } } + public static string TeamDriveIdShort { get { return LC.L("Team drive ID"); } } } } - From 1a09132254b17770d160494caa7b45311ef03dcc Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 26 Jul 2024 23:46:21 -0400 Subject: [PATCH 5/5] Sort and group strings on GoogleServices/Strings.cs Remove blank lines as well --- Duplicati/Library/Backend/GoogleServices/Strings.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Duplicati/Library/Backend/GoogleServices/Strings.cs b/Duplicati/Library/Backend/GoogleServices/Strings.cs index 997011817..b76fae6c8 100644 --- a/Duplicati/Library/Backend/GoogleServices/Strings.cs +++ b/Duplicati/Library/Backend/GoogleServices/Strings.cs @@ -30,7 +30,6 @@ namespace Duplicati.Library.Backend.Strings 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"); } } - public static string LocationDescriptionLong(string regions) { return LC.L(@"This option is only used when creating new buckets. Use this option to change what region the data is stored in. Charges vary with bucket location. Known bucket locations: {0}", regions); } public static string LocationDescriptionShort { get { return LC.L(@"Specifies location option for creating a bucket"); } } @@ -39,15 +38,14 @@ namespace Duplicati.Library.Backend.Strings public static string StorageclassDescriptionShort { get { return LC.L(@"Specifies storage class for creating a bucket"); } } public static string ProjectDescriptionLong { get { return LC.L(@"This option is only used when creating new buckets. Use this option to supply the project ID that the bucket is attached to. The project determines where usage charges are applied"); } } public static string ProjectDescriptionShort { get { return LC.L(@"Specifies project for creating a bucket"); } } - } internal static class GoogleDrive { public static string Description { get { return LC.L(@"This backend can read and write data to Google Drive. Supported format is ""googledrive://folder/subfolder""."); } } - 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 DisplayName { get { return LC.L(@"Google Drive"); } } public static string MultipleEntries(string folder, string parent) { return LC.L(@"There is more than one item named ""{0}"" in the folder ""{1}""", folder, parent); } + 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 TeamDriveIdLong { get { return LC.L("This option sets the team drive to use. Leaving it empty uses the personal drive"); } } public static string TeamDriveIdShort { get { return LC.L("Team drive ID"); } } }