[california/wip/732302-help: 121/121] Merge branch 'master' into wip/732302-help
- From: Jim Campbell <jcampbell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [california/wip/732302-help: 121/121] Merge branch 'master' into wip/732302-help
- Date: Thu, 18 Sep 2014 05:02:24 +0000 (UTC)
commit e2d9cca8872167d1a16cc7dcbed0db016168d2c3
Merge: e6e179a bf0b942
Author: Jim Campbell <jcampbell gnome org>
Date: Wed Sep 17 23:57:52 2014 -0500
Merge branch 'master' into wip/732302-help
Merging in changes from master into my WIP help branch in advance of
the 0.2 release.
Makefile.am | 8 +
NEWS | 29 +
THANKS | 3 +
california.doap | 6 +-
configure.ac | 22 +-
data/Makefile.am | 18 +-
...ornia.appdata.xml => california.appdata.xml.in} | 22 +-
data/icons/edit-symbolic.svg | 76 +
data/org.yorba.california.gschema.xml | 4 +-
debian/changelog | 33 +
debian/control | 2 +-
po/LINGUAS | 1 +
po/POTFILES.in | 22 +-
po/POTFILES.skip | 11 +-
po/cs.po | 808 +++++++++---
po/de.po | 589 ++++++--
po/el.po | 742 ++++++++---
po/es.po | 695 +++++++---
po/fi.po | 1397 +++++++++++++++++--
po/he.po | 1140 +++++++++++++---
po/hu.po | 364 ++++-
po/id.po | 1178 ++++++++++++++++
po/pl.po | 978 +++++++++++--
po/pt_BR.po | 984 +++++++++++---
po/sl.po | 2 +-
po/sv.po | 1450 ++++++++++++++++++--
src/Makefile.am | 50 +-
src/activator/activator-instance-list.vala | 5 +-
src/activator/activator-instance.vala | 2 +-
src/activator/activator-window.vala | 47 -
src/activator/activator.vala | 19 +-
.../caldav/caldav-activator-instance.vala | 27 +
src/activator/caldav/caldav-subscribe.vala | 31 +
.../generic-subscribe.vala} | 47 +-
...-google.vala => google-activator-instance.vala} | 14 +-
...g-pane.vala => google-authenticating-pane.vala} | 21 +-
...st-pane.vala => google-calendar-list-pane.vala} | 10 +-
...ogle-login-pane.vala => google-login-pane.vala} | 15 +-
...-webcal.vala => webcal-activator-instance.vala} | 14 +-
src/activator/webcal/webcal-subscribe.vala | 31 +
src/application/california-application.vala | 45 +-
src/application/california-resource.vala | 24 +-
src/application/california-settings.vala | 15 +-
.../backing-calendar-source-subscription.vala | 146 ++-
src/backing/backing-calendar-source.vala | 10 +-
src/backing/backing-error.vala | 6 +-
src/backing/backing-source.vala | 29 +-
src/backing/backing-store.vala | 15 +
.../backing-eds-calendar-source-subscription.vala | 209 ++-
src/backing/eds/backing-eds-calendar-source.vala | 89 +-
src/backing/eds/backing-eds-store.vala | 42 +-
src/base/base-object.vala | 10 +-
src/calendar/calendar-date-ordering.vala | 47 +
src/calendar/calendar-date-span.vala | 24 +
src/calendar/calendar-date.vala | 15 +-
src/calendar/calendar-day-of-week.vala | 58 +
src/calendar/calendar-exact-time-span.vala | 60 +
src/calendar/calendar-exact-time.vala | 21 +
src/calendar/calendar-first-of-week.vala | 9 +-
src/calendar/calendar-span.vala | 2 +-
src/calendar/calendar-system.vala | 160 +++-
src/calendar/calendar-wall-time.vala | 133 ++-
src/calendar/calendar.vala | 44 +
src/california-resources.xml | 19 +-
src/collection/collection-iterable.vala | 30 +-
src/collection/collection.vala | 30 +
src/component/component-date-time.vala | 112 +-
src/component/component-details-parser.vala | 295 ++++-
src/component/component-event.vala | 220 ++--
src/component/component-instance.vala | 229 +++-
src/component/component-recurrence-rule.vala | 348 +++++-
src/host/host-create-update-event.vala | 400 +++---
src/host/host-create-update-recurring.vala | 604 ++++++++
src/host/host-date-time-widget.vala | 371 +++++
src/host/host-event-time-settings.vala | 228 +++
src/host/host-import-calendar.vala | 2 +-
src/host/host-main-window-title.vala | 56 +
src/host/host-main-window.vala | 190 ++-
src/host/host-quick-create-event.vala | 135 ++-
src/host/host-show-event.vala | 135 ++-
src/host/host.vala | 27 +
src/manager/manager-calendar-list.vala | 45 +-
src/manager/manager-remove-calendar.vala | 79 ++
src/manager/manager-window.vala | 21 +-
src/rc/activator-list.ui | 8 +-
src/rc/app-menu.interface | 9 +-
src/rc/calendar-import.ui | 3 +-
src/rc/calendar-manager-list-item.ui | 3 +
src/rc/calendar-manager-list.ui | 119 ++-
src/rc/create-update-event.ui | 383 +++---
src/rc/create-update-recurring.ui | 572 ++++++++
src/rc/date-time-widget.ui | 250 ++++
src/rc/event-time-settings.ui | 155 +++
.../{webcal-subscribe.ui => generic-subscribe.ui} | 112 +-
src/rc/google-authenticating.ui | 9 +-
src/rc/google-calendar-list.ui | 6 +-
src/rc/google-login.ui | 19 +-
src/rc/main-window-title.ui | 84 ++
src/rc/quick-create-event.ui | 234 +++-
src/rc/remove-calendar.ui | 119 ++
src/rc/show-event.ui | 285 +---
src/tests/tests-calendar-exact-time.vala | 63 +
src/tests/tests-calendar-wall-time.vala | 91 +-
src/tests/tests-iterable.vala | 45 +
src/tests/tests-quick-add-recurring.vala | 44 +-
src/tests/tests-quick-add.vala | 327 +++++-
src/tests/tests.vala | 2 +
src/toolkit/toolkit-button-connector.vala | 148 +--
src/toolkit/toolkit-button-event.vala | 4 +-
src/toolkit/toolkit-calendar-popup.vala | 26 +-
src/toolkit/toolkit-card.vala | 101 +-
src/toolkit/toolkit-combo-box-text-model.vala | 18 +
src/toolkit/toolkit-deck-popover.vala | 108 ++
src/toolkit/toolkit-deck-window.vala | 39 +-
src/toolkit/toolkit-deck.vala | 101 +-
.../toolkit-entry-clear-text-connector.vala | 66 +
src/toolkit/toolkit-entry-filter-connector.vala | 87 ++
src/toolkit/toolkit-listbox-model.vala | 10 +
src/toolkit/toolkit-rotating-button-box.vala | 148 ++
src/toolkit/toolkit.vala | 29 +
src/util/util-numeric.vala | 17 +
src/util/util-scheduled.vala | 18 +
src/util/util-uri.vala | 24 +-
src/view/common/common-events-cell.vala | 44 +-
src/view/month/month-cell.vala | 17 +-
src/view/month/month-controller.vala | 27 +-
src/view/month/month-grid.vala | 257 ++--
src/view/month/month.vala | 2 +
src/view/view-chronology-motion.vala | 20 +
src/view/view-controllable.vala | 50 +
src/view/view.vala | 4 +
src/view/week/week-controller.vala | 20 +
src/view/week/week-day-pane.vala | 121 ++-
src/view/week/week-grid.vala | 44 +-
vapi/langinfo.vapi | 100 ++
vapi/libecal-1.2.vapi | 3 +-
vapi/libecal-1.2/libecal-1.2.metadata | 5 +-
137 files changed, 16903 insertions(+), 3403 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
