[gnome-calendar/calendar-management: 92/92] Merge branch 'master' into calendar-management

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit 55dd5f0aa6f924e67b823af0d64422ab7d5a35eb
Merge: f4d5bd7 9494326
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Fri Jan 30 13:50:49 2015 -0200

    Merge branch 'master' into calendar-management

 HACKING                                        |    8 +
 Makefile.am                                    |    1 +
 NEWS                                           |    8 +
 configure.ac                                   |    5 +-
 data/Makefile.am                               |   17 +-
 data/appdata/Makefile.am                       |    8 -
 data/appdata/org.gnome.Calendar.appdata.xml.in |   13 +-
 data/calendar.gresource.xml                    |    2 +-
 data/org.gnome.Calendar.desktop.in.in          |    1 +
 data/theme/gtk-styles.css                      |  122 ++-
 data/ui/menus.ui                               |    5 +-
 data/ui/nav_bar.ui                             |   40 -
 data/ui/window.ui                              |   41 +-
 data/ui/year-view.ui                           |  118 ++
 po/LINGUAS                                     |    2 +
 po/POTFILES.in                                 |    1 +
 po/cs.po                                       |  140 ++-
 po/es.po                                       |  144 +--
 po/eu.po                                       |  295 ++++
 po/he.po                                       |  201 +++-
 po/ru.po                                       |  396 +++---
 po/sk.po                                       |  305 +++++
 src/Makefile.am                                |    3 +-
 src/css-code.h                                 |  151 +++
 src/gcal-application.c                         |   99 +-
 src/gcal-application.h                         |    6 +-
 src/gcal-date-selector.h                       |    2 +-
 src/gcal-edit-dialog.c                         |    4 +-
 src/gcal-edit-dialog.h                         |    2 +-
 src/gcal-event-widget.c                        |   71 +-
 src/gcal-event-widget.h                        |    5 +-
 src/gcal-manager.c                             |   46 +-
 src/gcal-manager.h                             |    6 +-
 src/gcal-month-view.c                          |  258 ++--
 src/gcal-month-view.h                          |   14 +-
 src/gcal-nav-bar.c                             |  164 ---
 src/gcal-nav-bar.h                             |   53 -
 src/gcal-subscriber-view-private.h             |    3 +-
 src/gcal-subscriber-view.c                     |   23 +-
 src/gcal-time-selector.c                       |    2 +-
 src/gcal-time-selector.h                       |    2 +-
 src/gcal-utils.c                               |   76 +-
 src/gcal-utils.h                               |    5 +-
 src/gcal-view.c                                |   45 +-
 src/gcal-view.h                                |    9 +-
 src/gcal-week-view.c                           |   79 +-
 src/gcal-week-view.h                           |   15 +-
 src/gcal-window.c                              |  263 ++--
 src/gcal-window.h                              |    2 +-
 src/gcal-year-view.c                           | 1709 ++++++++++++++----------
 src/gcal-year-view.h                           |   58 +-
 src/main.c                                     |    2 +-
 52 files changed, 3210 insertions(+), 1840 deletions(-)
---
diff --cc data/Makefile.am
index 49808ff,3d74dbe..cf8db5f
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@@ -36,12 -43,12 +43,13 @@@ EXTRA_DIST=                     
    ui/date-selector.ui           \
    ui/edit-dialog.ui             \
    ui/menus.ui                   \
-   ui/nav_bar.ui                 \
    ui/search-view.ui             \
 +  ui/source-manager-dialog.ui   \
    ui/time-selector.ui           \
    ui/window.ui                  \
+   ui/year-view.ui               \
    theme/gtk-styles.css          \
+   $(appdata_in_files)           \
    $(desktop_in_files)           \
    $(gsettingsschema_in_files)
  
diff --cc data/calendar.gresource.xml
index c59d6d6,cf6dd5c..2866bd1
--- a/data/calendar.gresource.xml
+++ b/data/calendar.gresource.xml
@@@ -4,11 -4,10 +4,11 @@@
      <file alias="date-selector.ui" compressed="true" preprocess="xml-stripblanks">ui/date-selector.ui</file>
      <file alias="edit-dialog.ui" compressed="true" preprocess="xml-stripblanks">ui/edit-dialog.ui</file>
      <file alias="menus.ui" compressed="true" preprocess="xml-stripblanks">ui/menus.ui</file>
-     <file alias="nav_bar.ui" compressed="true" preprocess="xml-stripblanks">ui/nav_bar.ui</file>
      <file alias="search-view.ui" compressed="true" preprocess="xml-stripblanks">ui/search-view.ui</file>
 +    <file alias="source-manager-dialog.ui" compressed="true" 
preprocess="xml-stripblanks">ui/source-manager-dialog.ui</file>
      <file alias="time-selector.ui" compressed="true" preprocess="xml-stripblanks">ui/time-selector.ui</file>
      <file alias="window.ui" compressed="true" preprocess="xml-stripblanks">ui/window.ui</file>
+     <file alias="year-view.ui" compressed="true" preprocess="xml-stripblanks">ui/year-view.ui</file>
      <file alias="gtk-styles.css" compressed="true">theme/gtk-styles.css</file>
    </gresource>
  </gresources>