[gnome-games/sudoku-vala: 170/170] Merge with master



commit eb2c605dd47ce8bacd6f7fa4f832238005e6f59a
Merge: 5c6cbd2 41f967e
Author: Robert Ancell <robert ancell canonical com>
Date:   Wed Mar 28 14:32:55 2012 +1100

    Merge with master

 NEWS                                           |  106 +
 aisleriot/help/de/de.po                        |  825 +++-
 aisleriot/prop-editor.c                        |   24 +-
 aisleriot/rules/poker.scm                      |   10 +-
 aisleriot/window.c                             |    6 +-
 configure.in                                   |  124 +-
 glchess/ChangeLog.old                          | 1366 -----
 glchess/data/Makefile.am                       |   20 +-
 glchess/data/ai.xml                            |  276 -
 glchess/data/engines.conf                      |  142 +
 glchess/data/glchess.schemas.in                |  293 --
 glchess/data/glchess.ui                        |  315 +-
 glchess/data/load_game.ui                      |   95 -
 glchess/data/log.ui                            |  103 -
 glchess/data/network_game.ui                   |  464 --
 glchess/data/network_new_server.ui             |  214 -
 glchess/data/new_game.ui                       |  409 --
 glchess/data/org.gnome.glchess.gschema.xml     |  135 +
 glchess/data/pieces/3d/Makefile.am             |   12 +
 glchess/data/pieces/3d/bishop.3ds              |  Bin 0 -> 29376 bytes
 glchess/data/pieces/3d/king.3ds                |  Bin 0 -> 29734 bytes
 glchess/data/pieces/3d/knight.3ds              |  Bin 0 -> 59316 bytes
 glchess/data/pieces/3d/pawn.3ds                |  Bin 0 -> 14894 bytes
 glchess/data/pieces/3d/queen.3ds               |  Bin 0 -> 33055 bytes
 glchess/data/pieces/3d/rook.3ds                |  Bin 0 -> 22214 bytes
 glchess/data/pieces/Makefile.am                |    2 +-
 glchess/data/preferences.ui                    |  708 ++-
 glchess/data/save_game.ui                      |   76 -
 glchess/gnuchess/getopt.c                      |   28 +-
 glchess/src/3ds.vala                           |  273 +
 glchess/src/Makefile.am                        |   76 +-
 glchess/src/ai-profile.vala                    |   75 +
 glchess/src/chess-bitboard.vala                | 1314 +++++
 glchess/src/chess-clock.vala                   |  153 +
 glchess/src/chess-engine-cecp.vala             |   94 +
 glchess/src/chess-engine-uci.vala              |  123 +
 glchess/src/chess-engine.vala                  |  151 +
 glchess/src/chess-game.vala                    | 1391 +++++
 glchess/src/chess-pgn.vala                     |  403 ++
 glchess/src/chess-view-2d.vala                 |  261 +
 glchess/src/chess-view-3d.vala                 |  660 +++
 glchess/src/chess-view-options.vala            |  134 +
 glchess/src/chess-view.vala                    |   19 +
 glchess/src/config.vapi                        |    7 +
 glchess/src/gl.vapi                            | 1402 +++++
 glchess/src/glchess.in.in                      |   83 -
 glchess/src/glchess.vala                       | 1647 ++++++
 glchess/src/glu.vapi                           |  301 ++
 glchess/src/glx.vapi                           |  202 +
 glchess/src/history.vala                       |  190 +
 glchess/src/lib/Makefile.am                    |   27 -
 glchess/src/lib/__init__.py                    |    2 -
 glchess/src/lib/ai.py                          |  490 --
 glchess/src/lib/cecp.py                        |  246 -
 glchess/src/lib/chess/Makefile.am              |   12 -
 glchess/src/lib/chess/__init__.py              |  132 -
 glchess/src/lib/chess/bitboard.py              |  194 -
 glchess/src/lib/chess/board.py                 | 1194 -----
 glchess/src/lib/chess/fics/Makefile.am         |    9 -
 glchess/src/lib/chess/fics/__init__.py         |    3 -
 glchess/src/lib/chess/fics/client.py           |  492 --
 glchess/src/lib/chess/fics/server.py           |  561 --
 glchess/src/lib/chess/fics/style12.py          |  205 -
 glchess/src/lib/chess/fics/telnet.py           |  207 -
 glchess/src/lib/chess/lan.py                   |  193 -
 glchess/src/lib/chess/pgn.py                   |  592 ---
 glchess/src/lib/chess/san.py                   |  450 --
 glchess/src/lib/config.py                      |  229 -
 glchess/src/lib/defaults.py.in                 |   89 -
 glchess/src/lib/display.py                     |  647 ---
 glchess/src/lib/game.py                        |  812 ---
 glchess/src/lib/ggz/Makefile.am                |    8 -
 glchess/src/lib/ggz/__init__.py                |    6 -
 glchess/src/lib/ggz/chess.py                   |  175 -
 glchess/src/lib/ggz/client.py                  |  669 ---
 glchess/src/lib/ggz/protocol.py                |  716 ---
 glchess/src/lib/glchess.py                     |    5 -
 glchess/src/lib/gtkui/Makefile.am              |   10 -
 glchess/src/lib/gtkui/__init__.py              |    3 -
 glchess/src/lib/gtkui/chessview.py             |  654 ---
 glchess/src/lib/gtkui/dialogs.py               |  830 ---
 glchess/src/lib/gtkui/gtkui.py                 |  884 ----
 glchess/src/lib/gtkui/log.py                   |  120 -
 glchess/src/lib/gtkui/network.py               |  659 ---
 glchess/src/lib/history.py                     |  160 -
 glchess/src/lib/i18n.py                        |   10 -
 glchess/src/lib/main.py                        |  747 ---
 glchess/src/lib/network.py                     |  552 --
 glchess/src/lib/player.py                      |   82 -
 glchess/src/lib/scene/Makefile.am              |    8 -
 glchess/src/lib/scene/__init__.py              |  162 -
 glchess/src/lib/scene/cairo/Makefile.am        |    5 -
 glchess/src/lib/scene/cairo/__init__.py        |  553 --
 glchess/src/lib/scene/human.py                 |  154 -
 glchess/src/lib/scene/opengl/Makefile.am       |    8 -
 glchess/src/lib/scene/opengl/__init__.py       |   25 -
 glchess/src/lib/scene/opengl/models.py         | 1543 ------
 glchess/src/lib/scene/opengl/opengl.py         |  932 ----
 glchess/src/lib/scene/opengl/texture.py        |  101 -
 glchess/src/lib/uci.py                         |  184 -
 glchess/src/lib/ui/Makefile.am                 |    6 -
 glchess/src/lib/ui/__init__.py                 |    2 -
 glchess/src/lib/ui/ui.py                       |  499 --
 glchess/src/test-chess-game.vala               |  138 +
 glines/glines.c                                |   44 +-
 glines/help/Makefile.am                        |    2 +-
 glines/help/zh_CN/zh_CN.po                     |  629 +++
 gnect/help/Makefile.am                         |    2 +-
 gnect/help/zh_CN/zh_CN.po                      |  798 +++
 gnibbles/board.c                               |   45 +-
 gnibbles/boni.c                                |    2 +-
 gnibbles/bonus.c                               |    4 +-
 gnibbles/gnibbles.c                            |    4 +-
 gnibbles/main.c                                |    6 +-
 gnibbles/warp.c                                |    4 +-
 gnibbles/warpmanager.c                         |    2 +-
 gnibbles/worm.c                                |   25 +-
 gnobots2/game.c                                |    4 +-
 gnobots2/help/Makefile.am                      |    2 +-
 gnobots2/help/zh_CN/zh_CN.po                   |  752 +++
 gnomine/gnomine.c                              |    5 +-
 gnomine/minefield.c                            |   48 +-
 gnotravex/gnotravex.c                          |   26 +-
 gnotski/gnotski.c                              |    4 +-
 gnotski/help/Makefile.am                       |    2 +-
 gnotski/help/zh_CN/zh_CN.po                    |  511 ++
 gtali/gyahtzee.c                               |   18 +-
 gtali/help/Makefile.am                         |    2 +-
 gtali/help/zh_CN/zh_CN.po                      |  637 +++
 iagno/gnothello.c                              |  141 +-
 iagno/gnothello.h                              |    4 +-
 iagno/properties.c                             |   31 +-
 iagno/properties.h                             |    2 +
 libgames-support/Makefile.am                   |    1 -
 libgames-support/eggsmclient-private.h         |    6 +
 libgames-support/eggsmclient-xsmp.c            |    5 +
 libgames-support/games-clock.c                 |   69 +-
 libgames-support/games-clock.h                 |   16 +-
 libgames-support/games-conf.c                  |    6 +-
 libgames-support/games-conf.h                  |  144 +-
 libgames-support/games-controls.c              |   79 +-
 libgames-support/games-controls.h              |   42 +-
 libgames-support/games-files.c                 |   64 +-
 libgames-support/games-files.h                 |   61 +-
 libgames-support/games-frame.c                 |   39 +-
 libgames-support/games-frame.h                 |   25 +-
 libgames-support/games-fullscreen-action.h     |   31 +-
 libgames-support/games-gridframe.c             |   79 +-
 libgames-support/games-gridframe.h             |   39 +-
 libgames-support/games-help.h                  |    7 +-
 libgames-support/games-pause-action.h          |   10 +-
 libgames-support/games-preimage.c              |   16 +-
 libgames-support/games-preimage.h              |    5 +-
 libgames-support/games-runtime.c               |    2 -
 libgames-support/games-runtime.h               |   27 +-
 libgames-support/games-score.c                 |  163 +-
 libgames-support/games-score.h                 |   45 +-
 libgames-support/games-scores-backend.c        |   81 +-
 libgames-support/games-scores-backend.h        |   30 +-
 libgames-support/games-scores-dialog-private.h |   53 -
 libgames-support/games-scores-dialog.c         |  235 +-
 libgames-support/games-scores-dialog.h         |   32 +-
 libgames-support/games-scores.c                |   93 +-
 libgames-support/games-scores.h                |   74 +-
 libgames-support/games-setgid-io.h             |   29 +-
 libgames-support/games-settings.c              |    5 +-
 libgames-support/games-settings.h              |   21 +-
 libgames-support/games-show.c                  |    2 +-
 libgames-support/games-show.h                  |   17 +-
 libgames-support/games-sound.c                 |    6 +-
 libgames-support/games-sound.h                 |   27 +-
 libgames-support/games-stock.c                 |    7 +-
 libgames-support/games-stock.h                 |    8 +-
 lightsoff/help/Makefile.am                     |    2 +-
 lightsoff/help/zh_CN/zh_CN.po                  |  357 ++
 lightsoff/src/Makefile.am                      |    1 +
 lightsoff/src/lightsoff.in                     |    2 +-
 mahjongg/help/Makefile.am                      |    2 +-
 mahjongg/help/zh_CN/zh_CN.po                   |  841 +++
 mahjongg/mahjongg.c                            |    5 +-
 po/POTFILES.in                                 |   68 +-
 po/POTFILES.skip                               |    2 +-
 po/af.po                                       |  312 +-
 po/ar.po                                       |  336 +-
 po/as.po                                       |  336 +-
 po/ast.po                                      |  312 +-
 po/bg.po                                       |  312 +-
 po/bn.po                                       |  168 +-
 po/bn_IN.po                                    |  168 +-
 po/br.po                                       |  168 +-
 po/ca.po                                       |  332 +-
 po/ca valencia po                              |  336 +-
 po/cs.po                                       | 4086 +++++++--------
 po/cy.po                                       |  168 +-
 po/da.po                                       |  330 +-
 po/de.po                                       |  312 +-
 po/dz.po                                       |   32 +-
 po/el.po                                       | 3032 ++++++-----
 po/en shaw po                                  |  312 +-
 po/en_GB.po                                    |  336 +-
 po/eo.po                                       |  168 +-
 po/es.po                                       | 3415 ++++++-------
 po/et.po                                       | 2640 +++++-----
 po/eu.po                                       |  312 +-
 po/fi.po                                       |  326 +-
 po/fr.po                                       |  312 +-
 po/ga.po                                       |  168 +-
 po/gl.po                                       | 3463 ++++++-------
 po/gu.po                                       |  312 +-
 po/he.po                                       |  757 ++--
 po/hi.po                                       |  312 +-
 po/hr.po                                       |   16 +-
 po/hu.po                                       |  312 +-
 po/id.po                                       |  312 +-
 po/it.po                                       |  312 +-
 po/ja.po                                       |  312 +-
 po/kk.po                                       |  168 +-
 po/kn.po                                       |  312 +-
 po/ko.po                                       |  312 +-
 po/lt.po                                       |  336 +-
 po/lv.po                                       |  312 +-
 po/mai.po                                      |   16 +-
 po/mk.po                                       |   32 +-
 po/ml.po                                       |  312 +-
 po/mr.po                                       |  312 +-
 po/nb.po                                       | 3382 ++++++-------
 po/ne.po                                       |   12 +-
 po/nl.po                                       |  336 +-
 po/nn.po                                       |  596 ++--
 po/oc.po                                       |   16 +-
 po/or.po                                       |  312 +-
 po/pa.po                                       | 1826 ++++----
 po/pl.po                                       |  312 +-
 po/pt.po                                       |  332 +-
 po/pt_BR.po                                    |  336 +-
 po/ro.po                                       |  312 +-
 po/ru.po                                       |  312 +-
 po/si.po                                       |    6 +-
 po/sk.po                                       |  168 +-
 po/sl.po                                       |  312 +-
 po/sr.po                                       |  332 +-
 po/sr latin po                                 |  332 +-
 po/sv.po                                       | 6591 +++++++++++++-----------
 po/ta.po                                       |  312 +-
 po/te.po                                       |  312 +-
 po/th.po                                       |  332 +-
 po/tr.po                                       |  312 +-
 po/ug.po                                       |  609 ++--
 po/uk.po                                       |  312 +-
 po/vi.po                                       |  576 ++--
 po/zh_CN.po                                    |  332 +-
 po/zh_HK.po                                    | 4291 ++++++----------
 po/zh_TW.po                                    | 4300 ++++++----------
 quadrapassel/blockops.cpp                      |   16 +-
 quadrapassel/highscores.cpp                    |    6 +-
 quadrapassel/main.cpp                          |    2 +-
 quadrapassel/renderer.cpp                      |  102 +-
 quadrapassel/renderer.h                        |    9 +-
 quadrapassel/tetris.cpp                        |    2 +-
 swell-foop/help/Makefile.am                    |    2 +-
 swell-foop/help/zh_CN/zh_CN.po                 |  522 ++
 swell-foop/src/Makefile.am                     |    2 +
 swell-foop/swell-foop.in                       |    2 +-
 263 files changed, 43116 insertions(+), 50856 deletions(-)
---
diff --cc configure.in
index 46750e7,2c8330d..c311588
--- a/configure.in
+++ b/configure.in
@@@ -1179,20 -1274,13 +1271,9 @@@ glchess/data/pieces/simple/Makefil
  glchess/data/textures/Makefile
  glchess/gnuchess/Makefile
  glchess/help/Makefile
- glchess/src/glchess.in
  glchess/src/Makefile
- glchess/src/lib/Makefile
- glchess/src/lib/defaults.py
- glchess/src/lib/chess/Makefile
- glchess/src/lib/chess/fics/Makefile
- glchess/src/lib/ggz/Makefile
- glchess/src/lib/gtkui/Makefile
- glchess/src/lib/scene/Makefile
- glchess/src/lib/scene/cairo/Makefile
- glchess/src/lib/scene/opengl/Makefile
- glchess/src/lib/ui/Makefile
  gnome-sudoku/Makefile
 -gnome-sudoku/src/gnome-sudoku.in
  gnome-sudoku/src/Makefile
 -gnome-sudoku/src/lib/Makefile
 -gnome-sudoku/src/lib/defaults.py
 -gnome-sudoku/src/lib/gtk_goodies/Makefile
  gnome-sudoku/data/Makefile
  gnome-sudoku/images/Makefile
  gnome-sudoku/help/Makefile



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]