diff --git a/TheGameExtreme/TheGameExtreme_AppRessource.Designer.cs b/TheGameExtreme/AppRessource.Designer.cs
similarity index 100%
rename from TheGameExtreme/TheGameExtreme_AppRessource.Designer.cs
rename to TheGameExtreme/AppRessource.Designer.cs
diff --git a/TheGameExtreme/AppRessource.Designer.cs.orig b/TheGameExtreme/AppRessource.Designer.cs.orig
deleted file mode 100644
index aab041b..0000000
--- a/TheGameExtreme/AppRessource.Designer.cs.orig
+++ /dev/null
@@ -1,165 +0,0 @@
-//------------------------------------------------------------------------------
-//
-// 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.
-//
-//------------------------------------------------------------------------------
-
-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
-=======
- ///
- /// Recherche une chaîne localisée semblable à -L'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'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..
- ///
- internal static string StrRules {
- get {
- return ResourceManager.GetString("StrRules", resourceCulture);
- }
- }
-
- ///
- /// Recherche une chaîne localisée semblable à Désolé, vous n'avez pas recouvert la tête de mort... Réessayez ;).
- ///
->>>>>>> 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);
- }
- }
- }
-}
diff --git a/TheGameExtreme/AppRessources-br.Designer.cs b/TheGameExtreme/AppRessources-br.Designer.cs
new file mode 100644
index 0000000..3f2f1b9
--- /dev/null
+++ b/TheGameExtreme/AppRessources-br.Designer.cs
@@ -0,0 +1,210 @@
+//------------------------------------------------------------------------------
+//
+// 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é.
+//
+//------------------------------------------------------------------------------
+
+namespace TheGameExtreme {
+ using System;
+
+
+ ///
+ /// Une classe de ressource fortement typée destinée, entre autres, à la consultation des chaînes localisées.
+ ///
+ // 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() {
+ }
+
+ ///
+ /// Retourne l'instance ResourceManager mise en cache utilisée par cette classe.
+ ///
+ [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;
+ }
+ }
+
+ ///
+ /// Remplace la propriété CurrentUICulture du thread actuel pour toutes
+ /// les recherches de ressources à l'aide de cette classe de ressource fortement typée.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ ///
+ /// Recherche une chaîne localisée semblable à rising stack.
+ ///
+ internal static string StrAcendingStack {
+ get {
+ return ResourceManager.GetString("StrAcendingStack", resourceCulture);
+ }
+ }
+
+ ///
+ /// Recherche une chaîne localisée semblable à the chosen pile does not exist.
+ ///
+ internal static string StrCantGetStack {
+ get {
+ return ResourceManager.GetString("StrCantGetStack", resourceCulture);
+ }
+ }
+
+ ///
+ /// Recherche une chaîne localisée semblable à You have not played enough cards!.
+ ///
+ internal static string StrCardPlayedLessThanTwo {
+ get {
+ return ResourceManager.GetString("StrCardPlayedLessThanTwo", resourceCulture);
+ }
+ }
+
+ ///
+ /// Recherche une chaîne localisée semblable à Please select a card to place on a stack.
+ ///
+ internal static string StrChooseCardToPlay {
+ get {
+ return ResourceManager.GetString("StrChooseCardToPlay", resourceCulture);
+ }
+ }
+
+ ///
+ /// Recherche une chaîne localisée semblable à Select the stack on which you want to put the card.
+ ///
+ internal static string StrChooseStack {
+ get {
+ return ResourceManager.GetString("StrChooseStack", resourceCulture);
+ }
+ }
+
+ ///
+ /// Recherche une chaîne localisée semblable à Down stack.
+ ///
+ internal static string StrDownStack {
+ get {
+ return ResourceManager.GetString("StrDownStack", resourceCulture);
+ }
+ }
+
+ ///
+ /// Recherche une chaîne localisée semblable à End of turn.
+ ///
+ internal static string StrEndTurn {
+ get {
+ return ResourceManager.GetString("StrEndTurn", resourceCulture);
+ }
+ }
+
+ ///
+ /// Recherche une chaîne localisée semblable à .
+ ///
+ internal static string String1 {
+ get {
+ return ResourceManager.GetString("String1", resourceCulture);
+ }
+ }
+
+ ///
+ /// Recherche une chaîne localisée semblable à The game is over! Sorry, you lost ... Try again!.
+ ///
+ internal static string StrLose {
+ get {
+ return ResourceManager.GetString("StrLose", resourceCulture);
+ }
+ }
+
+ ///
+ /// Recherche une chaîne localisée semblable à The game is over! Sorry, you lost ... You had to play three cards because of the effect \ "Three cards played \" off your game does not play as much! Try again!.
+ ///
+ internal static string StrLose3CardEffect {
+ get {
+ return ResourceManager.GetString("StrLose3CardEffect", resourceCulture);
+ }
+ }
+
+ ///
+ /// Recherche une chaîne localisée semblable à The player has no more cards in his hand.
+ ///
+ internal static string StrNoMoreCardOnHand {
+ get {
+ return ResourceManager.GetString("StrNoMoreCardOnHand", resourceCulture);
+ }
+ }
+
+ ///
+ /// 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 -> possibil [le reste de la chaîne a été tronqué]";.
+ ///
+ internal static string StrRules {
+ get {
+ return ResourceManager.GetString("StrRules", resourceCulture);
+ }
+ }
+
+ ///
+ /// Recherche une chaîne localisée semblable à Sorry, you did not cover the skull ... Try again;).
+ ///
+ internal static string StrSkullEffect {
+ get {
+ return ResourceManager.GetString("StrSkullEffect", resourceCulture);
+ }
+ }
+
+ ///
+ /// Recherche une chaîne localisée semblable à The game is over! Well done you won!.
+ ///
+ internal static string StrWin {
+ get {
+ return ResourceManager.GetString("StrWin", resourceCulture);
+ }
+ }
+
+ ///
+ /// Recherche une chaîne localisée semblable à The card does not fit in the selected stack!.
+ ///
+ internal static string StrWrongStack {
+ get {
+ return ResourceManager.GetString("StrWrongStack", resourceCulture);
+ }
+ }
+ }
+}
diff --git a/TheGameExtreme/TheGameExtreme_AppRessources-br.Designer.cs b/TheGameExtreme/AppRessources-br.Designer.cs.orig
similarity index 100%
rename from TheGameExtreme/TheGameExtreme_AppRessources-br.Designer.cs
rename to TheGameExtreme/AppRessources-br.Designer.cs.orig
diff --git a/TheGameExtreme/TheGameExtreme_AppRessources-br.resx b/TheGameExtreme/AppRessources-br.resx
similarity index 90%
rename from TheGameExtreme/TheGameExtreme_AppRessources-br.resx
rename to TheGameExtreme/AppRessources-br.resx
index 8f9ac32..77e02ce 100644
--- a/TheGameExtreme/TheGameExtreme_AppRessources-br.resx
+++ b/TheGameExtreme/AppRessources-br.resx
@@ -155,6 +155,25 @@
The player has no more cards in his hand
+
+ -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 -> possibility to play above 73 or 63).
+
+-On a falling stack, it is possible to roll back 10 (eg 73 is played -> possibility to play below 73 or 83).
+
+-The cohesion and strategy will be two important friends to overcome The Game.
+
Sorry, you did not cover the skull ... Try again;)
diff --git a/TheGameExtreme/TheGameExtreme.csproj b/TheGameExtreme/TheGameExtreme.csproj
index 1cd0c9a..031f45a 100644
--- a/TheGameExtreme/TheGameExtreme.csproj
+++ b/TheGameExtreme/TheGameExtreme.csproj
@@ -28,6 +28,7 @@
+
@@ -42,11 +43,8 @@
- AppRessource.Designer.cs
-
-
ResXFileCodeGenerator
- AppRessources-br.Designer.cs
+ AppRessource.Designer.cs
MSBuild:UpdateDesignTimeXaml
@@ -61,8 +59,8 @@
True
AppRessource.resx
-
- AppRessources-br.resx
+
+ AppRessources.resx
True
True
diff --git a/TheGameExtreme/view/Settings.xaml.cs b/TheGameExtreme/view/Settings.xaml.cs
index da2cc4e..13de124 100644
--- a/TheGameExtreme/view/Settings.xaml.cs
+++ b/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)
{