[gnome-games/sudoku-tube: 67/209] Merge branch 'master' into work

[Zhang Sen <zhangsen src gnome org>]

commit 0295ae04a470b42d70e74b68b80c5fffbe4e34a3
Merge: bf23b22... 1043b2a...
Author: Zhang Sen <zh jesse gmail com>
Date:   Sat Oct 10 11:13:32 2009 +0800

    Merge branch 'master' into work

 .gitignore                               |   10 +
 NEWS                                     |  257 ++
 aisleriot/Makefile.am                    |    3 +
 aisleriot/README                         |    2 +-
 aisleriot/board-noclutter.c              |   31 +-
 aisleriot/board.c                        |   27 +-
 aisleriot/help/el/el.po                  |  558 ++-
 aisleriot/help/fr/fr.po                  |  522 ++-
 aisleriot/sol.6                          |  116 +
 aisleriot/stats-dialog.c                 |    9 +-
 aisleriot/window.c                       |   26 +-
 blackjack/data/Makefile.am               |    5 +-
 blackjack/data/blackjack.6               |  135 +
 blackjack/help/da/da.po                  |  529 ++--
 blackjack/src/dialog.cpp                 |    2 +-
 configure.in                             |    2 +-
 glchess/data/Makefile.am                 |    8 +-
 glchess/data/glchess.6                   |   27 +
 glchess/data/save_game.ui                |    1 -
 glchess/src/lib/gtkui/chessview.py       |   77 +-
 glchess/src/lib/main.py                  |   15 +-
 glines/Makefile.am                       |    3 +
 glines/glines.6                          |   42 +
 glines/glines.c                          |    7 +-
 glines/help/el/el.po                     |  632 ++-
 glines/help/fr/fr.po                     |  251 +-
 gnect/data/Makefile.am                   |    5 +-
 gnect/data/gnect.6                       |   41 +
 gnect/help/el/el.po                      |  159 +-
 gnect/help/en_GB/en_GB.po                |    4 +-
 gnect/help/fr/fr.po                      |  237 +-
 gnect/src/gfx.c                          |   17 +-
 gnect/src/main.c                         |    7 +-
 gnect/src/prefs.c                        |   20 +-
 gnibbles/Makefile.am                     |    3 +
 gnibbles/gnibbles.6                      |   43 +
 gnibbles/gnibbles.c                      |   24 +-
 gnibbles/help/eu/figures/playing.png     |  Bin 20017 -> 0 bytes
 gnibbles/main.c                          |   80 +-
 gnibbles/preferences.c                   |   21 +-
 gnobots2/Makefile.am                     |    5 +-
 gnobots2/gnobots2.6                      |   53 +
 gnobots2/help/en_GB/en_GB.po             |    4 +-
 gnome-sudoku/data/Makefile.am            |    5 +-
 gnome-sudoku/data/gnome-sudoku.6         |   34 +
 gnometris/Makefile.am                    |    5 +-
 gnometris/gnometris.6                    |   44 +
 gnometris/help/fr/fr.po                  |  168 +-
 gnomine/Makefile.am                      |    6 +-
 gnomine/gnomine.6                        |   59 +
 gnomine/gnomine.c                        |    8 +-
 gnomine/help/eu/figures/easy-hints-1.png |  Bin 3030 -> 0 bytes
 gnomine/help/eu/figures/easy-hints-2.png |  Bin 3537 -> 0 bytes
 gnomine/help/eu/figures/easy-hints-3.png |  Bin 5456 -> 0 bytes
 gnomine/help/eu/figures/faces.png        |  Bin 12006 -> 0 bytes
 gnomine/help/eu/figures/flags.png        |  Bin 3575 -> 0 bytes
 gnomine/help/eu/figures/hard-hints-1.png |  Bin 6041 -> 0 bytes
 gnomine/help/eu/figures/hard-hints-2.png |  Bin 7950 -> 0 bytes
 gnomine/help/eu/figures/hard-hints-3.png |  Bin 5091 -> 0 bytes
 gnomine/minefield.c                      |   16 +-
 gnotravex/Makefile.am                    |    3 +
 gnotravex/gnotravex.6                    |   50 +
 gnotravex/gnotravex.c                    |    8 +-
 gnotravex/help/C/gnotravex.xml           |    4 +-
 gnotravex/help/Makefile.am               |    2 +-
 gnotravex/help/cs/cs.po                  |   15 +-
 gnotravex/help/da/da.po                  |  454 ++
 gnotravex/help/de/de.po                  |  430 ++-
 gnotravex/help/es/es.po                  |  130 +-
 gnotravex/help/fr/fr.po                  |  138 +-
 gnotski/Makefile.am                      |    3 +
 gnotski/gnotski.6                        |   47 +
 gtali/Makefile.am                        |    4 +-
 gtali/gtali.6                            |   56 +
 iagno/Makefile.am                        |    5 +-
 iagno/gnothello.c                        |   26 +-
 iagno/help/el/el.po                      |  866 +++-
 iagno/iagno.6                            |   50 +
 iagno/properties.c                       |   23 +-
 icons/hicolor_apps_24x24_gnome-tali.png  |  Bin 1452 -> 1400 bytes
 libgames-support/games-gridframe.c       |    4 +-
 libgames-support/games-gtk-compat.h      |   16 +-
 libgames-support/games-scores-dialog.c   |    1 +
 lightsoff/src/lightsoff.in               |    2 +-
 mahjongg/Makefile.am                     |    3 +
 mahjongg/drawing.c                       |    1 +
 mahjongg/help/el/el.po                   |  712 ++--
 mahjongg/mahjongg.6                      |   39 +
 po/as.po                                 | 4634 +++++++++++---------
 po/bn_IN.po                              | 7194 +++++++++++++++++-------------
 po/br.po                                 | 2841 +++++++-----
 po/cs.po                                 | 3900 +++++++++--------
 po/da.po                                 | 3938 ++++++++++-------
 po/de.po                                 |  456 +-
 po/el.po                                 | 5573 +++++++++++++----------
 po/en_GB.po                              | 3904 ++++++++++-------
 po/fi.po                                 | 3838 ++++++++++-------
 po/gu.po                                 | 1042 ++---
 po/hi.po                                 | 4241 +++++++++++-------
 po/hu.po                                 | 4441 ++++++++++---------
 po/it.po                                 | 3750 +++++++++-------
 po/kn.po                                 |  369 +-
 po/ko.po                                 | 4721 +++++++++-----------
 po/ml.po                                 | 4126 +++++++++--------
 po/mr.po                                 | 3958 +++++++++--------
 po/or.po                                 | 4909 ++++++++++++---------
 po/pa.po                                 | 4450 +++++++++++--------
 po/pl.po                                 | 5232 ++++++++++++----------
 po/pt_BR.po                              |  252 +-
 po/ro.po                                 | 5554 +++++++++++++-----------
 po/sl.po                                 | 5399 +++++++++++++----------
 po/sr.po                                 | 3922 ++++++++++-------
 po/sr latin po                           | 3922 ++++++++++-------
 po/uk.po                                 | 2729 ++++++------
 same-gnome-clutter/same-gnome-clutter.in |    2 +-
 same-gnome/Makefile.am                   |    3 +
 same-gnome/help/C/same-gnome.xml         |    1 +
 same-gnome/help/el/el.po                 |  471 ++-
 same-gnome/help/fr/fr.po                 |  183 +-
 same-gnome/same-gnome.6                  |   51 +
 120 files changed, 61428 insertions(+), 46035 deletions(-)
---
diff --cc gnome-sudoku/data/Makefile.am
index 2fdcbc7,d1e7f9b..6e3e667
--- a/gnome-sudoku/data/Makefile.am
+++ b/gnome-sudoku/data/Makefile.am
@@@ -42,14 -29,15 +42,17 @@@ endi
  
  install-data-local: install-schemas-local
  
+ man_MANS = gnome-sudoku.6
+ 
  EXTRA_DIST = \
 +	$(dbusservice_in_files)	\
  	$(puzzle_DATA)	\
  	$(ui_DATA)	\
- 	$(schema_in_files)
+ 	$(schema_in_files) \
+ 	$(man_MANS)
  
  CLEANFILES = \
 +	$(dbusservice_DATA)	\
  	$(schema_DATA)
  
  DISTCLEANFILES = \