[gbrainy] Better wording
- From: Jordi Mas <jmas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gbrainy] Better wording
- Date: Mon, 6 Jun 2011 19:04:39 +0000 (UTC)
commit 76d058eb99f381f63aecc31992b269e571938261
Author: Jordi Mas <jmas softcatala org>
Date: Mon Jun 6 21:04:11 2011 +0200
Better wording
data/games.xml | 20 ++++++++++----------
src/Core/Main/Verbal/AnalogiesMultipleOptions.cs | 2 +-
.../Main/Verbal/AnalogiesPairOfWordsOptions.cs | 2 +-
src/Games/Calculation/CalculationAverage.cs | 2 +-
src/Games/Calculation/CalculationCloserFraction.cs | 2 +-
src/Games/Calculation/CalculationPrimes.cs | 2 +-
src/Games/Calculation/CalculationProportions.cs | 2 +-
src/Games/Logic/PuzzleFigurePattern.cs | 2 +-
src/Games/Logic/PuzzleFigures.cs | 2 +-
src/Games/Logic/PuzzleGridDots.cs | 2 +-
src/Games/Logic/PuzzleLargerShape.cs | 2 +-
src/Games/Logic/PuzzleMissingPiece.cs | 2 +-
src/Games/Logic/PuzzleMissingSlice.cs | 2 +-
src/Games/Logic/PuzzleMostInCommon.cs | 2 +-
src/Games/Logic/PuzzleNextFigure.cs | 2 +-
src/Games/Logic/PuzzleOstracism.cs | 2 +-
src/Games/Logic/PuzzlePredicateLogic.cs | 2 +-
src/Games/Logic/PuzzleTetris.cs | 2 +-
18 files changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/data/games.xml b/data/games.xml
index bd09223..a4628a4 100644
--- a/data/games.xml
+++ b/data/games.xml
@@ -392,7 +392,7 @@
<_question>Which two numbers of the list below are both multiple of [num_x] and [num_y]? [option_answers]</_question>
<_tip>A multiple is a number that may be divided by another number with no remainder. For example, 10, 15 and 25 are multiples of 5.</_tip>
- <string _text = "Possible answers are:" x = "0.1" y = "0.15" size = "large"/>
+ <string _text = "Choose one of the following:" x = "0.1" y = "0.15" size = "large"/>
<option x = "0.3" y = "0.3" width ="0.45" height ="0.1" order ="randomized">
<string _text = "[option_prefix] [option_a] and [option_c]" x = "0.05" y = "0.02" size = "large"/>
@@ -432,7 +432,7 @@
</variables>
<_question>In a small town, [all_cars]% of the inhabitants have a car and [males_cars]% have a car and are males. What percentage of the population are females and have a car? [option_answers]</_question>
- <string _text = "Possible answers are:" x = "0.1" y = "0.15" size = "large"/>
+ <string _text = "Choose one of the following:" x = "0.1" y = "0.15" size = "large"/>
<option x = "0.3" y = "0.3" width ="0.45" height ="0.1" order ="randomized">
<string _text = "[option_prefix] [option_a]%" x = "0.05" y = "0.02" size = "large"/>
@@ -464,7 +464,7 @@
<variant>
<_question>If p < x < q and r < y < s. Which of the following options makes x < y true? [option_answers]</_question>
- <string _text = "Possible answers are:" x = "0.1" y = "0.15" size = "large"/>
+ <string _text = "Choose one of the following:" x = "0.1" y = "0.15" size = "large"/>
<option x = "0.3" y = "0.3" width ="0.45" height ="0.1" order ="randomized" correct = "yes">
<string _text = "[option_prefix] s > p" x = "0.05" y = "0.02" size = "large"/>
@@ -489,7 +489,7 @@
<variant>
<_question>If p < x < q and r < y < s. Which of the following options makes x > y true? [option_answers]</_question>
- <string _text = "Possible answers are:" x = "0.1" y = "0.15" size = "large"/>
+ <string _text = "Choose one of the following:" x = "0.1" y = "0.15" size = "large"/>
<option x = "0.3" y = "0.3" width ="0.45" height ="0.1" order ="randomized" correct = "yes">
<string _text = "[option_prefix] r < q" x = "0.05" y = "0.02" size = "large"/>
@@ -521,7 +521,7 @@
<variant>
<_question>Given two integer numbers x and y, if x is even and y odd, which of the following expressions gives always an odd result? [option_answers]</_question>
- <string _text = "Possible answers are:" x = "0.1" y = "0.15" size = "large"/>
+ <string _text = "Choose one of the following:" x = "0.1" y = "0.15" size = "large"/>
<option x = "0.3" y = "0.3" width ="0.45" height ="0.1" order ="randomized" correct = "yes">
<string _text = "[option_prefix] 2x + y" x = "0.05" y = "0.02" size = "large"/>
@@ -591,7 +591,7 @@
<question plural ="[john_time]">John needs [john_time] hours to clean a warehouse and his friend needs twice as many. How many hours would it take them to clean up the warehouse if they worked together? [option_answers]</question>
</variant>
- <string _text = "Possible answers are:" x = "0.1" y = "0.15" size = "large"/>
+ <string _text = "Choose one of the following:" x = "0.1" y = "0.15" size = "large"/>
<option x = "0.3" y = "0.3" width ="0.45" height ="0.1" order ="randomized" correct = "yes">
<string _text = "[option_prefix] [answer_a]" x = "0.05" y = "0.02" size = "large"/>
@@ -635,7 +635,7 @@
<_question>You have two trucks that have a total weight of [add] unit. If the lighter truck weights 15 units less that half of the weight of the heavier truck, what is the weight of the lighter truck? [option_answers]</_question>
<question plural ="[add]">You have two trucks that have a total weight of [add] units. If the lighter truck weights 15 units less that half of the weight of the heavier truck, what is the weight of the lighter truck? [option_answers]</question>
- <string _text = "Possible answers are:" x = "0.1" y = "0.15" size = "large"/>
+ <string _text = "Choose one of the following:" x = "0.1" y = "0.15" size = "large"/>
<option x = "0.3" y = "0.3" width ="0.45" height ="0.1" order ="randomized" correct = "yes">
<string _text = "[option_prefix] [answer_a]" x = "0.05" y = "0.02" size = "large"/>
@@ -664,7 +664,7 @@
<variant>
<_question>John's father's sister's sister-in-law is also? Do not assume that John has any relative that has not been mentioned. [option_answers]</_question>
- <string _text = "Possible answers are:" x = "0.1" y = "0.15" size = "large"/>
+ <string _text = "Choose one of the following:" x = "0.1" y = "0.15" size = "large"/>
<option x = "0.25" y = "0.3" width ="0.6" height ="0.1" order ="randomized" correct = "yes">
<string _text = "[option_prefix] His mother" x = "0.05" y = "0.02" size = "large"/>
@@ -688,7 +688,7 @@
<variant>
<_question>John's mother's brother's brother-in-law is also? Do not assume that John has any relative that has not been mentioned. [option_answers]</_question>
- <string _text = "Possible answers are:" x = "0.1" y = "0.15" size = "large"/>
+ <string _text = "Choose one of the following:" x = "0.1" y = "0.15" size = "large"/>
<option x = "0.25" y = "0.3" width ="0.6" height ="0.1" order ="randomized" correct = "yes">
<string _text = "[option_prefix] His father" x = "0.05" y = "0.02" size = "large"/>
@@ -736,7 +736,7 @@
<variant>
<_question>The average of three numbers is [three]. The average of two of these numbers is [two]. What is the third number? [option_answers]</_question>
- <string _text = "Possible answers are:" x = "0.1" y = "0.15" size = "large"/>
+ <string _text = "Choose one of the following:" x = "0.1" y = "0.15" size = "large"/>
<option x = "0.3" y = "0.3" width ="0.45" height ="0.1" order ="randomized" correct = "yes">
<string _text = "[option_prefix] [answer_a]" x = "0.05" y = "0.02" size = "large"/>
diff --git a/src/Core/Main/Verbal/AnalogiesMultipleOptions.cs b/src/Core/Main/Verbal/AnalogiesMultipleOptions.cs
index 915744d..5a020bc 100644
--- a/src/Core/Main/Verbal/AnalogiesMultipleOptions.cs
+++ b/src/Core/Main/Verbal/AnalogiesMultipleOptions.cs
@@ -104,7 +104,7 @@ namespace gbrainy.Core.Main.Verbal
gr.SetPangoLargeFontSize ();
gr.MoveTo (0.1, DrawAreaY + 0.05);
- gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Possible answers are:"));
+ gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Choose one of the following:"));
}
}
}
diff --git a/src/Core/Main/Verbal/AnalogiesPairOfWordsOptions.cs b/src/Core/Main/Verbal/AnalogiesPairOfWordsOptions.cs
index 807fcab..cc0f4b2 100644
--- a/src/Core/Main/Verbal/AnalogiesPairOfWordsOptions.cs
+++ b/src/Core/Main/Verbal/AnalogiesPairOfWordsOptions.cs
@@ -119,7 +119,7 @@ namespace gbrainy.Core.Main.Verbal
gr.SetPangoLargeFontSize ();
gr.MoveTo (0.1, y + 0.12);
- gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Possible answers are:"));
+ gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Choose one of the following:"));
gr.Stroke ();
gr.DrawTextCentered (0.5, y,
diff --git a/src/Games/Calculation/CalculationAverage.cs b/src/Games/Calculation/CalculationAverage.cs
index 047839d..1bbcdbf 100644
--- a/src/Games/Calculation/CalculationAverage.cs
+++ b/src/Games/Calculation/CalculationAverage.cs
@@ -182,7 +182,7 @@ namespace gbrainy.Games.Calculation
gr.SetPangoLargeFontSize ();
gr.MoveTo (0.1, 0.15);
- gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Possible answers are:"));
+ gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Choose one of the following:"));
}
}
}
diff --git a/src/Games/Calculation/CalculationCloserFraction.cs b/src/Games/Calculation/CalculationCloserFraction.cs
index 1b7e9ad..4f49de9 100644
--- a/src/Games/Calculation/CalculationCloserFraction.cs
+++ b/src/Games/Calculation/CalculationCloserFraction.cs
@@ -174,7 +174,7 @@ namespace gbrainy.Games.Calculation
gr.SetPangoLargeFontSize ();
gr.MoveTo (0.1, 0.15);
- gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Possible answers are:"));
+ gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Choose one of the following:"));
}
}
}
diff --git a/src/Games/Calculation/CalculationPrimes.cs b/src/Games/Calculation/CalculationPrimes.cs
index f35ea9f..3228b11 100644
--- a/src/Games/Calculation/CalculationPrimes.cs
+++ b/src/Games/Calculation/CalculationPrimes.cs
@@ -149,7 +149,7 @@ namespace gbrainy.Games.Calculation
gr.SetPangoLargeFontSize ();
gr.MoveTo (0.1, 0.15);
- gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Possible answers are:"));
+ gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Choose one of the following:"));
}
short GenerateNonPrime ()
diff --git a/src/Games/Calculation/CalculationProportions.cs b/src/Games/Calculation/CalculationProportions.cs
index 38f574f..60deca3 100644
--- a/src/Games/Calculation/CalculationProportions.cs
+++ b/src/Games/Calculation/CalculationProportions.cs
@@ -128,7 +128,7 @@ namespace gbrainy.Games.Calculation
gr.SetPangoLargeFontSize ();
gr.MoveTo (0.1, 0.15);
- gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Possible answers are:"));
+ gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Choose one of the following:"));
}
}
}
diff --git a/src/Games/Logic/PuzzleFigurePattern.cs b/src/Games/Logic/PuzzleFigurePattern.cs
index a0cf832..cbf3faf 100644
--- a/src/Games/Logic/PuzzleFigurePattern.cs
+++ b/src/Games/Logic/PuzzleFigurePattern.cs
@@ -188,7 +188,7 @@ namespace gbrainy.Games.Logic
gr.Stroke ();
gr.MoveTo (0.05, y - 0.01 + space_y);
- gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Possible answers are:"));
+ gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Choose one of the following:"));
// Answers
x = org_x;
diff --git a/src/Games/Logic/PuzzleFigures.cs b/src/Games/Logic/PuzzleFigures.cs
index 2b0699f..2399293 100644
--- a/src/Games/Logic/PuzzleFigures.cs
+++ b/src/Games/Logic/PuzzleFigures.cs
@@ -192,7 +192,7 @@ namespace gbrainy.Games.Logic
}
gr.MoveTo (0.08, 0.45);
- gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Possible answers are:"));
+ gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Choose one of the following:"));
gr.Stroke ();
}
}
diff --git a/src/Games/Logic/PuzzleGridDots.cs b/src/Games/Logic/PuzzleGridDots.cs
index 0131fed..e5b0278 100644
--- a/src/Games/Logic/PuzzleGridDots.cs
+++ b/src/Games/Logic/PuzzleGridDots.cs
@@ -338,7 +338,7 @@ namespace gbrainy.Games.Logic
y += figure_size + 0.10;
gr.MoveTo (x, y - 0.02);
- gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Possible answers are:"));
+ gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Choose one of the following:"));
}
}
}
diff --git a/src/Games/Logic/PuzzleLargerShape.cs b/src/Games/Logic/PuzzleLargerShape.cs
index 7c83320..d9a1a50 100644
--- a/src/Games/Logic/PuzzleLargerShape.cs
+++ b/src/Games/Logic/PuzzleLargerShape.cs
@@ -300,7 +300,7 @@ namespace gbrainy.Games.Logic
base.Draw (gr, area_width, area_height, rtl);
gr.MoveTo (0.1, 0.3);
- gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Possible answers are:"));
+ gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Choose one of the following:"));
gr.Stroke ();
}
}
diff --git a/src/Games/Logic/PuzzleMissingPiece.cs b/src/Games/Logic/PuzzleMissingPiece.cs
index 4b928d0..8b05d1d 100644
--- a/src/Games/Logic/PuzzleMissingPiece.cs
+++ b/src/Games/Logic/PuzzleMissingPiece.cs
@@ -170,7 +170,7 @@ namespace gbrainy.Games.Logic
DrawFigureSequence (gr, x, DrawAreaY + sub_figure * 2 , 2, false);
gr.MoveTo (0.1, 0.62);
- gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Possible answers are:"));
+ gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Choose one of the following:"));
}
}
}
diff --git a/src/Games/Logic/PuzzleMissingSlice.cs b/src/Games/Logic/PuzzleMissingSlice.cs
index ccacfe3..ad5321c 100644
--- a/src/Games/Logic/PuzzleMissingSlice.cs
+++ b/src/Games/Logic/PuzzleMissingSlice.cs
@@ -215,7 +215,7 @@ namespace gbrainy.Games.Logic
}
gr.MoveTo (0.1, 0.55);
- gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Possible answers are:"));
+ gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Choose one of the following:"));
gr.Stroke ();
}
}
diff --git a/src/Games/Logic/PuzzleMostInCommon.cs b/src/Games/Logic/PuzzleMostInCommon.cs
index 2cdaa92..132f07a 100644
--- a/src/Games/Logic/PuzzleMostInCommon.cs
+++ b/src/Games/Logic/PuzzleMostInCommon.cs
@@ -311,7 +311,7 @@ namespace gbrainy.Games.Logic
y += 0.28;
x = DrawAreaX;
gr.MoveTo (x - 0.06, y);
- gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Possible answers are:"));
+ gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Choose one of the following:"));
gr.Stroke ();
}
}
diff --git a/src/Games/Logic/PuzzleNextFigure.cs b/src/Games/Logic/PuzzleNextFigure.cs
index 2834fcc..4b278ff 100644
--- a/src/Games/Logic/PuzzleNextFigure.cs
+++ b/src/Games/Logic/PuzzleNextFigure.cs
@@ -163,7 +163,7 @@ namespace gbrainy.Games.Logic
y += figure_size + 0.06;
gr.MoveTo (x, y);
- gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Possible answers are:"));
+ gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Choose one of the following:"));
gr.Stroke ();
}
}
diff --git a/src/Games/Logic/PuzzleOstracism.cs b/src/Games/Logic/PuzzleOstracism.cs
index 857a286..f332ded 100644
--- a/src/Games/Logic/PuzzleOstracism.cs
+++ b/src/Games/Logic/PuzzleOstracism.cs
@@ -173,7 +173,7 @@ namespace gbrainy.Games.Logic
gr.SetPangoLargeFontSize ();
gr.MoveTo (0.1, 0.15);
- gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Possible answers are:"));
+ gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Choose one of the following:"));
}
}
}
diff --git a/src/Games/Logic/PuzzlePredicateLogic.cs b/src/Games/Logic/PuzzlePredicateLogic.cs
index 17997d9..16719ba 100644
--- a/src/Games/Logic/PuzzlePredicateLogic.cs
+++ b/src/Games/Logic/PuzzlePredicateLogic.cs
@@ -195,7 +195,7 @@ namespace gbrainy.Games.Logic
gr.SetPangoLargeFontSize ();
gr.MoveTo (0.1, DrawAreaY);
- gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Possible answers are:"));
+ gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Choose one of the following:"));
}
}
}
diff --git a/src/Games/Logic/PuzzleTetris.cs b/src/Games/Logic/PuzzleTetris.cs
index 1813455..3822f28 100644
--- a/src/Games/Logic/PuzzleTetris.cs
+++ b/src/Games/Logic/PuzzleTetris.cs
@@ -169,7 +169,7 @@ namespace gbrainy.Games.Logic
}
gr.MoveTo (0.1, 0.4 - 0.02);
- gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Possible answers are:"));
+ gr.ShowPangoText (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Choose one of the following:"));
}
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]