From fcda72509c7f28f5d4cc5058782913cea093a364 Mon Sep 17 00:00:00 2001 From: Tom Laird-McConnell Date: Mon, 25 Jun 2018 17:08:07 -0700 Subject: [PATCH] Tomlm/fix401 merge master (#4791) * fix success to use status==TaskStatus.RunToCompletion instead of .IsCompleted * merge translation --- .../MultilingualResources/FormTest.en.xlf | 29 +++++++++++++++++++ .../MultilingualResources/FormTest.fr.xlf | 29 +++++++++++++++++++ .../FormTest/Resource/DynamicSandwich.en.resx | 15 ---------- .../FormTest/Resource/DynamicSandwich.fr.resx | 15 ---------- 4 files changed, 58 insertions(+), 30 deletions(-) diff --git a/CSharp/Tests/FormTest/MultilingualResources/FormTest.en.xlf b/CSharp/Tests/FormTest/MultilingualResources/FormTest.en.xlf index c92b02eb67..b41885dcc3 100644 --- a/CSharp/Tests/FormTest/MultilingualResources/FormTest.en.xlf +++ b/CSharp/Tests/FormTest/MultilingualResources/FormTest.en.xlf @@ -686,4 +686,33 @@ + +
+ +
+ + + + Address must start with a number. + Address must start with a number. + + + Total for your sandwich is {0:C2} is that ok? + Total for your sandwich is {0:C2} is that ok? + + + Free cookie + Free cookie + + + Free drink + Free drink + + + We are currently processing your sandwich. We will message you the status. + We are currently processing your sandwich. We will message you the status. + + + + \ No newline at end of file diff --git a/CSharp/Tests/FormTest/MultilingualResources/FormTest.fr.xlf b/CSharp/Tests/FormTest/MultilingualResources/FormTest.fr.xlf index c2cd4afaa5..5aa0f80506 100644 --- a/CSharp/Tests/FormTest/MultilingualResources/FormTest.fr.xlf +++ b/CSharp/Tests/FormTest/MultilingualResources/FormTest.fr.xlf @@ -686,4 +686,33 @@ + +
+ +
+ + + + Address must start with a number. + Address must start with a number. + + + Total for your sandwich is {0:C2} is that ok? + Total for your sandwich is {0:C2} is that ok? + + + Free cookie + Free cookie + + + Free drink + Free drink + + + We are currently processing your sandwich. We will message you the status. + We are currently processing your sandwich. We will message you the status. + + + + \ No newline at end of file diff --git a/CSharp/Tests/FormTest/Resource/DynamicSandwich.en.resx b/CSharp/Tests/FormTest/Resource/DynamicSandwich.en.resx index 8d77969113..a3df4f013d 100644 --- a/CSharp/Tests/FormTest/Resource/DynamicSandwich.en.resx +++ b/CSharp/Tests/FormTest/Resource/DynamicSandwich.en.resx @@ -12,19 +12,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Address must start with a number. - - - Total for your sandwich is {0:C2} is that ok? - - - Free cookie - - - Free drink - - - We are currently processing your sandwich. We will message you the status. - \ No newline at end of file diff --git a/CSharp/Tests/FormTest/Resource/DynamicSandwich.fr.resx b/CSharp/Tests/FormTest/Resource/DynamicSandwich.fr.resx index 9dad1dd2da..a3df4f013d 100644 --- a/CSharp/Tests/FormTest/Resource/DynamicSandwich.fr.resx +++ b/CSharp/Tests/FormTest/Resource/DynamicSandwich.fr.resx @@ -12,19 +12,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Adresse doit commencer par un nombre. - - - Total pour votre "sandwich" est {0:C2} est ce correct? - - - Cookie gratuit - - - Boisson gratuite - - - Nous traitons actuellement votre "sandwich". Nous seront vous message le statut. - \ No newline at end of file