[gbrainy/refactoring: 39/39] Merge fixes

[Jordi Mas <jmas src gnome org>]

commit 18729e71684215a8b17de9f3fc65caeee55a0d4b
Merge: 488812e 8926f8f
Author: Jordi Mas <jmas softcatala org>
Date:   Wed Sep 28 20:23:03 2011 +0200

    Merge fixes

 NEWS                                             |    9 +
 configure.ac                                     |    6 +-
 data/games.xml                                   |    2 +-
 data/verbal_analogies.xml                        |   10 +-
 help/sr/sr.po                                    | 2915 +++--------
 help/sr latin/sr latin po                        | 2915 +++--------
 po/LINGUAS                                       |    1 +
 po/af.po                                         | 5266 +++++++++---------
 po/ca.po                                         | 5195 +++++++++---------
 po/cs.po                                         |  578 +-
 po/da.po                                         | 6257 +++++++++++-----------
 po/de.po                                         | 5248 +++++++++---------
 po/eo.po                                         | 5061 +++++++++++++++++
 po/es.po                                         | 5240 +++++++++---------
 po/fr.po                                         | 5238 +++++++++---------
 po/hu.po                                         | 6055 +++++++++++-----------
 po/pt_BR.po                                      | 5150 +++++++++---------
 po/sl.po                                         |  854 ++--
 po/sr.po                                         |  784 ++--
 po/sr latin po                                   |  784 ++--
 po/sv.po                                         | 3220 ++++++------
 po/zh_CN.po                                      | 3607 +++++++-------
 src/Clients/Classical/AssemblyInfo.cs.in         |    2 +-
 src/Clients/Classical/Widgets/GameDrawingArea.cs |   19 +-
 src/Clients/Classical/gbrainy.csproj             |   12 +
 src/Core/AssemblyInfo.cs.in                      |    2 +-
 src/Core/Main/Verbal/Analogies.cs                |   12 +-
 src/Games/AssemblyInfo.cs.in                     |    2 +-
 src/Games/Logic/PuzzleGridDots.cs                |    1 -
 29 files changed, 33305 insertions(+), 31140 deletions(-)
---
diff --cc src/Games/Logic/PuzzleGridDots.cs
index 1ea8b96,fad44f2..e697571
--- a/src/Games/Logic/PuzzleGridDots.cs
+++ b/src/Games/Logic/PuzzleGridDots.cs
@@@ -216,10 -216,9 +216,9 @@@ namespace gbrainy.Games.Logi
  			get {
  				switch (puzzle_index) {
  				case 0:
- 					// Translators: Please, do not make the translated string longer than the original English one. It will not fit in screen.
 -					return ServiceLocator.Instance.GetService <ITranslations> ().GetString ("From the top-left figure, the top-left circle moves down, the bottom-left circle moves up, the bottom-right moves diagonally up-left and the top-right moves diagonally down-left.");
 +					return translations.GetString ("From the top-left figure, the top-left circle moves down, the bottom-left circle moves up, the bottom-right moves diagonally up-left and the top-right moves diagonally down-left.");
  				case 2:
 -					return ServiceLocator.Instance.GetService <ITranslations> ().GetString
 +					return translations.GetString
  					("From the top-left figure, the figure is rotated counterclockwise 90 degrees.");
  				case 1: // TODO
  				default: