diff --git a/resources/xlf/en/cms.xlf b/resources/xlf/en/cms.xlf index b1d5d3510a..11334eac6f 100644 --- a/resources/xlf/en/cms.xlf +++ b/resources/xlf/en/cms.xlf @@ -197,6 +197,12 @@ Source + + Indicates the host name specified in TLS certificate that will be used by SQL Server to validate server certificate. When not specified, the server name is used by default for certificate validation. + + + Host name in certificate + The minimum amount of time (in seconds) for this connection to live in the pool before being destroyed @@ -269,12 +275,6 @@ Server - - Indicates the host name specified in TLS certificate that will be used by SQL Server to validate server certificate. When not specified, the server name is used by default for certificate validation. - - - Host name in certificate - When true (and encrypt=true), SQL Server uses SSL encryption for all data sent between the client and server without validating the server certificate @@ -402,4 +402,4 @@ Version - + \ No newline at end of file diff --git a/resources/xlf/en/mssql.xlf b/resources/xlf/en/mssql.xlf index 470adfb641..e8211de6d2 100644 --- a/resources/xlf/en/mssql.xlf +++ b/resources/xlf/en/mssql.xlf @@ -286,6 +286,12 @@ Source + + Indicates the host name specified in TLS certificate that will be used by SQL Server to validate server certificate. When not specified, the server name is used by default for certificate validation. + + + Host name in certificate + The minimum amount of time (in seconds) for this connection to live in the pool before being destroyed @@ -352,12 +358,6 @@ Server - - Indicates the host name specified in TLS certificate that will be used by SQL Server to validate server certificate. When not specified, the server name is used by default for certificate validation. - - - Host name in certificate - When true (and encrypt=true), SQL Server uses SSL encryption for all data sent between the client and server without validating the server certificate @@ -599,4 +599,4 @@ Show Log File - + \ No newline at end of file diff --git a/resources/xlf/en/sql-database-projects.xlf b/resources/xlf/en/sql-database-projects.xlf index d1b10a1d49..6c0b6c7390 100644 --- a/resources/xlf/en/sql-database-projects.xlf +++ b/resources/xlf/en/sql-database-projects.xlf @@ -915,6 +915,9 @@ Database Projects + + SQLCMD Variables + Stored Procedure diff --git a/resources/xlf/en/sql-migration.xlf b/resources/xlf/en/sql-migration.xlf index 7d6c8a1b3c..d72c65fe5e 100644 --- a/resources/xlf/en/sql-migration.xlf +++ b/resources/xlf/en/sql-migration.xlf @@ -1873,6 +1873,27 @@ This may take some time. Validating and migrating logins failed + + Error migrating certificate for database {0}. {1} + + + An error occurred while starting the certificate migration: '{0}' + + + Canceled + + + Failed + + + Pending + + + Running + + + Succeeded + Status @@ -2083,6 +2104,114 @@ This may take some time. Target version + + Edit + + + Migrate certificates + + + Certificates migration was canceled. Please run and complete the certificates migration to continue. + + + Validation was canceled with the following error(s):{0}{1} + + + Databases + + + Status + + + Migration completed with the following error(s):{0}{1} + + + Copy migration results + + + Done + + + Migrating the certificates from the following databases: + + + Certificates migration has not been run for the current configuration. Please run and complete the certificates migration to continue. + + + Certificates migration progress details: + + + Certificates migration results: + + + Previous certificates migration results: + + + Retry migration + + + Migration status: {0}{1}{2} + + + {0}{1}{2} + + + Certificates migration completed successfully. Please click Next to proceed with the migration. + + + Migration canceled + + + Migration completed successfully. + + + {0} Transparent Data Encryption enabled databases selected for migration. {1} + + + No encrypted database selected. + + + You have chosen to manually migrate certificates. + + + You have given access to Azure Data Studio to migrate the encryption certificates and database. + + + {0} of {1} completed + + + {0} out of {1} selected database(s) is using transparent data encryption. + + + To migrate an encrypted database successfully you need to provide access to the encryption certificates or migrate certificates manually before proceeding with the migration. {0}. + + + Network path where certificate will be placed. + + + Network path for certificate + + + Enter network path + + + Export my certificates and private key to the target. + + + I give consent to use my credentials for accessing the certificates. + + + I don't want Azure Data Studio to export the certificates. + + + You must migrate the certificates before proceeding with the migration otherwise the migration will fail. {0}. + + + Certificate migration + + + Encrypted database selected. + Test connection