diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b30c7286..7fec866eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ `Invoke-SqlScript` so that `PRINT` statements is outputted correctly when verbose output is requested, e.g `Start-DscConfiguration -Verbose`. +- Changes to SqlSetup + - Concatenated Robocopy localization strings ([issue #694](https://github.com/PowerShell/SqlServerDsc/issues/694)). ## 12.4.0.0 diff --git a/DSCResources/MSFT_SqlSetup/en-US/MSFT_SqlSetup.strings.psd1 b/DSCResources/MSFT_SqlSetup/en-US/MSFT_SqlSetup.strings.psd1 index fbce73d37..15912a5ba 100644 --- a/DSCResources/MSFT_SqlSetup/en-US/MSFT_SqlSetup.strings.psd1 +++ b/DSCResources/MSFT_SqlSetup/en-US/MSFT_SqlSetup.strings.psd1 @@ -42,7 +42,6 @@ ConvertFrom-StringData @' EvaluateClientToolsSdkFeature = Detecting Client Tools SDK feature ({0}). ClientToolsSdkFeatureFound = Client Tools SDK feature detected. ClientToolsSdkFeatureNotFound = Client Tools SDK feature not detected. - RobocopyIsCopying = Robocopy is copying media from source '{0}' to destination '{1}'. FeatureNotSupported = '{0}' is not a valid value for setting 'FEATURES'. Refer to SQL Help for more information. PathRequireClusterDriveFound = Found assigned parameter '{0}'. Adding path '{1}' to list of paths that required cluster drive. FailoverClusterDiskMappingError = Unable to map the specified paths to valid cluster storage. Drives mapped: {0}. diff --git a/DSCResources/MSFT_SqlSetup/sv-SE/MSFT_SqlSetup.strings.psd1 b/DSCResources/MSFT_SqlSetup/sv-SE/MSFT_SqlSetup.strings.psd1 index ed61272c7..f2ebc2da5 100644 --- a/DSCResources/MSFT_SqlSetup/sv-SE/MSFT_SqlSetup.strings.psd1 +++ b/DSCResources/MSFT_SqlSetup/sv-SE/MSFT_SqlSetup.strings.psd1 @@ -42,7 +42,6 @@ ConvertFrom-StringData @' EvaluateClientToolsSdkFeature = Letar efter Client Tools SDK funktionen ({0}). ClientToolsSdkFeatureFound = Client Tools SDK funktionen hittad. ClientToolsSdkFeatureNotFound = Client Tools SDK funktionen hittades inte. - RobocopyIsCopying = Robocopy kopierar media från källan '{0}' till destinationen '{1}'. FeatureNotSupported = '{0}' är inte ett giltigt värde för egenskapen 'FEATURES'. Titta i hjälpdokumentationen för SQL Server för mer information. PathRequireClusterDriveFound = Hittade tilldelad parameter '{0}'. Adderar sökväg '{1}' till listan av sökvägar som kräver en klustrad enhet. FailoverClusterDiskMappingError = Kunde inte koppla den specifika sökvägen till en giltig klusterlagring. Enheter kopplade: {0}. @@ -61,15 +60,6 @@ ConvertFrom-StringData @' UnableToFindFeature = Kunde inte hitta funktion '{0}' bland som installerade funktionerna: '{1}'. EvaluatingClusterParameters = Klustrad installation, kontrollerar parametrar. ClusterParameterIsNotInDesiredState = {0} '{1}' är inte i önskat läge för detta kluster. - RobocopyUsingUnbufferedIo = Robocopy använder sig av obuffrad I/O. - RobocopyNotUsingUnbufferedIo = Obuffrad I/O kan inte användas på grund av versionen av Robocopy inte är kompatibel. - RobocopyArguments = Robocopy startas med följande argument: {0} - RobocopyErrorCopying = Robocopy rapporterade fel när filer kopierades. Felkod: {0}. - RobocopyFailuresCopying = Robocopy rapporterade att fel uppstod när filer kopierades. Felkod: {0}. - RobocopySuccessful = Robocopy lyckades kopiera filer till destinationen. - RobocopyRemovedExtraFilesAtDestination = Robocopy fann extra filer på destinationen som inte finns i källan, dessa extra filer togs bort på destinationen. - RobocopySuccessfulAndRemovedExtraFilesAtDestination = Robocopy lyckades kopiera filer till destinationen. Robocopy fann extra filer på destinationen som inte finns i källan, dessa extra filer togs bort på destinationen. - RobocopyAllFilesPresent = Robocopy rapporterade att alla filer redan finns på destinationen. StartSetupProcess = Startade processen med id {0}, använder sig av sökvägen '{1}', och med en tidsgräns på {2} sekunder. EvaluateMasterDataServicesFeature = Letar efter Master Data Services (MDS) funktion ({0}). MasterDataServicesFeatureFound = Master Data Services (MDS) funktionen hittad. diff --git a/Modules/DscResource.Common/DscResource.Common.psm1 b/Modules/DscResource.Common/DscResource.Common.psm1 index 0a1c02f73..db818c733 100644 --- a/Modules/DscResource.Common/DscResource.Common.psm1 +++ b/Modules/DscResource.Common/DscResource.Common.psm1 @@ -340,7 +340,7 @@ function Copy-ItemWithRobocopy ArgumentList = $robocopyArgumentList } - Write-Verbose -Message ($script:localizedData.RobocopyArguments -f $robocopyArgumentList) -Verbose + Write-Verbose -Message ($script:localizedData.RobocopyArguments -f $robocopyArgumentList) -Verbose $robocopyProcess = Start-Process @robocopyStartProcessParameters -Wait -NoNewWindow -PassThru switch ($($robocopyProcess.ExitCode)) @@ -359,22 +359,24 @@ function Copy-ItemWithRobocopy 1 { - Write-Verbose -Message $script:localizedData.RobocopySuccessful -Verbose + Write-Verbose -Message $script:localizedData.RobocopySuccessful -Verbose } 2 { - Write-Verbose -Message $script:localizedData.RobocopyRemovedExtraFilesAtDestination -Verbose + Write-Verbose -Message $script:localizedData.RobocopyRemovedExtraFilesAtDestination -Verbose } 3 { - Write-Verbose -Message $script:localizedData.RobocopySuccessfulAndRemovedExtraFilesAtDestination -Verbose + Write-Verbose -Message ( + '{0} {1}' -f $script:localizedData.RobocopySuccessful, $script:localizedData.RobocopyRemovedExtraFilesAtDestination + ) -Verbose } {$_ -eq 0 -or $null -eq $_ } { - Write-Verbose -Message $script:localizedData.RobocopyAllFilesPresent -Verbose + Write-Verbose -Message $script:localizedData.RobocopyAllFilesPresent -Verbose } } } diff --git a/Modules/DscResource.Common/en-US/DscResource.Common.strings.psd1 b/Modules/DscResource.Common/en-US/DscResource.Common.strings.psd1 index c0b589dc1..1a9799400 100644 --- a/Modules/DscResource.Common/en-US/DscResource.Common.strings.psd1 +++ b/Modules/DscResource.Common/en-US/DscResource.Common.strings.psd1 @@ -8,6 +8,7 @@ ConvertFrom-StringData @' PropertyThatDoesNotMatch = {0} - {1} ValueOfTypeDoesNotMatch = {0} value for property {1} does not match. Current state is '{2}' and desired state is '{3}'. UnableToCompareProperty = Unable to compare property {0} as the type {1} is not handled by the Test-DscParameterState cmdlet. + RobocopyIsCopying = Robocopy is copying media from source '{0}' to destination '{1}'. RobocopyUsingUnbufferedIo = Robocopy is using unbuffered I/O. RobocopyNotUsingUnbufferedIo = Unbuffered I/O cannot be used due to incompatible version of Robocopy. RobocopyArguments = Robocopy is started with the following arguments: {0} @@ -15,7 +16,6 @@ ConvertFrom-StringData @' RobocopyFailuresCopying = Robocopy reported that failures occurred when copying files. Error code: {0}. RobocopySuccessful = Robocopy copied files successfully RobocopyRemovedExtraFilesAtDestination = Robocopy found files at the destination path that is not present at the source path, these extra files was remove at the destination path. - RobocopySuccessfulAndRemovedExtraFilesAtDestination = Robocopy copied files to destination successfully. Robocopy also found files at the destination path that is not present at the source path, these extra files was remove at the destination path. RobocopyAllFilesPresent = Robocopy reported that all files already present. StartSetupProcess = Started the process with id {0} using the path '{1}', and with a timeout value of {2} seconds. ConnectedToDatabaseEngineInstance = Connected to SQL instance '{0}'. diff --git a/Modules/DscResource.Common/sv-SE/DscResource.Common.strings.psd1 b/Modules/DscResource.Common/sv-SE/DscResource.Common.strings.psd1 index 0d2ec4462..dd7c9d056 100644 --- a/Modules/DscResource.Common/sv-SE/DscResource.Common.strings.psd1 +++ b/Modules/DscResource.Common/sv-SE/DscResource.Common.strings.psd1 @@ -35,6 +35,15 @@ ConvertFrom-StringData @' ExecuteNonQueryFailed = Exekvering av icke-fråga misslyckades på databas '{0}'. AlterAvailabilityGroupReplicaFailed = Misslyckades att ändra Availability Group kopia '{0}'. GetEffectivePermissionForLogin = Hämtar effektiva behörigheter för inloggningen '{0}' på '{1}'. + RobocopyIsCopying = Robocopy kopierar media från källan '{0}' till destinationen '{1}'. + RobocopyUsingUnbufferedIo = Robocopy använder sig av obuffrad I/O. + RobocopyNotUsingUnbufferedIo = Obuffrad I/O kan inte användas på grund av versionen av Robocopy inte är kompatibel. + RobocopyArguments = Robocopy startas med följande argument: {0} + RobocopyErrorCopying = Robocopy rapporterade fel när filer kopierades. Felkod: {0}. + RobocopyFailuresCopying = Robocopy rapporterade att fel uppstod när filer kopierades. Felkod: {0}. + RobocopySuccessful = Robocopy lyckades kopiera filer till destinationen. + RobocopyRemovedExtraFilesAtDestination = Robocopy fann extra filer på destinationen som inte finns i källan, dessa extra filer togs bort på destinationen. + RobocopyAllFilesPresent = Robocopy rapporterade att alla filer redan finns på destinationen. # - NOTE! # - Below strings are used by helper functions New-TerminatingError and New-WarningMessage. @@ -137,5 +146,4 @@ ConvertFrom-StringData @' # SQLServerNetwork UnableToUseBothDynamicAndStaticPort = Unable to set both TCP dynamic port and TCP static port. Only one can be set. - '@