Skip to content

Commit

Permalink
LEGO: check in for master to temporary branch. (dotnet#181)
Browse files Browse the repository at this point in the history
  • Loading branch information
@csigs @cheenamalhotra
csigs authored and cheenamalhotra committed Sep 9, 2019
1 parent 6e230cb commit 34b9eae
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Localize/loc/de/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9227,7 +9227,7 @@
<Str Cat="Text">
<Val><![CDATA[Cannot use 'Authentication=Active Directory Integrated' with 'User ID', 'UID', 'Password' or 'PWD' connection string keywords.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA["Authentication=Active Directory Integrated" kann nicht mit Schlüsselwörtern "User ID", "UID", "Password" oder "PWD" für die Verbindungszeichenfolge verwendet werden.]]></Val>
<Val><![CDATA["Authentication=Active Directory Integrated" kann nicht mit den Schlüsselwörtern "User ID", "UID", "Password" oder "PWD" für die Verbindungszeichenfolge verwendet werden.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down
9 changes: 3 additions & 6 deletions Localize/loc/es/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9227,17 +9227,14 @@
<Str Cat="Text">
<Val><![CDATA[Cannot use 'Authentication=Active Directory Integrated' 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 Integrated' con las palabras clave de cadena de conexión 'User ID', 'UID', 'Password' o 'PWD'.]]></Val>
<Val><![CDATA[No se puede usar "Authentication=Active Directory Integrated" con las palabras clave de cadena de conexión "User ID", "UID", "Password" ni "PWD".]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";SQL_InteractiveWithUserIDAndPassword" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<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 las palabras clave de cadena de conexión "User ID", "UID", "Password" ni "PWD".]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down Expand Up @@ -9704,7 +9701,7 @@
<Str Cat="Text">
<Val><![CDATA[Cannot set the Credential property if 'Authentication=Active Directory Integrated' has been specified in the connection string.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[No se puede establecer la propiedad Credential si se ha especificado 'Authentication=Active Directory Integrated' en la cadena de conexión.]]></Val>
<Val><![CDATA[No se puede establecer la propiedad Credential si se ha especificado "Authentication=Active Directory Integrated" en la cadena de conexión.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand All @@ -9713,7 +9710,7 @@
<Str Cat="Text">
<Val><![CDATA[Cannot use 'Authentication=Active Directory Integrated', if the Credential property has been set.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[No se puede usar 'Authentication=Active Directory Integrated' si se ha establecido la propiedad Credential.]]></Val>
<Val><![CDATA[No se puede usar "Authentication=Active Directory Integrated" si se ha establecido la propiedad Credential.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down
2 changes: 1 addition & 1 deletion Localize/loc/ko/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9236,7 +9236,7 @@
<Str Cat="Text">
<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 Integrated'를 'User ID', 'UID', 'Password' 또는 'PWD' 연결 문자열 키워드와 함께 사용할 수 없습니다.]]></Val>
<Val><![CDATA['Authentication=Active Directory Interactive'를 'User ID', 'UID', 'Password' 또는 'PWD' 연결 문자열 키워드와 함께 사용할 수 없습니다.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down
8 changes: 4 additions & 4 deletions Localize/loc/pt-BR/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9227,7 +9227,7 @@
<Str Cat="Text">
<Val><![CDATA[Cannot use 'Authentication=Active Directory Integrated' with 'User ID', 'UID', 'Password' or 'PWD' connection string keywords.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Não é possível usar "Authentication=Active Directory Integrated" com as palavras-chave da cadeia de conexão "User ID", "UID", "Password" ou "PWD".]]></Val>
<Val><![CDATA[Não é possível usar 'Authentication=Active Directory Integrated' com as palavras-chave de cadeia de conexão 'User ID', 'UID', 'Password' ou 'PWD'.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand All @@ -9236,7 +9236,7 @@
<Str Cat="Text">
<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[Não é possível usar 'Autenticação = Integrada ao Active Directory' com as palavras-chave da cadeia de conexão 'ID de Usuário', 'UID', 'Senha' ou 'PWD'.]]></Val>
<Val><![CDATA[Não é possível usar 'Authentication=Active Directory Interactive' com as palavras-chave de cadeia de conexão 'User ID', 'UID', 'Password' or 'PWD'.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down Expand Up @@ -9704,7 +9704,7 @@
<Str Cat="Text">
<Val><![CDATA[Cannot set the Credential property if 'Authentication=Active Directory Integrated' has been specified in the connection string.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Não é possível definir a propriedade Credential se "Authentication=Active Directory Integrated" for especificado na cadeia de conexão.]]></Val>
<Val><![CDATA[Não é possível definir a propriedade Credential quando 'Authentication=Active Directory Integrated' está especificado na cadeia de conexão.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand All @@ -9713,7 +9713,7 @@
<Str Cat="Text">
<Val><![CDATA[Cannot use 'Authentication=Active Directory Integrated', if the Credential property has been set.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Não é possível usar "Authentication=Active Directory Integrated", se a propriedade Credential tiver sido definida.]]></Val>
<Val><![CDATA[Não é possível usar 'Authentication=Active Directory Integrated' quando a propriedade Credential está definida.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down
6 changes: 3 additions & 3 deletions Localize/loc/ru/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9227,7 +9227,7 @@
<Str Cat="Text">
<Val><![CDATA[Cannot use 'Authentication=Active Directory Integrated' with 'User ID', 'UID', 'Password' or 'PWD' connection string keywords.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Нельзя использовать 'Authentication=Active Directory Integrated' с ключевыми словами строки подключения 'User ID', 'UID', 'Password' или 'PWD'.]]></Val>
<Val><![CDATA[Невозможно использовать "Authentication=Active Directory Integrated" с ключевыми словами строки подключения "User ID", "UID", "Password" или "PWD".]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down Expand Up @@ -9704,7 +9704,7 @@
<Str Cat="Text">
<Val><![CDATA[Cannot set the Credential property if 'Authentication=Active Directory Integrated' has been specified in the connection string.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Не удается задать свойство Credential, если в строке подключения указано Authentication=Active Directory Integrated'.]]></Val>
<Val><![CDATA[Не удается задать свойство "Credential", если в строке подключения указано "Authentication=Active Directory Integrated".]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand All @@ -9713,7 +9713,7 @@
<Str Cat="Text">
<Val><![CDATA[Cannot use 'Authentication=Active Directory Integrated', if the Credential property has been set.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Не удается использовать 'Authentication=Active Directory Integrated', если задано свойство «Credential».]]></Val>
<Val><![CDATA[Не удается использовать "Authentication=Active Directory Integrated", если задано свойство "Credential".]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down
2 changes: 1 addition & 1 deletion Localize/loc/zh-Hans/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9236,7 +9236,7 @@
<Str Cat="Text">
<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[无法将“身份验证=Active Directory 交互”与“用户 ID”、"UID"、“密码”或 "PWD" 连接字符串关键字结合使用。]]></Val>
<Val><![CDATA[无法对“User ID”、“UID”、“Password”或“PWD”连接字符串关键字使用“Authentication=Active Directory Interactive”。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down

0 comments on commit 34b9eae

Please sign in to comment.