Resolution erreur

TheGameExtreme/AppRessource.Designer.cs.orig

@@ -1,165 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace TheGameExtreme {
-    using System;
-    using System.Reflection;
-    
-    
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class AppRessource {
-        
-        private static System.Resources.ResourceManager resourceMan;
-        
-        private static System.Globalization.CultureInfo resourceCulture;
-        
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal AppRessource() {
-        }
-        
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.Equals(null, resourceMan)) {
-                    System.Resources.ResourceManager temp = new System.Resources.ResourceManager("TheGameExtreme.AppRessource", typeof(AppRessource).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        internal static string StrAcendingStack {
-            get {
-                return ResourceManager.GetString("StrAcendingStack", resourceCulture);
-            }
-        }
-        
-        internal static string StrCantGetStack {
-            get {
-                return ResourceManager.GetString("StrCantGetStack", resourceCulture);
-            }
-        }
-        
-        internal static string StrCardPlayedLessThanTwo {
-            get {
-                return ResourceManager.GetString("StrCardPlayedLessThanTwo", resourceCulture);
-            }
-        }
-        
-        internal static string StrChooseCardToPlay {
-            get {
-                return ResourceManager.GetString("StrChooseCardToPlay", resourceCulture);
-            }
-        }
-        
-        internal static string StrChooseStack {
-            get {
-                return ResourceManager.GetString("StrChooseStack", resourceCulture);
-            }
-        }
-        
-        internal static string StrDownStack {
-            get {
-                return ResourceManager.GetString("StrDownStack", resourceCulture);
-            }
-        }
-        
-        internal static string StrEndOfGame {
-            get {
-                return ResourceManager.GetString("StrEndOfGame", resourceCulture);
-            }
-        }
-        
-        internal static string StrEndTurn {
-            get {
-                return ResourceManager.GetString("StrEndTurn", resourceCulture);
-            }
-        }
-        
-        internal static string StrLose {
-            get {
-                return ResourceManager.GetString("StrLose", resourceCulture);
-            }
-        }
-        
-        internal static string StrLose3CardEffect {
-            get {
-                return ResourceManager.GetString("StrLose3CardEffect", resourceCulture);
-            }
-        }
-        
-        internal static string StrNoMoreCardOnHand {
-            get {
-                return ResourceManager.GetString("StrNoMoreCardOnHand", resourceCulture);
-            }
-        }
-        
-<<<<<<< HEAD
-=======
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à -L&apos;objectif est de battre le jeu !
-        ///
-        ///-99 cartes numérotés de 2 à 99.
-        ///
-        ///-4 piles sont à votre disposition, deux ascendantes et deux descendantes.
-        ///
-        ///-L&apos;objectif est de pourvoir poser toute les cartes de la pioches sur les différentes piles à votre disposition.
-        ///
-        ///-Si vous arrivé a vider toute la pioche et de poser tout les cartes sur les piles, vous gagné, sinon vous perdez.
-        ///
-        ///-Quelques suprise pourrait aussi vous surprendre..
-        /// </summary>
-        internal static string StrRules {
-            get {
-                return ResourceManager.GetString("StrRules", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Recherche une chaîne localisée semblable à Désolé, vous n&apos;avez pas recouvert la tête de mort... Réessayez ;).
-        /// </summary>
->>>>>>> master
-        internal static string StrSkullEffect {
-            get {
-                return ResourceManager.GetString("StrSkullEffect", resourceCulture);
-            }
-        }
-        
-        internal static string StrWin {
-            get {
-                return ResourceManager.GetString("StrWin", resourceCulture);
-            }
-        }
-        
-        internal static string StrWrongStack {
-            get {
-                return ResourceManager.GetString("StrWrongStack", resourceCulture);
-            }
-        }
-        
-        internal static string StrPlayerSelection {
-            get {
-                return ResourceManager.GetString("StrPlayerSelection", resourceCulture);
-            }
-        }
-    }
-}

TheGameExtreme/AppRessources-br.Designer.cs

@@ -0,0 +1,210 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Ce code a été généré par un outil.
+//     Version du runtime :4.0.30319.42000
+//
+//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
+//     le code est régénéré.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace TheGameExtreme {
+    using System;
+    
+    
+    /// <summary>
+    ///   Une classe de ressource fortement typée destinée, entre autres, à la consultation des chaînes localisées.
+    /// </summary>
+    // Cette classe a été générée automatiquement par la classe StronglyTypedResourceBuilder
+    // à l'aide d'un outil, tel que ResGen ou Visual Studio.
+    // Pour ajouter ou supprimer un membre, modifiez votre fichier .ResX, puis réexécutez ResGen
+    // avec l'option /str ou régénérez votre projet VS.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class AppRessources_br {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal AppRessources_br() {
+        }
+        
+        /// <summary>
+        ///   Retourne l'instance ResourceManager mise en cache utilisée par cette classe.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TheGameExtreme.AppRessources-br", typeof(AppRessources_br).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Remplace la propriété CurrentUICulture du thread actuel pour toutes
+        ///   les recherches de ressources à l'aide de cette classe de ressource fortement typée.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à rising stack.
+        /// </summary>
+        internal static string StrAcendingStack {
+            get {
+                return ResourceManager.GetString("StrAcendingStack", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à the chosen pile does not exist.
+        /// </summary>
+        internal static string StrCantGetStack {
+            get {
+                return ResourceManager.GetString("StrCantGetStack", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à You have not played enough cards!.
+        /// </summary>
+        internal static string StrCardPlayedLessThanTwo {
+            get {
+                return ResourceManager.GetString("StrCardPlayedLessThanTwo", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Please select a card to place on a stack.
+        /// </summary>
+        internal static string StrChooseCardToPlay {
+            get {
+                return ResourceManager.GetString("StrChooseCardToPlay", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Select the stack on which you want to put the card.
+        /// </summary>
+        internal static string StrChooseStack {
+            get {
+                return ResourceManager.GetString("StrChooseStack", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Down stack.
+        /// </summary>
+        internal static string StrDownStack {
+            get {
+                return ResourceManager.GetString("StrDownStack", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à End of turn.
+        /// </summary>
+        internal static string StrEndTurn {
+            get {
+                return ResourceManager.GetString("StrEndTurn", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à .
+        /// </summary>
+        internal static string String1 {
+            get {
+                return ResourceManager.GetString("String1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à The game is over! Sorry, you lost ... Try again!.
+        /// </summary>
+        internal static string StrLose {
+            get {
+                return ResourceManager.GetString("StrLose", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à The game is over! Sorry, you lost ... You had to play three cards because of the effect \ &quot;Three cards played \&quot; off your game does not play as much! Try again!.
+        /// </summary>
+        internal static string StrLose3CardEffect {
+            get {
+                return ResourceManager.GetString("StrLose3CardEffect", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à The player has no more cards in his hand.
+        /// </summary>
+        internal static string StrNoMoreCardOnHand {
+            get {
+                return ResourceManager.GetString("StrNoMoreCardOnHand", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à -The goal is to beat the game! Alone or with others!
+        ///
+        ///-98 cards numbered from 2 to 99.
+        ///
+        ///-4 batteries are at your disposal, two ascending and two descending.
+        ///
+        ///-The objective is to be able to put all the cards of the picks on the different piles at your disposal.
+        ///
+        ///-If you get to empty all the deck and put all the cards on the piles, you win, otherwise you lose.
+        ///
+        ///-Every player must play at least two cards per turn.
+        ///
+        ///-On an ascending stack, it is possible to roll back 10 (eg 73 is played -&gt; possibil [le reste de la chaîne a été tronqué]&quot;;.
+        /// </summary>
+        internal static string StrRules {
+            get {
+                return ResourceManager.GetString("StrRules", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à Sorry, you did not cover the skull ... Try again;).
+        /// </summary>
+        internal static string StrSkullEffect {
+            get {
+                return ResourceManager.GetString("StrSkullEffect", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à The game is over!  Well done you won!.
+        /// </summary>
+        internal static string StrWin {
+            get {
+                return ResourceManager.GetString("StrWin", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Recherche une chaîne localisée semblable à The card does not fit in the selected stack!.
+        /// </summary>
+        internal static string StrWrongStack {
+            get {
+                return ResourceManager.GetString("StrWrongStack", resourceCulture);
+            }
+        }
+    }
+}

TheGameExtreme/AppRessources-br.resx

@@ -155,6 +155,25 @@
   <data name="StrNoMoreCardOnHand" xml:space="preserve">
     <value>The player has no more cards in his hand</value>
   </data>
+  <data name="StrRules" xml:space="preserve">
+    <value>-The goal is to beat the game! Alone or with others!
+
+-98 cards numbered from 2 to 99.
+
+-4 batteries are at your disposal, two ascending and two descending.
+
+-The objective is to be able to put all the cards of the picks on the different piles at your disposal.
+
+-If you get to empty all the deck and put all the cards on the piles, you win, otherwise you lose.
+
+-Every player must play at least two cards per turn.
+
+-On an ascending stack, it is possible to roll back 10 (eg 73 is played -&gt; possibility to play above 73 or 63).
+
+-On a falling stack, it is possible to roll back 10 (eg 73 is played -&gt; possibility to play below 73 or 83).
+
+-The cohesion and strategy will be two important friends to overcome The Game.</value>
+  </data>
   <data name="StrSkullEffect" xml:space="preserve">
     <value>Sorry, you did not cover the skull ... Try again;)</value>
   </data>

TheGameExtreme/TheGameExtreme.csproj

@@ -28,6 +28,7 @@
     <Compile Remove="model\effect\StopCom.cs" />
     <Compile Remove="model\manager.cs" />
     <Compile Remove="model\manager\GameManagerSolo.cs" />
+    <Compile Remove="view\AppRessources.Designer.cs" />
     <Compile Remove="view\AppRessources-br.Designer.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -42,11 +43,8 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="AppRessource.resx">
-      <LastGenOutput>AppRessource.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Update="AppRessources-br.resx">
       <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>AppRessources-br.Designer.cs</LastGenOutput>
+      <LastGenOutput>AppRessource.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <EmbeddedResource Update="DictionnaireBGCBLACK.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
@@ -61,8 +59,8 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>AppRessource.resx</DependentUpon>
     </Compile>
-    <Compile Update="AppRessources-br.Designer.cs">
+    <Compile Update="AppRessources.Designer.cs">
-      <DependentUpon>AppRessources-br.resx</DependentUpon>
+      <DependentUpon>AppRessources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
     </Compile>

TheGameExtreme/view/Settings.xaml.cs

@@ -22,7 +22,7 @@ namespace TheGameExtreme.view
                 swTheme.IsToggled = true;
             }
 
-             
+            
             
 
 
@@ -33,7 +33,7 @@ namespace TheGameExtreme.view
             if (CBBr.IsChecked == true)
             {
                 CBFr.IsChecked = false;
-                
+                AppRessources_br.StrRules.ToString();
             }
             else if(CBBr.IsChecked == false)
             {