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

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

commit 573248b227e094fdc3bd1fdded828e1fd83155b2
Merge: e46ca0f 4bc3f02
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Dec 22 16:48:25 2014 +0800

    Merge branch 'master' into master.fcw
    
    Conflicts:
        gdk/win32/gdkdisplay-win32.h
        gdk/win32/gdkglcontext-win32.c

 README.in                                  |   12 +
 build/win32/vs10/gdk-win32.vcxproj         |    1 +
 build/win32/vs10/gdk-win32.vcxproj.filters |    1 +
 build/win32/vs10/gtk-install.props         |    5 +-
 build/win32/vs9/gdk-win32.vcproj           |    1 +
 build/win32/vs9/gtk-install.vsprops        |    5 +-
 demos/widget-factory/widget-factory.c      |   25 +-
 docs/reference/gtk/gtk3-sections.txt       |    1 +
 docs/tools/Makefile.am                     |    9 +-
 gdk/gdkglcontext.c                         |   17 +
 gdk/win32/gdkdisplay-win32.h               |    2 -
 gdk/win32/gdkglcontext-win32.c             |    2 -
 gdk/x11/gdkglcontext-x11.c                 |    3 +
 gdk/x11/gdksettings.c                      |    1 +
 gtk/deprecated/gtkimagemenuitem.c          |    1 +
 gtk/gtkapplication-dbus.c                  |   59 ++-
 gtk/gtkcssprovider.c                       |    2 +-
 gtk/gtkcsstransformvalue.c                 |    3 +
 gtk/gtkgesturesingle.c                     |    3 +-
 gtk/gtkmagnifier.c                         |  194 +++++-
 gtk/gtkmagnifierprivate.h                  |    4 +
 gtk/gtkmenubutton.c                        |    2 +
 gtk/gtkmenutracker.c                       |    3 +
 gtk/gtkmodelmenuitem.c                     |    1 +
 gtk/gtkpagesetup.c                         |   20 +-
 gtk/gtkprintcontext.c                      |   28 +-
 gtk/gtkrecentmanager.c                     |   24 +-
 gtk/gtktexthandle.c                        |   32 +-
 gtk/gtktextlayout.c                        |    8 +-
 gtk/gtktextview.c                          |  325 ++++++---
 gtk/gtktextview.h                          |   24 +-
 gtk/gtkwidget.c                            |   73 +--
 gtk/inspector/Makefile.inc                 |    3 +
 gtk/inspector/data-list.ui                 |    1 -
 gtk/inspector/init.c                       |    5 +
 gtk/inspector/magnifier.c                  |   80 ++
 gtk/inspector/magnifier.h                  |   54 ++
 gtk/inspector/window.c                     |    3 +
 gtk/inspector/window.h                     |    2 +-
 gtk/inspector/window.ui                    |    8 +
 gtk/inspector/window.ui.h                  |    1 +
 gtk/theme/Adwaita/_common.scss             |  133 ++--
 gtk/theme/Adwaita/_drawing.scss            |   44 +-
 gtk/theme/Adwaita/gtk-contained-dark.css   |  707 ++++++++++--------
 gtk/theme/Adwaita/gtk-contained.css        |  702 ++++++++++--------
 po-properties/POTFILES.in                  |    1 +
 po-properties/de.po                        |  897 +++++++++++++---------
 po-properties/es.po                        | 1141 ++++++++++++++--------------
 po/POTFILES.in                             |    2 +
 po/es.po                                   |  718 +++++++++---------
 po/he.po                                   |   96 ++-
 testsuite/reftests/Makefile.am             |    2 +-
 52 files changed, 3295 insertions(+), 2196 deletions(-)
---