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
=== modified file 'po/calendar-app.pot'
--- po/calendar-app.pot 2014-03-11 00:04:28 +0000
+++ po/calendar-app.pot 2014-05-22 16:51:23 +0000
@@ -1,5 +1,5 @@
1# Calendar App Translations1# ubuntu-calendar-app translations.
2# Copyright (C) 2014 Canonical Ltd.2# Copyright (C) YEAR Canonical Ltd.
3# This file is distributed under the same license as the ubuntu-calendar-app package.3# This file is distributed under the same license as the ubuntu-calendar-app package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#5#
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: calendar-app\n"9"Project-Id-Version: calendar-app\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2014-03-10 19:02-0500\n"11"POT-Creation-Date: 2014-05-22 21:21+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"
@@ -17,108 +17,157 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: ../AllDayEventComponent.qml:10120#: ../AgendaView.qml:49
21#, c-format, qt-format21msgid "No upcoming events"
22msgid "%1E"
23msgstr ""
24
25#: ../AllDayEventComponent.qml:104
26#, qt-format
27msgid "%1 All day events"
28msgstr ""22msgstr ""
2923
30#. TRANSLATORS: this is a time formatting string,24#. TRANSLATORS: this is a time formatting string,
31#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions25#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions
32#: ../EventBubble.qml:36 ../EventDetails.qml:4026#: ../AgendaView.qml:100 ../EventBubble.qml:40 ../EventDetails.qml:97
33msgid "hh:mm"27msgid "hh:mm"
34msgstr ""28msgstr ""
3529
30#: ../AgendaView.qml:101
31msgid "dddd , d MMMM"
32msgstr ""
33
34#. TRANSLATORS: the first argument (%1) refer to a start time for an event,
35#. while the third one (%2) refers to the end time
36#. TRANSLATORS: the first argument (%1) refers to a start time for an event,36#. TRANSLATORS: the first argument (%1) refers to a start time for an event,
37#. while the second one (%2) refers to the end time37#. while the second one (%2) refers to the end time
38#: ../EventBubble.qml:4138#: ../AgendaView.qml:108 ../EventBubble.qml:45
39#, qt-format39#, qt-format
40msgid "%1 - %2"40msgid "%1 - %2"
41msgstr ""41msgstr ""
4242
43#: ../EventDetails.qml:9843#: ../AllDayEventComponent.qml:94
44#, c-format, qt-format
45msgid "%1E"
46msgstr ""
47
48#: ../AllDayEventComponent.qml:97
49#, qt-format
50msgid "%1 All day events"
51msgstr ""
52
53#: ../DeleteConfirmationDialog.qml:13
54msgid "Delete Recurring Event"
55msgstr ""
56
57#: ../DeleteConfirmationDialog.qml:14
58msgid "Delete Event"
59msgstr ""
60
61#: ../DeleteConfirmationDialog.qml:21
62msgid "Delete series"
63msgstr ""
64
65#: ../DeleteConfirmationDialog.qml:31
66msgid "Delete this"
67msgstr ""
68
69#: ../DeleteConfirmationDialog.qml:31 ../EventDetails.qml:156
44msgid "Delete"70msgid "Delete"
45msgstr ""71msgstr ""
4672
47#: ../EventDetails.qml:11073#: ../DeleteConfirmationDialog.qml:40 ../EditEventConfirmationDialog.qml:35
74#: ../EditToolbar.qml:37 ../NewEvent.qml:469 ../TimePicker.qml:74
75msgid "Cancel"
76msgstr ""
77
78#: ../EditEventConfirmationDialog.qml:12 ../NewEvent.qml:181
79msgid "Edit Event"
80msgstr ""
81
82#: ../EditEventConfirmationDialog.qml:17
83msgid "Edit series"
84msgstr ""
85
86#: ../EditEventConfirmationDialog.qml:26
87msgid "Edit this"
88msgstr ""
89
90#: ../EditToolbar.qml:52
91msgid "Done"
92msgstr ""
93
94#: ../EventDetails.qml:89
95msgid "Not specified"
96msgstr ""
97
98#. TRANSLATORS: this is a time & Date formatting string,
99#. see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details
100#: ../EventDetails.qml:100
101msgid "dd-MMM-yyyy"
102msgstr ""
103
104#: ../EventDetails.qml:170
48msgid "Edit"105msgid "Edit"
49msgstr ""106msgstr ""
50107
51#: ../EventDetails.qml:140 ../NewEvent.qml:262108#: ../EventDetails.qml:230 ../NewEvent.qml:283
109msgid "Date"
110msgstr ""
111
112#: ../EventDetails.qml:235 ../NewEvent.qml:298
52msgid "Start"113msgid "Start"
53msgstr ""114msgstr ""
54115
55#: ../EventDetails.qml:145 ../NewEvent.qml:287116#: ../EventDetails.qml:240 ../NewEvent.qml:323
56msgid "End"117msgid "End"
57msgstr ""118msgstr ""
58119
59#: ../EventDetails.qml:153 ../NewEvent.qml:316120#: ../EventDetails.qml:248 ../NewEvent.qml:352
60msgid "All Day event:"121msgid "All Day event:"
61msgstr ""122msgstr ""
62123
63#: ../EventDetails.qml:183 ../NewEvent.qml:365124#: ../EventDetails.qml:278 ../NewEvent.qml:406
64msgid "Location"125msgid "Location"
65msgstr ""126msgstr ""
66127
67#: ../EventDetails.qml:207 ../NewEvent.qml:372128#: ../EventDetails.qml:303 ../NewEvent.qml:413
68msgid "Guests"129msgid "Guests"
69msgstr ""130msgstr ""
70131
71#: ../EventDetails.qml:238 ../NewEvent.qml:381132#: ../EventDetails.qml:340 ../NewEvent.qml:424
72msgid "This happens"133msgid "This happens"
73msgstr ""134msgstr ""
74135
75#: ../EventDetails.qml:244 ../NewEvent.qml:398136#: ../EventDetails.qml:345 ../NewEvent.qml:441
76msgid "Remind me"137msgid "Remind me"
77msgstr ""138msgstr ""
78139
79#: ../NewEvent.qml:106140#: ../NewEvent.qml:111
80msgid "End time can't be before start time"141msgid "End time can't be before start time"
81msgstr ""142msgstr ""
82143
83#: ../NewEvent.qml:165144#: ../NewEvent.qml:181 ../calendar.qml:215
84msgid "Edit Event"
85msgstr ""
86
87#: ../NewEvent.qml:165 ../calendar.qml:226
88msgid "New Event"145msgid "New Event"
89msgstr ""146msgstr ""
90147
91#: ../NewEvent.qml:176 ../TimePicker.qml:74148#: ../NewEvent.qml:197
92msgid "Cancel"
93msgstr ""
94
95#: ../NewEvent.qml:187
96msgid "Save"
97msgstr ""
98
99#: ../NewEvent.qml:200
100msgid "Error"149msgid "Error"
101msgstr ""150msgstr ""
102151
103#: ../NewEvent.qml:202152#: ../NewEvent.qml:199
104msgid "Ok"153msgid "Ok"
105msgstr ""154msgstr ""
106155
107#: ../NewEvent.qml:247156#: ../NewEvent.qml:370
108msgid "Date"
109msgstr ""
110
111#: ../NewEvent.qml:334
112msgid "Event Name"157msgid "Event Name"
113msgstr ""158msgstr ""
114159
115#: ../NewEvent.qml:350160#: ../NewEvent.qml:386
116msgid "Description"161msgid "Description"
117msgstr ""162msgstr ""
118163
164#: ../NewEvent.qml:465
165msgid "Save"
166msgstr ""
167
119#. TRANSLATORS: this is a time formatting string,168#. TRANSLATORS: this is a time formatting string,
120#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions169#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
121#: ../TimeLineBackground.qml:18170#: ../TimeLineBackground.qml:19
122msgid "hh ap"171msgid "hh ap"
123msgstr ""172msgstr ""
124173
@@ -138,32 +187,36 @@
138msgid "OK"187msgid "OK"
139msgstr ""188msgstr ""
140189
141#: ../calendar.qml:21190#: ../calendar.qml:20
142msgid ""191msgid ""
143"Calendar app accept three arguments: --starttime, --endtime and --newevet. "192"Calendar app accept three arguments: --starttime, --endtime and --newevet. "
144"They will be managed by system. See the source for a full comment about them"193"They will be managed by system. See the source for a full comment about them"
145msgstr ""194msgstr ""
146195
147#: ../calendar.qml:216196#: ../calendar.qml:197
148msgid "Today"197msgid "Today"
149msgstr ""198msgstr ""
150199
151#: ../calendar.qml:238200#: ../calendar.qml:248
152msgid "Year"201msgid "Year"
153msgstr ""202msgstr ""
154203
155#: ../calendar.qml:260204#: ../calendar.qml:283
156msgid "Month"205msgid "Month"
157msgstr ""206msgstr ""
158207
159#: ../calendar.qml:274208#: ../calendar.qml:312
160msgid "Week"209msgid "Week"
161msgstr ""210msgstr ""
162211
163#: ../calendar.qml:291212#: ../calendar.qml:346
164msgid "Day"213msgid "Day"
165msgstr ""214msgstr ""
166215
216#: ../calendar.qml:375
217msgid "Agenda"
218msgstr ""
219
167#: ../.build/com.ubuntu.calendar_calendar.desktop.in:1220#: ../.build/com.ubuntu.calendar_calendar.desktop.in:1
168msgid "Calendar"221msgid "Calendar"
169msgstr ""222msgstr ""

Subscribers

People subscribed via source and target branches

to status/vote changes: