[gbrainy/gbrainy-17x: 55/55] Merge branch 'master', remote branch 'origin' into gbrainy-17x
- From: Jordi Mas <jmas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gbrainy/gbrainy-17x: 55/55] Merge branch 'master', remote branch 'origin' into gbrainy-17x
- Date: Wed, 12 Jan 2011 20:56:41 +0000 (UTC)
commit 62ff08f2c4d73c89545f211ccf3068cfb8cafe34
Merge: 1f3af74 911d6fc
Author: Jordi Mas <jmas softcatala org>
Date: Wed Jan 12 21:57:57 2011 +0100
Merge branch 'master', remote branch 'origin' into gbrainy-17x
NEWS | 4 +
configure.ac | 8 +-
data/games.xml | 42 +-
data/verbal_analogies.xml | 3 +-
help/Makefile.am | 2 +-
help/af/af.po | 141 +-
help/da/da.po | 160 +-
help/de/de.po | 220 +-
help/hu/hu.po | 729 +++++
po/af.po | 497 ++--
po/ast.po | 6 +-
po/ca.po | 111 +-
po/cs.po | 164 +-
po/da.po | 480 ++--
po/de.po | 474 ++--
po/es.po | 175 +-
po/fr.po | 461 ++--
po/gl.po | 3153 +++++++++++++-------
po/hu.po | 183 +-
po/pl.po | 1951 ++++++-------
po/pt_BR.po | 860 +++---
po/sl.po | 143 +-
po/sv.po | 1978 +++++++++----
po/zh_CN.po | 3199 ++++++++++++++------
src/Core/Main/GameSession.cs | 29 +-
.../Calculation/CalculationGreatestDivisor.cs | 5 +-
src/Games/Calculation/CalculationPrimes.cs | 1 -
src/Games/Logic/PuzzleBalance.cs | 6 +-
src/Games/Logic/PuzzleExtraCircle.cs | 123 +-
src/Games/Logic/PuzzlePredicateLogic.cs | 13 +-
30 files changed, 9576 insertions(+), 5745 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]