diff --git a/resources/xlf/en/Microsoft.azuremonitor.xlf b/resources/xlf/en/Microsoft.azuremonitor.xlf index 58218ebbfc..d2e392cba9 100644 --- a/resources/xlf/en/Microsoft.azuremonitor.xlf +++ b/resources/xlf/en/Microsoft.azuremonitor.xlf @@ -97,9 +97,6 @@ Authentication type - - Azure Active Directory - Universal with MFA support - Azure Monitor Logs @@ -124,6 +121,9 @@ Metadata Pooling + + Microsoft Entra ID - Universal with MFA support + Name diff --git a/resources/xlf/en/Microsoft.cms.xlf b/resources/xlf/en/Microsoft.cms.xlf index fbe7775071..d2096af399 100644 --- a/resources/xlf/en/Microsoft.cms.xlf +++ b/resources/xlf/en/Microsoft.cms.xlf @@ -89,9 +89,6 @@ Authentication type - - Azure Active Directory - Universal with MFA support - Azure Attestation @@ -221,6 +218,9 @@ Maximum number of old files to remove upon startup that have expired mssql.logRetentionMinutes. Files that do not get cleaned up due to this limitation get cleaned up next time Azure Data Studio starts up. + + Microsoft Entra ID - Universal with MFA support + Microsoft SQL Server diff --git a/resources/xlf/en/Microsoft.kusto.xlf b/resources/xlf/en/Microsoft.kusto.xlf index 8201d9d9d0..8477cb73a2 100644 --- a/resources/xlf/en/Microsoft.kusto.xlf +++ b/resources/xlf/en/Microsoft.kusto.xlf @@ -97,9 +97,6 @@ Authentication type - - Azure Active Directory - Universal with MFA support - Azure Data Explorer (Kusto) @@ -151,6 +148,9 @@ Kusto cluster name + + Microsoft Entra ID - Universal with MFA support + Name diff --git a/resources/xlf/en/Microsoft.mssql.xlf b/resources/xlf/en/Microsoft.mssql.xlf index a5a37b43f6..5d6b3eb45c 100644 --- a/resources/xlf/en/Microsoft.mssql.xlf +++ b/resources/xlf/en/Microsoft.mssql.xlf @@ -163,7 +163,7 @@ Attach database - Authenticate with Azure Active Directory + Authenticate with Microsoft Entra Authenticate with password @@ -201,9 +201,6 @@ Automatically set processor affinity mask for all processors - - Azure Active Directory Authentication - Azure SQL Database pricing calculator @@ -657,12 +654,18 @@ Memory Used By Memory Optimized Objects + + Microsoft Entra ID Authentication + Minimum Server Memory (MB) Monitoring + + N/A + Name @@ -998,6 +1001,9 @@ Value for Secondary + + Value should be greater than {0}. Choose 0 for default settings. + Version @@ -1205,9 +1211,6 @@ Authentication type - - Azure Active Directory - Universal with MFA support - Azure Attestation @@ -1451,6 +1454,9 @@ Maximum size of text and ntext data returned from a SELECT statement + + Microsoft Entra ID - Universal with MFA support + Microsoft SQL Server diff --git a/resources/xlf/en/Microsoft.sql-migration.xlf b/resources/xlf/en/Microsoft.sql-migration.xlf index 744706a059..e42a0de22a 100644 --- a/resources/xlf/en/Microsoft.sql-migration.xlf +++ b/resources/xlf/en/Microsoft.sql-migration.xlf @@ -166,9 +166,6 @@ An error occurred while restarting the migration. - - An error occurred while starting the certificate migration: '{0}' - An error occurred while trying to get {0} login information. @@ -232,15 +229,6 @@ Authentication type - - Azure AD tenant - - - Azure Active Directory (AAD) Domain name is required to migrate Windows login. Please enter an AAD Domain Name or deselect windows login(s). - - - Azure Active Directory Domain Name (only required to migrate Windows Authenication Logins) - Azure Database Migration Guides @@ -748,6 +736,9 @@ Delete migration + + Description + Description @@ -877,6 +868,9 @@ Enter the target user name + + Error + Error @@ -1051,6 +1045,9 @@ In Azure Database Migration Service, you can migrate your databases offline or while they are online. In an offline migration, application downtime starts when the migration starts. To limit downtime to the time it takes you to cut over to the new environment after the migration, use an online migration. + + In order for certificate migration to succeed, you must meet all of the requirements listed below. Click "Run validation" to check that requirements are met. + In progress @@ -1225,6 +1222,15 @@ Memory requirement + + Microsoft Entra ID Domain Name (only required to migrate Windows Authenication Logins) + + + Microsoft Entra ID Domain name is required to migrate Windows login. Please enter an AAD Domain Name or deselect windows login(s). + + + Microsoft Entra tenant + Migrate @@ -1546,6 +1552,9 @@ Pending + + Pending + Pending @@ -1780,12 +1789,18 @@ Run migration workflow again + + Run validation + Run validation Running + + Running + Running @@ -2170,6 +2185,9 @@ Succeeded + + Succeeded + Succeeded @@ -2317,6 +2335,9 @@ The fininish time for the migration + + The following error has occurred while starting the certificate migration: '{0}' + The following error occurred while retrieving registration information for Azure Database Migration Service '{0}'. Please click refresh and try again. Error: '{1}'. @@ -2422,6 +2443,9 @@ Transaction log + + Troubleshooting tips + Tutorial: Migrate to Azure SQL Managed Instance (online) @@ -2476,6 +2500,9 @@ Validating and migrating logins failed + + Validation + Validation check canceled diff --git a/resources/xlf/en/sql.xlf b/resources/xlf/en/sql.xlf index 2337577629..52010b962d 100644 --- a/resources/xlf/en/sql.xlf +++ b/resources/xlf/en/sql.xlf @@ -1694,10 +1694,10 @@ Default Skipped Commands: Collapse All Connections - Azure Active Directory - Universal with MFA support + Microsoft Entra ID - Universal with MFA support - Azure Active Directory - Password + Microsoft Entra ID - Password Windows Authentication @@ -5518,7 +5518,7 @@ Error Message: {1} Azure subscription - Azure AD Tenant + Microsoft Entra Tenant Discard @@ -5721,7 +5721,7 @@ Error Message: {1} Account - Azure AD tenant + Microsoft Entra tenant Name (optional)