Ubuntu Calendar App

Merge lp:~mihirsoni/ubuntu-calendar-app/1317683 into lp:ubuntu-calendar-app

  1. 1317683
  2. Merge into trunk
Proposed by Mihir Soni
Status: Merged
Approved by: David Planella
Approved revision: 284
Merged at revision: 288
Proposed branch: lp:~mihirsoni/ubuntu-calendar-app/1317683
Merge into: lp:ubuntu-calendar-app
Diff against target: 264 lines (+105/-52)
1 file modified
po/calendar-app.pot (+105/-52)
To merge this branch: bzr merge lp:~mihirsoni/ubuntu-calendar-app/1317683
Reviewer Review Type Date Requested Status
Bartosz Kosiorek (community) Approve
David Planella Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+220678@code.launchpad.net

Commit message

Updated translation template

Description of the change

Updated translation template

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

PASSED: Continuous integration, rev:282
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/488/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2795
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2795/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/332
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/332/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/322
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/46

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/488/rebuild

review: Approve (continuous-integration)
Revision history for this message
Bartosz Kosiorek (gang65) wrote :

Nice job Mihir.

Could you please update header for pot file:
-# Calendar App Translations
-# Copyright (C) 2014 Canonical Ltd.
-# This file is distributed under the same license as the ubuntu-calendar-app package.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical Ltd.
+# This file is distributed under the same license as the PACKAGE package.

review: Needs Fixing
lp:~mihirsoni/ubuntu-calendar-app/1317683 updated
283. By Mihir Soni

Updated headers

284. By Mihir Soni

merge from trunk

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:284
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/490/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2801
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2801/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/338
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/338/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/324
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/48

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/490/rebuild

review: Approve (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

LGTM, thanks!

review: Approve
Revision history for this message
Bartosz Kosiorek (gang65) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/calendar-app.pot'
2--- po/calendar-app.pot 2014-03-11 00:04:28 +0000
3+++ po/calendar-app.pot 2014-05-22 16:51:23 +0000
4@@ -1,5 +1,5 @@
5-# Calendar App Translations
6-# Copyright (C) 2014 Canonical Ltd.
7+# ubuntu-calendar-app translations.
8+# Copyright (C) YEAR Canonical Ltd.
9 # This file is distributed under the same license as the ubuntu-calendar-app package.
10 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
11 #
12@@ -8,7 +8,7 @@
13 msgstr ""
14 "Project-Id-Version: calendar-app\n"
15 "Report-Msgid-Bugs-To: \n"
16-"POT-Creation-Date: 2014-03-10 19:02-0500\n"
17+"POT-Creation-Date: 2014-05-22 21:21+0530\n"
18 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
19 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
20 "Language-Team: LANGUAGE <LL@li.org>\n"
21@@ -17,108 +17,157 @@
22 "Content-Type: text/plain; charset=CHARSET\n"
23 "Content-Transfer-Encoding: 8bit\n"
24
25-#: ../AllDayEventComponent.qml:101
26-#, c-format, qt-format
27-msgid "%1E"
28-msgstr ""
29-
30-#: ../AllDayEventComponent.qml:104
31-#, qt-format
32-msgid "%1 All day events"
33+#: ../AgendaView.qml:49
34+msgid "No upcoming events"
35 msgstr ""
36
37 #. TRANSLATORS: this is a time formatting string,
38-#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
39-#: ../EventBubble.qml:36 ../EventDetails.qml:40
40+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions
41+#: ../AgendaView.qml:100 ../EventBubble.qml:40 ../EventDetails.qml:97
42 msgid "hh:mm"
43 msgstr ""
44
45+#: ../AgendaView.qml:101
46+msgid "dddd , d MMMM"
47+msgstr ""
48+
49+#. TRANSLATORS: the first argument (%1) refer to a start time for an event,
50+#. while the third one (%2) refers to the end time
51 #. TRANSLATORS: the first argument (%1) refers to a start time for an event,
52 #. while the second one (%2) refers to the end time
53-#: ../EventBubble.qml:41
54+#: ../AgendaView.qml:108 ../EventBubble.qml:45
55 #, qt-format
56 msgid "%1 - %2"
57 msgstr ""
58
59-#: ../EventDetails.qml:98
60+#: ../AllDayEventComponent.qml:94
61+#, c-format, qt-format
62+msgid "%1E"
63+msgstr ""
64+
65+#: ../AllDayEventComponent.qml:97
66+#, qt-format
67+msgid "%1 All day events"
68+msgstr ""
69+
70+#: ../DeleteConfirmationDialog.qml:13
71+msgid "Delete Recurring Event"
72+msgstr ""
73+
74+#: ../DeleteConfirmationDialog.qml:14
75+msgid "Delete Event"
76+msgstr ""
77+
78+#: ../DeleteConfirmationDialog.qml:21
79+msgid "Delete series"
80+msgstr ""
81+
82+#: ../DeleteConfirmationDialog.qml:31
83+msgid "Delete this"
84+msgstr ""
85+
86+#: ../DeleteConfirmationDialog.qml:31 ../EventDetails.qml:156
87 msgid "Delete"
88 msgstr ""
89
90-#: ../EventDetails.qml:110
91+#: ../DeleteConfirmationDialog.qml:40 ../EditEventConfirmationDialog.qml:35
92+#: ../EditToolbar.qml:37 ../NewEvent.qml:469 ../TimePicker.qml:74
93+msgid "Cancel"
94+msgstr ""
95+
96+#: ../EditEventConfirmationDialog.qml:12 ../NewEvent.qml:181
97+msgid "Edit Event"
98+msgstr ""
99+
100+#: ../EditEventConfirmationDialog.qml:17
101+msgid "Edit series"
102+msgstr ""
103+
104+#: ../EditEventConfirmationDialog.qml:26
105+msgid "Edit this"
106+msgstr ""
107+
108+#: ../EditToolbar.qml:52
109+msgid "Done"
110+msgstr ""
111+
112+#: ../EventDetails.qml:89
113+msgid "Not specified"
114+msgstr ""
115+
116+#. TRANSLATORS: this is a time & Date formatting string,
117+#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details
118+#: ../EventDetails.qml:100
119+msgid "dd-MMM-yyyy"
120+msgstr ""
121+
122+#: ../EventDetails.qml:170
123 msgid "Edit"
124 msgstr ""
125
126-#: ../EventDetails.qml:140 ../NewEvent.qml:262
127+#: ../EventDetails.qml:230 ../NewEvent.qml:283
128+msgid "Date"
129+msgstr ""
130+
131+#: ../EventDetails.qml:235 ../NewEvent.qml:298
132 msgid "Start"
133 msgstr ""
134
135-#: ../EventDetails.qml:145 ../NewEvent.qml:287
136+#: ../EventDetails.qml:240 ../NewEvent.qml:323
137 msgid "End"
138 msgstr ""
139
140-#: ../EventDetails.qml:153 ../NewEvent.qml:316
141+#: ../EventDetails.qml:248 ../NewEvent.qml:352
142 msgid "All Day event:"
143 msgstr ""
144
145-#: ../EventDetails.qml:183 ../NewEvent.qml:365
146+#: ../EventDetails.qml:278 ../NewEvent.qml:406
147 msgid "Location"
148 msgstr ""
149
150-#: ../EventDetails.qml:207 ../NewEvent.qml:372
151+#: ../EventDetails.qml:303 ../NewEvent.qml:413
152 msgid "Guests"
153 msgstr ""
154
155-#: ../EventDetails.qml:238 ../NewEvent.qml:381
156+#: ../EventDetails.qml:340 ../NewEvent.qml:424
157 msgid "This happens"
158 msgstr ""
159
160-#: ../EventDetails.qml:244 ../NewEvent.qml:398
161+#: ../EventDetails.qml:345 ../NewEvent.qml:441
162 msgid "Remind me"
163 msgstr ""
164
165-#: ../NewEvent.qml:106
166+#: ../NewEvent.qml:111
167 msgid "End time can't be before start time"
168 msgstr ""
169
170-#: ../NewEvent.qml:165
171-msgid "Edit Event"
172-msgstr ""
173-
174-#: ../NewEvent.qml:165 ../calendar.qml:226
175+#: ../NewEvent.qml:181 ../calendar.qml:215
176 msgid "New Event"
177 msgstr ""
178
179-#: ../NewEvent.qml:176 ../TimePicker.qml:74
180-msgid "Cancel"
181-msgstr ""
182-
183-#: ../NewEvent.qml:187
184-msgid "Save"
185-msgstr ""
186-
187-#: ../NewEvent.qml:200
188+#: ../NewEvent.qml:197
189 msgid "Error"
190 msgstr ""
191
192-#: ../NewEvent.qml:202
193+#: ../NewEvent.qml:199
194 msgid "Ok"
195 msgstr ""
196
197-#: ../NewEvent.qml:247
198-msgid "Date"
199-msgstr ""
200-
201-#: ../NewEvent.qml:334
202+#: ../NewEvent.qml:370
203 msgid "Event Name"
204 msgstr ""
205
206-#: ../NewEvent.qml:350
207+#: ../NewEvent.qml:386
208 msgid "Description"
209 msgstr ""
210
211+#: ../NewEvent.qml:465
212+msgid "Save"
213+msgstr ""
214+
215 #. TRANSLATORS: this is a time formatting string,
216 #. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
217-#: ../TimeLineBackground.qml:18
218+#: ../TimeLineBackground.qml:19
219 msgid "hh ap"
220 msgstr ""
221
222@@ -138,32 +187,36 @@
223 msgid "OK"
224 msgstr ""
225
226-#: ../calendar.qml:21
227+#: ../calendar.qml:20
228 msgid ""
229 "Calendar app accept three arguments: --starttime, --endtime and --newevet. "
230 "They will be managed by system. See the source for a full comment about them"
231 msgstr ""
232
233-#: ../calendar.qml:216
234+#: ../calendar.qml:197
235 msgid "Today"
236 msgstr ""
237
238-#: ../calendar.qml:238
239+#: ../calendar.qml:248
240 msgid "Year"
241 msgstr ""
242
243-#: ../calendar.qml:260
244+#: ../calendar.qml:283
245 msgid "Month"
246 msgstr ""
247
248-#: ../calendar.qml:274
249+#: ../calendar.qml:312
250 msgid "Week"
251 msgstr ""
252
253-#: ../calendar.qml:291
254+#: ../calendar.qml:346
255 msgid "Day"
256 msgstr ""
257
258+#: ../calendar.qml:375
259+msgid "Agenda"
260+msgstr ""
261+
262 #: ../.build/com.ubuntu.calendar_calendar.desktop.in:1
263 msgid "Calendar"
264 msgstr ""

Subscribers

People subscribed via source and target branches

to status/vote changes: