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

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

commit 736f97f1dece0d332cc75da56c8206bc8936a8a7
Merge: ed3ea2b 5127136
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Dec 23 15:46:04 2014 +0800

    Merge branch 'master' into master.fcw

 examples/bp/gtk/menus.ui         |    2 +
 gtk/gtkapplication-quartz-menu.c |    2 +
 gtk/gtkmenusectionbox.c          |    6 +-
 gtk/gtkmenushell.c               |    6 +-
 gtk/gtkmenutracker.c             |   13 ++-
 gtk/gtkmenutracker.h             |    2 +
 gtk/gtkmenutrackeritem.c         |    8 +
 gtk/gtkmenutrackeritem.h         |    1 +
 gtk/gtknotebook.c                |    6 +-
 gtk/gtkrecentmanager.c           |  137 ++++++++--------
 po-properties/es.po              |  330 +++++++++++++++++++-------------------
 po/es.po                         |   57 ++++----
 12 files changed, 295 insertions(+), 275 deletions(-)
---