Merge lp:~acerisara/ubuntu-calendar-app/bottom-edge-autopilot into lp:~mihirsoni/ubuntu-calendar-app/bottomEdge

Proposed by Andrea Cerisara on 2014-12-09
Status: Needs review
Proposed branch: lp:~acerisara/ubuntu-calendar-app/bottom-edge-autopilot
Merge into: lp:~mihirsoni/ubuntu-calendar-app/bottomEdge
Diff against target: 2199 lines (+486/-363)
80 files modified
AgendaView.qml (+69/-77)
EventBubble.qml (+2/-1)
EventReminder.qml (+25/-42)
NewEvent.qml (+1/-0)
SimpleDivider.qml (+25/-0)
TimeLineBackground.qml (+4/-26)
TimeLineBase.qml (+1/-1)
TimeLineBaseComponent.qml (+10/-5)
TimeLineTimeScale.qml (+61/-0)
po/am.po (+2/-2)
po/ar.po (+2/-2)
po/ast.po (+2/-2)
po/az.po (+2/-2)
po/be.po (+2/-2)
po/bg.po (+2/-2)
po/br.po (+2/-2)
po/ca.po (+2/-2)
po/ca@valencia.po (+2/-2)
po/ckb.po (+2/-2)
po/cs.po (+2/-2)
po/cy.po (+2/-2)
po/da.po (+2/-2)
po/de.po (+2/-2)
po/el.po (+2/-2)
po/en_AU.po (+2/-2)
po/en_CA.po (+2/-2)
po/en_GB.po (+2/-2)
po/eo.po (+2/-2)
po/es.po (+2/-2)
po/et.po (+2/-2)
po/eu.po (+2/-2)
po/fa.po (+5/-5)
po/fi.po (+2/-2)
po/fr.po (+2/-2)
po/gd.po (+2/-2)
po/gl.po (+4/-4)
po/gu.po (+2/-2)
po/he.po (+2/-2)
po/hi.po (+2/-2)
po/hr.po (+2/-2)
po/hu.po (+5/-5)
po/id.po (+2/-2)
po/is.po (+18/-16)
po/it.po (+2/-2)
po/ja.po (+2/-2)
po/ka.po (+2/-2)
po/km.po (+2/-2)
po/ko.po (+2/-2)
po/lo.po (+2/-2)
po/lv.po (+3/-3)
po/ml.po (+2/-2)
po/ms.po (+2/-2)
po/my.po (+2/-2)
po/nb.po (+2/-2)
po/nl.po (+2/-2)
po/pa.po (+2/-2)
po/pl.po (+2/-2)
po/pt.po (+6/-6)
po/pt_BR.po (+2/-2)
po/ro.po (+14/-12)
po/ru.po (+2/-2)
po/shn.po (+2/-2)
po/si.po (+2/-2)
po/sk.po (+2/-2)
po/sl.po (+2/-2)
po/sr.po (+2/-2)
po/st.po (+2/-2)
po/sv.po (+2/-2)
po/ta.po (+2/-2)
po/te.po (+2/-2)
po/tr.po (+2/-2)
po/ug.po (+2/-2)
po/uk.po (+2/-2)
po/vi.po (+2/-2)
po/xh.po (+2/-2)
po/zh_CN.po (+2/-2)
po/zh_HK.po (+2/-2)
po/zh_TW.po (+26/-28)
tests/autopilot/calendar_app/__init__.py (+57/-6)
tests/autopilot/calendar_app/tests/test_new_event.py (+28/-4)
To merge this branch: bzr merge lp:~acerisara/ubuntu-calendar-app/bottom-edge-autopilot
Reviewer Review Type Date Requested Status
Nicholas Skaggs 2014-12-09 Pending
Review via email: mp+244230@code.launchpad.net

This proposal supersedes a proposal from 2014-12-09.

Description of the change

The autopilot tests for the new event page are now using the bottom edge button. WIP, tests are currently failing: it seems that when opening the page with the bottom edge button the calendar is not always set to "Personal".

To post a comment you must log in.
Nicholas Skaggs (nskaggs) wrote :

This MP is a bit larger than needed because mihir's branch isn't against trunk as well.

Mihir Soni (mihirsoni) wrote :

Thanks a lot Andrea.

as I responded back on email , i'll get back soon and make this merge with in few days.

Really appreciate your help !!

Mihir Soni (mihirsoni) wrote :

Hi ,

Could you just revert back pot files ?

Mihir Soni (mihirsoni) wrote :

Hi ,

I just tried to reproduce the issue you have mentioned of PERSONAL calendar , I am unable to reproduce that , do you have any proper steps for reproducing same ?

Mihir Soni (mihirsoni) wrote :

Hi ,
As per your email instruction I did tried for couple of time , could we do like this , we can check both the thing , I am not sure why it is creating problem. I will check if sorting is an issue on the collection we receive from evolution

Andrea Cerisara (acerisara) wrote :

Sure, let me know if you need something. Not sure this will solve all my problems (there could be a timing issue also, I have to check), but still it is something we have to fix to make everything working :)

Unmerged revisions

561. By Andrea Cerisara on 2014-12-09

New event autopilot tests: opening the page with bottom edge button

560. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2014-12-03

Launchpad automatic translations update.

559. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2014-12-02

Launchpad automatic translations update.

558. By Andrea Cerisara on 2014-12-01

Added checks for default values in new event.

Approved by Nicholas Skaggs, Ubuntu Phone Apps Jenkins Bot.

557. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2014-12-01

Launchpad automatic translations update.

556. By Kunal Parmar on 2014-11-27

Timeline background chnges required for new day and week view support.

Approved by Mihir Soni, Ubuntu Phone Apps Jenkins Bot.

555. By Kunal Parmar on 2014-11-23

Changing event bubble to flat.

Approved by Mihir Soni, Ubuntu Phone Apps Jenkins Bot.

554. By Launchpad Translations on behalf of ubuntu-calendar-dev on 2014-11-23

Launchpad automatic translations update.

553. By Mihir Soni on 2014-11-23

Agenda view Design Fix. Fixes: https://bugs.launchpad.net/bugs/1393524.

Approved by Kunal Parmar, Ubuntu Phone Apps Jenkins Bot.

552. By Mihir Soni on 2014-11-23

Reminder Design Fix.

Approved by Kunal Parmar, Ubuntu Phone Apps Jenkins Bot.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AgendaView.qml'
2--- AgendaView.qml 2014-11-03 18:39:53 +0000
3+++ AgendaView.qml 2014-12-09 21:56:54 +0000
4@@ -120,8 +120,7 @@
5 anchors.fill: parent
6 visible: eventListModel.itemCount > 0
7
8- delegate:listDelegate
9-
10+ delegate: listDelegate
11 }
12
13 Scrollbar{
14@@ -148,13 +147,13 @@
15 return;
16 }
17
18- headerList.visible = false;
19+ headerContainer.visible = false;
20 if( index == 0 ) {
21- headerList.visible = true;
22+ headerContainer.visible = true;
23 } else {
24 var prevEvent = eventListModel.items[index-1];
25 if( prevEvent.startDateTime.midnight() < event.startDateTime.midnight()) {
26- headerList.visible = true;
27+ headerContainer.visible = true;
28 }
29 }
30
31@@ -169,7 +168,7 @@
32 header.text = date
33 timeLabel.text = timeString
34 header.color = event.startDateTime.toLocaleDateString() === new Date().toLocaleDateString() ? UbuntuColors.orange : UbuntuColors.darkGrey
35- calendarColorCode.color = eventListModel.collection(event.collectionId).color
36+ detailsContainer.color = eventListModel.collection(event.collectionId).color
37
38 if( event.displayLabel) {
39 titleLabel.text = event.displayLabel;
40@@ -182,86 +181,79 @@
41 width: parent.width
42 anchors.top: parent.top
43
44- ListItem.Header{
45- id:headerList
46+ //Not using ListItem.Header because of bug #1380766
47+ ListItem.Standard{
48+ id: headerContainer
49+
50+ height: visible ? header.height + units.gu(1) : 0
51+ width: parent.width
52+
53 Label{
54- id:header
55+ id: header
56+ fontSize: "medium"
57+ width: parent.width
58+ elide: Text.ElideRight
59 anchors {
60 left: parent.left
61- leftMargin : units.gu(1)
62+ leftMargin: units.gu(1)
63 verticalCenter: parent.verticalCenter
64 }
65 }
66-
67- states: [
68- State {
69- name: "headerDateClicked"
70- when:testClick.pressed
71- PropertyChanges {
72- target: header
73- color : header.color == UbuntuColors.orange
74- ? UbuntuColors.darkGrey
75- : UbuntuColors.orange
76+ onClicked: {
77+ dateSelected(event.startDateTime);
78+ }
79+ showDivider: false
80+ }
81+ ListItem.ThinDivider {}
82+
83+ Rectangle{
84+ id: detailsContainer
85+
86+ anchors {
87+ left: parent.left
88+ right: parent.right
89+ }
90+
91+ height: detailsColumn.height + units.gu(1)
92+
93+ ListItem.Standard{
94+
95+
96+ showDivider:false
97+ Column{
98+ id: detailsColumn
99+
100+ anchors {
101+ top: parent.top
102+ left: parent.left
103+ right: parent.right
104+ margins: units.gu(0.5)
105+ }
106+
107+ Label{
108+ id: timeLabel
109+ color:"White"
110+ font.bold: true
111+ fontSize: "small"
112+ width: parent.width
113+ }
114+
115+ Label{
116+ id: titleLabel
117+
118+ color:"White"
119+ fontSize: "small"
120+ width: parent.width
121+ maximumLineCount: 2
122+ elide: Text.ElideRight
123+ wrapMode: Text.WrapAtWordBoundaryOrAnywhere
124 }
125 }
126- ]
127-
128- MouseArea{
129- id:testClick
130- anchors.fill: parent
131 onClicked: {
132- dateSelected(event.startDateTime);
133- }
134- }
135-
136- }
137-
138- ListItem.Standard {
139- id:eventDetails
140- showDivider: false
141- Rectangle {
142- id: calendarColorCode
143-
144- width: parent.height- units.gu(2)
145- height: width
146-
147- anchors {
148- left: parent.left
149- leftMargin: units.gu(2)
150- verticalCenter: parent.verticalCenter
151- }
152- }
153- Column{
154- id: detailsColumn
155-
156- anchors {
157- top: parent.top
158- left: calendarColorCode.right
159- right: parent.right
160- margins: units.gu(1)
161- }
162-
163- Label{
164- id: timeLabel
165- font.bold: true
166- fontSize: "small"
167- width: parent.width
168- }
169-
170- Label{
171- id: titleLabel
172- fontSize: "small"
173- width: parent.width
174- maximumLineCount: 2
175- elide: Text.ElideRight
176- wrapMode: Text.WrapAtWordBoundaryOrAnywhere
177- }
178- }
179- onClicked: {
180- pageStack.push(Qt.resolvedUrl("EventDetails.qml"), {"event":event,"model":eventListModel});
181- }
182- }
183-
184+ pageStack.push(Qt.resolvedUrl("EventDetails.qml"), {"event":event,"model":eventListModel});
185+ }
186+ }
187+ }
188 }
189 }
190 }
191
192=== modified file 'EventBubble.qml'
193--- EventBubble.qml 2014-10-24 13:18:44 +0000
194+++ EventBubble.qml 2014-12-09 21:56:54 +0000
195@@ -41,9 +41,10 @@
196
197 signal clicked(var event);
198
199- UbuntuShape{
200+ Rectangle{
201 id: bg
202 anchors.fill: parent
203+ border.color: "white"
204 }
205
206 function resize() {
207
208=== modified file 'EventReminder.qml'
209--- EventReminder.qml 2014-10-10 17:49:49 +0000
210+++ EventReminder.qml 2014-12-09 21:56:54 +0000
211@@ -49,58 +49,41 @@
212 pop();
213 }
214 }
215-
216+ Scrollbar{
217+ id:scrollList
218+ flickableItem: _pageFlickable
219+ anchors.fill :parent
220+ }
221 Flickable {
222 id: _pageFlickable
223
224+
225 clip: true
226 anchors.fill: parent
227- contentHeight: reminderModel.count * units.gu(7)
228-
229- Column {
230- id: _reminderColumn
231-
232- anchors {
233- top: parent.top
234- left: parent.left
235- right: parent.right
236+ contentHeight: _reminders.itemHeight * reminderModel.count + units.gu(2)
237+ ListItem.ItemSelector {
238+ id: _reminders
239+ expanded: true
240+ model: reminderModel
241+ delegate: selectorDelegate
242+ selectedIndex: reminderModel.get
243+ onSelectedIndexChanged: {
244+ root.reminderTime = reminderModel.get(selectedIndex).value
245 }
246
247- Repeater {
248- id: _reminders
249-
250- model: reminderModel
251-
252- ListItem.Standard {
253- id: _reminderDelegate
254-
255- property alias isChecked: reminderCheckbox.checked
256-
257- text: label
258- control: CheckBox {
259- id: reminderCheckbox
260-
261- checked: root.reminderTime === value
262-
263- onClicked: {
264- root.reminderTime = value
265- if (checked) {
266- // Ensures only one reminder option is selected
267- for(var i=0; i<reminderModel.count; i++) {
268- if(_reminders.itemAt(i).isChecked &&
269- i !== index) {
270- _reminders.itemAt(i).isChecked = false
271- }
272- }
273- }
274-
275- else {
276- checked = !checked
277- }
278- }
279+ Component.onCompleted: {
280+ for(var i=0; i<reminderModel.count; i++) {
281+ if (root.reminderTime === reminderModel.get(i).value){
282+ _reminders.selectedIndex = i
283+ return;
284 }
285 }
286 }
287 }
288+ Component {
289+ id: selectorDelegate
290+ OptionSelectorDelegate { text: label; }
291+ }
292+
293 }
294 }
295
296=== modified file 'NewEvent.qml'
297--- NewEvent.qml 2014-11-16 10:10:53 +0000
298+++ NewEvent.qml 2014-12-09 21:56:54 +0000
299@@ -382,6 +382,7 @@
300 text: i18n.tr("All day event")
301 showDivider: false
302 control: CheckBox {
303+ objectName: "allDayEventCheckbox"
304 id: allDayEventCheckbox
305 checked: false
306 }
307
308=== added file 'SimpleDivider.qml'
309--- SimpleDivider.qml 1970-01-01 00:00:00 +0000
310+++ SimpleDivider.qml 2014-12-09 21:56:54 +0000
311@@ -0,0 +1,25 @@
312+/*
313+ * Copyright (C) 2013-2014 Canonical Ltd
314+ *
315+ * This file is part of Ubuntu Calendar App
316+ *
317+ * Ubuntu Calendar App is free software: you can redistribute it and/or modify
318+ * it under the terms of the GNU General Public License version 3 as
319+ * published by the Free Software Foundation.
320+ *
321+ * Ubuntu Calendar App is distributed in the hope that it will be useful,
322+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
323+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
324+ * GNU General Public License for more details.
325+ *
326+ * You should have received a copy of the GNU General Public License
327+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
328+ */
329+
330+import QtQuick 2.0
331+
332+Rectangle{
333+ height: units.gu(0.1)
334+ width: parent.width
335+ color: "#e5e2e2"
336+}
337
338=== modified file 'TimeLineBackground.qml'
339--- TimeLineBackground.qml 2014-10-04 02:19:01 +0000
340+++ TimeLineBackground.qml 2014-12-09 21:56:54 +0000
341@@ -21,35 +21,13 @@
342
343 Column {
344 width: parent.width
345-
346 Repeater {
347 model: 24 // hour in a day
348-
349- delegate: Rectangle {
350+ delegate: Item {
351 width: parent.width
352- height: units.gu(10)
353- color: (index % 2 == 0) ? "#F5F5F5" : "#ECECEC"
354-
355- Label {
356- id: timeLabel
357- width: (parent.width / 7) - units.gu(1)
358- wrapMode: Text.WordWrap
359-
360- text: {
361- var locale = Qt.locale()
362- return new Date(0, 0, 0, index).toLocaleTimeString
363- (locale, locale.timeFormat(Locale.NarrowFormat))
364- }
365-
366- anchors {
367- left: parent.left
368- leftMargin: units.gu(0.5)
369- verticalCenter: parent.verticalCenter
370- }
371-
372- color: UbuntuColors.lightGrey
373- fontSize: "small"
374- }
375+ height: units.gu(8)
376+
377+ SimpleDivider{}
378 }
379 }
380 }
381
382=== modified file 'TimeLineBase.qml'
383--- TimeLineBase.qml 2014-11-08 02:16:45 +0000
384+++ TimeLineBase.qml 2014-12-09 21:56:54 +0000
385@@ -24,7 +24,7 @@
386
387 property var delegate;
388 property var day;
389- property int hourHeight: units.gu(10)
390+ property int hourHeight: units.gu(8)
391 property var model;
392
393 Component.onCompleted: {
394
395=== modified file 'TimeLineBaseComponent.qml'
396--- TimeLineBaseComponent.qml 2014-11-08 02:27:16 +0000
397+++ TimeLineBaseComponent.qml 2014-12-09 21:56:54 +0000
398@@ -43,7 +43,7 @@
399 var currentTime = new Date();
400 scrollHour = currentTime.getHours();
401
402- timeLineView.contentY = scrollHour * units.gu(10);
403+ timeLineView.contentY = scrollHour * units.gu(8);
404 if(timeLineView.contentY >= timeLineView.contentHeight - timeLineView.height) {
405 timeLineView.contentY = timeLineView.contentHeight - timeLineView.height
406 }
407@@ -61,7 +61,7 @@
408
409 onScrollDown:{
410 scrollHour++;
411- var visibleHour = root.height / units.gu(10);
412+ var visibleHour = root.height / units.gu(8);
413 if( scrollHour > (25 -visibleHour)) {
414 scrollHour = 25 - visibleHour;
415 }
416@@ -70,7 +70,7 @@
417 }
418
419 function scrollToHour() {
420- timeLineView.contentY = scrollHour * units.gu(10);
421+ timeLineView.contentY = scrollHour * units.gu(8);
422 if(timeLineView.contentY >= timeLineView.contentHeight - timeLineView.height) {
423 timeLineView.contentY = timeLineView.contentHeight - timeLineView.height
424 }
425@@ -108,13 +108,18 @@
426 Flickable {
427 id: timeLineView
428
429- contentHeight: units.gu(10) * 24
430+ contentHeight: units.gu(8) * 24
431 contentWidth: width
432 anchors.fill: parent
433
434 clip: true
435
436- TimeLineBackground {}
437+ Row {
438+ width: parent.width
439+ height: timeLineView.contentHeight
440+ TimeLineTimeScale{ id: timeScale }
441+ TimeLineBackground { width: parent.width - x}
442+ }
443
444 Row {
445 id: week
446
447=== added file 'TimeLineTimeScale.qml'
448--- TimeLineTimeScale.qml 1970-01-01 00:00:00 +0000
449+++ TimeLineTimeScale.qml 2014-12-09 21:56:54 +0000
450@@ -0,0 +1,61 @@
451+/*
452+ * Copyright (C) 2013-2014 Canonical Ltd
453+ *
454+ * This file is part of Ubuntu Calendar App
455+ *
456+ * Ubuntu Calendar App is free software: you can redistribute it and/or modify
457+ * it under the terms of the GNU General Public License version 3 as
458+ * published by the Free Software Foundation.
459+ *
460+ * Ubuntu Calendar App is distributed in the hope that it will be useful,
461+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
462+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
463+ * GNU General Public License for more details.
464+ *
465+ * You should have received a copy of the GNU General Public License
466+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
467+ */
468+
469+import QtQuick 2.0
470+import Ubuntu.Components 1.1
471+
472+Flickable{
473+ id: timeFlickble
474+
475+ height: parent.height
476+ width: units.gu(6)
477+
478+ contentHeight: 24 * units.gu(8)
479+ contentWidth: width
480+
481+ interactive: false
482+
483+ clip: true
484+
485+ Column {
486+ id: timeLine
487+ width: parent.width
488+
489+ Repeater {
490+ model: 24 // hour in a day
491+
492+ delegate: Item {
493+ width: parent.width
494+ height: units.gu(8)
495+
496+ Label {
497+ id: timeLabel
498+ width: units.gu(5)
499+ anchors.top: parent.top
500+ anchors.topMargin: units.gu(0.5)
501+ horizontalAlignment: Text.AlignRight
502+ text: Qt.formatTime( new Date(0,0,0,index), "hh:mm")
503+ color: UbuntuColors.lightGrey
504+ fontSize: "small"
505+ }
506+
507+ SimpleDivider{}
508+ }
509+ }
510+ }
511+}
512
513=== modified file 'po/am.po'
514--- po/am.po 2014-10-19 07:01:35 +0000
515+++ po/am.po 2014-12-09 21:56:54 +0000
516@@ -15,8 +15,8 @@
517 "Content-Type: text/plain; charset=UTF-8\n"
518 "Content-Transfer-Encoding: 8bit\n"
519 "Plural-Forms: nplurals=2; plural=n > 1;\n"
520-"X-Launchpad-Export-Date: 2014-10-19 07:01+0000\n"
521-"X-Generator: Launchpad (build 17196)\n"
522+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
523+"X-Generator: Launchpad (build 17274)\n"
524
525 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
526 #: ../WeekView.qml:42 ../YearView.qml:36
527
528=== modified file 'po/ar.po'
529--- po/ar.po 2014-10-18 07:05:51 +0000
530+++ po/ar.po 2014-12-09 21:56:54 +0000
531@@ -16,8 +16,8 @@
532 "Content-Transfer-Encoding: 8bit\n"
533 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
534 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
535-"X-Launchpad-Export-Date: 2014-10-18 07:04+0000\n"
536-"X-Generator: Launchpad (build 17196)\n"
537+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
538+"X-Generator: Launchpad (build 17274)\n"
539
540 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
541 #: ../WeekView.qml:42 ../YearView.qml:36
542
543=== modified file 'po/ast.po'
544--- po/ast.po 2014-10-20 07:01:17 +0000
545+++ po/ast.po 2014-12-09 21:56:54 +0000
546@@ -15,8 +15,8 @@
547 "Content-Type: text/plain; charset=UTF-8\n"
548 "Content-Transfer-Encoding: 8bit\n"
549 "Plural-Forms: nplurals=2; plural=n != 1;\n"
550-"X-Launchpad-Export-Date: 2014-10-20 07:01+0000\n"
551-"X-Generator: Launchpad (build 17196)\n"
552+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
553+"X-Generator: Launchpad (build 17274)\n"
554
555 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
556 #: ../WeekView.qml:42 ../YearView.qml:36
557
558=== modified file 'po/az.po'
559--- po/az.po 2014-10-18 07:05:51 +0000
560+++ po/az.po 2014-12-09 21:56:54 +0000
561@@ -15,8 +15,8 @@
562 "Content-Type: text/plain; charset=UTF-8\n"
563 "Content-Transfer-Encoding: 8bit\n"
564 "Plural-Forms: nplurals=2; plural=n != 1;\n"
565-"X-Launchpad-Export-Date: 2014-10-18 07:04+0000\n"
566-"X-Generator: Launchpad (build 17196)\n"
567+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
568+"X-Generator: Launchpad (build 17274)\n"
569
570 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
571 #: ../WeekView.qml:42 ../YearView.qml:36
572
573=== modified file 'po/be.po'
574--- po/be.po 2014-10-18 07:05:51 +0000
575+++ po/be.po 2014-12-09 21:56:54 +0000
576@@ -16,8 +16,8 @@
577 "Content-Transfer-Encoding: 8bit\n"
578 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
579 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
580-"X-Launchpad-Export-Date: 2014-10-18 07:04+0000\n"
581-"X-Generator: Launchpad (build 17196)\n"
582+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
583+"X-Generator: Launchpad (build 17274)\n"
584
585 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
586 #: ../WeekView.qml:42 ../YearView.qml:36
587
588=== modified file 'po/bg.po'
589--- po/bg.po 2014-10-18 07:05:51 +0000
590+++ po/bg.po 2014-12-09 21:56:54 +0000
591@@ -15,8 +15,8 @@
592 "Content-Type: text/plain; charset=UTF-8\n"
593 "Content-Transfer-Encoding: 8bit\n"
594 "Plural-Forms: nplurals=2; plural=n != 1;\n"
595-"X-Launchpad-Export-Date: 2014-10-18 07:04+0000\n"
596-"X-Generator: Launchpad (build 17196)\n"
597+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
598+"X-Generator: Launchpad (build 17274)\n"
599
600 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
601 #: ../WeekView.qml:42 ../YearView.qml:36
602
603=== modified file 'po/br.po'
604--- po/br.po 2014-10-21 07:23:48 +0000
605+++ po/br.po 2014-12-09 21:56:54 +0000
606@@ -15,8 +15,8 @@
607 "Content-Type: text/plain; charset=UTF-8\n"
608 "Content-Transfer-Encoding: 8bit\n"
609 "Plural-Forms: nplurals=2; plural=n > 1;\n"
610-"X-Launchpad-Export-Date: 2014-10-21 07:23+0000\n"
611-"X-Generator: Launchpad (build 17203)\n"
612+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
613+"X-Generator: Launchpad (build 17274)\n"
614
615 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
616 #: ../WeekView.qml:42 ../YearView.qml:36
617
618=== modified file 'po/ca.po'
619--- po/ca.po 2014-10-18 07:05:51 +0000
620+++ po/ca.po 2014-12-09 21:56:54 +0000
621@@ -15,8 +15,8 @@
622 "Content-Type: text/plain; charset=UTF-8\n"
623 "Content-Transfer-Encoding: 8bit\n"
624 "Plural-Forms: nplurals=2; plural=n != 1;\n"
625-"X-Launchpad-Export-Date: 2014-10-18 07:04+0000\n"
626-"X-Generator: Launchpad (build 17196)\n"
627+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
628+"X-Generator: Launchpad (build 17274)\n"
629
630 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
631 #: ../WeekView.qml:42 ../YearView.qml:36
632
633=== modified file 'po/ca@valencia.po'
634--- po/ca@valencia.po 2014-10-20 07:01:17 +0000
635+++ po/ca@valencia.po 2014-12-09 21:56:54 +0000
636@@ -15,8 +15,8 @@
637 "Content-Type: text/plain; charset=UTF-8\n"
638 "Content-Transfer-Encoding: 8bit\n"
639 "Plural-Forms: nplurals=2; plural=n != 1;\n"
640-"X-Launchpad-Export-Date: 2014-10-20 07:01+0000\n"
641-"X-Generator: Launchpad (build 17196)\n"
642+"X-Launchpad-Export-Date: 2014-12-01 06:28+0000\n"
643+"X-Generator: Launchpad (build 17274)\n"
644
645 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
646 #: ../WeekView.qml:42 ../YearView.qml:36
647
648=== modified file 'po/ckb.po'
649--- po/ckb.po 2014-10-18 07:05:51 +0000
650+++ po/ckb.po 2014-12-09 21:56:54 +0000
651@@ -15,8 +15,8 @@
652 "Content-Type: text/plain; charset=UTF-8\n"
653 "Content-Transfer-Encoding: 8bit\n"
654 "Plural-Forms: nplurals=2; plural=n != 1;\n"
655-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
656-"X-Generator: Launchpad (build 17196)\n"
657+"X-Launchpad-Export-Date: 2014-12-01 06:28+0000\n"
658+"X-Generator: Launchpad (build 17274)\n"
659
660 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
661 #: ../WeekView.qml:42 ../YearView.qml:36
662
663=== modified file 'po/cs.po'
664--- po/cs.po 2014-10-27 06:28:19 +0000
665+++ po/cs.po 2014-12-09 21:56:54 +0000
666@@ -15,8 +15,8 @@
667 "Content-Type: text/plain; charset=UTF-8\n"
668 "Content-Transfer-Encoding: 8bit\n"
669 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
670-"X-Launchpad-Export-Date: 2014-10-27 06:28+0000\n"
671-"X-Generator: Launchpad (build 17203)\n"
672+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
673+"X-Generator: Launchpad (build 17274)\n"
674
675 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
676 #: ../WeekView.qml:42 ../YearView.qml:36
677
678=== modified file 'po/cy.po'
679--- po/cy.po 2014-10-18 07:05:51 +0000
680+++ po/cy.po 2014-12-09 21:56:54 +0000
681@@ -16,8 +16,8 @@
682 "Content-Transfer-Encoding: 8bit\n"
683 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
684 "2 : 3;\n"
685-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
686-"X-Generator: Launchpad (build 17196)\n"
687+"X-Launchpad-Export-Date: 2014-12-01 06:28+0000\n"
688+"X-Generator: Launchpad (build 17274)\n"
689
690 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
691 #: ../WeekView.qml:42 ../YearView.qml:36
692
693=== modified file 'po/da.po'
694--- po/da.po 2014-10-18 07:05:51 +0000
695+++ po/da.po 2014-12-09 21:56:54 +0000
696@@ -16,8 +16,8 @@
697 "Content-Type: text/plain; charset=UTF-8\n"
698 "Content-Transfer-Encoding: 8bit\n"
699 "Plural-Forms: nplurals=2; plural=n != 1;\n"
700-"X-Launchpad-Export-Date: 2014-10-18 07:04+0000\n"
701-"X-Generator: Launchpad (build 17196)\n"
702+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
703+"X-Generator: Launchpad (build 17274)\n"
704
705 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
706 #: ../WeekView.qml:42 ../YearView.qml:36
707
708=== modified file 'po/de.po'
709--- po/de.po 2014-10-19 07:01:35 +0000
710+++ po/de.po 2014-12-09 21:56:54 +0000
711@@ -15,8 +15,8 @@
712 "Content-Type: text/plain; charset=UTF-8\n"
713 "Content-Transfer-Encoding: 8bit\n"
714 "Plural-Forms: nplurals=2; plural=n != 1;\n"
715-"X-Launchpad-Export-Date: 2014-10-19 07:01+0000\n"
716-"X-Generator: Launchpad (build 17196)\n"
717+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
718+"X-Generator: Launchpad (build 17274)\n"
719
720 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
721 #: ../WeekView.qml:42 ../YearView.qml:36
722
723=== modified file 'po/el.po'
724--- po/el.po 2014-10-18 07:05:51 +0000
725+++ po/el.po 2014-12-09 21:56:54 +0000
726@@ -15,8 +15,8 @@
727 "Content-Type: text/plain; charset=UTF-8\n"
728 "Content-Transfer-Encoding: 8bit\n"
729 "Plural-Forms: nplurals=2; plural=n != 1;\n"
730-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
731-"X-Generator: Launchpad (build 17196)\n"
732+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
733+"X-Generator: Launchpad (build 17274)\n"
734
735 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
736 #: ../WeekView.qml:42 ../YearView.qml:36
737
738=== modified file 'po/en_AU.po'
739--- po/en_AU.po 2014-10-19 07:01:35 +0000
740+++ po/en_AU.po 2014-12-09 21:56:54 +0000
741@@ -15,8 +15,8 @@
742 "Content-Type: text/plain; charset=UTF-8\n"
743 "Content-Transfer-Encoding: 8bit\n"
744 "Plural-Forms: nplurals=2; plural=n != 1;\n"
745-"X-Launchpad-Export-Date: 2014-10-19 07:01+0000\n"
746-"X-Generator: Launchpad (build 17196)\n"
747+"X-Launchpad-Export-Date: 2014-12-01 06:28+0000\n"
748+"X-Generator: Launchpad (build 17274)\n"
749
750 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
751 #: ../WeekView.qml:42 ../YearView.qml:36
752
753=== modified file 'po/en_CA.po'
754--- po/en_CA.po 2014-10-18 07:05:51 +0000
755+++ po/en_CA.po 2014-12-09 21:56:54 +0000
756@@ -15,8 +15,8 @@
757 "Content-Type: text/plain; charset=UTF-8\n"
758 "Content-Transfer-Encoding: 8bit\n"
759 "Plural-Forms: nplurals=2; plural=n != 1;\n"
760-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
761-"X-Generator: Launchpad (build 17196)\n"
762+"X-Launchpad-Export-Date: 2014-12-01 06:28+0000\n"
763+"X-Generator: Launchpad (build 17274)\n"
764
765 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
766 #: ../WeekView.qml:42 ../YearView.qml:36
767
768=== modified file 'po/en_GB.po'
769--- po/en_GB.po 2014-10-18 07:05:51 +0000
770+++ po/en_GB.po 2014-12-09 21:56:54 +0000
771@@ -15,8 +15,8 @@
772 "Content-Type: text/plain; charset=UTF-8\n"
773 "Content-Transfer-Encoding: 8bit\n"
774 "Plural-Forms: nplurals=2; plural=n != 1;\n"
775-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
776-"X-Generator: Launchpad (build 17196)\n"
777+"X-Launchpad-Export-Date: 2014-12-01 06:28+0000\n"
778+"X-Generator: Launchpad (build 17274)\n"
779
780 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
781 #: ../WeekView.qml:42 ../YearView.qml:36
782
783=== modified file 'po/eo.po'
784--- po/eo.po 2014-10-18 07:05:51 +0000
785+++ po/eo.po 2014-12-09 21:56:54 +0000
786@@ -15,8 +15,8 @@
787 "Content-Type: text/plain; charset=UTF-8\n"
788 "Content-Transfer-Encoding: 8bit\n"
789 "Plural-Forms: nplurals=2; plural=n != 1;\n"
790-"X-Launchpad-Export-Date: 2014-10-18 07:04+0000\n"
791-"X-Generator: Launchpad (build 17196)\n"
792+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
793+"X-Generator: Launchpad (build 17274)\n"
794
795 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
796 #: ../WeekView.qml:42 ../YearView.qml:36
797
798=== modified file 'po/es.po'
799--- po/es.po 2014-10-21 07:23:48 +0000
800+++ po/es.po 2014-12-09 21:56:54 +0000
801@@ -15,8 +15,8 @@
802 "Content-Type: text/plain; charset=UTF-8\n"
803 "Content-Transfer-Encoding: 8bit\n"
804 "Plural-Forms: nplurals=2; plural=n != 1;\n"
805-"X-Launchpad-Export-Date: 2014-10-21 07:23+0000\n"
806-"X-Generator: Launchpad (build 17203)\n"
807+"X-Launchpad-Export-Date: 2014-12-01 06:28+0000\n"
808+"X-Generator: Launchpad (build 17274)\n"
809
810 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
811 #: ../WeekView.qml:42 ../YearView.qml:36
812
813=== modified file 'po/et.po'
814--- po/et.po 2014-10-18 07:05:51 +0000
815+++ po/et.po 2014-12-09 21:56:54 +0000
816@@ -15,8 +15,8 @@
817 "Content-Type: text/plain; charset=UTF-8\n"
818 "Content-Transfer-Encoding: 8bit\n"
819 "Plural-Forms: nplurals=2; plural=n != 1;\n"
820-"X-Launchpad-Export-Date: 2014-10-18 07:04+0000\n"
821-"X-Generator: Launchpad (build 17196)\n"
822+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
823+"X-Generator: Launchpad (build 17274)\n"
824
825 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
826 #: ../WeekView.qml:42 ../YearView.qml:36
827
828=== modified file 'po/eu.po'
829--- po/eu.po 2014-10-27 06:28:19 +0000
830+++ po/eu.po 2014-12-09 21:56:54 +0000
831@@ -15,8 +15,8 @@
832 "Content-Type: text/plain; charset=UTF-8\n"
833 "Content-Transfer-Encoding: 8bit\n"
834 "Plural-Forms: nplurals=2; plural=n != 1;\n"
835-"X-Launchpad-Export-Date: 2014-10-27 06:28+0000\n"
836-"X-Generator: Launchpad (build 17203)\n"
837+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
838+"X-Generator: Launchpad (build 17274)\n"
839
840 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
841 #: ../WeekView.qml:42 ../YearView.qml:36
842
843=== modified file 'po/fa.po'
844--- po/fa.po 2014-10-18 07:05:51 +0000
845+++ po/fa.po 2014-12-09 21:56:54 +0000
846@@ -8,15 +8,15 @@
847 "Project-Id-Version: ubuntu-calendar-app\n"
848 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
849 "POT-Creation-Date: 2014-10-17 17:41+0200\n"
850-"PO-Revision-Date: 2014-10-17 22:33+0000\n"
851-"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"
852+"PO-Revision-Date: 2014-12-01 08:45+0000\n"
853+"Last-Translator: Arash Badie Modiri <arashbm@gmail.com>\n"
854 "Language-Team: Persian <fa@li.org>\n"
855 "MIME-Version: 1.0\n"
856 "Content-Type: text/plain; charset=UTF-8\n"
857 "Content-Transfer-Encoding: 8bit\n"
858 "Plural-Forms: nplurals=1; plural=0;\n"
859-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
860-"X-Generator: Launchpad (build 17196)\n"
861+"X-Launchpad-Export-Date: 2014-12-02 06:09+0000\n"
862+"X-Generator: Launchpad (build 17274)\n"
863
864 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
865 #: ../WeekView.qml:42 ../YearView.qml:36
866@@ -242,7 +242,7 @@
867
868 #: ../NewEvent.qml:59
869 msgid "Save"
870-msgstr "ذخیره‌کردن"
871+msgstr "ذخیره"
872
873 #: ../NewEvent.qml:164
874 msgid "End time can't be before start time"
875
876=== modified file 'po/fi.po'
877--- po/fi.po 2014-10-22 06:13:38 +0000
878+++ po/fi.po 2014-12-09 21:56:54 +0000
879@@ -15,8 +15,8 @@
880 "Content-Type: text/plain; charset=UTF-8\n"
881 "Content-Transfer-Encoding: 8bit\n"
882 "Plural-Forms: nplurals=2; plural=n != 1;\n"
883-"X-Launchpad-Export-Date: 2014-10-22 06:13+0000\n"
884-"X-Generator: Launchpad (build 17203)\n"
885+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
886+"X-Generator: Launchpad (build 17274)\n"
887
888 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
889 #: ../WeekView.qml:42 ../YearView.qml:36
890
891=== modified file 'po/fr.po'
892--- po/fr.po 2014-10-27 06:28:19 +0000
893+++ po/fr.po 2014-12-09 21:56:54 +0000
894@@ -15,8 +15,8 @@
895 "Content-Type: text/plain; charset=UTF-8\n"
896 "Content-Transfer-Encoding: 8bit\n"
897 "Plural-Forms: nplurals=2; plural=n > 1;\n"
898-"X-Launchpad-Export-Date: 2014-10-27 06:28+0000\n"
899-"X-Generator: Launchpad (build 17203)\n"
900+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
901+"X-Generator: Launchpad (build 17274)\n"
902
903 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
904 #: ../WeekView.qml:42 ../YearView.qml:36
905
906=== modified file 'po/gd.po'
907--- po/gd.po 2014-10-21 07:23:48 +0000
908+++ po/gd.po 2014-12-09 21:56:54 +0000
909@@ -16,8 +16,8 @@
910 "Content-Transfer-Encoding: 8bit\n"
911 "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
912 "(n > 2 && n < 20) ? 2 : 3;\n"
913-"X-Launchpad-Export-Date: 2014-10-21 07:23+0000\n"
914-"X-Generator: Launchpad (build 17203)\n"
915+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
916+"X-Generator: Launchpad (build 17274)\n"
917 "Language: gd\n"
918
919 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
920
921=== modified file 'po/gl.po'
922--- po/gl.po 2014-10-18 07:05:51 +0000
923+++ po/gl.po 2014-12-09 21:56:54 +0000
924@@ -8,15 +8,15 @@
925 "Project-Id-Version: ubuntu-calendar-app\n"
926 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
927 "POT-Creation-Date: 2014-10-17 17:41+0200\n"
928-"PO-Revision-Date: 2014-10-17 19:34+0000\n"
929+"PO-Revision-Date: 2014-11-22 15:00+0000\n"
930 "Last-Translator: Marcos Lans <Unknown>\n"
931 "Language-Team: Galician <gl@li.org>\n"
932 "MIME-Version: 1.0\n"
933 "Content-Type: text/plain; charset=UTF-8\n"
934 "Content-Transfer-Encoding: 8bit\n"
935 "Plural-Forms: nplurals=2; plural=n != 1;\n"
936-"X-Launchpad-Export-Date: 2014-10-18 07:04+0000\n"
937-"X-Generator: Launchpad (build 17196)\n"
938+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
939+"X-Generator: Launchpad (build 17274)\n"
940
941 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
942 #: ../WeekView.qml:42 ../YearView.qml:36
943@@ -307,7 +307,7 @@
944 #: ../RecurrenceLabelDefines.qml:27
945 #, qt-format
946 msgid "On %1, %2 ,%3"
947-msgstr "Os %1, %2 ,%3"
948+msgstr "Os %1, %2 e %3"
949
950 #. TRANSLATORS: The arguments refer to days of the week. E.g. "On Monday and Thursday"
951 #: ../RecurrenceLabelDefines.qml:29
952
953=== modified file 'po/gu.po'
954--- po/gu.po 2014-10-18 07:05:51 +0000
955+++ po/gu.po 2014-12-09 21:56:54 +0000
956@@ -15,8 +15,8 @@
957 "Content-Type: text/plain; charset=UTF-8\n"
958 "Content-Transfer-Encoding: 8bit\n"
959 "Plural-Forms: nplurals=2; plural=n != 1;\n"
960-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
961-"X-Generator: Launchpad (build 17196)\n"
962+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
963+"X-Generator: Launchpad (build 17274)\n"
964
965 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
966 #: ../WeekView.qml:42 ../YearView.qml:36
967
968=== modified file 'po/he.po'
969--- po/he.po 2014-10-18 07:05:51 +0000
970+++ po/he.po 2014-12-09 21:56:54 +0000
971@@ -15,8 +15,8 @@
972 "Content-Type: text/plain; charset=UTF-8\n"
973 "Content-Transfer-Encoding: 8bit\n"
974 "Plural-Forms: nplurals=2; plural=n != 1;\n"
975-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
976-"X-Generator: Launchpad (build 17196)\n"
977+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
978+"X-Generator: Launchpad (build 17274)\n"
979
980 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
981 #: ../WeekView.qml:42 ../YearView.qml:36
982
983=== modified file 'po/hi.po'
984--- po/hi.po 2014-10-18 07:05:51 +0000
985+++ po/hi.po 2014-12-09 21:56:54 +0000
986@@ -15,8 +15,8 @@
987 "Content-Type: text/plain; charset=UTF-8\n"
988 "Content-Transfer-Encoding: 8bit\n"
989 "Plural-Forms: nplurals=2; plural=n != 1;\n"
990-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
991-"X-Generator: Launchpad (build 17196)\n"
992+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
993+"X-Generator: Launchpad (build 17274)\n"
994
995 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
996 #: ../WeekView.qml:42 ../YearView.qml:36
997
998=== modified file 'po/hr.po'
999--- po/hr.po 2014-10-18 07:05:51 +0000
1000+++ po/hr.po 2014-12-09 21:56:54 +0000
1001@@ -16,8 +16,8 @@
1002 "Content-Transfer-Encoding: 8bit\n"
1003 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
1004 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
1005-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1006-"X-Generator: Launchpad (build 17196)\n"
1007+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1008+"X-Generator: Launchpad (build 17274)\n"
1009
1010 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1011 #: ../WeekView.qml:42 ../YearView.qml:36
1012
1013=== modified file 'po/hu.po'
1014--- po/hu.po 2014-11-02 06:12:36 +0000
1015+++ po/hu.po 2014-12-09 21:56:54 +0000
1016@@ -8,15 +8,15 @@
1017 "Project-Id-Version: ubuntu-calendar-app\n"
1018 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1019 "POT-Creation-Date: 2014-10-17 17:41+0200\n"
1020-"PO-Revision-Date: 2014-11-01 10:02+0000\n"
1021+"PO-Revision-Date: 2014-11-18 07:24+0000\n"
1022 "Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
1023 "Language-Team: Hungarian <hu@li.org>\n"
1024 "MIME-Version: 1.0\n"
1025 "Content-Type: text/plain; charset=UTF-8\n"
1026 "Content-Transfer-Encoding: 8bit\n"
1027 "Plural-Forms: nplurals=2; plural=n != 1;\n"
1028-"X-Launchpad-Export-Date: 2014-11-02 06:12+0000\n"
1029-"X-Generator: Launchpad (build 17211)\n"
1030+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1031+"X-Generator: Launchpad (build 17274)\n"
1032
1033 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1034 #: ../WeekView.qml:42 ../YearView.qml:36
1035@@ -112,7 +112,7 @@
1036
1037 #: ../DeleteConfirmationDialog.qml:40
1038 msgid "Delete series"
1039-msgstr "Sorozat törlése"
1040+msgstr "Összes törlése"
1041
1042 #: ../DeleteConfirmationDialog.qml:51
1043 msgid "Delete this"
1044@@ -135,7 +135,7 @@
1045
1046 #: ../EditEventConfirmationDialog.qml:35
1047 msgid "Edit series"
1048-msgstr "Sorozat szerkesztése"
1049+msgstr "Összes szerkesztése"
1050
1051 #: ../EditEventConfirmationDialog.qml:44
1052 msgid "Edit this"
1053
1054=== modified file 'po/id.po'
1055--- po/id.po 2014-10-18 07:05:51 +0000
1056+++ po/id.po 2014-12-09 21:56:54 +0000
1057@@ -15,8 +15,8 @@
1058 "Content-Type: text/plain; charset=UTF-8\n"
1059 "Content-Transfer-Encoding: 8bit\n"
1060 "Plural-Forms: nplurals=1; plural=0;\n"
1061-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1062-"X-Generator: Launchpad (build 17196)\n"
1063+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1064+"X-Generator: Launchpad (build 17274)\n"
1065
1066 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1067 #: ../WeekView.qml:42 ../YearView.qml:36
1068
1069=== modified file 'po/is.po'
1070--- po/is.po 2014-10-18 07:05:51 +0000
1071+++ po/is.po 2014-12-09 21:56:54 +0000
1072@@ -10,15 +10,15 @@
1073 "Project-Id-Version: po_com.ubuntu.calendar-is\n"
1074 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1075 "POT-Creation-Date: 2014-10-17 17:41+0200\n"
1076-"PO-Revision-Date: 2014-09-30 12:14+0000\n"
1077+"PO-Revision-Date: 2014-12-02 12:07+0000\n"
1078 "Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
1079 "Language-Team: Icelandic <translation-team-is@lists.sourceforge.net>\n"
1080 "MIME-Version: 1.0\n"
1081 "Content-Type: text/plain; charset=UTF-8\n"
1082 "Content-Transfer-Encoding: 8bit\n"
1083 "Plural-Forms: nplurals=2; plural=n != 1;\n"
1084-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1085-"X-Generator: Launchpad (build 17196)\n"
1086+"X-Launchpad-Export-Date: 2014-12-03 06:46+0000\n"
1087+"X-Generator: Launchpad (build 17274)\n"
1088 "Language: is\n"
1089
1090 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1091@@ -52,15 +52,15 @@
1092 #: ../AllDayEventComponent.qml:109
1093 #, qt-format
1094 msgid "%1 ev."
1095-msgstr ""
1096+msgstr "%1 atb"
1097
1098 #. TRANSLATORS: the argument refers to the number of all day events
1099 #: ../AllDayEventComponent.qml:113
1100 #, qt-format
1101 msgid "%1 all day event"
1102 msgid_plural "%1 all day events"
1103-msgstr[0] ""
1104-msgstr[1] ""
1105+msgstr[0] "%1 heilsdagsatburður"
1106+msgstr[1] "%1 heilsdagsatburðir"
1107
1108 #: ../CalendarChoicePopup.qml:32 ../EventActions.qml:42
1109 msgid "Calendars"
1110@@ -107,11 +107,12 @@
1111 #, qt-format
1112 msgid "Delete only this event \"%1\", or all events in the series?"
1113 msgstr ""
1114+"Eyða einungis atburðinum \"%1\", eða öllum tilvikum atburða í lotunni?"
1115
1116 #: ../DeleteConfirmationDialog.qml:37
1117 #, qt-format
1118 msgid "Are you sure you want to delete the event \"%1\"?"
1119-msgstr ""
1120+msgstr "Ertu viss um að þú viljir eyða atburðinum \"%1\"?"
1121
1122 #: ../DeleteConfirmationDialog.qml:40
1123 msgid "Delete series"
1124@@ -134,6 +135,7 @@
1125 #, qt-format
1126 msgid "Edit only this event \"%1\", or all events in the series?"
1127 msgstr ""
1128+"Breyta einungis atburðinum \"%1\", eða öllum tilvikum atburða í lotunni?"
1129
1130 #: ../EditEventConfirmationDialog.qml:35
1131 msgid "Edit series"
1132@@ -163,13 +165,13 @@
1133 #: ../EventDetails.qml:66
1134 #, qt-format
1135 msgid "%1 Calendar"
1136-msgstr ""
1137+msgstr "%1 dagatal"
1138
1139 #. TRANSLATORS: the first parameter refers to number of all day events.
1140 #: ../EventDetails.qml:112
1141 #, qt-format
1142 msgid "%1 (All Day)"
1143-msgstr ""
1144+msgstr "%1 (allan daginn)"
1145
1146 #: ../EventDetails.qml:171
1147 msgid "Edit"
1148@@ -216,22 +218,22 @@
1149 #, qt-format
1150 msgid "%1; %2 time"
1151 msgid_plural "%1; %2 times"
1152-msgstr[0] ""
1153-msgstr[1] ""
1154+msgstr[0] "%1; %2 sinni"
1155+msgstr[1] "%1; %2 sinnum"
1156
1157 #. TRANSLATORS: the argument refers to recurrence until user selected date.
1158 #. E.g. "Daily; until 12/12/2014."
1159 #: ../EventUtils.qml:79
1160 #, qt-format
1161 msgid "%1; until %2"
1162-msgstr ""
1163+msgstr "%1; til %2"
1164
1165 #. TRANSLATORS: the argument refers to several different days of the week.
1166 #. E.g. "Weekly on Mondays, Tuesdays"
1167 #: ../EventUtils.qml:102
1168 #, qt-format
1169 msgid "Weekly on %1"
1170-msgstr ""
1171+msgstr "Vikulega á %1"
1172
1173 #: ../LimitLabelDefines.qml:21
1174 msgid "Never"
1175@@ -309,13 +311,13 @@
1176 #: ../RecurrenceLabelDefines.qml:27
1177 #, qt-format
1178 msgid "On %1, %2 ,%3"
1179-msgstr ""
1180+msgstr "Á %1, %2 ,%3"
1181
1182 #. TRANSLATORS: The arguments refer to days of the week. E.g. "On Monday and Thursday"
1183 #: ../RecurrenceLabelDefines.qml:29
1184 #, qt-format
1185 msgid "On %1 and %2"
1186-msgstr ""
1187+msgstr "Á %1 og %2"
1188
1189 #: ../RecurrenceLabelDefines.qml:30
1190 msgid "Weekly"
1191@@ -338,7 +340,7 @@
1192 #. the event starts, not any time before
1193 #: ../RemindersModel.qml:30
1194 msgid "On Event"
1195-msgstr ""
1196+msgstr "Við atburð"
1197
1198 #: ../RemindersModel.qml:31
1199 msgid "5 minutes"
1200
1201=== modified file 'po/it.po'
1202--- po/it.po 2014-10-18 07:05:51 +0000
1203+++ po/it.po 2014-12-09 21:56:54 +0000
1204@@ -15,8 +15,8 @@
1205 "Content-Type: text/plain; charset=UTF-8\n"
1206 "Content-Transfer-Encoding: 8bit\n"
1207 "Plural-Forms: nplurals=2; plural=n != 1;\n"
1208-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1209-"X-Generator: Launchpad (build 17196)\n"
1210+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1211+"X-Generator: Launchpad (build 17274)\n"
1212
1213 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1214 #: ../WeekView.qml:42 ../YearView.qml:36
1215
1216=== modified file 'po/ja.po'
1217--- po/ja.po 2014-10-18 07:05:51 +0000
1218+++ po/ja.po 2014-12-09 21:56:54 +0000
1219@@ -15,8 +15,8 @@
1220 "Content-Type: text/plain; charset=UTF-8\n"
1221 "Content-Transfer-Encoding: 8bit\n"
1222 "Plural-Forms: nplurals=1; plural=0;\n"
1223-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1224-"X-Generator: Launchpad (build 17196)\n"
1225+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1226+"X-Generator: Launchpad (build 17274)\n"
1227
1228 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1229 #: ../WeekView.qml:42 ../YearView.qml:36
1230
1231=== modified file 'po/ka.po'
1232--- po/ka.po 2014-10-18 07:05:51 +0000
1233+++ po/ka.po 2014-12-09 21:56:54 +0000
1234@@ -15,8 +15,8 @@
1235 "Content-Type: text/plain; charset=UTF-8\n"
1236 "Content-Transfer-Encoding: 8bit\n"
1237 "Plural-Forms: nplurals=1; plural=0;\n"
1238-"X-Launchpad-Export-Date: 2014-10-18 07:04+0000\n"
1239-"X-Generator: Launchpad (build 17196)\n"
1240+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1241+"X-Generator: Launchpad (build 17274)\n"
1242
1243 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1244 #: ../WeekView.qml:42 ../YearView.qml:36
1245
1246=== modified file 'po/km.po'
1247--- po/km.po 2014-10-18 07:05:51 +0000
1248+++ po/km.po 2014-12-09 21:56:54 +0000
1249@@ -15,8 +15,8 @@
1250 "Content-Type: text/plain; charset=UTF-8\n"
1251 "Content-Transfer-Encoding: 8bit\n"
1252 "Plural-Forms: nplurals=1; plural=0;\n"
1253-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1254-"X-Generator: Launchpad (build 17196)\n"
1255+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1256+"X-Generator: Launchpad (build 17274)\n"
1257
1258 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1259 #: ../WeekView.qml:42 ../YearView.qml:36
1260
1261=== modified file 'po/ko.po'
1262--- po/ko.po 2014-11-12 06:42:57 +0000
1263+++ po/ko.po 2014-12-09 21:56:54 +0000
1264@@ -15,8 +15,8 @@
1265 "Content-Type: text/plain; charset=UTF-8\n"
1266 "Content-Transfer-Encoding: 8bit\n"
1267 "Plural-Forms: nplurals=1; plural=0;\n"
1268-"X-Launchpad-Export-Date: 2014-11-12 06:42+0000\n"
1269-"X-Generator: Launchpad (build 17241)\n"
1270+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1271+"X-Generator: Launchpad (build 17274)\n"
1272
1273 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1274 #: ../WeekView.qml:42 ../YearView.qml:36
1275
1276=== modified file 'po/lo.po'
1277--- po/lo.po 2014-10-18 07:05:51 +0000
1278+++ po/lo.po 2014-12-09 21:56:54 +0000
1279@@ -15,8 +15,8 @@
1280 "Content-Type: text/plain; charset=UTF-8\n"
1281 "Content-Transfer-Encoding: 8bit\n"
1282 "Plural-Forms: nplurals=1; plural=0;\n"
1283-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1284-"X-Generator: Launchpad (build 17196)\n"
1285+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1286+"X-Generator: Launchpad (build 17274)\n"
1287
1288 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1289 #: ../WeekView.qml:42 ../YearView.qml:36
1290
1291=== modified file 'po/lv.po'
1292--- po/lv.po 2014-10-18 07:05:51 +0000
1293+++ po/lv.po 2014-12-09 21:56:54 +0000
1294@@ -9,14 +9,14 @@
1295 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1296 "POT-Creation-Date: 2014-10-17 17:41+0200\n"
1297 "PO-Revision-Date: 2014-09-07 14:25+0000\n"
1298-"Last-Translator: Jānis-Marks Gailis <jm-gailis@fai-vianet.fr>\n"
1299+"Last-Translator: Jānis Marks Gailis <jm-gailis@fai-vianet.fr>\n"
1300 "Language-Team: Latvian <lv@li.org>\n"
1301 "MIME-Version: 1.0\n"
1302 "Content-Type: text/plain; charset=UTF-8\n"
1303 "Content-Transfer-Encoding: 8bit\n"
1304 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
1305-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1306-"X-Generator: Launchpad (build 17196)\n"
1307+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1308+"X-Generator: Launchpad (build 17274)\n"
1309
1310 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1311 #: ../WeekView.qml:42 ../YearView.qml:36
1312
1313=== modified file 'po/ml.po'
1314--- po/ml.po 2014-10-18 07:05:51 +0000
1315+++ po/ml.po 2014-12-09 21:56:54 +0000
1316@@ -15,8 +15,8 @@
1317 "Content-Type: text/plain; charset=UTF-8\n"
1318 "Content-Transfer-Encoding: 8bit\n"
1319 "Plural-Forms: nplurals=2; plural=n != 1;\n"
1320-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1321-"X-Generator: Launchpad (build 17196)\n"
1322+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1323+"X-Generator: Launchpad (build 17274)\n"
1324
1325 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1326 #: ../WeekView.qml:42 ../YearView.qml:36
1327
1328=== modified file 'po/ms.po'
1329--- po/ms.po 2014-10-18 07:05:51 +0000
1330+++ po/ms.po 2014-12-09 21:56:54 +0000
1331@@ -15,8 +15,8 @@
1332 "Content-Type: text/plain; charset=UTF-8\n"
1333 "Content-Transfer-Encoding: 8bit\n"
1334 "Plural-Forms: nplurals=2; plural=n != 1;\n"
1335-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1336-"X-Generator: Launchpad (build 17196)\n"
1337+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1338+"X-Generator: Launchpad (build 17274)\n"
1339
1340 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1341 #: ../WeekView.qml:42 ../YearView.qml:36
1342
1343=== modified file 'po/my.po'
1344--- po/my.po 2014-10-18 07:05:51 +0000
1345+++ po/my.po 2014-12-09 21:56:54 +0000
1346@@ -15,8 +15,8 @@
1347 "Content-Type: text/plain; charset=UTF-8\n"
1348 "Content-Transfer-Encoding: 8bit\n"
1349 "Plural-Forms: nplurals=1; plural=0;\n"
1350-"X-Launchpad-Export-Date: 2014-10-18 07:04+0000\n"
1351-"X-Generator: Launchpad (build 17196)\n"
1352+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1353+"X-Generator: Launchpad (build 17274)\n"
1354
1355 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1356 #: ../WeekView.qml:42 ../YearView.qml:36
1357
1358=== modified file 'po/nb.po'
1359--- po/nb.po 2014-10-18 07:05:51 +0000
1360+++ po/nb.po 2014-12-09 21:56:54 +0000
1361@@ -15,8 +15,8 @@
1362 "Content-Type: text/plain; charset=UTF-8\n"
1363 "Content-Transfer-Encoding: 8bit\n"
1364 "Plural-Forms: nplurals=2; plural=n != 1;\n"
1365-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1366-"X-Generator: Launchpad (build 17196)\n"
1367+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1368+"X-Generator: Launchpad (build 17274)\n"
1369
1370 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1371 #: ../WeekView.qml:42 ../YearView.qml:36
1372
1373=== modified file 'po/nl.po'
1374--- po/nl.po 2014-10-19 07:01:35 +0000
1375+++ po/nl.po 2014-12-09 21:56:54 +0000
1376@@ -15,8 +15,8 @@
1377 "Content-Type: text/plain; charset=UTF-8\n"
1378 "Content-Transfer-Encoding: 8bit\n"
1379 "Plural-Forms: nplurals=2; plural=n != 1;\n"
1380-"X-Launchpad-Export-Date: 2014-10-19 07:01+0000\n"
1381-"X-Generator: Launchpad (build 17196)\n"
1382+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1383+"X-Generator: Launchpad (build 17274)\n"
1384
1385 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1386 #: ../WeekView.qml:42 ../YearView.qml:36
1387
1388=== modified file 'po/pa.po'
1389--- po/pa.po 2014-10-18 07:05:51 +0000
1390+++ po/pa.po 2014-12-09 21:56:54 +0000
1391@@ -15,8 +15,8 @@
1392 "Content-Type: text/plain; charset=UTF-8\n"
1393 "Content-Transfer-Encoding: 8bit\n"
1394 "Plural-Forms: nplurals=2; plural=n != 1;\n"
1395-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1396-"X-Generator: Launchpad (build 17196)\n"
1397+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1398+"X-Generator: Launchpad (build 17274)\n"
1399
1400 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1401 #: ../WeekView.qml:42 ../YearView.qml:36
1402
1403=== modified file 'po/pl.po'
1404--- po/pl.po 2014-10-18 07:05:51 +0000
1405+++ po/pl.po 2014-12-09 21:56:54 +0000
1406@@ -16,8 +16,8 @@
1407 "Content-Transfer-Encoding: 8bit\n"
1408 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
1409 "|| n%100>=20) ? 1 : 2;\n"
1410-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1411-"X-Generator: Launchpad (build 17196)\n"
1412+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1413+"X-Generator: Launchpad (build 17274)\n"
1414
1415 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1416 #: ../WeekView.qml:42 ../YearView.qml:36
1417
1418=== modified file 'po/pt.po'
1419--- po/pt.po 2014-10-18 07:05:51 +0000
1420+++ po/pt.po 2014-12-09 21:56:54 +0000
1421@@ -8,15 +8,15 @@
1422 "Project-Id-Version: ubuntu-calendar-app\n"
1423 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1424 "POT-Creation-Date: 2014-10-17 17:41+0200\n"
1425-"PO-Revision-Date: 2014-10-17 12:15+0000\n"
1426+"PO-Revision-Date: 2014-11-20 14:19+0000\n"
1427 "Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"
1428 "Language-Team: Portuguese <pt@li.org>\n"
1429 "MIME-Version: 1.0\n"
1430 "Content-Type: text/plain; charset=UTF-8\n"
1431 "Content-Transfer-Encoding: 8bit\n"
1432 "Plural-Forms: nplurals=2; plural=n != 1;\n"
1433-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1434-"X-Generator: Launchpad (build 17196)\n"
1435+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1436+"X-Generator: Launchpad (build 17274)\n"
1437
1438 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1439 #: ../WeekView.qml:42 ../YearView.qml:36
1440@@ -78,18 +78,18 @@
1441
1442 #: ../ContactChoicePopup.qml:37
1443 msgid "No contact"
1444-msgstr "Sem contato"
1445+msgstr "Sem contacto"
1446
1447 #: ../ContactChoicePopup.qml:83
1448 msgid "Search contact"
1449-msgstr "Pesquisar contato"
1450+msgstr "Pesquisar contacto"
1451
1452 #. TRANSLATORS: this is a time formatting string,
1453 #. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.
1454 #. It's used in the header of the month and week views
1455 #: ../DayView.qml:56 ../MonthView.qml:56 ../WeekView.qml:60
1456 msgid "MMMM yyyy"
1457-msgstr "MMMM aaaa"
1458+msgstr "MMM yyy"
1459
1460 #: ../DeleteConfirmationDialog.qml:31
1461 msgid "Delete Recurring Event"
1462
1463=== modified file 'po/pt_BR.po'
1464--- po/pt_BR.po 2014-10-18 07:05:51 +0000
1465+++ po/pt_BR.po 2014-12-09 21:56:54 +0000
1466@@ -15,8 +15,8 @@
1467 "Content-Type: text/plain; charset=UTF-8\n"
1468 "Content-Transfer-Encoding: 8bit\n"
1469 "Plural-Forms: nplurals=2; plural=n > 1;\n"
1470-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1471-"X-Generator: Launchpad (build 17196)\n"
1472+"X-Launchpad-Export-Date: 2014-12-01 06:28+0000\n"
1473+"X-Generator: Launchpad (build 17274)\n"
1474
1475 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1476 #: ../WeekView.qml:42 ../YearView.qml:36
1477
1478=== modified file 'po/ro.po'
1479--- po/ro.po 2014-11-11 07:06:51 +0000
1480+++ po/ro.po 2014-12-09 21:56:54 +0000
1481@@ -8,16 +8,16 @@
1482 "Project-Id-Version: ubuntu-calendar-app\n"
1483 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1484 "POT-Creation-Date: 2014-10-17 17:41+0200\n"
1485-"PO-Revision-Date: 2014-11-10 17:24+0000\n"
1486-"Last-Translator: Meriuță Cornel <meriutacornel@neacornel.eu>\n"
1487+"PO-Revision-Date: 2014-12-01 18:16+0000\n"
1488+"Last-Translator: Marian Vasile <marianvasile1972@gmail.com>\n"
1489 "Language-Team: Romanian <ro@li.org>\n"
1490 "MIME-Version: 1.0\n"
1491 "Content-Type: text/plain; charset=UTF-8\n"
1492 "Content-Transfer-Encoding: 8bit\n"
1493 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
1494 "== 0) && (n != 0))) ? 2: 1));\n"
1495-"X-Launchpad-Export-Date: 2014-11-11 07:06+0000\n"
1496-"X-Generator: Launchpad (build 17241)\n"
1497+"X-Launchpad-Export-Date: 2014-12-02 06:09+0000\n"
1498+"X-Generator: Launchpad (build 17274)\n"
1499
1500 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1501 #: ../WeekView.qml:42 ../YearView.qml:36
1502@@ -57,8 +57,9 @@
1503 #, qt-format
1504 msgid "%1 all day event"
1505 msgid_plural "%1 all day events"
1506-msgstr[0] ""
1507-msgstr[1] ""
1508+msgstr[0] "%1 eveniment în desfășurare pe durata întregii zile"
1509+msgstr[1] "%1 evenimente în desfășurare pe durata întregii zile"
1510+msgstr[2] "%1 de evenimente în desfășurare pe durata întregii zile"
1511
1512 #: ../CalendarChoicePopup.qml:32 ../EventActions.qml:42
1513 msgid "Calendars"
1514@@ -161,7 +162,7 @@
1515 #: ../EventDetails.qml:66
1516 #, qt-format
1517 msgid "%1 Calendar"
1518-msgstr ""
1519+msgstr "Calendar %1"
1520
1521 #. TRANSLATORS: the first parameter refers to number of all day events.
1522 #: ../EventDetails.qml:112
1523@@ -214,8 +215,9 @@
1524 #, qt-format
1525 msgid "%1; %2 time"
1526 msgid_plural "%1; %2 times"
1527-msgstr[0] ""
1528-msgstr[1] ""
1529+msgstr[0] "%1; %2 apariție"
1530+msgstr[1] "%1; %2 apariții"
1531+msgstr[2] "%1; %2 de apariții"
1532
1533 #. TRANSLATORS: the argument refers to recurrence until user selected date.
1534 #. E.g. "Daily; until 12/12/2014."
1535@@ -307,13 +309,13 @@
1536 #: ../RecurrenceLabelDefines.qml:27
1537 #, qt-format
1538 msgid "On %1, %2 ,%3"
1539-msgstr ""
1540+msgstr "În zilele de %1, %2 ,%3"
1541
1542 #. TRANSLATORS: The arguments refer to days of the week. E.g. "On Monday and Thursday"
1543 #: ../RecurrenceLabelDefines.qml:29
1544 #, qt-format
1545 msgid "On %1 and %2"
1546-msgstr ""
1547+msgstr "În zilele de %1 și %2"
1548
1549 #: ../RecurrenceLabelDefines.qml:30
1550 msgid "Weekly"
1551@@ -336,7 +338,7 @@
1552 #. the event starts, not any time before
1553 #: ../RemindersModel.qml:30
1554 msgid "On Event"
1555-msgstr ""
1556+msgstr "În momentul evenimentului"
1557
1558 #: ../RemindersModel.qml:31
1559 msgid "5 minutes"
1560
1561=== modified file 'po/ru.po'
1562--- po/ru.po 2014-10-25 05:59:00 +0000
1563+++ po/ru.po 2014-12-09 21:56:54 +0000
1564@@ -16,8 +16,8 @@
1565 "Content-Transfer-Encoding: 8bit\n"
1566 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
1567 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
1568-"X-Launchpad-Export-Date: 2014-10-25 05:58+0000\n"
1569-"X-Generator: Launchpad (build 17203)\n"
1570+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1571+"X-Generator: Launchpad (build 17274)\n"
1572
1573 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1574 #: ../WeekView.qml:42 ../YearView.qml:36
1575
1576=== modified file 'po/shn.po'
1577--- po/shn.po 2014-10-18 07:05:51 +0000
1578+++ po/shn.po 2014-12-09 21:56:54 +0000
1579@@ -15,8 +15,8 @@
1580 "Content-Type: text/plain; charset=UTF-8\n"
1581 "Content-Transfer-Encoding: 8bit\n"
1582 "Plural-Forms: nplurals=2; plural=(n == 1) ? 0 : 1;\n"
1583-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1584-"X-Generator: Launchpad (build 17196)\n"
1585+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1586+"X-Generator: Launchpad (build 17274)\n"
1587
1588 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1589 #: ../WeekView.qml:42 ../YearView.qml:36
1590
1591=== modified file 'po/si.po'
1592--- po/si.po 2014-10-18 07:05:51 +0000
1593+++ po/si.po 2014-12-09 21:56:54 +0000
1594@@ -15,8 +15,8 @@
1595 "Content-Type: text/plain; charset=UTF-8\n"
1596 "Content-Transfer-Encoding: 8bit\n"
1597 "Plural-Forms: nplurals=2; plural=n != 1;\n"
1598-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1599-"X-Generator: Launchpad (build 17196)\n"
1600+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1601+"X-Generator: Launchpad (build 17274)\n"
1602
1603 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1604 #: ../WeekView.qml:42 ../YearView.qml:36
1605
1606=== modified file 'po/sk.po'
1607--- po/sk.po 2014-10-18 07:05:51 +0000
1608+++ po/sk.po 2014-12-09 21:56:54 +0000
1609@@ -15,8 +15,8 @@
1610 "Content-Type: text/plain; charset=UTF-8\n"
1611 "Content-Transfer-Encoding: 8bit\n"
1612 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
1613-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1614-"X-Generator: Launchpad (build 17196)\n"
1615+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1616+"X-Generator: Launchpad (build 17274)\n"
1617
1618 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1619 #: ../WeekView.qml:42 ../YearView.qml:36
1620
1621=== modified file 'po/sl.po'
1622--- po/sl.po 2014-10-21 07:23:48 +0000
1623+++ po/sl.po 2014-12-09 21:56:54 +0000
1624@@ -16,8 +16,8 @@
1625 "Content-Transfer-Encoding: 8bit\n"
1626 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
1627 "n%100==4 ? 3 : 0);\n"
1628-"X-Launchpad-Export-Date: 2014-10-21 07:23+0000\n"
1629-"X-Generator: Launchpad (build 17203)\n"
1630+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1631+"X-Generator: Launchpad (build 17274)\n"
1632
1633 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1634 #: ../WeekView.qml:42 ../YearView.qml:36
1635
1636=== modified file 'po/sr.po'
1637--- po/sr.po 2014-10-18 07:05:51 +0000
1638+++ po/sr.po 2014-12-09 21:56:54 +0000
1639@@ -16,8 +16,8 @@
1640 "Content-Transfer-Encoding: 8bit\n"
1641 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
1642 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
1643-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1644-"X-Generator: Launchpad (build 17196)\n"
1645+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1646+"X-Generator: Launchpad (build 17274)\n"
1647
1648 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1649 #: ../WeekView.qml:42 ../YearView.qml:36
1650
1651=== modified file 'po/st.po'
1652--- po/st.po 2014-10-18 07:05:51 +0000
1653+++ po/st.po 2014-12-09 21:56:54 +0000
1654@@ -15,8 +15,8 @@
1655 "Content-Type: text/plain; charset=UTF-8\n"
1656 "Content-Transfer-Encoding: 8bit\n"
1657 "Plural-Forms: nplurals=2; plural=n != 1;\n"
1658-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1659-"X-Generator: Launchpad (build 17196)\n"
1660+"X-Launchpad-Export-Date: 2014-12-01 06:27+0000\n"
1661+"X-Generator: Launchpad (build 17274)\n"
1662
1663 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1664 #: ../WeekView.qml:42 ../YearView.qml:36
1665
1666=== modified file 'po/sv.po'
1667--- po/sv.po 2014-10-18 07:05:51 +0000
1668+++ po/sv.po 2014-12-09 21:56:54 +0000
1669@@ -15,8 +15,8 @@
1670 "Content-Type: text/plain; charset=UTF-8\n"
1671 "Content-Transfer-Encoding: 8bit\n"
1672 "Plural-Forms: nplurals=2; plural=n != 1;\n"
1673-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1674-"X-Generator: Launchpad (build 17196)\n"
1675+"X-Launchpad-Export-Date: 2014-12-01 06:28+0000\n"
1676+"X-Generator: Launchpad (build 17274)\n"
1677 "Language: sv\n"
1678
1679 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1680
1681=== modified file 'po/ta.po'
1682--- po/ta.po 2014-10-18 07:05:51 +0000
1683+++ po/ta.po 2014-12-09 21:56:54 +0000
1684@@ -15,8 +15,8 @@
1685 "Content-Type: text/plain; charset=UTF-8\n"
1686 "Content-Transfer-Encoding: 8bit\n"
1687 "Plural-Forms: nplurals=2; plural=n != 1;\n"
1688-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1689-"X-Generator: Launchpad (build 17196)\n"
1690+"X-Launchpad-Export-Date: 2014-12-01 06:28+0000\n"
1691+"X-Generator: Launchpad (build 17274)\n"
1692
1693 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1694 #: ../WeekView.qml:42 ../YearView.qml:36
1695
1696=== modified file 'po/te.po'
1697--- po/te.po 2014-10-18 07:05:51 +0000
1698+++ po/te.po 2014-12-09 21:56:54 +0000
1699@@ -15,8 +15,8 @@
1700 "Content-Type: text/plain; charset=UTF-8\n"
1701 "Content-Transfer-Encoding: 8bit\n"
1702 "Plural-Forms: nplurals=2; plural=n != 1;\n"
1703-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1704-"X-Generator: Launchpad (build 17196)\n"
1705+"X-Launchpad-Export-Date: 2014-12-01 06:28+0000\n"
1706+"X-Generator: Launchpad (build 17274)\n"
1707
1708 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1709 #: ../WeekView.qml:42 ../YearView.qml:36
1710
1711=== modified file 'po/tr.po'
1712--- po/tr.po 2014-10-18 07:05:51 +0000
1713+++ po/tr.po 2014-12-09 21:56:54 +0000
1714@@ -15,8 +15,8 @@
1715 "Content-Type: text/plain; charset=UTF-8\n"
1716 "Content-Transfer-Encoding: 8bit\n"
1717 "Plural-Forms: nplurals=2; plural=n != 1;\n"
1718-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1719-"X-Generator: Launchpad (build 17196)\n"
1720+"X-Launchpad-Export-Date: 2014-12-01 06:28+0000\n"
1721+"X-Generator: Launchpad (build 17274)\n"
1722
1723 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1724 #: ../WeekView.qml:42 ../YearView.qml:36
1725
1726=== modified file 'po/ug.po'
1727--- po/ug.po 2014-10-18 07:05:51 +0000
1728+++ po/ug.po 2014-12-09 21:56:54 +0000
1729@@ -15,8 +15,8 @@
1730 "Content-Type: text/plain; charset=UTF-8\n"
1731 "Content-Transfer-Encoding: 8bit\n"
1732 "Plural-Forms: nplurals=1; plural=0;\n"
1733-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1734-"X-Generator: Launchpad (build 17196)\n"
1735+"X-Launchpad-Export-Date: 2014-12-01 06:28+0000\n"
1736+"X-Generator: Launchpad (build 17274)\n"
1737
1738 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1739 #: ../WeekView.qml:42 ../YearView.qml:36
1740
1741=== modified file 'po/uk.po'
1742--- po/uk.po 2014-10-18 07:05:51 +0000
1743+++ po/uk.po 2014-12-09 21:56:54 +0000
1744@@ -16,8 +16,8 @@
1745 "Content-Transfer-Encoding: 8bit\n"
1746 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
1747 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
1748-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1749-"X-Generator: Launchpad (build 17196)\n"
1750+"X-Launchpad-Export-Date: 2014-12-01 06:28+0000\n"
1751+"X-Generator: Launchpad (build 17274)\n"
1752
1753 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1754 #: ../WeekView.qml:42 ../YearView.qml:36
1755
1756=== modified file 'po/vi.po'
1757--- po/vi.po 2014-10-18 07:05:51 +0000
1758+++ po/vi.po 2014-12-09 21:56:54 +0000
1759@@ -15,8 +15,8 @@
1760 "Content-Type: text/plain; charset=UTF-8\n"
1761 "Content-Transfer-Encoding: 8bit\n"
1762 "Plural-Forms: nplurals=1; plural=0;\n"
1763-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1764-"X-Generator: Launchpad (build 17196)\n"
1765+"X-Launchpad-Export-Date: 2014-12-01 06:28+0000\n"
1766+"X-Generator: Launchpad (build 17274)\n"
1767
1768 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1769 #: ../WeekView.qml:42 ../YearView.qml:36
1770
1771=== modified file 'po/xh.po'
1772--- po/xh.po 2014-10-18 07:05:51 +0000
1773+++ po/xh.po 2014-12-09 21:56:54 +0000
1774@@ -15,8 +15,8 @@
1775 "Content-Type: text/plain; charset=UTF-8\n"
1776 "Content-Transfer-Encoding: 8bit\n"
1777 "Plural-Forms: nplurals=2; plural=n != 1;\n"
1778-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1779-"X-Generator: Launchpad (build 17196)\n"
1780+"X-Launchpad-Export-Date: 2014-12-01 06:28+0000\n"
1781+"X-Generator: Launchpad (build 17274)\n"
1782
1783 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1784 #: ../WeekView.qml:42 ../YearView.qml:36
1785
1786=== modified file 'po/zh_CN.po'
1787--- po/zh_CN.po 2014-10-18 07:05:51 +0000
1788+++ po/zh_CN.po 2014-12-09 21:56:54 +0000
1789@@ -15,8 +15,8 @@
1790 "Content-Type: text/plain; charset=UTF-8\n"
1791 "Content-Transfer-Encoding: 8bit\n"
1792 "Plural-Forms: nplurals=1; plural=0;\n"
1793-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1794-"X-Generator: Launchpad (build 17196)\n"
1795+"X-Launchpad-Export-Date: 2014-12-01 06:28+0000\n"
1796+"X-Generator: Launchpad (build 17274)\n"
1797
1798 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1799 #: ../WeekView.qml:42 ../YearView.qml:36
1800
1801=== modified file 'po/zh_HK.po'
1802--- po/zh_HK.po 2014-10-18 07:05:51 +0000
1803+++ po/zh_HK.po 2014-12-09 21:56:54 +0000
1804@@ -15,8 +15,8 @@
1805 "Content-Type: text/plain; charset=UTF-8\n"
1806 "Content-Transfer-Encoding: 8bit\n"
1807 "Plural-Forms: nplurals=1; plural=0;\n"
1808-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1809-"X-Generator: Launchpad (build 17196)\n"
1810+"X-Launchpad-Export-Date: 2014-12-01 06:28+0000\n"
1811+"X-Generator: Launchpad (build 17274)\n"
1812
1813 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1814 #: ../WeekView.qml:42 ../YearView.qml:36
1815
1816=== modified file 'po/zh_TW.po'
1817--- po/zh_TW.po 2014-10-18 07:05:51 +0000
1818+++ po/zh_TW.po 2014-12-09 21:56:54 +0000
1819@@ -8,15 +8,15 @@
1820 "Project-Id-Version: ubuntu-calendar-app\n"
1821 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1822 "POT-Creation-Date: 2014-10-17 17:41+0200\n"
1823-"PO-Revision-Date: 2014-08-29 10:56+0000\n"
1824+"PO-Revision-Date: 2014-11-19 13:50+0000\n"
1825 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
1826 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
1827 "MIME-Version: 1.0\n"
1828 "Content-Type: text/plain; charset=UTF-8\n"
1829 "Content-Transfer-Encoding: 8bit\n"
1830 "Plural-Forms: nplurals=1; plural=0;\n"
1831-"X-Launchpad-Export-Date: 2014-10-18 07:05+0000\n"
1832-"X-Generator: Launchpad (build 17196)\n"
1833+"X-Launchpad-Export-Date: 2014-12-01 06:28+0000\n"
1834+"X-Generator: Launchpad (build 17274)\n"
1835
1836 #: ../AgendaView.qml:50 ../DayView.qml:38 ../MonthView.qml:37
1837 #: ../WeekView.qml:42 ../YearView.qml:36
1838@@ -29,11 +29,11 @@
1839
1840 #: ../AgendaView.qml:93
1841 msgid "You have no calendars enabled"
1842-msgstr ""
1843+msgstr "未有啟用行事曆"
1844
1845 #: ../AgendaView.qml:103
1846 msgid "Enable calendars"
1847-msgstr ""
1848+msgstr "啟用行事曆"
1849
1850 #. TRANSLATORS: the first argument (%1) refers to a start time for an event,
1851 #. while the second one (%2) refers to the end time
1852@@ -49,15 +49,14 @@
1853 #: ../AllDayEventComponent.qml:109
1854 #, qt-format
1855 msgid "%1 ev."
1856-msgstr ""
1857+msgstr "%1 件事"
1858
1859 #. TRANSLATORS: the argument refers to the number of all day events
1860 #: ../AllDayEventComponent.qml:113
1861 #, qt-format
1862 msgid "%1 all day event"
1863 msgid_plural "%1 all day events"
1864-msgstr[0] ""
1865-msgstr[1] ""
1866+msgstr[0] "%1 件整日事件"
1867
1868 #: ../CalendarChoicePopup.qml:32 ../EventActions.qml:42
1869 msgid "Calendars"
1870@@ -89,7 +88,7 @@
1871 #. It's used in the header of the month and week views
1872 #: ../DayView.qml:56 ../MonthView.qml:56 ../WeekView.qml:60
1873 msgid "MMMM yyyy"
1874-msgstr ""
1875+msgstr "yyyy年M月"
1876
1877 #: ../DeleteConfirmationDialog.qml:31
1878 msgid "Delete Recurring Event"
1879@@ -103,12 +102,12 @@
1880 #: ../DeleteConfirmationDialog.qml:36
1881 #, qt-format
1882 msgid "Delete only this event \"%1\", or all events in the series?"
1883-msgstr ""
1884+msgstr "僅刪除此「%1」事件,還是整系列事件?"
1885
1886 #: ../DeleteConfirmationDialog.qml:37
1887 #, qt-format
1888 msgid "Are you sure you want to delete the event \"%1\"?"
1889-msgstr ""
1890+msgstr "確定刪除「%1」事件?"
1891
1892 #: ../DeleteConfirmationDialog.qml:40
1893 msgid "Delete series"
1894@@ -130,7 +129,7 @@
1895 #: ../EditEventConfirmationDialog.qml:32
1896 #, qt-format
1897 msgid "Edit only this event \"%1\", or all events in the series?"
1898-msgstr ""
1899+msgstr "僅編輯此「%1」事件,還是整系列事件?"
1900
1901 #: ../EditEventConfirmationDialog.qml:35
1902 msgid "Edit series"
1903@@ -160,13 +159,13 @@
1904 #: ../EventDetails.qml:66
1905 #, qt-format
1906 msgid "%1 Calendar"
1907-msgstr ""
1908+msgstr "%1 行事曆"
1909
1910 #. TRANSLATORS: the first parameter refers to number of all day events.
1911 #: ../EventDetails.qml:112
1912 #, qt-format
1913 msgid "%1 (All Day)"
1914-msgstr ""
1915+msgstr "%1 件 (整日)"
1916
1917 #: ../EventDetails.qml:171
1918 msgid "Edit"
1919@@ -178,7 +177,7 @@
1920
1921 #: ../EventDetails.qml:365 ../EventReminder.qml:35 ../NewEvent.qml:636
1922 msgid "Reminder"
1923-msgstr ""
1924+msgstr "提醒"
1925
1926 #. TRANSLATORS: this refers to how often a recurrent event repeats
1927 #. and it is shown as the header of the page to choose repetition
1928@@ -186,7 +185,7 @@
1929 #. summary in the page that displays the event details
1930 #: ../EventRepetition.qml:41 ../EventRepetition.qml:128
1931 msgid "Repeat"
1932-msgstr ""
1933+msgstr "重複"
1934
1935 #: ../EventRepetition.qml:147
1936 msgid "Repeats On:"
1937@@ -201,7 +200,7 @@
1938 #. its repetition
1939 #: ../EventRepetition.qml:215 ../NewEvent.qml:617
1940 msgid "Repeats"
1941-msgstr ""
1942+msgstr "重複"
1943
1944 #: ../EventRepetition.qml:240
1945 msgid "Date"
1946@@ -213,22 +212,21 @@
1947 #, qt-format
1948 msgid "%1; %2 time"
1949 msgid_plural "%1; %2 times"
1950-msgstr[0] ""
1951-msgstr[1] ""
1952+msgstr[0] "%1; %2 次"
1953
1954 #. TRANSLATORS: the argument refers to recurrence until user selected date.
1955 #. E.g. "Daily; until 12/12/2014."
1956 #: ../EventUtils.qml:79
1957 #, qt-format
1958 msgid "%1; until %2"
1959-msgstr ""
1960+msgstr "%1; 直到 %2"
1961
1962 #. TRANSLATORS: the argument refers to several different days of the week.
1963 #. E.g. "Weekly on Mondays, Tuesdays"
1964 #: ../EventUtils.qml:102
1965 #, qt-format
1966 msgid "Weekly on %1"
1967-msgstr ""
1968+msgstr "每週%1"
1969
1970 #: ../LimitLabelDefines.qml:21
1971 msgid "Never"
1972@@ -260,15 +258,15 @@
1973
1974 #: ../NewEvent.qml:340
1975 msgid "From"
1976-msgstr ""
1977+msgstr "由"
1978
1979 #: ../NewEvent.qml:384
1980 msgid "To"
1981-msgstr ""
1982+msgstr "到"
1983
1984 #: ../NewEvent.qml:434
1985 msgid "All day event"
1986-msgstr ""
1987+msgstr "整日事件"
1988
1989 #: ../NewEvent.qml:462
1990 msgid "Event Name"
1991@@ -300,19 +298,19 @@
1992
1993 #: ../RecurrenceLabelDefines.qml:25
1994 msgid "On Weekdays"
1995-msgstr ""
1996+msgstr "週一至週五"
1997
1998 #. TRANSLATORS: The arguments refer to days of the week. E.g. "On Monday, Tuesday, Thursday"
1999 #: ../RecurrenceLabelDefines.qml:27
2000 #, qt-format
2001 msgid "On %1, %2 ,%3"
2002-msgstr ""
2003+msgstr "於%1、%2、%3"
2004
2005 #. TRANSLATORS: The arguments refer to days of the week. E.g. "On Monday and Thursday"
2006 #: ../RecurrenceLabelDefines.qml:29
2007 #, qt-format
2008 msgid "On %1 and %2"
2009-msgstr ""
2010+msgstr "於%1及%2"
2011
2012 #: ../RecurrenceLabelDefines.qml:30
2013 msgid "Weekly"
2014@@ -335,7 +333,7 @@
2015 #. the event starts, not any time before
2016 #: ../RemindersModel.qml:30
2017 msgid "On Event"
2018-msgstr ""
2019+msgstr "事件開始時"
2020
2021 #: ../RemindersModel.qml:31
2022 msgid "5 minutes"
2023
2024=== modified file 'tests/autopilot/calendar_app/__init__.py'
2025--- tests/autopilot/calendar_app/__init__.py 2014-11-04 15:08:45 +0000
2026+++ tests/autopilot/calendar_app/__init__.py 2014-12-09 21:56:54 +0000
2027@@ -18,7 +18,8 @@
2028
2029 import logging
2030 from time import sleep
2031-
2032+from autopilot.introspection import dbus
2033+import datetime
2034 import autopilot.logging
2035 import ubuntuuitoolkit
2036 from autopilot import exceptions
2037@@ -113,6 +114,27 @@
2038 logger.debug('The Day View page is already opened.')
2039 return self.get_day_view(day_tab)
2040
2041+ def open_new_event_page(self):
2042+ """Bring the new event page to the screen"""
2043+ self.visible.wait_for(True)
2044+ try:
2045+ button = self.wait_select_single(objectName='bottomEdgeTip')
2046+ button.visible.wait_for(True)
2047+
2048+ start_x = (button.globalRect.x +
2049+ (button.globalRect.width * 0.5))
2050+
2051+ start_y = (button.globalRect.y +
2052+ (button.height * 0.2))
2053+
2054+ stop_y = start_y - (self.height * 0.7)
2055+ self.pointing_device.drag(start_x, start_y,
2056+ start_x, stop_y, rate=3)
2057+
2058+ except dbus.StateNotFoundError:
2059+ logger.error('BottomEdge element not found.')
2060+ raise
2061+
2062 @autopilot.logging.log_action(logger.info)
2063 def go_to_new_event(self):
2064 """Open the page to add a new event.
2065@@ -120,9 +142,11 @@
2066 :return: The New Event page.
2067
2068 """
2069- header = self.get_header()
2070- header.click_action_button('neweventbutton')
2071- return self.wait_select_single(NewEvent, objectName='newEventPage')
2072+
2073+ self.open_new_event_page()
2074+ page = self.wait_select_single(NewEvent, objectName='newEventPage')
2075+ page.visible.wait_for(True)
2076+ return page
2077
2078 def set_picker(self, field, mode, value):
2079 # open picker
2080@@ -631,8 +655,8 @@
2081 self._get_calendar().select_option('Label', text=calendar)
2082
2083 def _get_calendar(self):
2084- return self.select_single(ubuntuuitoolkit.OptionSelector,
2085- objectName="calendarsOption")
2086+ return self.wait_select_single(ubuntuuitoolkit.OptionSelector,
2087+ objectName="calendarsOption")
2088
2089 def _get_guests(self):
2090 guestlist = self.select_single('QQuickColumn', objectName='guestList')
2091@@ -642,6 +666,9 @@
2092 guest_names.append(guest.text)
2093 return guest_names
2094
2095+ def has_guests(self):
2096+ return len(self._get_guests()) > 0
2097+
2098 def get_calendar_name(self):
2099 return self._get_calendar().get_current_label().text
2100
2101@@ -654,6 +681,30 @@
2102 def get_location_name(self):
2103 return self._get_text_box('eventLocationInput').text
2104
2105+ def get_is_all_day_event(self):
2106+ return self.wait_select_single('CheckBox',
2107+ objectName='allDayEventCheckbox'
2108+ ).checked
2109+
2110+ def get_this_happens(self):
2111+ return self.wait_select_single('Subtitled',
2112+ objectName='thisHappens').subText
2113+
2114+ def get_reminder(self):
2115+ return self.wait_select_single('Subtitled',
2116+ objectName='eventReminder').subText
2117+
2118+ def get_start_date(self):
2119+ startDate = self.startDate
2120+ return datetime.datetime(startDate.year, startDate.month,
2121+ startDate.day, startDate.hour,
2122+ startDate.minute)
2123+
2124+ def get_end_date(self):
2125+ endDate = self.endDate
2126+ return datetime.datetime(endDate.year, endDate.month,
2127+ endDate.day, endDate.hour, endDate.minute)
2128+
2129 def _get_form_values(self):
2130 # TODO get start date and end date, is all day event, recurrence and
2131 # reminders. --elopio - 2014-06-26
2132
2133=== modified file 'tests/autopilot/calendar_app/tests/test_new_event.py'
2134--- tests/autopilot/calendar_app/tests/test_new_event.py 2014-10-21 14:26:29 +0000
2135+++ tests/autopilot/calendar_app/tests/test_new_event.py 2014-12-09 21:56:54 +0000
2136@@ -19,6 +19,7 @@
2137 from __future__ import absolute_import
2138
2139 import logging
2140+import datetime
2141
2142 from autopilot.matchers import Eventually
2143 from testtools.matchers import Equals
2144@@ -72,13 +73,24 @@
2145 return False
2146 return True
2147
2148- # TODO write helpers to check all of the default values
2149- # then expand the asserts to ensure defaults are correct
2150+ def _expected_start_date(self):
2151+ now = datetime.datetime.now()
2152+ now = datetime.datetime(now.year, now.month,
2153+ now.day, now.hour, now.minute)
2154+
2155+ if now.minute < 30:
2156+ return datetime.datetime(now.year, now.month,
2157+ now.day, now.hour, 30)
2158+ else:
2159+ start_date = datetime.datetime(now.year, now.month,
2160+ now.day, now.hour, 0)
2161+ return start_date + datetime.timedelta(hours=1)
2162+
2163 def test_new_event_must_start_with_default_values(self):
2164 """Test adding a new event default values
2165
2166 Start Date: today Start Time: next half hour increment
2167- End Date: today End Time: 30 mins after start time
2168+ End Date: today End Time: 1 hour after start time
2169 Calendar: Personal
2170 All Day Event: unchecked
2171 Event Name: blank, selected
2172@@ -86,7 +98,7 @@
2173 Location: none
2174 Guests: none
2175 This happens: Once
2176- Remind me: No Reminder
2177+ Remind me: On Event
2178 """
2179
2180 new_event_page = self.app.main_view.go_to_new_event()
2181@@ -94,6 +106,18 @@
2182 self.assertThat(new_event_page.get_event_name(), Equals(''))
2183 self.assertThat(new_event_page.get_description_text(), Equals(''))
2184 self.assertThat(new_event_page.get_location_name(), Equals(''))
2185+ self.assertThat(new_event_page.get_is_all_day_event(), Equals(False))
2186+ self.assertThat(new_event_page.has_guests(), Equals(False))
2187+ self.assertThat(new_event_page.get_this_happens(), Equals('Once'))
2188+ self.assertThat(new_event_page.get_reminder(), Equals('On Event'))
2189+
2190+ expected_start_date = self._expected_start_date()
2191+ expected_end_date = expected_start_date + datetime.timedelta(hours=1)
2192+
2193+ self.assertThat(new_event_page.get_start_date(),
2194+ Equals(expected_start_date))
2195+ self.assertThat(new_event_page.get_end_date(),
2196+ Equals(expected_end_date))
2197
2198 def test_add_new_event_with_default_values(self):
2199 """Test adding a new event with the default values.

Subscribers

People subscribed via source and target branches

to all changes: