[five-or-more/vala-port: 137/137] Merge branch 'master' into vala-port
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [five-or-more/vala-port: 137/137] Merge branch 'master' into vala-port
- Date: Sat, 16 Nov 2013 22:52:50 +0000 (UTC)
commit 1bce75b452a651b99f784bceb44b0f9fc7e24b27
Merge: 93e5ca1 3c15eed
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Sat Nov 16 16:51:18 2013 -0600
Merge branch 'master' into vala-port
Conflicts:
data/five-or-more.ui
data/org.gnome.five-or-more.gschema.xml.in
src/glines.c
src/glines.h
COPYING | 41 +-
NEWS | 72 +
configure.ac | 11 +-
data/Makefile.am | 33 +-
data/classic.png | Bin 0 -> 22957 bytes
data/dots.png | Bin 0 -> 26927 bytes
data/five-or-more.appdata.xml.in | 23 +
data/five-or-more.ui | 7 +-
...ive-or-more.desktop.in.in => glines.desktop.in} | 5 +-
data/gumball.png | Bin 0 -> 35735 bytes
data/menu.ui | 37 +
data/org.gnome.five-or-more.gschema.xml | 55 +
data/org.gnome.five-or-more.gschema.xml.in | 40 -
data/pulse.png | Bin 0 -> 33780 bytes
five-or-more.doap | 7 +
help/C/bug-filing.page | 16 +-
help/C/index.page | 8 +-
help/C/shortcuts.page | 6 +-
help/C/translate.page | 2 +-
help/Makefile.am | 2 +-
help/cs/cs.po | 1485 ++-
help/es/es.po | 91 +-
help/fr/fr.po | 81 +-
help/hu/hu.po | 1068 ++
help/pt_BR/pt_BR.po | 1079 ++
po/LINGUAS | 1 +
po/POTFILES.in | 6 +-
po/POTFILES.skip | 2 +-
po/be.po | 4505 +--------
po/ca.po | 4608 +--------
po/ca valencia po | 4619 +--------
po/cs.po | 4455 +--------
po/da.po | 6584 +++++--------
po/de.po | 4956 +---------
po/el.po | 6657 +++++--------
po/es.po | 6609 +++++--------
po/et.po | 4645 ++++-----
po/eu.po | 6727 +++++--------
po/fa.po | 6680 +++++--------
po/fi.po | 6606 +++++--------
po/fr.po | 4582 +--------
po/gl.po | 6588 +++++--------
po/he.po | 7297 +++++--------
po/hi.po |10827 ++++++++------------
po/hu.po | 6613 +++++--------
po/id.po | 4492 +--------
po/it.po | 4537 +--------
po/ja.po | 6246 +-----------
po/ko.po | 4555 +--------
po/lt.po | 4749 +--------
po/lv.po | 6628 +++++--------
po/ml.po | 5928 ++++-------
po/nb.po | 4491 +--------
po/nl.po | 7638 +++++---------
po/pl.po | 4520 +--------
po/pt.po | 6876 +++++--------
po/pt_BR.po | 9798 ++++--------------
po/ru.po | 4958 +---------
po/sk.po | 5074 +---------
po/sl.po | 4960 +---------
po/sr.po | 4568 +--------
po/sr latin po | 4568 +--------
po/ta.po | 6604 +++++--------
po/tg.po | 474 +
po/ug.po | 6738 +++++--------
po/zh_HK.po | 4846 ++--------
po/zh_TW.po | 4861 ++--------
67 files changed, 55903 insertions(+), 169942 deletions(-)
---
diff --cc configure.ac
index 3eebdab,21f6339..fb66671
--- a/configure.ac
+++ b/configure.ac
@@@ -22,17 -64,12 +22,20 @@@ PKG_CHECK_MODULES(FIVE_OR_MORE,
gmodule-2.0
gtk+-3.0 >= $GTK_REQUIRED
librsvg-2.0 >= $RSVG_REQUIRED
+ gee-1.0 >= $GEE_REQUIRED
])
+ AC_PATH_PROG([APPDATA_VALIDATE], [appdata-validate], [/bin/true])
+ AC_PATH_PROG([DESKTOP_FILE_VALIDATE], [desktop-file-validate], [/bin/true])
+
dnl ###########################################################################
+dnl GResources
+dnl ###########################################################################
+
+GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
+AC_SUBST(GLIB_COMPILE_RESOURCES)
+
+dnl ###########################################################################
dnl Internationalization
dnl ###########################################################################
@@@ -55,8 -92,7 +58,8 @@@ Makefil
po/Makefile.in
data/Makefile
data/icons/Makefile
- data/five-or-more.desktop.in
help/Makefile
src/Makefile
+src/five-or-more.gresource.xml
])
+ AC_OUTPUT
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
