[gnome-sudoku/vala-port: 87/87] Merge branch 'master' into vala-port
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-sudoku/vala-port: 87/87] Merge branch 'master' into vala-port
- Date: Sat, 16 Nov 2013 22:48:03 +0000 (UTC)
commit a2fe1cd57aa0b299b6af427cfd4ea2f40531273a
Merge: 5cf8280 164ae0d
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Sat Nov 16 16:47:29 2013 -0600
Merge branch 'master' into vala-port
Conflicts:
configure.ac
data/gnome-sudoku.desktop.in
data/select_game.ui
src/gnome-sudoku
src/lib/Makefile.am
src/lib/dancer.py
src/lib/defaults.py
src/lib/dialog_swallower.py
src/lib/game_selector.py
src/lib/gnome_sudoku.py
src/lib/gsudoku.py
src/lib/gtk_goodies/Makefile.am
src/lib/gtk_goodies/Undo.py
src/lib/gtk_goodies/dialog_extras.py
src/lib/main.py
src/lib/number_box.py
src/lib/pausable.py
src/lib/printing.py
src/lib/saver.py
src/lib/simple_debug.py
src/lib/sudoku.py
src/lib/sudoku_maker.py
src/lib/tracker_info.py
COPYING | 41 +-
Makefile.am | 5 +
NEWS | 48 +
configure.ac | 11 +-
data/Makefile.am | 28 +-
data/gnome-sudoku.appdata.xml.in | 30 +
data/gnome-sudoku.desktop.in | 10 +
data/gnome-sudoku.desktop.in.in | 14 -
data/icons/HighContrast/Makefile.am | 6 +-
data/icons/HighContrast/scalable/gnome-sudoku.svg | 74 -
data/icons/Makefile.am | 2 +
data/icons/hicolor/Makefile.am | 2 +
...a.xml.in => org.gnome.gnome-sudoku.gschema.xml} | 4 +-
git.mk | 167 +-
gnome-sudoku.doap | 7 +
help/cs/cs.po | 2001 ++++---
help/fr/fr.po | 49 +-
po/POTFILES.in | 5 +-
po/be.po | 25 +-
po/ca.po | 2853 +--------
po/ca valencia po | 2935 +--------
po/cs.po | 30 +-
po/da.po | 27 +-
po/de.po | 37 +-
po/el.po | 158 +-
po/es.po | 142 +-
po/et.po | 16 +-
po/eu.po | 31 +-
po/fi.po | 7129 ++++++++------------
po/fr.po | 22 +-
po/gl.po | 22 +-
po/he.po | 270 +-
po/hu.po | 41 +-
po/id.po | 30 +-
po/it.po | 23 +-
po/ja.po | 24 +-
po/ko.po | 27 +-
po/lt.po | 28 +-
po/lv.po | 29 +-
po/ml.po | 452 +-
po/nb.po | 24 +-
po/pl.po | 29 +-
po/pt.po | 29 +-
po/pt_BR.po | 35 +-
po/ru.po | 4885 +-------------
po/sk.po | 168 +-
po/sl.po | 111 +-
po/sr.po | 28 +-
po/sr latin po | 28 +-
po/zh_HK.po | 37 +-
po/zh_TW.po | 37 +-
51 files changed, 5637 insertions(+), 16629 deletions(-)
---
diff --cc configure.ac
index c6319a6,2f93486..6797c50
--- a/configure.ac
+++ b/configure.ac
@@@ -13,21 -12,16 +13,24 @@@ dnl ###################################
dnl Dependencies
dnl ###########################################################################
-PYGOBJECT_REQUIRED=2.28.3
+GTK_REQUIRED=3.4.0
-PKG_CHECK_MODULES(PYGOBJECT, [
- pygobject-3.0 >= $PYGOBJECT_REQUIRED
+PKG_CHECK_MODULES(GNOME_SUDOKU, [
+ gio-2.0
+ gtk+-3.0 >= $GTK_REQUIRED
+ gee-1.0
])
+ AC_PATH_PROG([APPDATA_VALIDATE], [appdata-validate], [/bin/true])
+ AC_PATH_PROG([DESKTOP_FILE_VALIDATE], [desktop-file-validate], [/bin/true])
+
dnl ###########################################################################
+dnl GResources
+dnl ###########################################################################
+
+AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
+
+dnl ###########################################################################
dnl Internationalization
dnl ###########################################################################
@@@ -51,8 -45,10 +54,8 @@@ data/Makefil
data/icons/Makefile
data/icons/hicolor/Makefile
data/icons/HighContrast/Makefile
- data/gnome-sudoku.desktop.in
help/Makefile
src/Makefile
-src/lib/Makefile
-src/lib/defs.py
-src/lib/gtk_goodies/Makefile
+src/gnome-sudoku.gresource.xml
])
+ AC_OUTPUT
diff --cc data/gnome-sudoku.desktop.in
index 0000000,4adda84..aabb34d
mode 000000,100644..100644
--- a/data/gnome-sudoku.desktop.in
+++ b/data/gnome-sudoku.desktop.in
@@@ -1,0 -1,11 +1,10 @@@
+ [Desktop Entry]
+ _Name=Sudoku
+ _Comment=Test your logic skills in this number grid puzzle
-_Keywords=game;board;tiles;japanese;
+ Exec=gnome-sudoku
+ Icon=gnome-sudoku
+ Terminal=false
+ Type=Application
+ Categories=GNOME;GTK;Game;LogicGame;
+ StartupNotify=true
+ Version=1.0
diff --cc data/org.gnome.gnome-sudoku.gschema.xml
index fb22252,61c58ce..c93c203
--- a/data/org.gnome.gnome-sudoku.gschema.xml
+++ b/data/org.gnome.gnome-sudoku.gschema.xml
@@@ -101,10 -101,5 +101,10 @@@
<summary>Number of puzzles to print on a page</summary>
<description>Number of puzzles to print on a page</description>
</key>
+ <key name="fullscreen" type="b">
+ <default>false</default>
- <_summary>A flag to enable fullscreen mode</_summary>
- <_description>A flag to enable fullscreen mode</_description>
++ <summary>A flag to enable fullscreen mode</summary>
++ <description>A flag to enable fullscreen mode</description>
+ </key>
</schema>
</schemalist>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
