Ubuntu Calendar App

Merge lp:~nik90/ubuntu-calendar-app/new-event-style into lp:ubuntu-calendar-app

  1. new-event-style
  2. Merge into trunk
Proposed by Nekhelesh Ramananthan
Status: Work in progress
Proposed branch: lp:~nik90/ubuntu-calendar-app/new-event-style
Merge into: lp:ubuntu-calendar-app
Diff against target: 564 lines (+139/-93)
7 files modified
EventBubble.qml (+29/-22)
MonthComponentDateDelegate.qml (+8/-18)
calendar.qml (+1/-4)
click/calendar-helper-apparmor.json (+1/-1)
click/calendar.apparmor (+1/-1)
click/manifest.json.in (+2/-2)
po/com.ubuntu.calendar.pot (+97/-45)
To merge this branch: bzr merge lp:~nik90/ubuntu-calendar-app/new-event-style
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Needs Fixing
Ubuntu Calendar Developers Pending
Review via email: mp+287324@code.launchpad.net

Commit message

- Updated event bubble style to match new design
- Housekeeping stuff (updating version to 0.5 and framework to 15.04.3)
- Updated month view ubuntushape style
- Changed background to white

Description of the change

- Updated event bubble style to match new design
- Housekeeping stuff (updating version to 0.5 and framework to 15.04.3)
- Updated month view ubuntushape style
- Changed background to white

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:764
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1076/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/632/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1076/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp:~nik90/ubuntu-calendar-app/new-event-style updated
765. By Nekhelesh Ramananthan

update policy version to 1.3

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:765
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1077/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/633/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1077/rebuild

review: Needs Fixing (continuous-integration)
Reply

Unmerged revisions

765. By Nekhelesh Ramananthan

update policy version to 1.3

764. By Nekhelesh Ramananthan

Updated calendar version to 0.5

763. By Nekhelesh Ramananthan

Updated framework version to 15.04.3

762. By Nekhelesh Ramananthan

Changed background color to white

761. By Nekhelesh Ramananthan

Tweaked month view a bit

760. By Nekhelesh Ramananthan

