[california/wip/725785-create-recurring: 9/9] Merge branch 'master' into wip/725785-create-recurring

[Jim Nelson <jnelson src gnome org>]

commit 673ae39070932af4c5706a402e199a5175d6bacd
Merge: 6551c87 0ee60b1
Author: Jim Nelson <jim yorba org>
Date:   Wed Jun 18 19:27:06 2014 -0700

    Merge branch 'master' into wip/725785-create-recurring

 po/es.po                                    |  488 ++++++++++++++++++++-------
 po/pt_BR.po                                 |  225 +++++++------
 src/Makefile.am                             |    3 +
 src/application/california-application.vala |    9 +-
 src/application/main.vala                   |    7 +
 src/calendar/calendar-date.vala             |   13 +-
 src/calendar/calendar-olson-zone.vala       |    7 +-
 src/calendar/calendar.vala                  |   21 ++
 src/component/component-date-time.vala      |    2 +
 src/component/component-details-parser.vala |   21 ++-
 src/component/component-event.vala          |   19 +-
 src/component/component-instance.vala       |    6 +-
 src/host/host-show-event.vala               |   21 +-
 src/tests/tests-quick-add.vala              |   24 ++
 src/tests/tests-string.vala                 |   44 +++
 src/tests/tests.vala                        |    1 +
 src/util/util-markup.vala                   |   84 +++++
 src/util/util-string.vala                   |   36 ++
 src/util/util.vala                          |   26 ++
 src/view/week/week-grid.vala                |    6 +-
 vapi/libical.vapi                           |    2 +-
 21 files changed, 811 insertions(+), 254 deletions(-)
---