[california/wip/730602-stack: 14/14] Merge branch 'master' into wip/730602-stack
- From: Jim Nelson <jnelson src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [california/wip/730602-stack: 14/14] Merge branch 'master' into wip/730602-stack
- Date: Fri, 19 Sep 2014 23:19:14 +0000 (UTC)
commit 74f7fab51489b5122a752dd7c14a0ff633dc5399
Merge: e028d4b 5d437d6
Author: Jim Nelson <jim yorba org>
Date: Fri Sep 19 16:19:04 2014 -0700
Merge branch 'master' into wip/730602-stack
Makefile.am | 1 +
THANKS | 1 +
configure.ac | 2 +
debian/control | 3 +-
help/C/cal-add-calendar.page | 139 ++++
help/C/cal-change-view.page | 65 ++
help/C/cal-event-edit.page | 123 +++
help/C/cal-event-quick-add.page | 89 ++
help/C/cal-event-remove.page | 63 ++
help/C/cal-hide-a-calendar.page | 47 ++
help/C/cal-open-calendar-list.xml | 7 +
help/C/cal-quickstart.page | 35 +
help/C/cal-remove-calendar.page.stub | 26 +
help/C/cal-rename-calendar.page | 37 +
help/C/cal-shortcut-keys.page | 91 ++
help/C/gnome-help.sct | 22 +
help/C/index.page | 49 ++
help/C/legal.xml | 5 +
help/C/media/california-screenshot.png | Bin 0 -> 28760 bytes
help/C/media/x-office-calendar.png | Bin 0 -> 2848 bytes
help/C/schematron.sh | 1 +
help/Makefile.am | 37 +
po/POTFILES.in | 1 +
po/POTFILES.skip | 1 +
po/fi.po | 373 +++++++---
po/he.po | 1140 +++++++++++++++++++++-----
po/pl.po | 296 ++++++--
po/pt_BR.po | 304 ++++++--
po/sv.po | 588 +++++++++++--
src/Makefile.am | 9 +-
src/application/california-application.vala | 35 +-
src/calendar/calendar-day-of-week.vala | 37 +
src/component/component-recurrence-rule.vala | 42 +-
src/host/host-quick-create-event.vala | 2 +-
src/toolkit/toolkit.vala | 37 +-
src/view/month/month-grid.vala | 42 +-
src/view/week/week-grid.vala | 34 +-
37 files changed, 3221 insertions(+), 563 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]