Skip to content

Commit fcda725

Browse files
author
Tom Laird-McConnell
authored
Tomlm/fix401 merge master (#4791)
* fix success to use status==TaskStatus.RunToCompletion instead of .IsCompleted * merge translation
1 parent fdc73d8 commit fcda725

File tree

4 files changed

+58
-30
lines changed

4 files changed

+58
-30
lines changed

‎CSharp/Tests/FormTest/MultilingualResources/FormTest.en.xlf

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,4 +686,33 @@
686686
</group>
687687
</body>
688688
</file>
689+
<file datatype="xml" source-language="en" target-language="en" original="FORMTEST/RESOURCE/DYNAMICSANDWICH.RESX" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
690+
<header>
691+
<tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.0.6900.0" tool-company="Microsoft" />
692+
</header>
693+
<body>
694+
<group id="FORMTEST/RESOURCE/DYNAMICSANDWICH.RESX" datatype="resx">
695+
<trans-unit id="BadAddress" translate="yes" xml:space="preserve">
696+
<source>Address must start with a number.</source>
697+
<target state="new">Address must start with a number.</target>
698+
</trans-unit>
699+
<trans-unit id="Cost" translate="yes" xml:space="preserve">
700+
<source>Total for your sandwich is {0:C2} is that ok?</source>
701+
<target state="new">Total for your sandwich is {0:C2} is that ok?</target>
702+
</trans-unit>
703+
<trans-unit id="FreeCookie" translate="yes" xml:space="preserve">
704+
<source>Free cookie</source>
705+
<target state="new">Free cookie</target>
706+
</trans-unit>
707+
<trans-unit id="FreeDrink" translate="yes" xml:space="preserve">
708+
<source>Free drink</source>
709+
<target state="new">Free drink</target>
710+
</trans-unit>
711+
<trans-unit id="Processing" translate="yes" xml:space="preserve">
712+
<source>We are currently processing your sandwich. We will message you the status.</source>
713+
<target state="new">We are currently processing your sandwich. We will message you the status.</target>
714+
</trans-unit>
715+
</group>
716+
</body>
717+
</file>
689718
</xliff>

‎CSharp/Tests/FormTest/MultilingualResources/FormTest.fr.xlf

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,4 +686,33 @@
686686
</group>
687687
</body>
688688
</file>
689+
<file datatype="xml" source-language="en" target-language="fr" original="FORMTEST/RESOURCE/DYNAMICSANDWICH.RESX" tool-id="MultilingualAppToolkit" product-name="n/a" product-version="n/a" build-num="n/a">
690+
<header>
691+
<tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.0.6900.0" tool-company="Microsoft" />
692+
</header>
693+
<body>
694+
<group id="FORMTEST/RESOURCE/DYNAMICSANDWICH.RESX" datatype="resx">
695+
<trans-unit id="BadAddress" translate="yes" xml:space="preserve">
696+
<source>Address must start with a number.</source>
697+
<target state="new">Address must start with a number.</target>
698+
</trans-unit>
699+
<trans-unit id="Cost" translate="yes" xml:space="preserve">
700+
<source>Total for your sandwich is {0:C2} is that ok?</source>
701+
<target state="new">Total for your sandwich is {0:C2} is that ok?</target>
702+
</trans-unit>
703+
<trans-unit id="FreeCookie" translate="yes" xml:space="preserve">
704+
<source>Free cookie</source>
705+
<target state="new">Free cookie</target>
706+
</trans-unit>
707+
<trans-unit id="FreeDrink" translate="yes" xml:space="preserve">
708+
<source>Free drink</source>
709+
<target state="new">Free drink</target>
710+
</trans-unit>
711+
<trans-unit id="Processing" translate="yes" xml:space="preserve">
712+
<source>We are currently processing your sandwich. We will message you the status.</source>
713+
<target state="new">We are currently processing your sandwich. We will message you the status.</target>
714+
</trans-unit>
715+
</group>
716+
</body>
717+
</file>
689718
</xliff>

‎CSharp/Tests/FormTest/Resource/DynamicSandwich.en.resx

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,4 @@
1212
<resheader name="writer">
1313
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
1414
</resheader>
15-
<data name="BadAddress" xml:space="preserve">
16-
<value>Address must start with a number.</value>
17-
</data>
18-
<data name="Cost" xml:space="preserve">
19-
<value>Total for your sandwich is {0:C2} is that ok?</value>
20-
</data>
21-
<data name="FreeCookie" xml:space="preserve">
22-
<value>Free cookie</value>
23-
</data>
24-
<data name="FreeDrink" xml:space="preserve">
25-
<value>Free drink</value>
26-
</data>
27-
<data name="Processing" xml:space="preserve">
28-
<value>We are currently processing your sandwich. We will message you the status.</value>
29-
</data>
3015
</root>

‎CSharp/Tests/FormTest/Resource/DynamicSandwich.fr.resx

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,4 @@
1212
<resheader name="writer">
1313
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
1414
</resheader>
15-
<data name="BadAddress" xml:space="preserve">
16-
<value>Adresse doit commencer par un nombre.</value>
17-
</data>
18-
<data name="Cost" xml:space="preserve">
19-
<value>Total pour votre "sandwich" est {0:C2} est ce correct?</value>
20-
</data>
21-
<data name="FreeCookie" xml:space="preserve">
22-
<value>Cookie gratuit</value>
23-
</data>
24-
<data name="FreeDrink" xml:space="preserve">
25-
<value>Boisson gratuite</value>
26-
</data>
27-
<data name="Processing" xml:space="preserve">
28-
<value>Nous traitons actuellement votre "sandwich". Nous seront vous message le statut.</value>
29-
</data>
3015
</root>

0 commit comments

Comments
 (0)