This is an automated email from the git hooks/post-receive script. peter pushed a commit to branch stephan/new-ui in repository apps/squeeze.
commit 270bad3819ee1e87801dbb6302d7bf3859a7d272 Merge: ba043fd 100870e Author: Peter de Ridder <pe...@xfce.org> Date: Fri Oct 31 14:37:50 2014 +0100 Merge branch 'master' into stephan/new-ui Conflicts: configure.ac.in configure.ac.in | 9 +- data/gnu-tar.squeeze.in | 4 +- data/unzip.squeeze.in | 4 +- data/zip.squeeze.in | 4 +- libsqueeze/execute-context.c | 2 +- module.xml | 20 -- po/ar.po | 56 +++--- po/ast.po | 245 +++++++++++-------------- po/{ko.po => bg.po} | 228 +++++++++++------------ po/de.po | 281 +++++----------------------- po/el.po | 140 +++++++------- po/{tl_PH.po => en_AU.po} | 289 +++++++++++++---------------- po/es.po | 360 ++++++++---------------------------- po/fr.po | 360 +++++++++--------------------------- po/he.po | 110 +++++------ po/hr.po | 106 +++++------ po/ja.po | 235 ++++++++++-------------- po/ko.po | 2 +- po/{ku.po => ms.po} | 293 +++++++++++++++--------------- po/{hr.po => nb.po} | 233 +++++++++++------------- po/nl.po | 258 +++++++------------------- po/{hr.po => oc.po} | 230 +++++++++++------------ po/pt_BR.po | 361 +++++++++--------------------------- po/ru.po | 165 ++++++++--------- po/{hr.po => sr.po} | 232 ++++++++++++------------ po/th.po | 412 ++++++++++++++++++++++++++++++++++++++++++ po/ug.po | 298 ++++++++++++++++++------------ po/zh_TW.po | 11 +- squeeze-cli/cli.c | 82 +++++---- squeeze-cli/main.c | 2 +- stamp-h.in | 1 - 31 files changed, 2182 insertions(+), 2851 deletions(-) diff --cc configure.ac.in index 88b2ea4,9dff30d..6881f66 --- a/configure.ac.in +++ b/configure.ac.in @@@ -70,13 -70,14 +70,10 @@@ dnl Check for i18n suppor XDT_I18N([@LINGUAS@]) - XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0]) - XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.24.0]) - XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.20.0]) -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) -XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.36.0]) -XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.36.0]) -XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.36.0]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0]) - XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [0.34]) + XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [0.84]) - XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.7.0]) + XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.8.0]) dnl Some distro's have dbus < 1.0, need to define the following to make it compile. (Squeeze depends on the glib-bindings anyways) AC_DEFINE([DBUS_API_SUBJECT_TO_CHANGE], [1], [Define we understand dbus is subject to api churn]) -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits