Merge branch 'master' into lego/hb_839_20191018204037752

xueyitang5726 · Oct 22, 2019 · c1bb83c · c1bb83c
2 parents d9e0f03 + db95032
commit c1bb83c
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 16 deletions.
diff --git a/Python/loc/lcl/CHS/Microsoft.PythonTools.Common.dll.lcl b/Python/loc/lcl/CHS/Microsoft.PythonTools.Common.dll.lcl
@@ -5153,7 +5153,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Pytest is enabled in the {0} {1}, but it is not installed in the active environment.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[已在 {0} {1} 中启用 Pytest，但未在活动环境中安装它。]]></Val>
+            <Val><![CDATA[已在 {0} {1} 中启用 pytest，但未在活动环境中安装它。]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -5162,7 +5162,7 @@
         <Str Cat="Text">
           <Val><![CDATA[A pytest configuration file was detected in the {0} {1}, but pytest is not installed or enabled.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[在 {0} {1} 中检测到 pytest 配置文件，但未安装或未启用 pytest。]]></Val>
+            <Val><![CDATA[在 {0} {1} 中检测到 pytest 配置文件，但未安装或启用 pytest。]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -5569,6 +5569,9 @@
       <Item ItemId=";PythonVersionNotSupportedInfoBarText" ItemType="0" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[You are using Python {0} and some features might not work because Visual Studio doesn't support it yet.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[你正在使用 Python {0}，但由于 Visual Studio 尚不支持它，因此某些功能可能无效。]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>

diff --git a/Python/loc/lcl/CHT/Microsoft.PythonTools.Common.dll.lcl b/Python/loc/lcl/CHT/Microsoft.PythonTools.Common.dll.lcl
@@ -5189,7 +5189,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Results for pytest not found {0}]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[找不到 pytest 的結果 {0}]]></Val>
+            <Val><![CDATA[在 {0} 中找不到 pytest 的結果]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -5569,6 +5569,9 @@
       <Item ItemId=";PythonVersionNotSupportedInfoBarText" ItemType="0" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[You are using Python {0} and some features might not work because Visual Studio doesn't support it yet.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[您目前使用 Python {0}，但因為 Visual Studio 尚不支援它，所以某些功能可能無法運作。]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>

diff --git a/Python/loc/lcl/CSY/Microsoft.PythonTools.Common.dll.lcl b/Python/loc/lcl/CSY/Microsoft.PythonTools.Common.dll.lcl
@@ -5189,7 +5189,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Results for pytest not found {0}]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Nenašly se výsledky pro pytest {0}.]]></Val>
+            <Val><![CDATA[Nenašly se výsledky pro pytest ({0}).]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -5569,6 +5569,9 @@
       <Item ItemId=";PythonVersionNotSupportedInfoBarText" ItemType="0" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[You are using Python {0} and some features might not work because Visual Studio doesn't support it yet.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Používáte Python {0} a některé funkce nemusí fungovat, protože je Visual Studio ještě nepodporuje.]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>

diff --git a/Python/loc/lcl/DEU/Microsoft.PythonTools.Common.dll.lcl b/Python/loc/lcl/DEU/Microsoft.PythonTools.Common.dll.lcl
@@ -5569,6 +5569,9 @@
       <Item ItemId=";PythonVersionNotSupportedInfoBarText" ItemType="0" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[You are using Python {0} and some features might not work because Visual Studio doesn't support it yet.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Sie verwenden Python {0}, und einige Features funktionieren möglicherweise nicht, weil Visual Studio diese Version noch nicht unterstützt.]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>

diff --git a/Python/loc/lcl/ESN/Microsoft.PythonTools.Common.dll.lcl b/Python/loc/lcl/ESN/Microsoft.PythonTools.Common.dll.lcl
@@ -5153,7 +5153,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Pytest is enabled in the {0} {1}, but it is not installed in the active environment.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Pytest está habilitado en {0} {1}, pero no está instalado en el entorno activo.]]></Val>
+            <Val><![CDATA[Pytest está habilitado en la instancia de {1} {0}, pero no está instalado en el entorno activo.]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -5162,7 +5162,7 @@
         <Str Cat="Text">
           <Val><![CDATA[A pytest configuration file was detected in the {0} {1}, but pytest is not installed or enabled.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Se ha detectado un archivo de configuración de pytest en {0} {1}, pero pytest no está instalado ni habilitado.]]></Val>
+            <Val><![CDATA[Se ha detectado un archivo de configuración de pytest en la instancia de {1} {0}, pero pytest no está instalado ni habilitado.]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -5189,7 +5189,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Results for pytest not found {0}]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se encontraron resultados para pytest {0}]]></Val>
+            <Val><![CDATA[No se encontraron resultados para pytest ({0})]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -5569,6 +5569,9 @@
       <Item ItemId=";PythonVersionNotSupportedInfoBarText" ItemType="0" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[You are using Python {0} and some features might not work because Visual Studio doesn't support it yet.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Está usando Python {0} y puede que algunas características no funcionen porque Visual Studio no lo admite aún.]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>

diff --git a/Python/loc/lcl/FRA/Microsoft.PythonTools.Common.dll.lcl b/Python/loc/lcl/FRA/Microsoft.PythonTools.Common.dll.lcl
@@ -5189,7 +5189,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Results for pytest not found {0}]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Résultats introuvables pour pytest {0}]]></Val>
+            <Val><![CDATA[Résultats de pytest introuvables {0}]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -5569,6 +5569,9 @@
       <Item ItemId=";PythonVersionNotSupportedInfoBarText" ItemType="0" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[You are using Python {0} and some features might not work because Visual Studio doesn't support it yet.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Vous utilisez Python {0}. Certaines fonctionnalités risquent de ne pas fonctionner, car Visual Studio ne les prend pas encore en charge.]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>

diff --git a/Python/loc/lcl/JPN/Microsoft.PythonTools.Common.dll.lcl b/Python/loc/lcl/JPN/Microsoft.PythonTools.Common.dll.lcl
@@ -5569,6 +5569,9 @@
       <Item ItemId=";PythonVersionNotSupportedInfoBarText" ItemType="0" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[You are using Python {0} and some features might not work because Visual Studio doesn't support it yet.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Python {0} を使用していますが、Visual Studio でまだサポートされていないため、一部の機能が動作しない可能性があります。]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>

diff --git a/Python/loc/lcl/KOR/Microsoft.PythonTools.Common.dll.lcl b/Python/loc/lcl/KOR/Microsoft.PythonTools.Common.dll.lcl
@@ -5189,7 +5189,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Results for pytest not found {0}]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[pytest의 결과를 찾을 수 없습니다. {0}]]></Val>
+            <Val><![CDATA[{0}에서 pytest의 결과를 찾을 수 없습니다.]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -5569,6 +5569,9 @@
       <Item ItemId=";PythonVersionNotSupportedInfoBarText" ItemType="0" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[You are using Python {0} and some features might not work because Visual Studio doesn't support it yet.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Python {0}을(를) 사용하고 있으며, Visual Studio에서 아직 지원하지 않기 때문에 일부 기능이 작동하지 않을 수 있습니다.]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>

diff --git a/Python/loc/lcl/PLK/Microsoft.PythonTools.Common.dll.lcl b/Python/loc/lcl/PLK/Microsoft.PythonTools.Common.dll.lcl
@@ -5189,7 +5189,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Results for pytest not found {0}]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ Nie znaleziono wyników dla testu pytest {0}]]></Val>
+            <Val><![CDATA[ Nie znaleziono wyników dla testu pytest: {0}]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -5569,6 +5569,9 @@
       <Item ItemId=";PythonVersionNotSupportedInfoBarText" ItemType="0" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[You are using Python {0} and some features might not work because Visual Studio doesn't support it yet.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Korzystasz z języka Python {0} i niektóre funkcje mogą nie działać, ponieważ nie są jeszcze obsługiwane przez program Visual Studio.]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>

diff --git a/Python/loc/lcl/RUS/Microsoft.PythonTools.Common.dll.lcl b/Python/loc/lcl/RUS/Microsoft.PythonTools.Common.dll.lcl
@@ -5153,7 +5153,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Pytest is enabled in the {0} {1}, but it is not installed in the active environment.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Платформа pytest не установлена в активной среде, но здесь она включена: {0} {1}.]]></Val>
+            <Val><![CDATA[Платформа pytest включена в {0} {1}, но не установлена в активной среде.]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -5162,7 +5162,7 @@
         <Str Cat="Text">
           <Val><![CDATA[A pytest configuration file was detected in the {0} {1}, but pytest is not installed or enabled.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Платформа pytest не установлена или не включена, но здесь обнаружен ее файл конфигурации: {0} {1}.]]></Val>
+            <Val><![CDATA[Файл конфигурации платформы pytest обнаружен в {0} {1}, но платформа pytest не установлена или не включена.]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -5189,7 +5189,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Results for pytest not found {0}]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Результаты для pytest не найдены {0}]]></Val>
+            <Val><![CDATA[Результаты для pytest не найдены {0}.]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -5569,6 +5569,9 @@
       <Item ItemId=";PythonVersionNotSupportedInfoBarText" ItemType="0" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[You are using Python {0} and some features might not work because Visual Studio doesn't support it yet.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Вы используете Python версии {0}. Некоторые функции могут не работать, так как Visual Studio еще не поддерживает эту версию.]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>

diff --git a/Python/loc/lcl/TRK/Microsoft.PythonTools.Common.dll.lcl b/Python/loc/lcl/TRK/Microsoft.PythonTools.Common.dll.lcl
@@ -5153,7 +5153,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Pytest is enabled in the {0} {1}, but it is not installed in the active environment.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Python testi {0} {1} konumunda etkinleştirildi ancak etkin ortama yüklenmedi.]]></Val>
+            <Val><![CDATA[Pytest, {0} {1} konumunda etkinleştirildi ancak etkin ortama yüklenmedi.]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -5162,7 +5162,7 @@
         <Str Cat="Text">
           <Val><![CDATA[A pytest configuration file was detected in the {0} {1}, but pytest is not installed or enabled.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[{0} {1} konumunda bir Pyhton testi yapılandırma dosyası algılandı ancak Python testi yüklü değil veya etkileştirilmemiş.]]></Val>
+            <Val><![CDATA[{0} {1} konumunda bir pytest yapılandırma dosyası algılandı ancak pytest yüklü değil veya etkileştirilmemiş.]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -5189,7 +5189,7 @@
         <Str Cat="Text">
           <Val><![CDATA[Results for pytest not found {0}]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[pytest sonuçları bulunamadı {0}]]></Val>
+            <Val><![CDATA[Pytest sonuçları bulunamadı {0}]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />
@@ -5569,6 +5569,9 @@
       <Item ItemId=";PythonVersionNotSupportedInfoBarText" ItemType="0" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[You are using Python {0} and some features might not work because Visual Studio doesn't support it yet.]]></Val>
+          <Tgt Cat="Text" Stat="Loc" Orig="New">
+            <Val><![CDATA[Python {0} kullanıyorsunuz, ancak Visual Studio henüz bu sürümü desteklemediğinden bazı özellikler çalışmıyor olabilir.]]></Val>
+          </Tgt>
         </Str>
         <Disp Icon="Str" />
       </Item>