mirror of
https://github.com/ckaczor/sqltoolsservice.git
synced 2026-01-26 09:35:38 -05:00
fix build breaks (#924)
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
// WARNING:
|
||||
// This file was generated by the Microsoft DataWarehouse String Resource Tool 1.37.0.0
|
||||
// This file was generated by the Microsoft DataWarehouse String Resource Tool 4.0.0.0
|
||||
// from information in sr.strings
|
||||
// DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN
|
||||
//
|
||||
|
||||
@@ -126,22 +126,22 @@
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="ConnectionServiceListDbErrorNotConnected" xml:space="preserve">
|
||||
<value>SpecifiedUri '{0}' does not have existing connection</value>
|
||||
<value>SpecifiedUri '{0}' does not have existing connection</value>
|
||||
<comment>.
|
||||
Parameters: 0 - uri (string) </comment>
|
||||
</data>
|
||||
<data name="ConnectionServiceDbErrorDefaultNotConnected" xml:space="preserve">
|
||||
<value>Specified URI '{0}' does not have a default connection</value>
|
||||
<value>Specified URI '{0}' does not have a default connection</value>
|
||||
<comment>.
|
||||
Parameters: 0 - uri (string) </comment>
|
||||
</data>
|
||||
<data name="ConnectionServiceConnStringInvalidAuthType" xml:space="preserve">
|
||||
<value>Invalid value '{0}' for AuthenticationType. Valid values are 'Integrated' and 'SqlLogin'.</value>
|
||||
<value>Invalid value '{0}' for AuthenticationType. Valid values are 'Integrated' and 'SqlLogin'.</value>
|
||||
<comment>.
|
||||
Parameters: 0 - authType (string) </comment>
|
||||
</data>
|
||||
<data name="ConnectionServiceConnStringInvalidIntent" xml:space="preserve">
|
||||
<value>Invalid value '{0}' for ApplicationIntent. Valid values are 'ReadWrite' and 'ReadOnly'.</value>
|
||||
<value>Invalid value '{0}' for ApplicationIntent. Valid values are 'ReadWrite' and 'ReadOnly'.</value>
|
||||
<comment>.
|
||||
Parameters: 0 - intent (string) </comment>
|
||||
</data>
|
||||
@@ -178,6 +178,10 @@
|
||||
<value>Azure SQL Stretch Database</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="AzureSqlAnalyticsOnDemandEdition" xml:space="preserve">
|
||||
<value>Azure SQL Analytics on-demand</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="QueryServiceCancelAlreadyCompleted" xml:space="preserve">
|
||||
<value>The query has already completed, it cannot be cancelled</value>
|
||||
<comment></comment>
|
||||
@@ -448,7 +452,7 @@
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="EditDataInvalidFormat" xml:space="preserve">
|
||||
<value>Invalid format for column '{0}', column is defined as {1}</value>
|
||||
<value>Invalid format for column '{0}', column is defined as {1}</value>
|
||||
<comment>.
|
||||
Parameters: 0 - colName (string), 1 - colType (string) </comment>
|
||||
</data>
|
||||
@@ -457,11 +461,11 @@
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="EditDataInvalidFormatBoolean" xml:space="preserve">
|
||||
<value>Allowed values for boolean columns are 0, 1, "true", or "false"</value>
|
||||
<value>Allowed values for boolean columns are 0, 1, "true", or "false"</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="EditDataCreateScriptMissingValue" xml:space="preserve">
|
||||
<value>The column '{0}' is defined as NOT NULL but was not given a value</value>
|
||||
<value>The column '{0}' is defined as NOT NULL but was not given a value</value>
|
||||
<comment>.
|
||||
Parameters: 0 - colName (string) </comment>
|
||||
</data>
|
||||
@@ -603,11 +607,11 @@
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="BatchParser_CircularReference" xml:space="preserve">
|
||||
<value>File '{0}' recursively included.</value>
|
||||
<value>File '{0}' recursively included.</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="BatchParser_CommentNotTerminated" xml:space="preserve">
|
||||
<value>Missing end comment mark '*/'.</value>
|
||||
<value>Missing end comment mark '*/'.</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="BatchParser_StringNotTerminated" xml:space="preserve">
|
||||
@@ -615,7 +619,7 @@
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="BatchParser_IncorrectSyntax" xml:space="preserve">
|
||||
<value>Incorrect syntax was encountered while parsing '{0}'.</value>
|
||||
<value>Incorrect syntax was encountered while parsing '{0}'.</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="BatchParser_VariableNotDefined" xml:space="preserve">
|
||||
@@ -1451,7 +1455,7 @@
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="general_default" xml:space="preserve">
|
||||
<value><default></value>
|
||||
<value>&lt;default&gt;</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="general_fileGroup" xml:space="preserve">
|
||||
@@ -1471,7 +1475,7 @@
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="general_newFilegroup" xml:space="preserve">
|
||||
<value><new filegroup></value>
|
||||
<value>&lt;new filegroup&gt;</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="general_path" xml:space="preserve">
|
||||
@@ -1483,7 +1487,7 @@
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="general_rawDevice" xml:space="preserve">
|
||||
<value><raw device></value>
|
||||
<value>&lt;raw device&gt;</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="general_recoveryModel_bulkLogged" xml:space="preserve">
|
||||
@@ -1715,7 +1719,7 @@
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="prototype_file_defaultpathstring" xml:space="preserve">
|
||||
<value><default path></value>
|
||||
<value>&lt;default path&gt;</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="title_openConnectionsMustBeClosed" xml:space="preserve">
|
||||
@@ -1899,7 +1903,7 @@
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="InvalidPathForDatabaseFile" xml:space="preserve">
|
||||
<value>Invalid path for database file: '{0}'</value>
|
||||
<value>Invalid path for database file: '{0}'</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="Log" xml:space="preserve">
|
||||
|
||||
@@ -1588,8 +1588,8 @@
|
||||
<note></note>
|
||||
</trans-unit>
|
||||
<trans-unit id="general_default">
|
||||
<source><default></source>
|
||||
<target state="new"><default></target>
|
||||
<source>&lt;default&gt;</source>
|
||||
<target state="new">&lt;default&gt;</target>
|
||||
<note></note>
|
||||
</trans-unit>
|
||||
<trans-unit id="general_fileGroup">
|
||||
@@ -1613,8 +1613,8 @@
|
||||
<note></note>
|
||||
</trans-unit>
|
||||
<trans-unit id="general_newFilegroup">
|
||||
<source><new filegroup></source>
|
||||
<target state="new"><new filegroup></target>
|
||||
<source>&lt;new filegroup&gt;</source>
|
||||
<target state="new">&lt;new filegroup&gt;</target>
|
||||
<note></note>
|
||||
</trans-unit>
|
||||
<trans-unit id="general_path">
|
||||
@@ -1628,8 +1628,8 @@
|
||||
<note></note>
|
||||
</trans-unit>
|
||||
<trans-unit id="general_rawDevice">
|
||||
<source><raw device></source>
|
||||
<target state="new"><raw device></target>
|
||||
<source>&lt;raw device&gt;</source>
|
||||
<target state="new">&lt;raw device&gt;</target>
|
||||
<note></note>
|
||||
</trans-unit>
|
||||
<trans-unit id="general_recoveryModel_bulkLogged">
|
||||
@@ -1913,8 +1913,8 @@
|
||||
<note></note>
|
||||
</trans-unit>
|
||||
<trans-unit id="prototype_file_defaultpathstring">
|
||||
<source><default path></source>
|
||||
<target state="new"><default path></target>
|
||||
<source>&lt;default path&gt;</source>
|
||||
<target state="new">&lt;default path&gt;</target>
|
||||
<note></note>
|
||||
</trans-unit>
|
||||
<trans-unit id="title_openConnectionsMustBeClosed">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// WARNING:
|
||||
// This file was generated by the Microsoft DataWarehouse String Resource Tool 1.37.0.0
|
||||
// This file was generated by the Microsoft DataWarehouse String Resource Tool 4.0.0.0
|
||||
// from information in sr.strings
|
||||
// DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN
|
||||
//
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// WARNING:
|
||||
// This file was generated by the Microsoft DataWarehouse String Resource Tool 1.37.0.0
|
||||
// This file was generated by the Microsoft DataWarehouse String Resource Tool 4.0.0.0
|
||||
// from information in sr.strings
|
||||
// DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN
|
||||
//
|
||||
|
||||
@@ -142,11 +142,11 @@
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="HostingUnexpectedEndOfStream" xml:space="preserve">
|
||||
<value>MessageReader's input stream ended unexpectedly, terminating</value>
|
||||
<value>MessageReader's input stream ended unexpectedly, terminating</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="HostingHeaderMissingColon" xml:space="preserve">
|
||||
<value>Message header must separate key and value using ':'</value>
|
||||
<value>Message header must separate key and value using ':'</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="HostingHeaderMissingContentLengthHeader" xml:space="preserve">
|
||||
@@ -174,7 +174,7 @@
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="HostingMethodHandlerDoesNotExist" xml:space="preserve">
|
||||
<value>{0} handler for method '{1}' does not exist.</value>
|
||||
<value>{0} handler for method '{1}' does not exist.</value>
|
||||
<comment>.
|
||||
Parameters: 0 - messageType (string), 1 - method (string) </comment>
|
||||
</data>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// WARNING:
|
||||
// This file was generated by the Microsoft DataWarehouse String Resource Tool 1.37.0.0
|
||||
// This file was generated by the Microsoft DataWarehouse String Resource Tool 4.0.0.0
|
||||
// from information in sr.strings
|
||||
// DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN
|
||||
//
|
||||
|
||||
@@ -162,11 +162,11 @@
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="HostingUnexpectedEndOfStream" xml:space="preserve">
|
||||
<value>MessageReader's input stream ended unexpectedly, terminating</value>
|
||||
<value>MessageReader's input stream ended unexpectedly, terminating</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="HostingHeaderMissingColon" xml:space="preserve">
|
||||
<value>Message header must separate key and value using ':'</value>
|
||||
<value>Message header must separate key and value using ':'</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="HostingHeaderMissingContentLengthHeader" xml:space="preserve">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// WARNING:
|
||||
// This file was generated by the Microsoft DataWarehouse String Resource Tool 1.37.0.0
|
||||
// This file was generated by the Microsoft DataWarehouse String Resource Tool 4.0.0.0
|
||||
// from information in sr.strings
|
||||
// DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN
|
||||
//
|
||||
@@ -388,6 +388,7 @@ namespace Microsoft.SqlTools.ManagedBatchParser
|
||||
|
||||
public const string SqlCmd_FailedInclude = "SqlCmd_FailedInclude";
|
||||
|
||||
|
||||
private Keys()
|
||||
{ }
|
||||
|
||||
|
||||
@@ -214,11 +214,11 @@
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="BatchParser_CircularReference" xml:space="preserve">
|
||||
<value>File '{0}' recursively included.</value>
|
||||
<value>File '{0}' recursively included.</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="BatchParser_CommentNotTerminated" xml:space="preserve">
|
||||
<value>Missing end comment mark '*/'.</value>
|
||||
<value>Missing end comment mark '*/'.</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="BatchParser_StringNotTerminated" xml:space="preserve">
|
||||
@@ -226,7 +226,7 @@
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="BatchParser_IncorrectSyntax" xml:space="preserve">
|
||||
<value>Incorrect syntax was encountered while parsing '{0}'.</value>
|
||||
<value>Incorrect syntax was encountered while parsing '{0}'.</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="BatchParser_VariableNotDefined" xml:space="preserve">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// WARNING:
|
||||
// This file was generated by the Microsoft DataWarehouse String Resource Tool 1.37.0.0
|
||||
// This file was generated by the Microsoft DataWarehouse String Resource Tool 4.0.0.0
|
||||
// from information in sr.strings
|
||||
// DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN
|
||||
//
|
||||
|
||||
@@ -142,7 +142,7 @@
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="FirewallRuleCreationFailedWithError" xml:space="preserve">
|
||||
<value>An error occurred while creating a new firewall rule: '{0}'</value>
|
||||
<value>An error occurred while creating a new firewall rule: '{0}'</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="InvalidIpAddress" xml:space="preserve">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// WARNING:
|
||||
// This file was generated by the Microsoft DataWarehouse String Resource Tool 1.37.0.0
|
||||
// This file was generated by the Microsoft DataWarehouse String Resource Tool 4.0.0.0
|
||||
// from information in sr.strings
|
||||
// DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN
|
||||
//
|
||||
|
||||
@@ -134,7 +134,7 @@
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="FailedToGetAzureSqlServersWithError" xml:space="preserve">
|
||||
<value>An error occurred while getting Azure Sql Servers: '{0}'</value>
|
||||
<value>An error occurred while getting Azure Sql Servers: '{0}'</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="FirewallRuleCreationFailed" xml:space="preserve">
|
||||
@@ -142,11 +142,11 @@
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="FirewallRuleCreationFailedWithError" xml:space="preserve">
|
||||
<value>An error occurred while creating a new firewall rule: '{0}'</value>
|
||||
<value>An error occurred while creating a new firewall rule: '{0}'</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="UnsupportedAuthType" xml:space="preserve">
|
||||
<value>Unsupported account type '{0}' for this provider</value>
|
||||
<value>Unsupported account type '{0}' for this provider</value>
|
||||
<comment></comment>
|
||||
</data>
|
||||
<data name="UserNotFoundError" xml:space="preserve">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// WARNING:
|
||||
// This file was generated by the Microsoft DataWarehouse String Resource Tool 1.37.0.0
|
||||
// This file was generated by the Microsoft DataWarehouse String Resource Tool 4.0.0.0
|
||||
// from information in sr.strings
|
||||
// DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN
|
||||
//
|
||||
|
||||
@@ -1160,7 +1160,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
|
||||
{
|
||||
if (string.IsNullOrEmpty(connectionDetails.ColumnEncryptionSetting) || connectionDetails.ColumnEncryptionSetting.ToUpper() == "DISABLED")
|
||||
{
|
||||
throw new ArgumentException(SR.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination());
|
||||
throw new ArgumentException(SR.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination);
|
||||
}
|
||||
|
||||
switch (connectionDetails.EnclaveAttestationProtocol.ToUpper())
|
||||
@@ -1179,7 +1179,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Connection
|
||||
{
|
||||
if (string.IsNullOrEmpty(connectionDetails.ColumnEncryptionSetting) || connectionDetails.ColumnEncryptionSetting.ToUpper() == "DISABLED")
|
||||
{
|
||||
throw new ArgumentException(SR.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination());
|
||||
throw new ArgumentException(SR.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination);
|
||||
}
|
||||
|
||||
connectionBuilder.EnclaveAttestationUrl = connectionDetails.EnclaveAttestationUrl;
|
||||
|
||||
@@ -45,6 +45,14 @@ namespace Microsoft.SqlTools.ServiceLayer
|
||||
}
|
||||
}
|
||||
|
||||
public static string ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination
|
||||
{
|
||||
get
|
||||
{
|
||||
return Keys.GetString(Keys.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination);
|
||||
}
|
||||
}
|
||||
|
||||
public static string ConnectionServiceConnectionCanceled
|
||||
{
|
||||
get
|
||||
@@ -364,6 +372,7 @@ namespace Microsoft.SqlTools.ServiceLayer
|
||||
return Keys.GetString(Keys.SqlCmdExitOnError);
|
||||
}
|
||||
}
|
||||
|
||||
public static string SqlCmdUnsupportedToken
|
||||
{
|
||||
get
|
||||
@@ -2997,11 +3006,6 @@ namespace Microsoft.SqlTools.ServiceLayer
|
||||
return Keys.GetString(Keys.ConnectionServiceConnStringInvalidEnclaveAttestationProtocol, enclaveAttestationProtocol);
|
||||
}
|
||||
|
||||
public static string ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination()
|
||||
{
|
||||
return Keys.GetString(Keys.ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination);
|
||||
}
|
||||
|
||||
public static string ConnectionServiceConnStringInvalidIntent(string intent)
|
||||
{
|
||||
return Keys.GetString(Keys.ConnectionServiceConnStringInvalidIntent, intent);
|
||||
@@ -3318,7 +3322,7 @@ namespace Microsoft.SqlTools.ServiceLayer
|
||||
|
||||
public const string QueryServiceExecutionPlanNotFound = "QueryServiceExecutionPlanNotFound";
|
||||
|
||||
|
||||
|
||||
public const string SqlCmdExitOnError = "SqlCmdExitOnError";
|
||||
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1590,7 +1590,7 @@
|
||||
<source>Azure SQL Stretch Database</source>
|
||||
<target state="new">Azure SQL Stretch Database</target>
|
||||
<note></note>
|
||||
</trans-unit>
|
||||
</trans-unit>
|
||||
<trans-unit id="AzureSqlAnalyticsOnDemandEdition">
|
||||
<source>Azure SQL Analytics on-demand</source>
|
||||
<target state="new">Azure SQL Analytics on-demand</target>
|
||||
@@ -2029,6 +2029,33 @@
|
||||
<note>.
|
||||
Parameters: 0 - filePath (string) </note>
|
||||
</trans-unit>
|
||||
<trans-unit id="ConnectionServiceConnStringInvalidColumnEncryptionSetting">
|
||||
<source>Invalid value '{0}' for ComlumEncryption. Valid values are 'Enabled' and 'Disabled'.</source>
|
||||
<target state="new">Invalid value '{0}' for ComlumEncryption. Valid values are 'Enabled' and 'Disabled'.</target>
|
||||
<note>.
|
||||
Parameters: 0 - columnEncryptionSetting (string) </note>
|
||||
</trans-unit>
|
||||
<trans-unit id="ConnectionServiceConnStringInvalidEnclaveAttestationProtocol">
|
||||
<source>Invalid value '{0}' for EnclaveAttestationProtocol. Valid values are 'AAS' and 'HGS'.</source>
|
||||
<target state="new">Invalid value '{0}' for EnclaveAttestationProtocol. Valid values are 'AAS' and 'HGS'.</target>
|
||||
<note>.
|
||||
Parameters: 0 - enclaveAttestationProtocol (string) </note>
|
||||
</trans-unit>
|
||||
<trans-unit id="ConnectionServiceConnStringInvalidAlwaysEncryptedOptionCombination">
|
||||
<source>The Attestation Protocol and Enclave Attestation URL requires Always Encrypted to be set to Enabled.</source>
|
||||
<target state="new">The Attestation Protocol and Enclave Attestation URL requires Always Encrypted to be set to Enabled.</target>
|
||||
<note></note>
|
||||
</trans-unit>
|
||||
<trans-unit id="SqlCmdExitOnError">
|
||||
<source>An error was encountered during execution of batch. Exiting.</source>
|
||||
<target state="new">An error was encountered during execution of batch. Exiting.</target>
|
||||
<note></note>
|
||||
</trans-unit>
|
||||
<trans-unit id="SqlCmdUnsupportedToken">
|
||||
<source>Encountered unsupported token {0}</source>
|
||||
<target state="new">Encountered unsupported token {0}</target>
|
||||
<note></note>
|
||||
</trans-unit>
|
||||
</body>
|
||||
</file>
|
||||
</xliff>
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user