Support GO N syntax to execute multiple times (#551)

* Support `GO N` syntax to execute multiple times - Plumbed through the batch execution count from the parser and used in the batch execution code path - Functionality matches SSMS: - Outputs loop start/end messages that match SSMS if you're doing multi-batch execution - Outputs an "ignoring failure" error if an error happens during a batch - Added tests for this - Manually verified end to end also * Fixing test error
2026-01-24 17:24:14 -05:00 · 2017-11-22 11:33:19 -08:00
parent 42ee96f99f
commit b8e46ce65f
35 changed files with 623 additions and 367 deletions
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.cs
@@ -749,11 +749,11 @@ namespace Microsoft.SqlTools.ServiceLayer
            }
        }

-        public static string EE_ExecutionInfo_InitilizingLoop
+        public static string EE_ExecutionInfo_InitializingLoop
        {
            get
            {
-                return Keys.GetString(Keys.EE_ExecutionInfo_InitilizingLoop);
+                return Keys.GetString(Keys.EE_ExecutionInfo_InitializingLoop);
            }
        }

@@ -3979,7 +3979,7 @@ namespace Microsoft.SqlTools.ServiceLayer
            public const string EE_BatchExecutionError_Ignoring = "EE_BatchExecutionError_Ignoring";


-            public const string EE_ExecutionInfo_InitilizingLoop = "EE_ExecutionInfo_InitilizingLoop";
+            public const string EE_ExecutionInfo_InitializingLoop = "EE_ExecutionInfo_InitializingLoop";


            public const string EE_ExecutionError_CommandNotSupported = "EE_ExecutionError_CommandNotSupported";
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.de.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.de.resx
@@ -91,7 +91,7 @@
  <data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>Sie haben die Abfrage abgebrochen.</value></data>
  <data name="EE_BatchExecutionError_Halting"><value>Fehler während der Batchausführung.</value></data>
  <data name="EE_BatchExecutionError_Ignoring"><value>Fehler während der Batchausführung, aber des Fehlers wurde ignoriert.</value></data>
-  <data name="EE_ExecutionInfo_InitilizingLoop"><value>{0}-malige Batchausführung wurde gestartet.</value></data>
+  <data name="EE_ExecutionInfo_InitializingLoop"><value>{0}-malige Batchausführung wurde gestartet.</value></data>
  <data name="EE_ExecutionError_CommandNotSupported"><value>Befehl {0} wird nicht unterstützt.</value></data>
  <data name="EE_ExecutionError_VariableNotFound"><value>Die Variable {0} konnte nicht gefunden werden.</value></data>
  <data name="BatchParserWrapperExecutionEngineError"><value>Fehler bei der SQL-Ausführung: {0}</value></data>
@@ -479,4 +479,12 @@ prototype_db_prop_parameterization = Parameterization</value></data>
  <data name="BackupPathIsFolderError"><value>Der angegebene Dateiname ist zugleich ein Verzeichnisname: {0}</value></data>
  <data name="InvalidBackupPathError"><value>Es kann nicht überprüft werden, ob der Speicherort der Sicherungsdatei vorhanden ist: {0}</value></data>
  <data name="InvalidPathError"><value>Auf den angegebenen Pfad auf dem Server kann nicht zugegriffen werden: {0}</value></data>
+  <data name="NoBackupsetsToRestore"><value>Kein Sicherungssatz zur Wiederherstellung ausgewählt</value></data>
+  <data name="NeverBackedUp"><value>Nie</value></data>
+  <data name="AzureSqlDbEdition"><value>Azure SQL DB</value></data>
+  <data name="AzureSqlDwEdition"><value>Azure SQL Data Warehouse</value></data>
+  <data name="AzureSqlStretchEdition"><value>Azure SQL Stretch Database</value></data>
+  <data name="Error_InvalidDirectoryName"><value>Der Pfad {0} ist kein gültiges Verzeichnis</value></data>
+  <data name="Error_ExistingDirectoryName"><value>Die Datei {1} im Verzeichnis {0} existiert bereits.</value></data>
+  <data name="EditDataValueTooLarge"><value>Der Wert {0} ist zu groß für eine Spalte mit dem Datentyp {1}</value></data>
  </root>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.es.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.es.resx
@@ -91,7 +91,7 @@
  <data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>Se canceló la consulta.</value></data>
  <data name="EE_BatchExecutionError_Halting"><value>Se produjo un error mientras se ejecutaba el lote.</value></data>
  <data name="EE_BatchExecutionError_Ignoring"><value>Se produjo un error mientras se ejecutaba el lote, pero se ha omitido el error.</value></data>
-  <data name="EE_ExecutionInfo_InitilizingLoop"><value>Iniciando bucle de ejecución de {0} veces...</value></data>
+  <data name="EE_ExecutionInfo_InitializingLoop"><value>Iniciando bucle de ejecución de {0} veces...</value></data>
  <data name="EE_ExecutionError_CommandNotSupported"><value>No se admite el comando {0}.</value></data>
  <data name="EE_ExecutionError_VariableNotFound"><value>La variable {0} no se encontró.</value></data>
  <data name="BatchParserWrapperExecutionEngineError"><value>Error de ejecución de SQL: {0}</value></data>
@@ -478,4 +478,12 @@
  <data name="BackupPathIsFolderError"><value>El nombre del archivo especificado es un nombre de directorio: {0}</value></data>
  <data name="InvalidBackupPathError"><value>No se puede verificar la existencia de la ubicación del archivo de copia de seguridad: {0}</value></data>
  <data name="InvalidPathError"><value>No se puede acceder a la ruta de acceso especificada en el servidor: {0}</value></data>
+  <data name="NoBackupsetsToRestore"><value>Ningún backupset seleccionado para ser restaurado</value></data>
+  <data name="NeverBackedUp"><value>Nunca</value></data>
+  <data name="AzureSqlDbEdition"><value>Azure SQL Database </value></data>
+  <data name="AzureSqlDwEdition"><value>Azure SQL Data Warehouse</value></data>
+  <data name="AzureSqlStretchEdition"><value>Azure SQL Stretch Database</value></data>
+  <data name="Error_InvalidDirectoryName"><value>La ruta de acceso [{0}] no es un directorio válido</value></data>
+  <data name="Error_ExistingDirectoryName"><value>Ya existe un archivo {1} en el directorio '{0}'</value></data>
+  <data name="EditDataValueTooLarge"><value>El valor {0} es muy grande para el tipo de columna {1} </value></data>
  </root>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.fr.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.fr.resx
@@ -91,7 +91,7 @@
  <data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>Vous avez annulé la requête.</value></data>
  <data name="EE_BatchExecutionError_Halting"><value>Une erreur s'est produite lors de l'exécution du lot.</value></data>
  <data name="EE_BatchExecutionError_Ignoring"><value>Une erreur s'est produite lors de l'exécution du lot, mais elle a été ignorée.</value></data>
-  <data name="EE_ExecutionInfo_InitilizingLoop"><value>Démarrage de la boucle d'exécution pour {0} fois...</value></data>
+  <data name="EE_ExecutionInfo_InitializingLoop"><value>Démarrage de la boucle d'exécution pour {0} fois...</value></data>
  <data name="EE_ExecutionError_CommandNotSupported"><value>La commande {0} n'est pas prise en charge.</value></data>
  <data name="EE_ExecutionError_VariableNotFound"><value>Impossible de trouver la variable {0}.</value></data>
  <data name="BatchParserWrapperExecutionEngineError"><value>Erreur d’exécution de SQL : {0}</value></data>
@@ -478,4 +478,12 @@
  <data name="BackupPathIsFolderError"><value>Le nom de fichier spécifié est également un nom de répertoire: {0}</value></data>
  <data name="InvalidBackupPathError"><value>Impossible de vérifier l'existence de l'emplacement du fichier de sauvegarde: {0}</value></data>
  <data name="InvalidPathError"><value>Impossible d'accéder au chemin d'accès spécifié sur le serveur: {0}</value></data>
+  <data name="NoBackupsetsToRestore"><value>Aucun jeu de sauvegarde n'a été sélectionné pour être restauré.</value></data>
+  <data name="NeverBackedUp"><value>Jamais</value></data>
+  <data name="AzureSqlDbEdition"><value>Azure SQL DB</value></data>
+  <data name="AzureSqlDwEdition"><value>Azure SQL Data Warehouse</value></data>
+  <data name="AzureSqlStretchEdition"><value>Azure SQL Stretch Database</value></data>
+  <data name="Error_InvalidDirectoryName"><value>Le chemin {0} n'est pas un répertoire valide.</value></data>
+  <data name="Error_ExistingDirectoryName"><value> Pour le répertoire {0} un fichier avec le nom {1} existe déjà</value></data>
+  <data name="EditDataValueTooLarge"><value>La valeur {0} est trop grande pour tenir dans la colonne de type {1}</value></data>
  </root>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.it.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.it.resx
@@ -91,7 +91,7 @@
  <data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>È stata annullata la query.</value></data>
  <data name="EE_BatchExecutionError_Halting"><value>Si è verificato un errore durante l'esecuzione del batch.</value></data>
  <data name="EE_BatchExecutionError_Ignoring"><value>Si è verificato un errore durante l'esecuzione del batch, ma l'errore è stato ignorato.</value></data>
-  <data name="EE_ExecutionInfo_InitilizingLoop"><value>Avvio ciclo di esecuzione di {0} volte...</value></data>
+  <data name="EE_ExecutionInfo_InitializingLoop"><value>Avvio ciclo di esecuzione di {0} volte...</value></data>
  <data name="EE_ExecutionError_CommandNotSupported"><value>Il comando {0} non è supportato.</value></data>
  <data name="EE_ExecutionError_VariableNotFound"><value>Impossibile trovare la variabile {0}.</value></data>
  <data name="BatchParserWrapperExecutionEngineError"><value>Errore di esecuzione di SQL: {0}</value></data>
@@ -478,4 +478,12 @@
  <data name="BackupPathIsFolderError"><value>Il nome file specificato è anche un nome di cartella: {0}</value></data>
  <data name="InvalidBackupPathError"><value>Impossibile verificare l'esistenza della posizione del file di backup: {0}</value></data>
  <data name="InvalidPathError"><value>Impossibile accedere al percorso specificato sul server: {0}</value></data>
+  <data name="NoBackupsetsToRestore"><value>Nessun insieme di backup selezionato per il ripristino</value></data>
+  <data name="NeverBackedUp"><value>Mai</value></data>
+  <data name="AzureSqlDbEdition"><value>Azure SQL DB</value></data>
+  <data name="AzureSqlDwEdition"><value>Azure SQL Data Warehouse</value></data>
+  <data name="AzureSqlStretchEdition"><value>Azure SQL Stretch Database</value></data>
+  <data name="Error_InvalidDirectoryName"><value>Il percorso [{0}] non è una directory valida.</value></data>
+  <data name="Error_ExistingDirectoryName"><value>Nella directory '{0}' esiste già il file {1}</value></data>
+  <data name="EditDataValueTooLarge"><value>Il valore {0} è troppo grande per essere contenuto in una colonna di tipo {1}</value></data>
  </root>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.ja.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.ja.resx
@@ -91,7 +91,7 @@
  <data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>クエリをキャンセルしました。</value></data>
  <data name="EE_BatchExecutionError_Halting"><value>バッチの実行中にエラーが発生しました。</value></data>
  <data name="EE_BatchExecutionError_Ignoring"><value>バッチの実行中にエラーが発生しましたが、エラーを無視しました。</value></data>
-  <data name="EE_ExecutionInfo_InitilizingLoop"><value>{0} 回の実行ループを開始しています.</value></data>
+  <data name="EE_ExecutionInfo_InitializingLoop"><value>{0} 回の実行ループを開始しています.</value></data>
  <data name="EE_ExecutionError_CommandNotSupported"><value>コマンド {0} はサポートされていません。</value></data>
  <data name="EE_ExecutionError_VariableNotFound"><value>変数 {0} が見つかりませんでした。</value></data>
  <data name="BatchParserWrapperExecutionEngineError"><value>SQL の実行エラー: {0}</value></data>
@@ -451,8 +451,10 @@ Enabledprototype_db_prop_parameterization = Parameterization</value></data>
  <data name="ConflictWithNoRecovery"><value>NORECOVERY オプションを使用してバックアップを復元するときにこのオプションを指定することはできません。</value></data>
  <data name="InvalidPathForDatabaseFile"><value>データベース ファイルのパスが無効です: '{0}'</value></data>
  <data name="Log"><value>ログ</value></data>
+  <data name="RestorePlanFailed"><value>リストア プランの作成に失敗しました。</value></data>
  <data name="RestoreNotSupported"><value>データベースのリストアはサポートされていません。</value></data>
  <data name="RestoreTaskName"><value>データベースのリストア</value></data>
+  <data name="RestoreCopyOnly"><value>(コピーのみ)</value></data>
  <data name="RestoreBackupSetComponent"><value>コンポーネント</value></data>
  <data name="RestoreBackupSetType"><value>種類</value></data>
  <data name="RestoreBackupSetServer"><value>サーバー</value></data>
@@ -473,7 +475,16 @@ Enabledprototype_db_prop_parameterization = Parameterization</value></data>
  <data name="TaskInProgress"><value>実行中</value></data>
  <data name="TaskCompleted"><value>完了</value></data>
  <data name="ScriptTaskName"><value>スクリプト</value></data>
-  <data name="BackupPathIsFolderError"><value>指定されたファイル名はディレクトリ名と重複します: {0}</value></data>
-  <data name="InvalidBackupPathError"><value>バックアップ ファイルの場所が存在するかどうかを確認できません: {0}</value></data>
+  <data name="ProfilerConnectionNotFound"><value>接続が見つかりません。</value></data>
+  <data name="BackupPathIsFolderError"><value>指定されたファイル名がディレクトリ名と同じです: {0}</value></data>
+  <data name="InvalidBackupPathError"><value>バックアップ ファイルの場所が存在するかどうか確認できません: {0}</value></data>
  <data name="InvalidPathError"><value>サーバーで指定されたパスにアクセスできません: {0}</value></data>
+  <data name="NoBackupsetsToRestore"><value>リストアするバックアップセットが選択されていません</value></data>
+  <data name="NeverBackedUp"><value>行わない</value></data>
+  <data name="AzureSqlDbEdition"><value>Azure SQL DB</value></data>
+  <data name="AzureSqlDwEdition"><value>Azure SQL Data Warehouse</value></data>
+  <data name="AzureSqlStretchEdition"><value>Azure SQL Stretch Database</value></data>
+  <data name="Error_InvalidDirectoryName"><value>パス {0} は有効なディレクトリではありません</value></data>
+  <data name="Error_ExistingDirectoryName"><value>ディレクトリ {0} 内に {1} という名前のファイルは既に存在します</value></data>
+  <data name="EditDataValueTooLarge"><value>値 {0} は大きすぎるため、型 {1} の列に収まりません</value></data>
  </root>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.ko.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.ko.resx
@@ -91,7 +91,7 @@
  <data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>쿼리를 취소 했습니다.</value></data>
  <data name="EE_BatchExecutionError_Halting"><value>일괄 처리를 실행 하는 동안 오류가 발생 합니다.</value></data>
  <data name="EE_BatchExecutionError_Ignoring"><value>일괄 처리를 실행 하는 동안 오류가 발생했으나 그 오류는 무시되었습니다.</value></data>
-  <data name="EE_ExecutionInfo_InitilizingLoop"><value>{0} 번 루프 실행을 시작 하는 중...</value></data>
+  <data name="EE_ExecutionInfo_InitializingLoop"><value>{0} 번 루프 실행을 시작 하는 중...</value></data>
  <data name="EE_ExecutionError_CommandNotSupported"><value>{0} 명령은 지원되지 않습니다.</value></data>
  <data name="EE_ExecutionError_VariableNotFound"><value>{0} 변수를 찾을 수 없습니다.</value></data>
  <data name="BatchParserWrapperExecutionEngineError"><value>SQL 실행 오류: {0}</value></data>
@@ -480,4 +480,12 @@ votes
  <data name="BackupPathIsFolderError"><value>지정한 파일 이름은 디렉터리 이름이기도 합니다: {0}</value></data>
  <data name="InvalidBackupPathError"><value>백업 파일 위치를 확인할 수 없습니다: {0}</value></data>
  <data name="InvalidPathError"><value>서버에서 지정된 경로에 액세스할 수 없습니다: {0}</value></data>
+  <data name="NoBackupsetsToRestore"><value>복원하려는 백업 세트를 선택하지 않았습니다</value></data>
+  <data name="NeverBackedUp"><value>안 함 </value></data>
+  <data name="AzureSqlDbEdition"><value>Azure SQL DB</value></data>
+  <data name="AzureSqlDwEdition"><value>Azure SQL Data Warehouse</value></data>
+  <data name="AzureSqlStretchEdition"><value>Azure SQL 신축성 데이터베이스</value></data>
+  <data name="Error_InvalidDirectoryName"><value>경로 [{0}]은(는) 올바른 디렉터리가 아닙니다.</value></data>
+  <data name="Error_ExistingDirectoryName"><value>디렉터리 {0}에 대한 파일{1} 이 이미 존재합니다. </value></data>
+  <data name="EditDataValueTooLarge"><value>값 {0}이 너무 커서 {1} 유형의 열에 들어갈 수 없습니다.</value></data>
  </root>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.pt-BR.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.pt-BR.resx
@@ -91,7 +91,7 @@
  <data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>Você cancelou a consulta.</value></data>
  <data name="EE_BatchExecutionError_Halting"><value>Ocorreu um erro enquanto o lote estava sendo executado.</value></data>
  <data name="EE_BatchExecutionError_Ignoring"><value>Ocorreu um erro enquanto o lote estava sendo executado, mas o erro foi ignorado.</value></data>
-  <data name="EE_ExecutionInfo_InitilizingLoop"><value>Iniciando a execução do loop {0} vezes...</value></data>
+  <data name="EE_ExecutionInfo_InitializingLoop"><value>Iniciando a execução do loop {0} vezes...</value></data>
  <data name="EE_ExecutionError_CommandNotSupported"><value>Comando {0} não é suportado.</value></data>
  <data name="EE_ExecutionError_VariableNotFound"><value>A variável {0} não pôde ser encontrada.</value></data>
  <data name="BatchParserWrapperExecutionEngineError"><value>Erro de execução de SQL: {0}</value></data>
@@ -479,4 +479,12 @@
  <data name="BackupPathIsFolderError"><value>O nome do arquivo especificado também é um nome de diretório: {0}</value></data>
  <data name="InvalidBackupPathError"><value>Não foi possível verificar a existência do local do arquivo de backup: {0}</value></data>
  <data name="InvalidPathError"><value>Não foi possível acessar o diretório especificado no servidor: {0}</value></data>
+  <data name="NoBackupsetsToRestore"><value>Nenhum conjunto de backup selecionado para ser restaurado</value></data>
+  <data name="NeverBackedUp"><value>Nunca</value></data>
+  <data name="AzureSqlDbEdition"><value>Azure SQL DB</value></data>
+  <data name="AzureSqlDwEdition"><value>Azure SQL Data Warehouse</value></data>
+  <data name="AzureSqlStretchEdition"><value>Azure SQL Stretch Database</value></data>
+  <data name="Error_InvalidDirectoryName"><value>Caminho {0} não é um diretório válido </value></data>
+  <data name="Error_ExistingDirectoryName"><value>Já existe um arquivo com nome {1} para o diretório {0}</value></data>
+  <data name="EditDataValueTooLarge"><value>Valor {0} é muito grande para caber em uma coluna do tipo {1}</value></data>
  </root>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx
@@ -537,7 +537,7 @@
    <comment></comment>
  </data>
  <data name="EE_ExecutionInfo_FinalizingLoop" xml:space="preserve">
-    <value>Execution completed {0} times...</value>
+    <value>Batch execution completed {0} times...</value>
    <comment></comment>
  </data>
  <data name="EE_ExecutionInfo_QueryCancelledbyUser" xml:space="preserve">
@@ -552,8 +552,8 @@
    <value>An error occurred while the batch was being executed, but the error has been ignored.</value>
    <comment></comment>
  </data>
-  <data name="EE_ExecutionInfo_InitilizingLoop" xml:space="preserve">
-    <value>Starting execution loop of {0} times...</value>
+  <data name="EE_ExecutionInfo_InitializingLoop" xml:space="preserve">
+    <value>Beginning execution loop</value>
    <comment></comment>
  </data>
  <data name="EE_ExecutionError_CommandNotSupported" xml:space="preserve">
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.ru.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.ru.resx
@@ -91,7 +91,7 @@
  <data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>Пользователь отменил запрос.</value></data>
  <data name="EE_BatchExecutionError_Halting"><value>При выполнении пакета произошла ошибка.</value></data>
  <data name="EE_BatchExecutionError_Ignoring"><value>В процессе выполнения пакета произошла ошибка, но она была проигнорирована.</value></data>
-  <data name="EE_ExecutionInfo_InitilizingLoop"><value>Начало цикла выполнения {0} раз...</value></data>
+  <data name="EE_ExecutionInfo_InitializingLoop"><value>Начало цикла выполнения {0} раз...</value></data>
  <data name="EE_ExecutionError_CommandNotSupported"><value>Команда {0} не поддерживается.</value></data>
  <data name="EE_ExecutionError_VariableNotFound"><value>Переменная {0} не найдена.</value></data>
  <data name="BatchParserWrapperExecutionEngineError"><value>Ошибка выполнения SQL: {0}</value></data>
@@ -478,4 +478,6 @@
  <data name="BackupPathIsFolderError"><value>Указанное имя файла является также именем каталога: {0}</value></data>
  <data name="InvalidBackupPathError"><value>Невозможно проверить существование расположения файла резервной копии: {0}</value></data>
  <data name="InvalidPathError"><value>Указанный путь на сервере недоступен: {0}</value></data>
+  <data name="NoBackupsetsToRestore"><value>Для восстановления не выбран резервный набор данных</value></data>
+  <data name="NeverBackedUp"><value>Никогда </value></data>
  </root>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings
@@ -255,7 +255,7 @@ EE_ScriptError_ParsingSyntax = Incorrect syntax was encountered while {0} was be

 EE_ScriptError_FatalError = A fatal error occurred.

-EE_ExecutionInfo_FinalizingLoop	= Execution completed {0} times...
+EE_ExecutionInfo_FinalizingLoop	= Batch execution completed {0} times...

 EE_ExecutionInfo_QueryCancelledbyUser = You cancelled the query.

@@ -263,7 +263,7 @@ EE_BatchExecutionError_Halting = An error occurred while the batch was being exe

 EE_BatchExecutionError_Ignoring	= An error occurred while the batch was being executed, but the error has been ignored.

-EE_ExecutionInfo_InitilizingLoop = Starting execution loop of {0} times...
+EE_ExecutionInfo_InitializingLoop = Beginning execution loop

 EE_ExecutionError_CommandNotSupported = Command {0} is not supported.

--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf
@@ -315,7 +315,7 @@
        <note></note>
      </trans-unit>
      <trans-unit id="EE_ExecutionInfo_FinalizingLoop">
-        <source>Execution completed {0} times...</source>
+        <source>Batch execution completed {0} times...</source>
        <target state="new">Execution completed {0} times...</target>
        <note></note>
      </trans-unit>
@@ -334,8 +334,8 @@
        <target state="new">An error occurred while the batch was being executed, but the error has been ignored.</target>
        <note></note>
      </trans-unit>
-      <trans-unit id="EE_ExecutionInfo_InitilizingLoop">
-        <source>Starting execution loop of {0} times...</source>
+      <trans-unit id="EE_ExecutionInfo_InitializingLoop">
+        <source>Beginning execution loop</source>
        <target state="new">Starting execution loop of {0} times...</target>
        <note></note>
      </trans-unit>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.zh-hans.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.zh-hans.resx
@@ -91,7 +91,7 @@
  <data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>您已取消查询。</value></data>
  <data name="EE_BatchExecutionError_Halting"><value>执行批次处理时发生错误。</value></data>
  <data name="EE_BatchExecutionError_Ignoring"><value>执行批次处理时发生错误，但该错误已被忽略。</value></data>
-  <data name="EE_ExecutionInfo_InitilizingLoop"><value>正在开始执行循环的次数为 {0} 次...</value></data>
+  <data name="EE_ExecutionInfo_InitializingLoop"><value>正在开始执行循环的次数为 {0} 次...</value></data>
  <data name="EE_ExecutionError_CommandNotSupported"><value>不支持命令 {0}。</value></data>
  <data name="EE_ExecutionError_VariableNotFound"><value>找不到变量 {0}。</value></data>
  <data name="BatchParserWrapperExecutionEngineError"><value>SQL 执行错误︰ {0}</value></data>
@@ -475,7 +475,15 @@
  <data name="TaskCompleted"><value>已完成</value></data>
  <data name="ScriptTaskName"><value>开始执行脚本操作</value></data>
  <data name="ProfilerConnectionNotFound"><value>找不到连接</value></data>
-  <data name="BackupPathIsFolderError"><value>指定的文件名也是一个目录名: {0}</value></data>
-  <data name="InvalidBackupPathError"><value>无法验证备份文件位置是否存在: {0}</value></data>
+  <data name="BackupPathIsFolderError"><value>所指定的文件名同时也是一个文件目录名: {0}</value></data>
+  <data name="InvalidBackupPathError"><value>无法验证备份文件的位置是否存在: {0}</value></data>
  <data name="InvalidPathError"><value>无法访问服务器上的指定路径: {0}</value></data>
+  <data name="NoBackupsetsToRestore"><value>未选择用于还原的备份集</value></data>
+  <data name="NeverBackedUp"><value>从不</value></data>
+  <data name="AzureSqlDbEdition"><value>Azure SQL 数据库</value></data>
+  <data name="AzureSqlDwEdition"><value>Azure SQL 数据仓库</value></data>
+  <data name="AzureSqlStretchEdition"><value>Azure SQL Stretch Database</value></data>
+  <data name="Error_InvalidDirectoryName"><value>路径 {0} 不是有效的目录</value></data>
+  <data name="Error_ExistingDirectoryName"><value>{0} 文件夹中已存在名为 {1} 的文件</value></data>
+  <data name="EditDataValueTooLarge"><value>值 {0} 太大，无法放入类型为 {1} 的列</value></data>
  </root>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.zh-hant.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.zh-hant.resx
@@ -91,7 +91,7 @@
  <data name="EE_ExecutionInfo_QueryCancelledbyUser"><value>您已取消查詢。</value></data>
  <data name="EE_BatchExecutionError_Halting"><value>執行此批次時發生錯誤。</value></data>
  <data name="EE_BatchExecutionError_Ignoring"><value>執行批次，但被忽略的錯誤時，就會發生錯誤。</value></data>
-  <data name="EE_ExecutionInfo_InitilizingLoop"><value>正在啟動 {0} 次執行迴圈...</value></data>
+  <data name="EE_ExecutionInfo_InitializingLoop"><value>正在啟動 {0} 次執行迴圈...</value></data>
  <data name="EE_ExecutionError_CommandNotSupported"><value>不支援命令 {0}。</value></data>
  <data name="EE_ExecutionError_VariableNotFound"><value>找不到變數 {0}。</value></data>
  <data name="BatchParserWrapperExecutionEngineError"><value>SQL 執行錯誤︰ {0}</value></data>
@@ -480,4 +480,12 @@ ANSI Padding 已啟用</value></data>
  <data name="BackupPathIsFolderError"><value>指定的檔案名稱也是目錄名稱: {0}</value></data>
  <data name="InvalidBackupPathError"><value>無法確認備份檔案位置的存在: {0}</value></data>
  <data name="InvalidPathError"><value>無法存取伺服器上指定的路徑: {0}</value></data>
+  <data name="NoBackupsetsToRestore"><value>無選擇的備份集可還原</value></data>
+  <data name="NeverBackedUp"><value>永不</value></data>
+  <data name="AzureSqlDbEdition"><value>Azure SQL DB</value></data>
+  <data name="AzureSqlDwEdition"><value>Azure SQL 資料倉儲</value></data>
+  <data name="AzureSqlStretchEdition"><value>Azure SQL 延展資料庫</value></data>
+  <data name="Error_InvalidDirectoryName"><value>路徑 {0} 不是有效的目錄</value></data>
+  <data name="Error_ExistingDirectoryName"><value>因目錄 {0} 中已有存在的檔案名稱 {1}</value></data>
+  <data name="EditDataValueTooLarge"><value>數值 {0} 太大以致於無法符合欄位型態 {1}</value></data>
  </root>
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.de.xlf
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.de.xlf
@@ -397,7 +397,7 @@
        
        <note/>
      </trans-unit>
