Tomlm/fix401 merge master (#4791)

* fix success to use status==TaskStatus.RunToCompletion instead of .IsCompleted * merge translation
microsoft · Jun 26, 2018 · fcda725 · fcda725
1 parent fdc73d8
commit fcda725
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 30 deletions.
diff --git a/CSharp/Tests/FormTest/MultilingualResources/FormTest.en.xlf b/CSharp/Tests/FormTest/MultilingualResources/FormTest.en.xlf
@@ -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>
diff --git a/CSharp/Tests/FormTest/MultilingualResources/FormTest.fr.xlf b/CSharp/Tests/FormTest/MultilingualResources/FormTest.fr.xlf
@@ -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>
diff --git a/CSharp/Tests/FormTest/Resource/DynamicSandwich.en.resx b/CSharp/Tests/FormTest/Resource/DynamicSandwich.en.resx
@@ -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>
diff --git a/CSharp/Tests/FormTest/Resource/DynamicSandwich.fr.resx b/CSharp/Tests/FormTest/Resource/DynamicSandwich.fr.resx
@@ -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>