[gbrainy/refactoring: 30/30] Merge changes from master

[Jordi Mas <jmas src gnome org>]

commit 488812ec8dd9bbf2ac986cbca6464bdd89889b6c
Merge: 766541b 84b8274
Author: Jordi Mas <jmas softcatala org>
Date:   Sun Aug 28 17:06:34 2011 +0200

    Merge changes from master

 NEWS                                          |    5 +
 configure.ac                                  |    2 +-
 data/games.xml                                |    7 +-
 data/verbal_analogies.xml                     |    5 +
 help/af/af.po                                 |   84 +-
 help/hu/hu.po                                 |  540 ++-
 po/POTFILES.in                                |   74 +-
 po/af.po                                      |  555 ++-
 po/ca.po                                      |    2 +-
 po/cs.po                                      | 5632 ++++++++++++------------
 po/de.po                                      |  494 ++-
 po/es.po                                      |   99 +-
 po/fr.po                                      |  565 ++--
 po/gl.po                                      | 2231 ++++++----
 po/hu.po                                      | 2749 ++++++++-----
 po/nb.po                                      | 2695 ++++++++----
 po/ru.po                                      | 2175 ++++++----
 po/sl.po                                      | 4745 +++++++++++----------
 po/sr.po                                      | 5690 +++++++++++++------------
 po/sr latin po                                | 5684 +++++++++++++------------
 po/tr.po                                      |    2 +-
 po/zh_CN.po                                   | 3494 +++++++++-------
 src/Clients/Classical/Makefile.am             |    2 +-
 src/Clients/Classical/MonoAddinsStrings.cs    |   90 +
 src/Clients/Classical/mono-addins-strings.xml |   59 -
 src/Core/Main/Xml/GameXmlFactory.cs           |   28 +-
 src/Games/Logic/PuzzleNumericRelation.cs      |    1 +
 src/Games/Logic/PuzzlePercentage.cs           |   10 +-
 tools/GameXmlGetString.cs                     |    2 +-
 tools/GameXmlGetStringTemplate.cs             |    2 +-
 30 files changed, 20750 insertions(+), 16973 deletions(-)
---
diff --cc src/Games/Logic/PuzzleNumericRelation.cs
index e720e61,10542a0..e4f1856
--- a/src/Games/Logic/PuzzleNumericRelation.cs
+++ b/src/Games/Logic/PuzzleNumericRelation.cs
@@@ -58,11 -58,12 +58,12 @@@ namespace gbrainy.Games.Logi
  			get {
  				switch (formula) {
  				case Formula.AllAdding:
+ 					// Translators: {0} is always replaced by the number 3
 -					return String.Format (ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Every group of {0} numbers sums exactly {1}."), group_size, sum_value);
 +					return String.Format (translations.GetString ("Every group of {0} numbers sums exactly {1}."), group_size, sum_value);
  				case Formula.ThirdMultiply:
 -					return ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Divide the sequence in groups of three numbers. Every third number is calculated by multiplying by the two previous ones.");
 +					return translations.GetString ("Divide the sequence in groups of three numbers. Every third number is calculated by multiplying by the two previous ones.");
  				case Formula.ThirdSubstracting:
 -					return ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Divide the sequence in groups of three numbers. Every third number is calculated by subtracting the second number from the first.");
 +					return translations.GetString ("Divide the sequence in groups of three numbers. Every third number is calculated by subtracting the second number from the first.");
  				default:
  					throw new InvalidOperationException ("Invalid Value");
  				}
diff --cc src/Games/Logic/PuzzlePercentage.cs
index 315e383,9bb9877..7d31396
--- a/src/Games/Logic/PuzzlePercentage.cs
+++ b/src/Games/Logic/PuzzlePercentage.cs
@@@ -71,7 -71,10 +71,10 @@@ namespace gbrainy.Games.Logi
  				}  while (paid != Math.Truncate (paid));
  
  				question = String.Format (
- 					translations.GetString ("After getting {0}% discount you have paid {1} monetary units for a TV set. What was the original price of the TV set?"),
 -					ServiceLocator.Instance.GetService <ITranslations> ().GetPluralString (
++					translations.GetPluralString (
+ 						"After getting {0}% discount you have paid {1} monetary unit for a TV set. What was the original price of the TV set?",
+ 						"After getting {0}% discount you have paid {1} monetary units for a TV set. What was the original price of the TV set?",
+ 						(int) paid),
  					discount, paid);
  				ans = (int)price;
  				svg_image = "tv_set.svg";
@@@ -89,7 -92,10 +92,10 @@@
  
  			
  				question = String.Format (
- 					translations.GetString ("John's shop had sales of {0} monetary units. This was an increase of {1}% over last month. What were last month sales?"),
 -					ServiceLocator.Instance.GetService <ITranslations> ().GetPluralString (
++					translations.GetPluralString (
+ 						"John's shop had sales of {0} monetary unit. This was an increase of {1}% over last month. What were last month sales?",
+ 						"John's shop had sales of {0} monetary units. This was an increase of {1}% over last month. What were last month sales?",	
+ 						(int) sales),
  					sales, increase);
  				ans = (int) previous;
  				svg_image = "shop.svg";