Merge pull request #452 from v-xiangs/xiangs-dev

update error messages for localization

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResource.java

@@ -190,7 +190,7 @@ protected Object[][] getContents() {
 				{"R_socketTimeoutPropertyDescription", "The number of milliseconds to wait before the java.net.SocketTimeoutException is raised."},
 				{"R_serverPreparedStatementDiscardThresholdPropertyDescription", "The threshold for when to close discarded prepare statements on the server (calling a batch of sp_unprepares). A value of 1 or less will cause sp_unprepare to be called immediately on PreparedStatment close."},
 				{"R_enablePrepareOnFirstPreparedStatementCallPropertyDescription", "This setting specifies whether a prepared statement is prepared (sp_prepexec) on first use (property=true) or on second after first calling sp_executesql (property=false)."},
-                {"R_statementPoolingCacheSizePropertyDescription", "This setting specifies the size of the prepared statement cache for a conection. A value less than 1 means no cache."},
+                {"R_statementPoolingCacheSizePropertyDescription", "This setting specifies the size of the prepared statement cache for a connection. A value less than 1 means no cache."},
 				{"R_gsscredentialPropertyDescription", "Impersonated GSS Credential to access SQL Server."}, 
 				{"R_noParserSupport", "An error occurred while instantiating the required parser. Error: \"{0}\""},
 				{"R_writeOnlyXML", "Cannot read from this SQLXML instance. This instance is for writing data only."},
@@ -268,7 +268,7 @@ protected Object[][] getContents() {
 				{"R_NullColumnEncryptionKey", "Column encryption key cannot be null."},
 				{"R_EmptyColumnEncryptionKey", "Empty column encryption key specified."},
 				{"R_CertificateNotFoundForAlias", "Certificate with alias {0} not found in the store provided by {1}. Verify the certificate has been imported correctly into the certificate location/store."},
-				{"R_UnrecoverableKeyAE", "Cannot recover private key from keystore with certificate details {0}.  Verify that imported AE certificate contains private key and password provided for certificate is correct."},
+				{"R_UnrecoverableKeyAE", "Cannot recover private key from keystore with certificate details {0}.  Verify that imported certificate for Always Encrypted contains private key and password provided for certificate is correct."},
 				{"R_KeyStoreNotFound", "System cannot find the key store file at the specified path. Verify that the path is correct and you have proper permissions to access it."},
 				{"R_CustomKeyStoreProviderMapNull", "Column encryption key store provider map cannot be null. Expecting a non-null value."},
 				{"R_EmptyCustomKeyStoreProviderName", "Invalid key store provider name specified. Key store provider names cannot be null or empty."},
@@ -320,8 +320,8 @@ protected Object[][] getContents() {
 				{"R_NoSHA256Algorithm","SHA-256 Algorithm is not supported."},
 				{"R_VerifySignature","Unable to verify signature of the column encryption key."},
 				{"R_CEKSignatureNotMatchCMK","The specified encrypted column encryption key signature does not match the signature computed with the column master key (Asymmetric key in Azure Key Vault) in {0}. The encrypted column encryption key may be corrupt, or the specified path may be incorrect."},
-				{"R_DecryptCEKError","Unable to decrypt CEK using specified Azure Key Vault key."},
-				{"R_EncryptCEKError","Unable to encrypt CEK using specified Azure Key Vault key."},
+				{"R_DecryptCEKError","Unable to decrypt column encryption key using specified Azure Key Vault key."},
+				{"R_EncryptCEKError","Unable to encrypt column encryption key using specified Azure Key Vault key."},
 				{"R_CipherTextLengthNotMatchRSASize","CipherText length does not match the RSA key size."},
 				{"R_GenerateSignature","Unable to generate signature using a specified Azure Key Vault Key URL."},
 				{"R_SignedHashLengthError","Signed hash length does not match the RSA key size."},
@@ -375,7 +375,7 @@ protected Object[][] getContents() {
 				{"R_TVPnotWorkWithSetObjectResultSet" , "setObject() with ResultSet is not supported for Table-Valued Parameter. Please use setStructured()."},
 				{"R_invalidQueryTimeout", "The queryTimeout {0} is not valid."},
 				{"R_invalidSocketTimeout", "The socketTimeout {0} is not valid."},
-				{"R_fipsPropertyDescription", "Determines if enable FIPS compilant SSL connection between the client and the server."},
+				{"R_fipsPropertyDescription", "Determines if enable FIPS compliant SSL connection between the client and the server."},
 				{"R_invalidFipsConfig", "Could not enable FIPS."},
 				{"R_invalidFipsEncryptConfig", "Could not enable FIPS due to either encrypt is not true or using trusted certificate settings."},
 				{"R_invalidFipsProviderConfig", "Could not enable FIPS due to invalid FIPSProvider or TrustStoreType."},