[gtk+/master.fcw: 645/648] Merge branch 'master' into master.fcw

[Chun-wei Fan <fanchunwei src gnome org>]

commit db9ac533c6a562aad20c0262f5bd0b83651b6644
Merge: 72a0458 9c49144
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Feb 4 12:29:38 2015 +0800

    Merge branch 'master' into master.fcw

 configure.ac                     |    2 +-
 gdk/Makefile.am                  |    1 +
 gdk/gdk-autocleanup.h            |   42 +++++
 gdk/gdk.h                        |    2 +
 gdk/x11/Makefile.am              |    1 +
 gdk/x11/gdkdevicemanager-xi2.c   |   28 +++
 gdk/x11/gdkx-autocleanups.h      |   39 ++++
 gdk/x11/gdkx.h                   |    2 +
 gtk/Makefile.am                  |    3 +
 gtk/a11y/Makefile.inc            |    1 +
 gtk/a11y/gtk-a11y-autocleanups.h |   75 ++++++++
 gtk/gtk-a11y.h                   |    2 +
 gtk/gtk-autocleanups.h           |  222 ++++++++++++++++++++++++
 gtk/gtk.h                        |    2 +
 gtk/gtkapplication.c             |    4 +
 gtk/gtkgesturezoom.h             |    2 +-
 gtk/gtkscrolledwindow.c          |    2 +-
 gtk/gtkunixprint-autocleanups.h  |   28 +++
 gtk/gtkunixprint.h               |    2 +
 gtk/gtkx-autocleanups.h          |   27 +++
 gtk/gtkx.h                       |    2 +
 po-properties/es.po              |  356 +++++++++++++++++++-------------------
 22 files changed, 666 insertions(+), 179 deletions(-)
---