From 89d77fa468eb59faa1787c7da86bde6dedc403b7 Mon Sep 17 00:00:00 2001 From: Vagisha Nidhi Date: Mon, 4 Mar 2019 16:56:26 +0530 Subject: [PATCH] Revert "LOC CHECKIN | Microsoft/vstest master | 20190213 (#1923)" This reverts commit 08b8fab95ea0773150e86dac784674470ec247b5. --- .../Resources/xlf/Resources.cs.xlf | 4 ++-- .../Resources/xlf/Resources.de.xlf | 4 ++-- .../Resources/xlf/Resources.es.xlf | 4 ++-- .../Resources/xlf/Resources.fr.xlf | 4 ++-- .../Resources/xlf/Resources.it.xlf | 4 ++-- .../Resources/xlf/Resources.ja.xlf | 4 ++-- .../Resources/xlf/Resources.ko.xlf | 4 ++-- .../Resources/xlf/Resources.pl.xlf | 4 ++-- .../Resources/xlf/Resources.pt-BR.xlf | 4 ++-- .../Resources/xlf/Resources.ru.xlf | 4 ++-- .../Resources/xlf/Resources.tr.xlf | 4 ++-- .../Resources/xlf/Resources.zh-Hans.xlf | 4 ++-- .../Resources/xlf/Resources.zh-Hant.xlf | 4 ++-- .../Resources/xlf/Resources.cs.xlf | 16 +++++++++++----- .../Resources/xlf/Resources.de.xlf | 16 +++++++++++----- .../Resources/xlf/Resources.es.xlf | 16 +++++++++++----- .../Resources/xlf/Resources.fr.xlf | 16 +++++++++++----- .../Resources/xlf/Resources.it.xlf | 16 +++++++++++----- .../Resources/xlf/Resources.ja.xlf | 16 +++++++++++----- .../Resources/xlf/Resources.ko.xlf | 16 +++++++++++----- .../Resources/xlf/Resources.pl.xlf | 16 +++++++++++----- .../Resources/xlf/Resources.pt-BR.xlf | 16 +++++++++++----- .../Resources/xlf/Resources.ru.xlf | 16 +++++++++++----- .../Resources/xlf/Resources.tr.xlf | 16 +++++++++++----- .../Resources/xlf/Resources.zh-Hans.xlf | 16 +++++++++++----- .../Resources/xlf/Resources.zh-Hant.xlf | 16 +++++++++++----- 26 files changed, 169 insertions(+), 91 deletions(-) diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.cs.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.cs.xlf index 1b49c492a4..fc2d60a7bc 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.cs.xlf +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.cs.xlf @@ -58,8 +58,8 @@ File {0} does not exists - Soubor {0} neexistuje. - + File {0} does not exists + diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.de.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.de.xlf index 7ff831419b..7b80a4a064 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.de.xlf +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.de.xlf @@ -58,8 +58,8 @@ File {0} does not exists - Die Datei "{0}" ist nicht vorhanden. - + File {0} does not exists + diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.es.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.es.xlf index 3160169511..5f6d8b8d75 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.es.xlf +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.es.xlf @@ -58,8 +58,8 @@ File {0} does not exists - El archivo {0} no existe - + File {0} does not exists + diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.fr.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.fr.xlf index 5c4b310162..c0bb489585 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.fr.xlf +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.fr.xlf @@ -58,8 +58,8 @@ File {0} does not exists - Le fichier {0} n'existe pas - + File {0} does not exists + diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.it.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.it.xlf index bb5b29d97a..c227f8c775 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.it.xlf +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.it.xlf @@ -58,8 +58,8 @@ File {0} does not exists - Il file {0} non esiste - + File {0} does not exists + diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ja.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ja.xlf index ab9ede3fab..0a302e68b9 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ja.xlf +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ja.xlf @@ -58,8 +58,8 @@ File {0} does not exists - ファイル {0} は存在しません - + File {0} does not exists + diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ko.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ko.xlf index b6c8f22f6e..4613012f09 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ko.xlf +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ko.xlf @@ -58,8 +58,8 @@ File {0} does not exists - {0} 파일이 없습니다. - + File {0} does not exists + diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.pl.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.pl.xlf index 769dc4ed96..3dd65d3da9 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.pl.xlf +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.pl.xlf @@ -58,8 +58,8 @@ File {0} does not exists - Plik {0} nie istnieje - + File {0} does not exists + diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.pt-BR.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.pt-BR.xlf index 5ec1cfca59..ad183f6acc 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.pt-BR.xlf +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.pt-BR.xlf @@ -58,8 +58,8 @@ File {0} does not exists - O arquivo {0} não existe - + File {0} does not exists + diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ru.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ru.xlf index 91c630cf6a..66a39cb7fd 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ru.xlf +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.ru.xlf @@ -58,8 +58,8 @@ File {0} does not exists - Файл {0} не существует. - + File {0} does not exists + diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.tr.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.tr.xlf index e7f5b65f56..d10df89242 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.tr.xlf +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.tr.xlf @@ -58,8 +58,8 @@ File {0} does not exists - {0} dosyası yok - + File {0} does not exists + diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.zh-Hans.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.zh-Hans.xlf index 2f51c13087..920a316e8e 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.zh-Hans.xlf +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.zh-Hans.xlf @@ -58,8 +58,8 @@ File {0} does not exists - 文件 {0} 不存在 - + File {0} does not exists + diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.zh-Hant.xlf b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.zh-Hant.xlf index 4eb384f0d4..fed746bce6 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.zh-Hant.xlf +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/xlf/Resources.zh-Hant.xlf @@ -58,8 +58,8 @@ File {0} does not exists - 檔案 {0} 不存在。 - + File {0} does not exists + diff --git a/src/vstest.console/Resources/xlf/Resources.cs.xlf b/src/vstest.console/Resources/xlf/Resources.cs.xlf index 2fc722ccd4..d5760cc3de 100644 --- a/src/vstest.console/Resources/xlf/Resources.cs.xlf +++ b/src/vstest.console/Resources/xlf/Resources.cs.xlf @@ -1517,9 +1517,9 @@ - Test Run Aborted. - Testovací běh se přerušil. - + Test Run Aborted. {0} + Testovací běh se přerušil. + Test Run Canceled. @@ -1634,8 +1634,14 @@ Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode". - Framework35 není podporován. Pro projekty sestavované pro .Net Framework 3.5 poběží test v režimu kompatibility pomocí CLR 4.0. - + Zadání Framework35 není podporováno. U projektů mířících na .Net Framework 3.5 prosím použijte Framework40, aby testy v CLR 4.0 běžely v režimu kompatibility. + + + + +The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform. + Conflicts in framework/platform identifier of provided sources. + diff --git a/src/vstest.console/Resources/xlf/Resources.de.xlf b/src/vstest.console/Resources/xlf/Resources.de.xlf index 24c29c7ef6..5daba271d0 100644 --- a/src/vstest.console/Resources/xlf/Resources.de.xlf +++ b/src/vstest.console/Resources/xlf/Resources.de.xlf @@ -1517,9 +1517,9 @@ - Test Run Aborted. - Testlauf abgebrochen. - + Test Run Aborted. {0} + Testlauf abgebrochen. + Test Run Canceled. @@ -1634,8 +1634,14 @@ Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode". - Framework35 wird nicht unterstützt. Für Projekte, die auf .NET Framework 3.5 ausgerichtet sind, wird der Test im "Kompatibilitätsmodus" von CLR 4.0 ausgeführt. - + Framework35 wird nicht unterstützt. Verwenden Sie für Projekte, die auf .Net Framework 3.5 ausgerichtet sind, Framework40 zum Ausführen von Tests im "Kompatibilitätsmodus" von CLR 4.0. + + + + +The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform. + Conflicts in framework/platform identifier of provided sources. + diff --git a/src/vstest.console/Resources/xlf/Resources.es.xlf b/src/vstest.console/Resources/xlf/Resources.es.xlf index fe668501f5..e54b04cb06 100644 --- a/src/vstest.console/Resources/xlf/Resources.es.xlf +++ b/src/vstest.console/Resources/xlf/Resources.es.xlf @@ -1522,9 +1522,9 @@ - Test Run Aborted. - Serie de pruebas anulada. - + Test Run Aborted. {0} + Serie de pruebas anulada. + Test Run Canceled. @@ -1639,8 +1639,14 @@ Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode". - No se admite Framework35. Para proyectos con destino .Net Framework 3.5, las pruebas se ejecutarán en "modo de compatibilidad" de CLR 4.0. - + No se admite Framework35. Para proyectos con destino .Net Framework 3.5, use Framework40 para ejecutar las pruebas en "modo de compatibilidad" de CLR 4.0. + + + + +The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform. + Conflicts in framework/platform identifier of provided sources. + diff --git a/src/vstest.console/Resources/xlf/Resources.fr.xlf b/src/vstest.console/Resources/xlf/Resources.fr.xlf index 092c49d39b..c4b571787e 100644 --- a/src/vstest.console/Resources/xlf/Resources.fr.xlf +++ b/src/vstest.console/Resources/xlf/Resources.fr.xlf @@ -1517,9 +1517,9 @@ - Test Run Aborted. - Série de tests abandonnée. - + Test Run Aborted. {0} + Série de tests abandonnée. + Test Run Canceled. @@ -1634,8 +1634,14 @@ Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode". - Framework35 n'est pas pris en charge. Pour les projets ciblant le .Net Framework 3.5, le test s'exécute dans CLR 4.0 en "mode compatibilité". - + Framework35 n'est pas pris en charge. Pour les projets ciblant .Net Framework 3.5, utilisez Framework40 pour exécuter les tests dans CLR 4.0 en "mode compatibilité". + + + + +The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform. + Conflicts in framework/platform identifier of provided sources. + diff --git a/src/vstest.console/Resources/xlf/Resources.it.xlf b/src/vstest.console/Resources/xlf/Resources.it.xlf index 606536bdbb..11698b06c3 100644 --- a/src/vstest.console/Resources/xlf/Resources.it.xlf +++ b/src/vstest.console/Resources/xlf/Resources.it.xlf @@ -1517,9 +1517,9 @@ - Test Run Aborted. - Esecuzione dei test interrotta. - + Test Run Aborted. {0} + Esecuzione dei test interrotta. + Test Run Canceled. @@ -1634,8 +1634,14 @@ Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode". - Framework35 non è supportato. Per i progetti destinati a .NET Framework 3.5, i test verranno eseguiti nella modalità di compatibilità di CLR 4.0. - + Framework35 non è supportato. Per i progetti destinati a .NET Framework 3.5, usare Framework40 per eseguire i test nella modalità di compatibilità di CLR 4.0. + + + + +The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform. + Conflicts in framework/platform identifier of provided sources. + diff --git a/src/vstest.console/Resources/xlf/Resources.ja.xlf b/src/vstest.console/Resources/xlf/Resources.ja.xlf index 33194ccabd..40a076ffdc 100644 --- a/src/vstest.console/Resources/xlf/Resources.ja.xlf +++ b/src/vstest.console/Resources/xlf/Resources.ja.xlf @@ -1517,9 +1517,9 @@ - Test Run Aborted. - テスト実行が中止されました。 - + Test Run Aborted. {0} + テスト実行が中止されました。 + Test Run Canceled. @@ -1634,8 +1634,14 @@ Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode". - Framework35 はサポートされていません。.Net Framework 3.5 を対象とするプロジェクトでは、CLR 4.0 の "互換モード" でテストが稼働します。 - + Framework35 はサポートされていません。.Net Framework 3.5 を対象とするプロジェクトでは、Framework40 を使用して CLR 4.0 の "互換モード" でテストを実行してください。 + + + + +The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform. + Conflicts in framework/platform identifier of provided sources. + diff --git a/src/vstest.console/Resources/xlf/Resources.ko.xlf b/src/vstest.console/Resources/xlf/Resources.ko.xlf index c7ab987e5f..47e9c29850 100644 --- a/src/vstest.console/Resources/xlf/Resources.ko.xlf +++ b/src/vstest.console/Resources/xlf/Resources.ko.xlf @@ -1517,9 +1517,9 @@ - Test Run Aborted. - 테스트 실행이 중단되었습니다. - + Test Run Aborted. {0} + 테스트 실행이 중단되었습니다. + Test Run Canceled. @@ -1634,8 +1634,14 @@ Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode". - Framework35는 지원되지 않습니다. .NET Framework 3.5를 대상으로 하는 프로젝트의 경우 CLR 4.0 "호환 모드"에서 테스트가 실행됩니다. - + Framework35는 지원되지 않습니다. .NET Framework 3.5를 대상으로 하는 프로젝트의 경우 Framework40을 사용하여 CLR 4.0 "호환 모드"에서 테스트를 실행하세요. + + + + +The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform. + Conflicts in framework/platform identifier of provided sources. + diff --git a/src/vstest.console/Resources/xlf/Resources.pl.xlf b/src/vstest.console/Resources/xlf/Resources.pl.xlf index 7540031e01..c65e76f0ae 100644 --- a/src/vstest.console/Resources/xlf/Resources.pl.xlf +++ b/src/vstest.console/Resources/xlf/Resources.pl.xlf @@ -1516,9 +1516,9 @@ - Test Run Aborted. - Przebieg testu został przerwany. - + Test Run Aborted. {0} + Przebieg testu został przerwany. + Test Run Canceled. @@ -1632,8 +1632,14 @@ Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode". - Wersja Framework35 nie jest obsługiwana. W przypadku projektów przeznaczonych dla programu .Net Framework 3.5 testy będą uruchamiane w „trybie zgodności” CLR 4.0. - + Wersja Framework35 nie jest obsługiwana. W przypadku projektów przeznaczonych dla programu .Net Framework 3.5 użyj wersji Framework40 do uruchamiania testów w „trybie zgodności” CLR 4.0. + + + + +The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform. + Conflicts in framework/platform identifier of provided sources. + diff --git a/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf b/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf index 205ad9e923..337b63c78e 100644 --- a/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf +++ b/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf @@ -1516,9 +1516,9 @@ - Test Run Aborted. - Execução de Teste Anulada. - + Test Run Aborted. {0} + Execução de Teste Anulada. + Test Run Canceled. @@ -1632,8 +1632,14 @@ Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode". - Não há suporte para Framework35. Para projetos com .Net Framework 3.5 de destino, o teste será executado no “modo de compatibilidade” CLR 4.0. - + Não há suporte para Framework35. Para projetos com .Net Framework 3.5 de destino, use o Framework40 para executar testes em “modo de compatibilidade” CLR 4.0. + + + + +The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform. + Conflicts in framework/platform identifier of provided sources. + diff --git a/src/vstest.console/Resources/xlf/Resources.ru.xlf b/src/vstest.console/Resources/xlf/Resources.ru.xlf index 5e780de9a4..c1567f8456 100644 --- a/src/vstest.console/Resources/xlf/Resources.ru.xlf +++ b/src/vstest.console/Resources/xlf/Resources.ru.xlf @@ -1517,9 +1517,9 @@ - Test Run Aborted. - Тестовый запуск прерван. - + Test Run Aborted. {0} + Тестовый запуск прерван. + Test Run Canceled. @@ -1634,8 +1634,14 @@ Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode". - Framework35 не поддерживается. В проектах для .Net Framework 3.5 тесты будут запускаться в режиме совместимости CLR 4.0. - + Framework35 не поддерживается. В проектах для .Net Framework 3.5 запускайте тесты в режиме совместимости CLR 4.0 с использованием Framework40. + + + + +The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform. + Conflicts in framework/platform identifier of provided sources. + diff --git a/src/vstest.console/Resources/xlf/Resources.tr.xlf b/src/vstest.console/Resources/xlf/Resources.tr.xlf index aecf1786eb..9246f1964e 100644 --- a/src/vstest.console/Resources/xlf/Resources.tr.xlf +++ b/src/vstest.console/Resources/xlf/Resources.tr.xlf @@ -1517,9 +1517,9 @@ - Test Run Aborted. - Test Çalıştırması Durduruldu. - + Test Run Aborted. {0} + Test Çalıştırması Durduruldu. + Test Run Canceled. @@ -1634,8 +1634,14 @@ Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode". - Framework35 desteklenmiyor. .NET Framework 3.5’i hedefleyen projeler için test CLR 4.0 “uyumluluk modunda” çalışacak. - + Framework35 desteklenmiyor. .NET Framework 3.5’i hedefleyen projeler için lütfen Framework40 kullanarak testleri CLR 4.0’ın “uyumluluk modunda” çalıştırın. + + + + +The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform. + Conflicts in framework/platform identifier of provided sources. + diff --git a/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf b/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf index fcb653550a..68f7f88c9d 100644 --- a/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf +++ b/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf @@ -1517,9 +1517,9 @@ - Test Run Aborted. - 测试运行已中止。 - + Test Run Aborted. {0} + 测试运行已中止。 + Test Run Canceled. @@ -1634,8 +1634,14 @@ Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode". - Framework35 不受支持。对于面向 .Net Framework 3.5 的项目，将在 CLR 4.0“兼容性模式”下运行测试。 - + Framework35 不受支持。对于面向 .Net Framework 3.5 的项目，请使用 Framework40 在 CLR 4.0“兼容性模式”下运行测试。 + + + + +The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform. + Conflicts in framework/platform identifier of provided sources. + diff --git a/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf b/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf index dbbc8f9917..9f9e92a8ee 100644 --- a/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf +++ b/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf @@ -1517,9 +1517,9 @@ - Test Run Aborted. - 測試回合已中止。 - + Test Run Aborted. {0} + 測試回合已中止。 + Test Run Canceled. @@ -1634,8 +1634,14 @@ Framework35 is not supported. For projects targeting .Net Framework 3.5, test will run in CLR 4.0 "compatibility mode". - 不支援 Framework35。若為以 .Net Framework 3.5 為目標的專案，則會在 CLR 4.0 「相容性模式」中執行測試。 - + 不支援 Framework35。若為以 .Net Framework 3.5 為目標的專案，請使用 Framework40 在 CLR 4.0「相容模式」中執行測試。 + + + + +The given test sources target multiple frameworks/platforms that are incompatible. Please make sure the sources target the same framework and platform. + Conflicts in framework/platform identifier of provided sources. +