Port localization changes from VSTS (dotnet#175)

yukiwongky · Sep 6, 2019 · 6e230cb · 6e230cb
1 parent 2c0b9fa
commit 6e230cb
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 40 deletions.
diff --git a/Localize/loc/es/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx.lcl b/Localize/loc/es/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx.lcl
@@ -9232,20 +9232,11 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";SQL_InteractiveWithPassword" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";SQL_InteractiveWithUserIDAndPassword" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Cannot use 'Authentication=Active Directory Interactive' with 'PWD' connection string keywords.]]></Val>
+          <Val><![CDATA[Cannot use 'Authentication=Active Directory Interactive' with 'User ID', 'UID', 'Password' or 'PWD' connection string keywords.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se puede usar "Authentication=Active Directory Interactive" con la palabra clave de cadena de conexión "PWD".]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SQL_InteractiveWithoutUserID" ItemType="0;.resx" PsrId="211" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot use 'Authentication=Active Directory Interactive' without 'User ID' or 'UID' connection string keywords.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[No se puede usar "Authentication=Active Directory Interactive" sin las palabras clave de cadena de conexión "User ID" o "UID".]]></Val>
+            <Val><![CDATA[No se puede usar "Authentication=Active Directory Interactive" con las palabras clave de cadena de conexión "User ID", "UID", "Password" ni "PWD".]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />

diff --git a/Localize/loc/fr/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx.lcl b/Localize/loc/fr/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx.lcl
@@ -9232,20 +9232,11 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";SQL_InteractiveWithPassword" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";SQL_InteractiveWithUserIDAndPassword" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Cannot use 'Authentication=Active Directory Interactive' with 'PWD' connection string keywords.]]></Val>
+          <Val><![CDATA[Cannot use 'Authentication=Active Directory Interactive' with 'User ID', 'UID', 'Password' or 'PWD' connection string keywords.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible d'utiliser 'Authentication=Active Directory Interactive' avec les mots clés de chaîne de connexion 'PWD'.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SQL_InteractiveWithoutUserID" ItemType="0;.resx" PsrId="211" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot use 'Authentication=Active Directory Interactive' without 'User ID' or 'UID' connection string keywords.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Impossible d'utiliser 'Authentication=Active Directory Interactive' sans les mots clés de chaîne de connexion 'User ID' ou 'UID'.]]></Val>
+            <Val><![CDATA[Impossible d'utiliser 'Authentication=Active Directory Interactive' avec les mots clés de chaîne de connexion 'User ID', 'UID', 'Password' et 'PWD'.]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />

diff --git a/Localize/loc/ja/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx.lcl b/Localize/loc/ja/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx.lcl
@@ -9232,20 +9232,11 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";SQL_InteractiveWithPassword" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";SQL_InteractiveWithUserIDAndPassword" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Cannot use 'Authentication=Active Directory Interactive' with 'PWD' connection string keywords.]]></Val>
+          <Val><![CDATA[Cannot use 'Authentication=Active Directory Interactive' with 'User ID', 'UID', 'Password' or 'PWD' connection string keywords.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['Authentication=Active Directory Interactive' を 'PWD' 接続文字列キーワードと一緒に使用することはできません。]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
-      <Item ItemId=";SQL_InteractiveWithoutUserID" ItemType="0;.resx" PsrId="211" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[Cannot use 'Authentication=Active Directory Interactive' without 'User ID' or 'UID' connection string keywords.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA['User ID' や 'UID' の接続文字列キーワードを指定しないで 'Authentication=Active Directory Interactive' を使用することはできません。]]></Val>
+            <Val><![CDATA['Authentication=Active Directory Interactive' と接続文字列キーワード 'User ID'、'UID'、'Password'、'PWD' を一緒に使用することはできません。]]></Val>
           </Tgt>
         </Str>
         <Disp Icon="Str" />

diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.es.resx b/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.es.resx
@@ -2497,7 +2497,7 @@
     <value>No se puede usar 'Authentication=Active Directory Integrated' con las palabras clave de cadena de conexión 'User ID', 'UID', 'Password' o 'PWD'.</value>
   </data>
   <data name="SQL_InteractiveWithUserIDAndPassword" xml:space="preserve">
-    <value>No se puede usar 'Authentication=Active Directory Interactive' con las palabras clave de cadena de conexión 'User ID', 'UID', 'Password' o 'PWD'.</value>
+    <value>No se puede usar "Authentication=Active Directory Interactive" con las palabras clave de cadena de conexión "User ID", "UID", "Password" ni "PWD".</value>
   </data>
   <data name="SQL_SettingIntegratedWithCredential" xml:space="preserve">
     <value>No se puede usar 'Authentication=Active Directory Integrated' si se ha establecido la propiedad Credential.</value>

diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.fr.resx b/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.fr.resx
@@ -2494,10 +2494,10 @@
     <value>Impossible d'utiliser 'Authentication avec 'Integrated Security'.</value>
   </data>
   <data name="SQL_IntegratedWithUserIDAndPassword" xml:space="preserve">
-    <value>Impossible d'utiliser 'Authentication=Active Directory Integrated' avec les mots clés de la chaîne de connexion 'User ID', 'UID', 'Password' ou 'PWD'.</value>
+    <value>Impossible d'utiliser 'Authentication=Active Directory Integrated' avec les mots clés de la chaîne de connexion 'User ID", "UID", "Password" ou "PWD".</value>
   </data>
   <data name="SQL_InteractiveWithUserIDAndPassword" xml:space="preserve">
-    <value>Impossible d'utiliser 'Authentication=Active Directory Interactive' avec les mots clés de la chaîne de connexion 'User ID', 'UID', 'Password' ou 'PWD'.</value>
+    <value>Impossible d'utiliser 'Authentication=Active Directory Interactive' avec les mots clés de chaîne de connexion 'User ID', 'UID', 'Password' et 'PWD'.</value>
   </data>
   <data name="SQL_SettingIntegratedWithCredential" xml:space="preserve">
     <value>Impossible d'utiliser 'Authentication=Active Directory Integrated', si la propriété Credential a été définie.</value>

diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.ru.resx b/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.ru.resx
@@ -2497,7 +2497,7 @@
     <value>Нельзя использовать 'Authentication=Active Directory Integrated' с ключевыми словами строки подключения 'User ID', 'UID', 'Password' или 'PWD'.</value>
   </data>
   <data name="SQL_InteractiveWithUserIDAndPassword" xml:space="preserve">
-    <value>Нельзя использовать 'Authentication=Active Directory Interactive' с ключевыми словами строки подключения 'User ID', 'UID', 'Password' или 'PWD'.</value>
+    <value>Невозможно использовать "Authentication=Active Directory Interactive" с ключевыми словами строки подключения "User ID", "UID", "Password" или "PWD".</value>
   </data>
   <data name="SQL_SettingIntegratedWithCredential" xml:space="preserve">
     <value>Не удается использовать 'Authentication=Active Directory Integrated', если задано свойство «Credential».</value>