-      <trans-unit id="EE_ExecutionInfo_InitilizingLoop">
+      <trans-unit id="EE_ExecutionInfo_InitializingLoop">
        <source>Starting execution loop of {0} times...</source>
        <target state="new">{0}-malige Batchausführung wurde gestartet.</target>
        
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.es.xlf
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.es.xlf
@@ -397,7 +397,7 @@
        
        <note/>
      </trans-unit>
-      <trans-unit id="EE_ExecutionInfo_InitilizingLoop">
+      <trans-unit id="EE_ExecutionInfo_InitializingLoop">
        <source>Starting execution loop of {0} times...</source>
        <target state="new">Iniciando bucle de ejecución de {0} veces...</target>
        
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.fr.xlf
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.fr.xlf
@@ -397,7 +397,7 @@
        
        <note/>
      </trans-unit>
-      <trans-unit id="EE_ExecutionInfo_InitilizingLoop">
+      <trans-unit id="EE_ExecutionInfo_InitializingLoop">
        <source>Starting execution loop of {0} times...</source>
        <target state="new">Démarrage de la boucle d'exécution pour {0} fois...</target>
        
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.it.xlf
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.it.xlf
@@ -397,7 +397,7 @@
        
        <note/>
      </trans-unit>
-      <trans-unit id="EE_ExecutionInfo_InitilizingLoop">
+      <trans-unit id="EE_ExecutionInfo_InitializingLoop">
        <source>Starting execution loop of {0} times...</source>
        <target state="new">Avvio ciclo di esecuzione di {0} volte...</target>
        
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.ja.xlf
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.ja.xlf
@@ -397,7 +397,7 @@
        
        <note/>
      </trans-unit>
-      <trans-unit id="EE_ExecutionInfo_InitilizingLoop">
+      <trans-unit id="EE_ExecutionInfo_InitializingLoop">
        <source>Starting execution loop of {0} times...</source>
        <target state="new">{0} 回の実行ループを開始しています.</target>
        
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.ko.xlf
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.ko.xlf
@@ -397,7 +397,7 @@
        
        <note/>
      </trans-unit>
-      <trans-unit id="EE_ExecutionInfo_InitilizingLoop">
+      <trans-unit id="EE_ExecutionInfo_InitializingLoop">
        <source>Starting execution loop of {0} times...</source>
        <target state="new">{0} 번 루프 실행을 시작 하는 중...</target>
        
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.pt-BR.xlf
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.pt-BR.xlf
@@ -397,7 +397,7 @@
        
        <note/>
      </trans-unit>
-      <trans-unit id="EE_ExecutionInfo_InitilizingLoop">
+      <trans-unit id="EE_ExecutionInfo_InitializingLoop">
        <source>Starting execution loop of {0} times...</source>
        <target state="new">Iniciando a execução do loop {0} vezes...</target>
        
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.ru.xlf
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.ru.xlf
@@ -397,7 +397,7 @@
        
        <note/>
      </trans-unit>
-      <trans-unit id="EE_ExecutionInfo_InitilizingLoop">
+      <trans-unit id="EE_ExecutionInfo_InitializingLoop">
        <source>Starting execution loop of {0} times...</source>
        <target state="new">Начало цикла выполнения {0} раз...</target>
        
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.zh-hans.xlf
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.zh-hans.xlf
@@ -397,7 +397,7 @@
        
        <note/>
      </trans-unit>
-      <trans-unit id="EE_ExecutionInfo_InitilizingLoop">
+      <trans-unit id="EE_ExecutionInfo_InitializingLoop">
        <source>Starting execution loop of {0} times...</source>
        <target state="new">正在开始执行循环的次数为 {0} 次...</target>
        
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.zh-hant.xlf
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/transXliff/sr.zh-hant.xlf
@@ -397,7 +397,7 @@
        
        <note/>
      </trans-unit>
-      <trans-unit id="EE_ExecutionInfo_InitilizingLoop">
+      <trans-unit id="EE_ExecutionInfo_InitializingLoop">
        <source>Starting execution loop of {0} times...</source>
        <target state="new">正在啟動 {0} 次執行迴圈...</target>