diff --git a/BuildTools/ResXEscapeCodeFixer/ResXEscapeCodeFixer.sln b/BuildTools/ResXEscapeCodeFixer/ResXEscapeCodeFixer.sln new file mode 100644 index 000000000..1c2a45885 --- /dev/null +++ b/BuildTools/ResXEscapeCodeFixer/ResXEscapeCodeFixer.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual C# Express 2008 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResXEscapeCodeFixer", "ResXEscapeCodeFixer\ResXEscapeCodeFixer.csproj", "{982E3EB3-369D-4DF4-AA73-C875D388F1BB}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {982E3EB3-369D-4DF4-AA73-C875D388F1BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {982E3EB3-369D-4DF4-AA73-C875D388F1BB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {982E3EB3-369D-4DF4-AA73-C875D388F1BB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {982E3EB3-369D-4DF4-AA73-C875D388F1BB}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/BuildTools/ResXEscapeCodeFixer/ResXEscapeCodeFixer/Program.cs b/BuildTools/ResXEscapeCodeFixer/ResXEscapeCodeFixer/Program.cs new file mode 100644 index 000000000..b431c9f84 --- /dev/null +++ b/BuildTools/ResXEscapeCodeFixer/ResXEscapeCodeFixer/Program.cs @@ -0,0 +1,72 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.IO; + +namespace ResXEscapeCodeFixer +{ + class Program + { + static void Main(string[] args) + { + string startpath = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location); + if (args.Length >= 1) + startpath = args[0]; + + Console.WriteLine("Root folder is: {0}", startpath); + + Queue folders = new Queue(); + folders.Enqueue(startpath); + + while (folders.Count > 0) + { + string folder = folders.Dequeue(); + + Console.WriteLine("Processing folder: {0}", folder); + + foreach (string s in Directory.GetDirectories(folder)) + folders.Enqueue(s); + + foreach (string s in Directory.GetFiles(folder, "*.resx")) + FixUpResX(s); + + } + + } + + static void FixUpResX(string file) + { + bool modified = false; + Console.WriteLine("Examining file: {0}", Path.GetFileName(file)); + System.Xml.XmlDocument doc = new System.Xml.XmlDocument(); + doc.Load(file); + + foreach (System.Xml.XmlNode n in doc.SelectNodes("root/data")) + { + //TODO: Make sure that xml:space="preserve" is present + System.Xml.XmlNode value = n["value"]; + if (value != null) + { + if (value.InnerText.IndexOf('\\') > 0) + { + string newvalue = value.InnerText + .Replace("\\r\\n", "\r\n") + .Replace("\\n", "\r\n") + .Replace("\\r", "\r") + .Replace("\\t", "\t") + .Replace("\\\"", "\""); + if (newvalue != value.InnerText) + { + Console.WriteLine("Replacing: \r\n\t{0}\r\n\t{1}", value.InnerText, newvalue); + value.InnerText = newvalue; + modified = true; + } + } + } + } + + if (modified) + doc.Save(file); + } + } +} diff --git a/BuildTools/ResXEscapeCodeFixer/ResXEscapeCodeFixer/Properties/AssemblyInfo.cs b/BuildTools/ResXEscapeCodeFixer/ResXEscapeCodeFixer/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..20f992115 --- /dev/null +++ b/BuildTools/ResXEscapeCodeFixer/ResXEscapeCodeFixer/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("ResXEscapeCodeFixer")] +[assembly: AssemblyDescription("A fixup tool for escape sequences in ResX files")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("HexaD")] +[assembly: AssemblyProduct("ResXEscapeCodeFixer")] +[assembly: AssemblyCopyright("Copyright © HexaD 2009 LGPL")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("c975af8a-55b0-42b2-b850-98adfac344f2")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/BuildTools/ResXEscapeCodeFixer/ResXEscapeCodeFixer/ResXEscapeCodeFixer.csproj b/BuildTools/ResXEscapeCodeFixer/ResXEscapeCodeFixer/ResXEscapeCodeFixer.csproj new file mode 100644 index 000000000..c30d79f0c --- /dev/null +++ b/BuildTools/ResXEscapeCodeFixer/ResXEscapeCodeFixer/ResXEscapeCodeFixer.csproj @@ -0,0 +1,61 @@ + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {982E3EB3-369D-4DF4-AA73-C875D388F1BB} + Exe + Properties + ResXEscapeCodeFixer + ResXEscapeCodeFixer + v2.0 + 512 + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + 3.5 + + + 3.5 + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BuildTools/ResXEscapeCodeFixer/ResXEscapeCodeFixer/app.config b/BuildTools/ResXEscapeCodeFixer/ResXEscapeCodeFixer/app.config new file mode 100644 index 000000000..b7db28170 --- /dev/null +++ b/BuildTools/ResXEscapeCodeFixer/ResXEscapeCodeFixer/app.config @@ -0,0 +1,3 @@ + + + diff --git a/Duplicati/GUI/Program.cs b/Duplicati/GUI/Program.cs index 98001e3fe..0d7b36a72 100644 --- a/Duplicati/GUI/Program.cs +++ b/Duplicati/GUI/Program.cs @@ -79,7 +79,6 @@ namespace Duplicati.GUI [STAThread] static void Main(string[] args) { - Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); SingleInstance singleInstance = null; diff --git a/Duplicati/GUI/Strings/ApplicationSetup.Designer.cs b/Duplicati/GUI/Strings/ApplicationSetup.Designer.cs index 4fcf6cc2f..259fdbd9a 100644 --- a/Duplicati/GUI/Strings/ApplicationSetup.Designer.cs +++ b/Duplicati/GUI/Strings/ApplicationSetup.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3082 +// Runtime Version:2.0.50727.3053 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -79,7 +79,8 @@ namespace Duplicati.GUI.Strings { } /// - /// Looks up a localized string similar to Delete signature files in the folder: \n{0}. + /// Looks up a localized string similar to Delete signature files in the folder: + ///{0}. /// internal static string ConfirmCacheDelete { get { @@ -97,7 +98,8 @@ namespace Duplicati.GUI.Strings { } /// - /// Looks up a localized string similar to An exception occured while examining the folder: {0}.\r\nDo you want to use that folder anyway?. + /// Looks up a localized string similar to An exception occured while examining the folder: {0}. + ///Do you want to use that folder anyway?. /// internal static string ErrorWhileExaminingFolder { get { @@ -106,7 +108,8 @@ namespace Duplicati.GUI.Strings { } /// - /// Looks up a localized string similar to The folder selected does not contain the file: {0}.\r\nDo you want to use that folder anyway?. + /// Looks up a localized string similar to The folder selected does not contain the file: {0}. + ///Do you want to use that folder anyway?. /// internal static string FolderIsMissingFile { get { diff --git a/Duplicati/GUI/Strings/ApplicationSetup.resx b/Duplicati/GUI/Strings/ApplicationSetup.resx index 1005a82e9..eb75613dc 100644 --- a/Duplicati/GUI/Strings/ApplicationSetup.resx +++ b/Duplicati/GUI/Strings/ApplicationSetup.resx @@ -126,7 +126,8 @@ A string displayed in a status label when calculating the size of the signature cache - Delete signature files in the folder: \n{0} + Delete signature files in the folder: +{0} A message displayed in a confirmation dialog before deleting the signature cache @@ -134,11 +135,13 @@ A string displayed to denote the current default language - An exception occured while examining the folder: {0}.\r\nDo you want to use that folder anyway? + An exception occured while examining the folder: {0}. +Do you want to use that folder anyway? A string displayed in a messagebox if an error occurs while checking for the existence of a required file - The folder selected does not contain the file: {0}.\r\nDo you want to use that folder anyway? + The folder selected does not contain the file: {0}. +Do you want to use that folder anyway? A string displayed in a messagebox asking the user to approve the use of a folder that does not contain the required file diff --git a/Duplicati/GUI/Strings/DatabaseUpgrader.resx b/Duplicati/GUI/Strings/DatabaseUpgrader.resx index bc7ebca5d..52b008a35 100644 --- a/Duplicati/GUI/Strings/DatabaseUpgrader.resx +++ b/Duplicati/GUI/Strings/DatabaseUpgrader.resx @@ -130,7 +130,9 @@ An error message that is displayed when the layout of the database is unexpected - Failed to execute SQL: {0}\nError: {1}\nDatabase is NOT upgraded. + Failed to execute SQL: {0} +Error: {1} +Database is NOT upgraded. An error message displayed if one of the upgrade SQL statements fail \ No newline at end of file diff --git a/Duplicati/GUI/Strings/Program.resx b/Duplicati/GUI/Strings/Program.resx index d08a24abb..68b77be14 100644 --- a/Duplicati/GUI/Strings/Program.resx +++ b/Duplicati/GUI/Strings/Program.resx @@ -122,7 +122,8 @@ A message displayed in the console when activating Duplicati and it is already running - Failed to create, open or upgrade the database.\r\nError message: {0} + Failed to create, open or upgrade the database. +Error message: {0} An error message displayed when opening the database fails @@ -158,7 +159,8 @@ Duplicati crashes - Unable to start up, perhaps another process is already running?\nError message: {0} + Unable to start up, perhaps another process is already running? +Error message: {0} An error message displayed when Duplicati startup fails diff --git a/Duplicati/GUI/Wizard pages/Add backup/Strings/IncrementalSettings.resx b/Duplicati/GUI/Wizard pages/Add backup/Strings/IncrementalSettings.resx index b11e0efda..036d6e347 100644 --- a/Duplicati/GUI/Wizard pages/Add backup/Strings/IncrementalSettings.resx +++ b/Duplicati/GUI/Wizard pages/Add backup/Strings/IncrementalSettings.resx @@ -118,10 +118,14 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - You have disabled backup removal. If no backups are removed, the amount of stored data will increase forever.\nDisabling backup cleanup may result in storage space being exhausted.\nDo you want to continue without backup removal backups? + You have disabled backup removal. If no backups are removed, the amount of stored data will increase forever. +Disabling backup cleanup may result in storage space being exhausted. +Do you want to continue without backup removal backups? - You have disabled full backups. Incremental backups are faster, but rely on the presence of a full backup.\nDisabling full backups may result in a very lengthy restoration process, and may cause a restore to fault.\nDo you want to continue without full backups? + You have disabled full backups. Incremental backups are faster, but rely on the presence of a full backup. +Disabling full backups may result in a very lengthy restoration process, and may cause a restore to fault. +Do you want to continue without full backups? To avoid large backups, Duplicati can back up only files that have changed. Each backup is much smaller, but all files are still avalible. diff --git a/Duplicati/GUI/Wizard pages/Add backup/Strings/PasswordSettings.resx b/Duplicati/GUI/Wizard pages/Add backup/Strings/PasswordSettings.resx index d9fedb609..3c4647da4 100644 --- a/Duplicati/GUI/Wizard pages/Add backup/Strings/PasswordSettings.resx +++ b/Duplicati/GUI/Wizard pages/Add backup/Strings/PasswordSettings.resx @@ -124,10 +124,16 @@ Backup is protected with password - Duplicati was unable to verify the existence of GNU Privacy Guard.\nGPG may work regardless, if it is located in the system search path.\nIf the encryption fails, no files will be backed up\nDo you want to continue anyway? + Duplicati was unable to verify the existence of GNU Privacy Guard. +GPG may work regardless, if it is located in the system search path. +If the encryption fails, no files will be backed up +Do you want to continue anyway? - If the backup is stored on machine or device that is not under your direct control,\nit is possible that others may view the files you have stored in the backups.\nIt is highly recomended that you enable encryption.\nDo you want to continue without encryption? + If the backup is stored on machine or device that is not under your direct control, +it is possible that others may view the files you have stored in the backups. +It is highly recomended that you enable encryption. +Do you want to continue without encryption? On this page you can select options that protect your backups from being read or altered. @@ -139,6 +145,9 @@ Select password for the backup - ****************** WARNING ***********************\nYou are modifying the password settings for an existing backup.\nIf you save these changes, you will no longer be able to recover previously backed up files.\nAre you absolutely sure you want to continue? + ****************** WARNING *********************** +You are modifying the password settings for an existing backup. +If you save these changes, you will no longer be able to recover previously backed up files. +Are you absolutely sure you want to continue? \ No newline at end of file diff --git a/Duplicati/GUI/Wizard pages/Add backup/Strings/SelectFiles.resx b/Duplicati/GUI/Wizard pages/Add backup/Strings/SelectFiles.resx index 4d108657e..cf7fbfb4c 100644 --- a/Duplicati/GUI/Wizard pages/Add backup/Strings/SelectFiles.resx +++ b/Duplicati/GUI/Wizard pages/Add backup/Strings/SelectFiles.resx @@ -127,10 +127,17 @@ The folder "{0}" does not exist. - You have modified the filters, but selected files by groups.\nSince that feature uses filters, there is a chance that your filters\nwill be removed after this.\nIf you switch to using only a single folder, your filters will not be modified.\n\nDo you want to continue, and possibly lose your filter setup? + You have modified the filters, but selected files by groups. +Since that feature uses filters, there is a chance that your filters +will be removed after this. +If you switch to using only a single folder, your filters will not be modified. + +Do you want to continue, and possibly lose your filter setup? - Due to your machine setup, it is not possible to backup\nthe selected folders in the same backup.\nTry unchecking some items, and create more than one backup. + Due to your machine setup, it is not possible to backup +the selected folders in the same backup. +Try unchecking some items, and create more than one backup. You have not included any files. diff --git a/Duplicati/GUI/Wizard pages/Add backup/Strings/SelectWhen.resx b/Duplicati/GUI/Wizard pages/Add backup/Strings/SelectWhen.resx index 07329cc83..010281c61 100644 --- a/Duplicati/GUI/Wizard pages/Add backup/Strings/SelectWhen.resx +++ b/Duplicati/GUI/Wizard pages/Add backup/Strings/SelectWhen.resx @@ -118,7 +118,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - You have no repetition set, so the backup will never run.\nThis is fine if you only want to run the backup manually, but it is not recomended.\nDo you want to continue? + You have no repetition set, so the backup will never run. +This is fine if you only want to run the backup manually, but it is not recomended. +Do you want to continue? On this page you may set up when the backup is run. Automatically repeating the backup ensure that you have a backup, without requiring any action from you. diff --git a/Duplicati/GUI/Wizard pages/Delete backup/Strings/DeleteFinished.resx b/Duplicati/GUI/Wizard pages/Delete backup/Strings/DeleteFinished.resx index 1723b6bbf..f5048186d 100644 --- a/Duplicati/GUI/Wizard pages/Delete backup/Strings/DeleteFinished.resx +++ b/Duplicati/GUI/Wizard pages/Delete backup/Strings/DeleteFinished.resx @@ -124,6 +124,7 @@ Delete backup - Action: Delete backup\nName: {0} + Action: Delete backup +Name: {0} \ No newline at end of file diff --git a/Duplicati/GUI/Wizard pages/Restore/Strings/FinishedRestore.resx b/Duplicati/GUI/Wizard pages/Restore/Strings/FinishedRestore.resx index 8f74aa16f..7a3d3f534 100644 --- a/Duplicati/GUI/Wizard pages/Restore/Strings/FinishedRestore.resx +++ b/Duplicati/GUI/Wizard pages/Restore/Strings/FinishedRestore.resx @@ -130,6 +130,9 @@ Restoring files, please wait... - Action: Restore backup\nBackup: {0}\nDate: {1}\nFolder: {2} + Action: Restore backup +Backup: {0} +Date: {1} +Folder: {2} \ No newline at end of file diff --git a/Duplicati/GUI/Wizard pages/Restore/Strings/TargetFolder.resx b/Duplicati/GUI/Wizard pages/Restore/Strings/TargetFolder.resx index d5434d320..a3ff7b8e0 100644 --- a/Duplicati/GUI/Wizard pages/Restore/Strings/TargetFolder.resx +++ b/Duplicati/GUI/Wizard pages/Restore/Strings/TargetFolder.resx @@ -139,6 +139,7 @@ Select restore folder - An error occured while verifying the destination. Please make sure it exists and is accessible.\nError message: {0} + An error occured while verifying the destination. Please make sure it exists and is accessible. +Error message: {0} \ No newline at end of file diff --git a/Duplicati/GUI/Wizard pages/RestoreSetup/Strings/FinishedRestoreSetup.resx b/Duplicati/GUI/Wizard pages/RestoreSetup/Strings/FinishedRestoreSetup.resx index af73a88cb..3de9be19f 100644 --- a/Duplicati/GUI/Wizard pages/RestoreSetup/Strings/FinishedRestoreSetup.resx +++ b/Duplicati/GUI/Wizard pages/RestoreSetup/Strings/FinishedRestoreSetup.resx @@ -124,7 +124,8 @@ Ready to restore settings - Failed to restore setup files, the error message was:\n {0} + Failed to restore setup files, the error message was: + {0} Restoring setup, please wait... diff --git a/Duplicati/GUI/Wizard pages/RunNow/Strings/RunNowFinished.resx b/Duplicati/GUI/Wizard pages/RunNow/Strings/RunNowFinished.resx index f34f4b05b..54df65b50 100644 --- a/Duplicati/GUI/Wizard pages/RunNow/Strings/RunNowFinished.resx +++ b/Duplicati/GUI/Wizard pages/RunNow/Strings/RunNowFinished.resx @@ -124,6 +124,7 @@ Ready to run backup - Action: Run backup now\nName: {0} + Action: Run backup now +Name: {0} \ No newline at end of file diff --git a/Duplicati/GUI/Wizard pages/Strings/CommandLineOptionsGrid.resx b/Duplicati/GUI/Wizard pages/Strings/CommandLineOptionsGrid.resx index 8eb680c71..095a90c64 100644 --- a/Duplicati/GUI/Wizard pages/Strings/CommandLineOptionsGrid.resx +++ b/Duplicati/GUI/Wizard pages/Strings/CommandLineOptionsGrid.resx @@ -121,6 +121,7 @@ Value type: {0}. {1}. {2} - This page is not supported on the current platform, this is a known issue.\r\nA newer version of Mono will enable this page. + This page is not supported on the current platform, this is a known issue. +A newer version of Mono will enable this page. \ No newline at end of file diff --git a/Duplicati/Library/Backend/BackendInterface/Strings/Common.resx b/Duplicati/Library/Backend/BackendInterface/Strings/Common.resx index e316077b7..d217425da 100644 --- a/Duplicati/Library/Backend/BackendInterface/Strings/Common.resx +++ b/Duplicati/Library/Backend/BackendInterface/Strings/Common.resx @@ -136,7 +136,8 @@ You must enter a password - You have not entered a password.\nProceed without a password? + You have not entered a password. +Proceed without a password? You must enter the name of the server @@ -145,7 +146,9 @@ You must enter a username - You have not entered a username.\nThis is fine if the server allows anonymous uploads, but likely a username is required\nProceed without a username? + You have not entered a username. +This is fine if the server allows anonymous uploads, but likely a username is required +Proceed without a username? The folder cannot be created because it already exists diff --git a/Duplicati/Library/Backend/CloudFiles/Strings/CloudFilesUI.resx b/Duplicati/Library/Backend/CloudFiles/Strings/CloudFilesUI.resx index 2456483be..02885f657 100644 --- a/Duplicati/Library/Backend/CloudFiles/Strings/CloudFilesUI.resx +++ b/Duplicati/Library/Backend/CloudFiles/Strings/CloudFilesUI.resx @@ -118,28 +118,42 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - The bucket name is not in all lower case.\n{0}\nDo you want to convert the bucket name to lower case? + The bucket name is not in all lower case. +{0} +Do you want to convert the bucket name to lower case? - The bucket name does not start with your user ID.\nTo avoid using a bucket owned by another user,\nit is recommended that you put your user ID in front of the bucket name.\nDo you want to insert the user ID in front of the bucket name? + The bucket name does not start with your user ID. +To avoid using a bucket owned by another user, +it is recommended that you put your user ID in front of the bucket name. +Do you want to insert the user ID in front of the bucket name? The bucket does not exist, do you want to create it? - You must enter your AWS Access ID.\nYou may click the link to the right\nto open the AWS login page, and retrieve it. + You must enter your AWS Access ID. +You may click the link to the right +to open the AWS login page, and retrieve it. - You must enter your AWS Secret Key.\nYou may click the link to the right\nto open the AWS login page, and retrieve it. + You must enter your AWS Secret Key. +You may click the link to the right +to open the AWS login page, and retrieve it. - You must enter a name for the bucket.\nYou must use a unique name for each backup.\nYou may enter any name you like. + You must enter a name for the bucket. +You must use a unique name for each backup. +You may enter any name you like. The european buckets require that the bucket name is in lower case. - A bug in Mono versions older than 2.4.3,\n prevents the backend from detecting and missing buckets.\nDue to this, it is recommended that you create the bucket.\nDo you want to create the bucket now? + A bug in Mono versions older than 2.4.3, + prevents the backend from detecting and missing buckets. +Due to this, it is recommended that you create the bucket. +Do you want to create the bucket now? The new amazon s3 API requires that bucket names are all lower case. diff --git a/Duplicati/Library/Backend/File/Strings/FileUI.resx b/Duplicati/Library/Backend/File/Strings/FileUI.resx index a8d3a06bc..25cb7c6da 100644 --- a/Duplicati/Library/Backend/File/Strings/FileUI.resx +++ b/Duplicati/Library/Backend/File/Strings/FileUI.resx @@ -130,7 +130,8 @@ The selected folder is not empty. Do you want to use it anyway? - An error occured while verifying the destination. Please make sure it exists and is accessible.\nError message: {0} + An error occured while verifying the destination. Please make sure it exists and is accessible. +Error message: {0} You must enter the full path of the folder diff --git a/Duplicati/Library/Backend/S3/Strings/S3UI.resx b/Duplicati/Library/Backend/S3/Strings/S3UI.resx index 2456483be..02885f657 100644 --- a/Duplicati/Library/Backend/S3/Strings/S3UI.resx +++ b/Duplicati/Library/Backend/S3/Strings/S3UI.resx @@ -118,28 +118,42 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - The bucket name is not in all lower case.\n{0}\nDo you want to convert the bucket name to lower case? + The bucket name is not in all lower case. +{0} +Do you want to convert the bucket name to lower case? - The bucket name does not start with your user ID.\nTo avoid using a bucket owned by another user,\nit is recommended that you put your user ID in front of the bucket name.\nDo you want to insert the user ID in front of the bucket name? + The bucket name does not start with your user ID. +To avoid using a bucket owned by another user, +it is recommended that you put your user ID in front of the bucket name. +Do you want to insert the user ID in front of the bucket name? The bucket does not exist, do you want to create it? - You must enter your AWS Access ID.\nYou may click the link to the right\nto open the AWS login page, and retrieve it. + You must enter your AWS Access ID. +You may click the link to the right +to open the AWS login page, and retrieve it. - You must enter your AWS Secret Key.\nYou may click the link to the right\nto open the AWS login page, and retrieve it. + You must enter your AWS Secret Key. +You may click the link to the right +to open the AWS login page, and retrieve it. - You must enter a name for the bucket.\nYou must use a unique name for each backup.\nYou may enter any name you like. + You must enter a name for the bucket. +You must use a unique name for each backup. +You may enter any name you like. The european buckets require that the bucket name is in lower case. - A bug in Mono versions older than 2.4.3,\n prevents the backend from detecting and missing buckets.\nDue to this, it is recommended that you create the bucket.\nDo you want to create the bucket now? + A bug in Mono versions older than 2.4.3, + prevents the backend from detecting and missing buckets. +Due to this, it is recommended that you create the bucket. +Do you want to create the bucket now? The new amazon s3 API requires that bucket names are all lower case. diff --git a/Duplicati/Library/Backend/SSH/Strings/SSHBackend.resx b/Duplicati/Library/Backend/SSH/Strings/SSHBackend.resx index abb5d6ceb..37113b12a 100644 --- a/Duplicati/Library/Backend/SSH/Strings/SSHBackend.resx +++ b/Duplicati/Library/Backend/SSH/Strings/SSHBackend.resx @@ -166,7 +166,7 @@ Prints debug info to the console - The password used to connect to the server. This may also be supplied as the environment variable \"FTP_PASSWORD\". + The password used to connect to the server. This may also be supplied as the environment variable "FTP_PASSWORD". Supplies the password used to connect to the server @@ -211,10 +211,14 @@ The host is not authenticated, please connect to the host using SSH, and then re-rerun Duplicati, log: {0} - Failed to start the SSH application ({0}).\nMake sure that "expect" is installed.\nError message: {1} + Failed to start the SSH application ({0}). +Make sure that "expect" is installed. +Error message: {1} - Failed to start the SSH application ({0}).\nMake sure that "putty" is installed, and you have set the correct path.\nError message: {1} + Failed to start the SSH application ({0}). +Make sure that "putty" is installed, and you have set the correct path. +Error message: {1} A password was expected, but passwordless login was specified diff --git a/Duplicati/Library/Backend/SSH/Strings/SSHUI.resx b/Duplicati/Library/Backend/SSH/Strings/SSHUI.resx index ab2f644d1..393c980d8 100644 --- a/Duplicati/Library/Backend/SSH/Strings/SSHUI.resx +++ b/Duplicati/Library/Backend/SSH/Strings/SSHUI.resx @@ -118,7 +118,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Duplicati was unable to verify the existence of the sftp program.\nsfpt may work regardless, if it is located in the system search path.\n\nDo you want to continue anyway? + Duplicati was unable to verify the existence of the sftp program. +sfpt may work regardless, if it is located in the system search path. + +Do you want to continue anyway? On this page you can select where to store the backup data. diff --git a/Duplicati/Localization/pt-BR/GUI/HelperControls/DurationEditor.resx b/Duplicati/Localization/pt-BR/GUI/HelperControls/DurationEditor.resx index 9dd69dd5c..e038bc94e 100644 --- a/Duplicati/Localization/pt-BR/GUI/HelperControls/DurationEditor.resx +++ b/Duplicati/Localization/pt-BR/GUI/HelperControls/DurationEditor.resx @@ -1,4 +1,4 @@ - +