gbrainy r483 - in trunk/sample_extensions: Calculation Logic Memory

[jmas svn gnome org]

Author: jmas
Date: Tue Dec 23 20:33:51 2008
New Revision: 483
URL: http://svn.gnome.org/viewvc/gbrainy?rev=483&view=rev

Log:
Remove GetStrings

Modified:
   trunk/sample_extensions/Calculation/CalculationSample.cs
   trunk/sample_extensions/Logic/PuzzleSample.cs
   trunk/sample_extensions/Memory/MemorySample.cs

Modified: trunk/sample_extensions/Calculation/CalculationSample.cs
==============================================================================
--- trunk/sample_extensions/Calculation/CalculationSample.cs	(original)
+++ trunk/sample_extensions/Calculation/CalculationSample.cs	Tue Dec 23 20:33:51 2008
@@ -28,7 +28,7 @@
 	private int op1, op2, max_operand;
 
 	public override string Name {
-		get {return Catalog.GetString ("Calculation sample");}
+		get {return "Calculation sample";}
 	}
 
 	public override Types Type {
@@ -36,7 +36,7 @@
 	}
 
 	public override string Question {
-		get {return String.Format (Catalog.GetString ("Which two numbers when added are {0} and when multiplied are {1}?"), op1, op2);} 
+		get {return String.Format ("Which two numbers when added are {0} and when multiplied are {1}?", op1, op2);} 
 	}
 
 	public override void Initialize ()
@@ -71,13 +71,13 @@
 		gr.SetPangoLargeFontSize ();
 
 		gr.MoveTo (x, DrawAreaY + 0.22);
-		gr.ShowPangoText (String.Format (Catalog.GetString ("number1 + number2 = {0}"), op1));
+		gr.ShowPangoText (String.Format ("number1 + number2 = {0}", op1));
 		
 		gr.MoveTo (x, DrawAreaY + 0.44);
-		gr.ShowPangoText (String.Format (Catalog.GetString ("number1 * number2 = {0}"), op2));
+		gr.ShowPangoText (String.Format ("number1 * number2 = {0}", op2));
 
 		gr.Color = new Color (0.9, 0.9, 0.9);
-		gr.DrawTextCentered (0.5, DrawAreaY, String.Format (Catalog.GetString ("This is an extension sample")));
+		gr.DrawTextCentered (0.5, DrawAreaY, "This is an extension sample");
 	}
 
 	public override bool CheckAnswer (string answer)

Modified: trunk/sample_extensions/Logic/PuzzleSample.cs
==============================================================================
--- trunk/sample_extensions/Logic/PuzzleSample.cs	(original)
+++ trunk/sample_extensions/Logic/PuzzleSample.cs	Tue Dec 23 20:33:51 2008
@@ -24,11 +24,11 @@
 public class PuzzleSample : Game
 {
 	public override string Name {
-		get {return Catalog.GetString ("Puzzle sample");}
+		get {return "Puzzle sample";}
 	}
 
 	public override string Question {
-		get {return Catalog.GetString ("In a party all the people is introduced to the rest. There are 28 handeshakes. How many people is in the party?");} 
+		get {return "In a party all the people is introduced to the rest. There are 28 handeshakes. How many people is in the party?";} 
 	}
 
 	public override void Initialize ()
@@ -41,6 +41,6 @@
 		base.Draw (gr, area_width, area_height);
 
 		gr.Color = new Color (0.4, 0.4, 0.4);
-		gr.DrawTextCentered (0.5, DrawAreaY, String.Format (Catalog.GetString ("This is an extension sample")));
+		gr.DrawTextCentered (0.5, DrawAreaY, "This is an extension sample");
 	}
 }

Modified: trunk/sample_extensions/Memory/MemorySample.cs
==============================================================================
--- trunk/sample_extensions/Memory/MemorySample.cs	(original)
+++ trunk/sample_extensions/Memory/MemorySample.cs	Tue Dec 23 20:33:51 2008
@@ -31,12 +31,12 @@
 	int answer;
 
 	public override string Name {
-		get {return Catalog.GetString ("Memory sample");}
+		get {return "Memory sample";}
 	}
 
 	public override string MemoryQuestion {
 		get { 
-			return String.Format (Catalog.GetString ("There is a missing animal name from the previous list. Which one is missing?"));}
+			return "There is a missing animal name from the previous list. Which one is missing?";}
 	}
 
 	public override void Initialize ()
@@ -98,7 +98,7 @@
 		}
 
 		gr.Color = new Color (0.9, 0.9, 0.9);
-		gr.DrawTextCentered (0.5, DrawAreaY, String.Format (Catalog.GetString ("This is an extension sample")));
+		gr.DrawTextCentered (0.5, DrawAreaY, "This is an extension sample");
 	}
 	
 	public override void DrawObjectToMemorize (CairoContextEx gr, int area_width, int area_height)