Skip to content

Tomlm/fix401 merge master #4791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 26, 2018
Merged

Tomlm/fix401 merge master #4791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c2a2a9
fix success to use status==TaskStatus.RunToCompletion instead of .IsC…
Jun 5, 2018
34f9f54
Merge branch 'master' into tomlm/fix401
Jun 26, 2018
5039c45
merge translation
Jun 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions CSharp/Tests/FormTest/MultilingualResources/FormTest.en.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,4 +686,33 @@
</group>
</body>
</file>
<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">
<header>
<tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.0.6900.0" tool-company="Microsoft" />
</header>
<body>
<group id="FORMTEST/RESOURCE/DYNAMICSANDWICH.RESX" datatype="resx">
<trans-unit id="BadAddress" translate="yes" xml:space="preserve">
<source>Address must start with a number.</source>
<target state="new">Address must start with a number.</target>
</trans-unit>
<trans-unit id="Cost" translate="yes" xml:space="preserve">
<source>Total for your sandwich is {0:C2} is that ok?</source>
<target state="new">Total for your sandwich is {0:C2} is that ok?</target>
</trans-unit>
<trans-unit id="FreeCookie" translate="yes" xml:space="preserve">
<source>Free cookie</source>
<target state="new">Free cookie</target>
</trans-unit>
<trans-unit id="FreeDrink" translate="yes" xml:space="preserve">
<source>Free drink</source>
<target state="new">Free drink</target>
</trans-unit>
<trans-unit id="Processing" translate="yes" xml:space="preserve">
<source>We are currently processing your sandwich. We will message you the status.</source>
<target state="new">We are currently processing your sandwich. We will message you the status.</target>
</trans-unit>
</group>
</body>
</file>
</xliff>
29 changes: 29 additions & 0 deletions CSharp/Tests/FormTest/MultilingualResources/FormTest.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,4 +686,33 @@
</group>
</body>
</file>
<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">
<header>
<tool tool-id="MultilingualAppToolkit" tool-name="Multilingual App Toolkit" tool-version="4.0.6900.0" tool-company="Microsoft" />
</header>
<body>
<group id="FORMTEST/RESOURCE/DYNAMICSANDWICH.RESX" datatype="resx">
<trans-unit id="BadAddress" translate="yes" xml:space="preserve">
<source>Address must start with a number.</source>
<target state="new">Address must start with a number.</target>
</trans-unit>
<trans-unit id="Cost" translate="yes" xml:space="preserve">
<source>Total for your sandwich is {0:C2} is that ok?</source>
<target state="new">Total for your sandwich is {0:C2} is that ok?</target>
</trans-unit>
<trans-unit id="FreeCookie" translate="yes" xml:space="preserve">
<source>Free cookie</source>
<target state="new">Free cookie</target>
</trans-unit>
<trans-unit id="FreeDrink" translate="yes" xml:space="preserve">
<source>Free drink</source>
<target state="new">Free drink</target>
</trans-unit>
<trans-unit id="Processing" translate="yes" xml:space="preserve">
<source>We are currently processing your sandwich. We will message you the status.</source>
<target state="new">We are currently processing your sandwich. We will message you the status.</target>
</trans-unit>
</group>
</body>
</file>
</xliff>
15 changes: 0 additions & 15 deletions CSharp/Tests/FormTest/Resource/DynamicSandwich.en.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="BadAddress" xml:space="preserve">
<value>Address must start with a number.</value>
</data>
<data name="Cost" xml:space="preserve">
<value>Total for your sandwich is {0:C2} is that ok?</value>
</data>
<data name="FreeCookie" xml:space="preserve">
<value>Free cookie</value>
</data>
<data name="FreeDrink" xml:space="preserve">
<value>Free drink</value>
</data>
<data name="Processing" xml:space="preserve">
<value>We are currently processing your sandwich. We will message you the status.</value>
</data>
</root>
15 changes: 0 additions & 15 deletions CSharp/Tests/FormTest/Resource/DynamicSandwich.fr.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="BadAddress" xml:space="preserve">
<value>Adresse doit commencer par un nombre.</value>
</data>
<data name="Cost" xml:space="preserve">
<value>Total pour votre "sandwich" est {0:C2} est ce correct?</value>
</data>
<data name="FreeCookie" xml:space="preserve">
<value>Cookie gratuit</value>
</data>
<data name="FreeDrink" xml:space="preserve">
<value>Boisson gratuite</value>
</data>
<data name="Processing" xml:space="preserve">
<value>Nous traitons actuellement votre "sandwich". Nous seront vous message le statut.</value>
</data>
</root>