Changed event style in day and week view

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'EventBubble.qml'
--- EventBubble.qml 2016-01-29 14:35:14 +0000
+++ EventBubble.qml 2016-02-26 17:14:41 +0000
@@ -37,9 +37,8 @@
3737
38 property Flickable flickable;38 property Flickable flickable;
3939
40 readonly property int minimumHeight: type == wideType40 readonly property int minimumHeight: type == wideType ? detailsItems.timeLabelHeight + /*top-bottom margin*/ units.gu(2)
41 ? detailsItems.timeLabelHeight + /*top-bottom margin*/ units.gu(2)41 : units.gu(2)
42 : units.gu(2)
4342
44 z: depthInRow43 z: depthInRow
4544
@@ -48,7 +47,14 @@
48 Rectangle{47 Rectangle{
49 id: bg48 id: bg
50 anchors.fill: parent49 anchors.fill: parent
51 border.color: isLiveEditing ? "red" : "white"50 border.color: lg.color
51 border.width: units.dp(1)
52 opacity: 0.5
53 Rectangle {
54 id: lg
55 anchors { left: parent.left; top: parent.top; bottom: parent.bottom }
56 width: units.dp(5)
57 }
52 }58 }
5359
54 function resize() {60 function resize() {
@@ -77,13 +83,16 @@
77 if( event.endDateTime >= now) {83 if( event.endDateTime >= now) {
78 if( getOwnersStatus(collection) === EventAttendee.StatusDeclined ) {84 if( getOwnersStatus(collection) === EventAttendee.StatusDeclined ) {
79 //if owner of account is not attending event the dim it85 //if owner of account is not attending event the dim it
80 bg.color = Qt.tint( collection.color, "#aaffffff" );86 lg.color = collection.color
87 bg.color = Qt.tint(collection.color, "#DDFFFFFF")
81 } else {88 } else {
82 bg.color = collection.color89 lg.color = collection.color
90 bg.color = Qt.tint(collection.color, "#77FFFFFF")
83 }91 }
84 } else {92 } else {
85 //if event is on past then add some white color to original color93 //if event is on past then add some white color to original color
86 bg.color = Qt.tint( collection.color, "#aaffffff" );94 lg.color = collection.color
95 bg.color = Qt.tint(collection.color, "#DDFFFFFF")
87 }96 }
88 }97 }
89 }98 }
@@ -149,9 +158,7 @@
149 timeLabel.text = i18n.tr("%1 <b>%2</b>").arg(timeString).arg(event.displayLabel);158 timeLabel.text = i18n.tr("%1 <b>%2</b>").arg(timeString).arg(event.displayLabel);
150 }159 }
151 } else {160 } else {
152 timeLabel.text = event.displayLabel;161 titleLabel.text = event.displayLabel;
153 timeLabel.horizontalAlignment = Text.AlignHCenter
154 timeLabel.wrapMode = Text.WrapAtWordBoundaryOrAnywhere
155 }162 }
156163
157 layoutBubbleDetails();164 layoutBubbleDetails();
@@ -172,26 +179,26 @@
172 top: parent.top179 top: parent.top
173 left: parent.left180 left: parent.left
174 right: parent.right181 right: parent.right
175 margins: units.gu(0.5)182 leftMargin: units.gu(2)
176 }183 margins: units.gu(1)
177
178 Label {
179 id: timeLabel
180 objectName: "timeLabel"
181 color: "White"
182 fontSize:"small"
183 font.bold: true
184 width: parent.width
185 }184 }
186185
187 Label {186 Label {
188 id: titleLabel187 id: titleLabel
189 objectName: "titleLabel"188 objectName: "titleLabel"
190 color: "White"189 textSize: type === wideType ? Label.Medium : Label.Small
191 fontSize: "small"190 font.bold: true
192 width: parent.width191 width: parent.width
193 wrapMode: Text.WrapAtWordBoundaryOrAnywhere192 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
194 }193 }
194
195 Label {
196 id: timeLabel
197 objectName: "timeLabel"
198 textSize: Label.Small
199 width: parent.width
200 visible: type == wideType
201 }
195 }202 }
196203
197 onHeightChanged: {204 onHeightChanged: {
198205
=== modified file 'MonthComponentDateDelegate.qml'
--- MonthComponentDateDelegate.qml 2016-02-03 08:06:25 +0000
+++ MonthComponentDateDelegate.qml 2016-02-26 17:14:41 +0000
@@ -96,7 +96,7 @@
96 Loader{ 96 Loader{
97 sourceComponent: showEvent ? eventIndicatorComp : undefined97 sourceComponent: showEvent ? eventIndicatorComp : undefined
98 onSourceComponentChanged: {98 onSourceComponentChanged: {
99 width = Qt.binding( function() { return units.gu(0.8)})99 width = Qt.binding( function() { return units.gu(1)})
100 height = Qt.binding( function() { return width })100 height = Qt.binding( function() { return width })
101 anchors.horizontalCenter = Qt.binding( function() { return parent.horizontalCenter })101 anchors.horizontalCenter = Qt.binding( function() { return parent.horizontalCenter })
102 anchors.top = Qt.binding( function() { return parent.verticalCenter })102 anchors.top = Qt.binding( function() { return parent.verticalCenter })
@@ -105,7 +105,7 @@
105 return (dateRootItem.height > dateRootItem.width ? dateRootItem.width :dateRootItem.height) / 2 + units.gu(1.5)105 return (dateRootItem.height > dateRootItem.width ? dateRootItem.width :dateRootItem.height) / 2 + units.gu(1.5)
106 } else {106 } else {
107 var w = (dateRootItem.height > dateRootItem.width ? dateRootItem.width :dateRootItem.height)/1.3107 var w = (dateRootItem.height > dateRootItem.width ? dateRootItem.width :dateRootItem.height)/1.3
108 return (w/2) + units.gu(0.1)108 return (w/2) + units.gu(0.5)
109 }109 }
110 });110 });
111 }111 }
@@ -115,27 +115,17 @@
115 id: eventIndicatorComp115 id: eventIndicatorComp
116 Rectangle {116 Rectangle {
117 anchors.fill: parent117 anchors.fill: parent
118 radius: height/2118 radius: height/3
119 color: "black"119 color: UbuntuColors.lightGrey
120 }120 }
121 }121 }
122122
123 Component{123 Component{
124 id: highLightComp124 id: highLightComp
125 UbuntuShape{125 UbuntuShape {
126 color: {126 aspect: UbuntuShape.Flat
127 if( isToday && !isSelected ) {127 backgroundColor: isToday && !isSelected ? UbuntuColors.orange : UbuntuColors.lightGrey
128 "#DD4814"128 relativeRadius: 0.74
129 } else {
130 "gray"
131 }
132 }
133
134 Rectangle{
135 anchors.fill: parent
136 anchors.margins: units.gu(0.5)
137 color: isToday ? "#DD4814" : "darkgray"
138 }
139 }129 }
140 }130 }
141131
142132
=== modified file 'calendar.qml'
--- calendar.qml 2016-02-03 14:55:42 +0000
+++ calendar.qml 2016-02-26 17:14:41 +0000
@@ -91,10 +91,7 @@
91 height: units.gu(80)91 height: units.gu(80)
92 focus: true92 focus: true
93 Keys.forwardTo: [pageStack.currentPage]93 Keys.forwardTo: [pageStack.currentPage]
9494 backgroundColor: "#FFFFFF"
95 headerColor: "#E8E8E8"
96 backgroundColor: "#f5f5f5"
97 footerColor: "#ECECEC"
98 anchorToKeyboard: true95 anchorToKeyboard: true
9996
100 Connections {97 Connections {
10198
=== modified file 'click/calendar-helper-apparmor.json'
--- click/calendar-helper-apparmor.json 2015-12-16 10:51:01 +0000
+++ click/calendar-helper-apparmor.json 2016-02-26 17:14:41 +0000
@@ -3,5 +3,5 @@
3 "policy_groups": [3 "policy_groups": [
4 "push-notification-client"4 "push-notification-client"
5 ],5 ],
6 "policy_version": 1.26 "policy_version": 1.3
7}7}
88
=== modified file 'click/calendar.apparmor'
--- click/calendar.apparmor 2015-12-16 10:51:01 +0000
+++ click/calendar.apparmor 2016-02-26 17:14:41 +0000
@@ -6,5 +6,5 @@
6 "accounts",6 "accounts",
7 "push-notification-client"7 "push-notification-client"
8 ],8 ],
9 "policy_version": 1.29 "policy_version": 1.3
10}10}
1111
=== modified file 'click/manifest.json.in'
--- click/manifest.json.in 2015-12-16 10:51:01 +0000
+++ click/manifest.json.in 2016-02-26 17:14:41 +0000
@@ -1,7 +1,7 @@
1{1{
2 "architecture": "all",2 "architecture": "all",
3 "description": "A calendar for Ubuntu which syncs with online accounts",3 "description": "A calendar for Ubuntu which syncs with online accounts",
4 "framework": "ubuntu-sdk-14.10-qml",4 "framework": "ubuntu-sdk-15.04.3-qml",
5 "hooks": {5 "hooks": {
6 "calendar": {6 "calendar": {
7 "account-application": "@PROJECT_NAME@_@APP_NAME@.application",7 "account-application": "@PROJECT_NAME@_@APP_NAME@.application",
@@ -18,7 +18,7 @@
18 "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",18 "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",
19 "name": "@PROJECT_NAME@",19 "name": "@PROJECT_NAME@",
20 "title": "Calendar",20 "title": "Calendar",
21 "version": "0.4.@BZR_REVNO@",21 "version": "0.5.@BZR_REVNO@",
22 "x-source": {22 "x-source": {
23 "vcs-bzr": "@BZR_SOURCE@",23 "vcs-bzr": "@BZR_SOURCE@",
24 "vcs-bzr-revno": "@BZR_REVNO@"24 "vcs-bzr-revno": "@BZR_REVNO@"
2525
=== modified file 'po/com.ubuntu.calendar.pot'
--- po/com.ubuntu.calendar.pot 2016-02-17 14:56:56 +0000
+++ po/com.ubuntu.calendar.pot 2016-02-26 17:14:41 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: \n"9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2016-01-11 21:36+0800\n"11"POT-Creation-Date: 2016-02-26 21:49+0530\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,30 +18,39 @@
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
2020
21#: ../AgendaView.qml:51 ../DayView.qml:40 ../MonthView.qml:3921#: ../AgendaView.qml:52 ../DayView.qml:41 ../MonthView.qml:40
22#: ../WeekView.qml:44 ../YearView.qml:3622#: ../WeekView.qml:45 ../YearView.qml:43
23msgid "Today"23msgid "Today"
24msgstr ""24msgstr ""
2525
26#: ../AgendaView.qml:9226#: ../AgendaView.qml:62 ../calendar.qml:288 ../calendar.qml:509
27msgid "Agenda"
28msgstr ""
29
30#: ../AgendaView.qml:101
27msgid "No upcoming events"31msgid "No upcoming events"
28msgstr ""32msgstr ""
2933
30#: ../AgendaView.qml:9534#: ../AgendaView.qml:104
31msgid "You have no calendars enabled"35msgid "You have no calendars enabled"
32msgstr ""36msgstr ""
3337
34#: ../AgendaView.qml:10538#: ../AgendaView.qml:114
35msgid "Enable calendars"39msgid "Enable calendars"
36msgstr ""40msgstr ""
3741
38#. TRANSLATORS: the first argument (%1) refers to a start time for an event,42#. TRANSLATORS: the first argument (%1) refers to a start time for an event,
39#. while the second one (%2) refers to the end time43#. while the second one (%2) refers to the end time
40#: ../AgendaView.qml:168 ../EventBubble.qml:13344#: ../AgendaView.qml:177 ../EventBubble.qml:142
41#, qt-format45#, qt-format
42msgid "%1 - %2"46msgid "%1 - %2"
43msgstr ""47msgstr ""
4448
49#: ../AgendaView.qml:183
50#, qt-format
51msgid "%1 %2 %3 %4 %5"
52msgstr ""
53
45#. TRANSLATORS: the first parameter refers to the number of all-day events54#. TRANSLATORS: the first parameter refers to the number of all-day events
46#. on a given day. "Ev." is short form for "Events".55#. on a given day. "Ev." is short form for "Events".
47#. Please keep the translation of "Ev." to 3 characters only, as the week view56#. Please keep the translation of "Ev." to 3 characters only, as the week view
@@ -59,21 +68,21 @@
59msgstr[0] ""68msgstr[0] ""
60msgstr[1] ""69msgstr[1] ""
6170
62#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:6071#: ../CalendarChoicePopup.qml:33 ../EventActions.qml:63
63msgid "Calendars"72msgid "Calendars"
64msgstr ""73msgstr ""
6574
66#: ../CalendarChoicePopup.qml:3775#: ../CalendarChoicePopup.qml:37 ../Settings.qml:32
67msgid "Back"76msgid "Back"
68msgstr ""77msgstr ""
6978
70#. TRANSLATORS: Please translate this string to 15 characters only.79#. TRANSLATORS: Please translate this string to 15 characters only.
71#. Currently ,there is no way we can increase width of action menu currently.80#. Currently ,there is no way we can increase width of action menu currently.
72#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:3681#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:37
73msgid "Sync"82msgid "Sync"
74msgstr ""83msgstr ""
7584
76#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:3685#: ../CalendarChoicePopup.qml:51 ../EventActions.qml:37
77msgid "Syncing"86msgid "Syncing"
78msgstr ""87msgstr ""
7988
@@ -101,10 +110,16 @@
101#. TRANSLATORS: this is a time formatting string,110#. TRANSLATORS: this is a time formatting string,
102#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.111#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
103#. It's used in the header of the month and week views112#. It's used in the header of the month and week views
104#: ../DayView.qml:59 ../MonthView.qml:60 ../WeekView.qml:63113#: ../DayView.qml:64 ../DayView.qml:157 ../MonthView.qml:62
114#: ../MonthView.qml:149 ../WeekView.qml:68 ../WeekView.qml:180
105msgid "MMMM yyyy"115msgid "MMMM yyyy"
106msgstr ""116msgstr ""
107117
118#: ../DayView.qml:155 ../MonthView.qml:144 ../WeekView.qml:178
119#, qt-format
120msgid "%1 %2"
121msgstr ""
122
108#: ../DeleteConfirmationDialog.qml:31123#: ../DeleteConfirmationDialog.qml:31
109msgid "Delete Recurring Event"124msgid "Delete Recurring Event"
110msgstr ""125msgstr ""
@@ -136,7 +151,7 @@
136msgid "Delete"151msgid "Delete"
137msgstr ""152msgstr ""
138153
139#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:324154#: ../EditEventConfirmationDialog.qml:29 ../NewEvent.qml:325
140msgid "Edit Event"155msgid "Edit Event"
141msgstr ""156msgstr ""
142157
@@ -154,46 +169,70 @@
154msgid "Edit this"169msgid "Edit this"
155msgstr ""170msgstr ""
156171
157#: ../EventActions.qml:50 ../NewEvent.qml:324172#: ../EventActions.qml:52 ../NewEvent.qml:325
158msgid "New Event"173msgid "New Event"
159msgstr ""174msgstr ""
160175
176#: ../EventActions.qml:75 ../Settings.qml:30
177msgid "Settings"
178msgstr ""
179
161#. TRANSLATORS: the first argument (%1) refers to a time for an event,180#. TRANSLATORS: the first argument (%1) refers to a time for an event,
162#. while the second one (%2) refers to title of event181#. while the second one (%2) refers to title of event
163#: ../EventBubble.qml:144 ../EventBubble.qml:149182#: ../EventBubble.qml:153 ../EventBubble.qml:158
164#, qt-format183#, qt-format
165msgid "%1 <b>%2</b>"184msgid "%1 <b>%2</b>"
166msgstr ""185msgstr ""
167186
168#: ../EventDetails.qml:43 ../NewEvent.qml:435187#: ../EventDetails.qml:44 ../NewEvent.qml:436
169msgid "Event Details"188msgid "Event Details"
170msgstr ""189msgstr ""
171190
172#. TRANSLATORS: the first parameter refers to the name of event calendar.191#. TRANSLATORS: the first parameter refers to the name of event calendar.
173#: ../EventDetails.qml:68192#: ../EventDetails.qml:69
174#, qt-format193#, qt-format
175msgid "%1 Calendar"194msgid "%1 Calendar"
176msgstr ""195msgstr ""
177196
178#: ../EventDetails.qml:129197#: ../EventDetails.qml:143
198#, qt-format
199msgid "%1 %2 %3 - %4 %5 %6 (All Day)"
200msgstr ""
201
202#: ../EventDetails.qml:147
179#, qt-format203#, qt-format
180msgid "%1 - %2 (All Day)"204msgid "%1 - %2 (All Day)"
181msgstr ""205msgstr ""
182206
183#: ../EventDetails.qml:133207#: ../EventDetails.qml:153
208#, qt-format
209msgid "%1 %2 %3 (All Day)"
210msgstr ""
211
212#: ../EventDetails.qml:156
184#, qt-format213#, qt-format
185msgid "%1 (All Day)"214msgid "%1 (All Day)"
186msgstr ""215msgstr ""
187216
188#: ../EventDetails.qml:203217#: ../EventDetails.qml:162
218#, qt-format
219msgid "%1 %2 %3, %4 - %5 %6 %7, %8"
220msgstr ""
221
222#: ../EventDetails.qml:171
223#, qt-format
224msgid "%1 %2 %3, %4 - %5"
225msgstr ""
226
227#: ../EventDetails.qml:238
189msgid "Edit"228msgid "Edit"
190msgstr ""229msgstr ""
191230
192#: ../EventDetails.qml:354 ../NewEvent.qml:537231#: ../EventDetails.qml:389 ../NewEvent.qml:538
193msgid "Guests"232msgid "Guests"
194msgstr ""233msgstr ""
195234
196#: ../EventDetails.qml:397 ../EventReminder.qml:35 ../NewEvent.qml:634235#: ../EventDetails.qml:432 ../EventReminder.qml:35 ../NewEvent.qml:635
197msgid "Reminder"236msgid "Reminder"
198msgstr ""237msgstr ""
199238
@@ -216,7 +255,7 @@
216#. TRANSLATORS: this refers to how often a recurrent event repeats255#. TRANSLATORS: this refers to how often a recurrent event repeats
217#. and it is shown as the header of the option selector to choose256#. and it is shown as the header of the option selector to choose
218#. its repetition257#. its repetition
219#: ../EventRepetition.qml:242 ../NewEvent.qml:618258#: ../EventRepetition.qml:242 ../NewEvent.qml:619
220msgid "Repeats"259msgid "Repeats"
221msgstr ""260msgstr ""
222261
@@ -247,6 +286,11 @@
247msgid "Weekly on %1"286msgid "Weekly on %1"
248msgstr ""287msgstr ""
249288
289#: ../HeaderDateComponent.qml:90
290#, qt-format
291msgid "%1 %2 %3"
292msgstr ""
293
250#: ../LimitLabelModel.qml:25294#: ../LimitLabelModel.qml:25
251msgid "Never"295msgid "Never"
252msgstr ""296msgstr ""
@@ -259,6 +303,10 @@
259msgid "After Date"303msgid "After Date"
260msgstr ""304msgstr ""
261305
306#: ../MonthComponent.qml:262
307msgid "Wk"
308msgstr ""
309
262#: ../NewEvent.qml:84310#: ../NewEvent.qml:84
263msgid "Save"311msgid "Save"
264msgstr ""312msgstr ""
@@ -267,43 +315,43 @@
267msgid "End time can't be before start time"315msgid "End time can't be before start time"
268msgstr ""316msgstr ""
269317
270#: ../NewEvent.qml:334318#: ../NewEvent.qml:335
271msgid "Error"319msgid "Error"
272msgstr ""320msgstr ""
273321
274#: ../NewEvent.qml:336322#: ../NewEvent.qml:337
275msgid "OK"323msgid "OK"
276msgstr ""324msgstr ""
277325
278#: ../NewEvent.qml:389326#: ../NewEvent.qml:390
279msgid "From"327msgid "From"
280msgstr ""328msgstr ""
281329
282#: ../NewEvent.qml:402330#: ../NewEvent.qml:403
283msgid "To"331msgid "To"
284msgstr ""332msgstr ""
285333
286#: ../NewEvent.qml:419334#: ../NewEvent.qml:420
287msgid "All day event"335msgid "All day event"
288msgstr ""336msgstr ""
289337
290#: ../NewEvent.qml:448338#: ../NewEvent.qml:449
291msgid "Event Name"339msgid "Event Name"
292msgstr ""340msgstr ""
293341
294#: ../NewEvent.qml:466342#: ../NewEvent.qml:467
295msgid "Description"343msgid "Description"
296msgstr ""344msgstr ""
297345
298#: ../NewEvent.qml:484346#: ../NewEvent.qml:485
299msgid "Location"347msgid "Location"
300msgstr ""348msgstr ""
301349
302#: ../NewEvent.qml:499 com.ubuntu.calendar_calendar.desktop.in.in.h:1350#: ../NewEvent.qml:500 com.ubuntu.calendar_calendar.desktop.in.in.h:1
303msgid "Calendar"351msgid "Calendar"
304msgstr ""352msgstr ""
305353
306#: ../NewEvent.qml:541354#: ../NewEvent.qml:542
307msgid "Add Guest"355msgid "Add Guest"
308msgstr ""356msgstr ""
309357
@@ -390,52 +438,56 @@
390msgid "2 weeks"438msgid "2 weeks"
391msgstr ""439msgstr ""
392440
441#: ../Settings.qml:60
442msgid "Show week numbers"
443msgstr ""
444
445#: ../Settings.qml:91
446msgid "Show lunar calendar"
447msgstr ""
448
393#: ../TimeLineBase.qml:73449#: ../TimeLineBase.qml:73
394msgid "Untitled"450msgid "Untitled"
395msgstr ""451msgstr ""
396452
397#. TRANSLATORS: W refers to Week, followed by the actual week number (%1)453#. TRANSLATORS: W refers to Week, followed by the actual week number (%1)
398#: ../TimeLineHeader.qml:54454#: ../TimeLineHeader.qml:53
399#, qt-format455#, qt-format
400msgid "W%1"456msgid "W%1"
401msgstr ""457msgstr ""
402458
403#: ../TimeLineHeader.qml:66459#: ../TimeLineHeader.qml:65
404msgid "All Day"460msgid "All Day"
405msgstr ""461msgstr ""
406462
407#: ../YearView.qml:54463#: ../YearView.qml:61 ../YearView.qml:112
408#, qt-format464#, qt-format
409msgid "Year %1"465msgid "Year %1"
410msgstr ""466msgstr ""
411467
412#: ../calendar.qml:45468#: ../calendar.qml:46
413msgid ""469msgid ""
414"Calendar app accept four arguments: --starttime, --endtime, --newevent and --"470"Calendar app accept four arguments: --starttime, --endtime, --newevent and --"
415"eventid. They will be managed by system. See the source for a full comment "471"eventid. They will be managed by system. See the source for a full comment "
416"about them"472"about them"
417msgstr ""473msgstr ""
418474
419#: ../calendar.qml:354475#: ../calendar.qml:256 ../calendar.qml:425
420msgid "Year"476msgid "Year"
421msgstr ""477msgstr ""
422478
423#: ../calendar.qml:388479#: ../calendar.qml:264 ../calendar.qml:446
424msgid "Month"480msgid "Month"
425msgstr ""481msgstr ""
426482
427#: ../calendar.qml:421483#: ../calendar.qml:272 ../calendar.qml:467
428msgid "Week"484msgid "Week"
429msgstr ""485msgstr ""
430486
431#: ../calendar.qml:459487#: ../calendar.qml:280 ../calendar.qml:488
432msgid "Day"488msgid "Day"
433msgstr ""489msgstr ""
434490
435#: ../calendar.qml:491
436msgid "Agenda"
437msgstr ""
438
439#: com.ubuntu.calendar_calendar.desktop.in.in.h:2491#: com.ubuntu.calendar_calendar.desktop.in.in.h:2
440msgid "A calendar for Ubuntu which syncs with online accounts."492msgid "A calendar for Ubuntu which syncs with online accounts."
441msgstr ""493msgstr ""

Subscribers

People subscribed via source and target branches

to status/vote changes: