[california/wip/725767-week: 4/4] Merge branch 'master' into wip/725767-week

[Jim Nelson <jnelson src gnome org>]

commit decc843c9c73bdc0a22808792cf6aca2066903c5
Merge: aee42a5 0e10af3
Author: Jim Nelson <jim yorba org>
Date:   Mon May 19 17:44:02 2014 -0700

    Merge branch 'master' into wip/725767-week
    
    Conflicts:
        src/host/host-main-window.vala

 po/cs.po                                         |   94 ++++++++++++---------
 src/Makefile.am                                  |    1 -
 src/backing/eds/backing-eds-calendar-source.vala |    3 +
 src/base/base-properties.vala                    |   54 ------------
 src/host/host-main-window.vala                   |   15 ++++
 src/host/host-quick-create-event.vala            |   10 ++-
 src/manager/manager-calendar-list-item.vala      |   20 ++++-
 7 files changed, 96 insertions(+), 101 deletions(-)
---
diff --cc src/host/host-main-window.vala
index 5c42d69,af21484..87314ee
--- a/src/host/host-main-window.vala
+++ b/src/host/host-main-window.vala
@@@ -91,6 -67,8 +91,7 @@@ public class MainWindow : Gtk.Applicati
          set_titlebar(headerbar);
  #endif
          
 -        Gtk.Button today = new Gtk.Button.with_label(_("_Today"));
+         today.valign = Gtk.Align.CENTER;
          today.use_underline = true;
          today.tooltip_text = _("Jump to today's date (Ctrl+T)");
          today.set_action_name(ACTION_JUMP_TO_TODAY);
@@@ -123,9 -94,9 +126,10 @@@
          // pack left-side of window
          headerbar.pack_start(today);
          headerbar.pack_start(nav_buttons);
 +        headerbar.pack_start(view_switcher);
          
          quick_add_button = new Gtk.Button.from_icon_name("list-add-symbolic", Gtk.IconSize.MENU);
+         quick_add_button.valign = Gtk.Align.CENTER;
          quick_add_button.tooltip_text = _("Quick add event (Ctrl+N)");
          quick_add_button.set_action_name(ACTION_QUICK_CREATE_EVENT);