Maya

Merge lp:~tintou/maya/fix-1329550 into lp:~elementary-apps/maya/trunk

  1. fix-1329550
  2. Merge into trunk
Proposed by Phillip Sz
Status: Merged
Approved by: Corentin Noël
Approved revision: 617
Merged at revision: 617
Proposed branch: lp:~tintou/maya/fix-1329550
Merge into: lp:~elementary-apps/maya/trunk
Diff against target: 635 lines (+221/-204)
4 files modified
data/maya-calendar.desktop (+10/-8)
po/maya-calendar.pot (+200/-188)
src/MayaToolbar.vala (+0/-8)
src/Translations.vala (+11/-0)
To merge this branch: bzr merge lp:~tintou/maya/fix-1329550
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+230441@code.launchpad.net

Commit message

move about to quicklist

Description of the change

move about to quicklist

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/maya-calendar.desktop'
2--- data/maya-calendar.desktop 2014-04-15 22:45:43 +0000
3+++ data/maya-calendar.desktop 2014-08-12 09:35:55 +0000
4@@ -9,13 +9,15 @@
5 Categories=GTK;Office;Calendar;
6 StartupNotify=true
7 MimeType=text/calendar;
8+Keywords=Maya;Planner;Dates;Days;Events;
9+X-AppInstall-Keywords=Maya;Planner;Dates;Days;Events;
10+Actions=AddEvent;AboutDialog;
11 X-GNOME-Gettext-Domain=maya-calendar
12-X-GNOME-Keywords=Maya;Planner;Dates;Days;Events;
13-X-AppInstall-Keywords=Maya;Planner;Dates;Days;Events;
14-
15-X-Ayatana-Desktop-Shortcuts=AddEvent
16-
17-[AddEvent Shortcut Group]
18-Name=_Add Event
19+
20+[Desktop Action AddEvent]
21+Name=Add Event
22 Exec=maya-calendar -a
23-TargetEnvironment=Unity
24\ No newline at end of file
25+
26+[Desktop Action AboutDialog]
27+Name=About Maya
28+Exec=maya-calendar --about
29
30=== modified file 'po/maya-calendar.pot'
31--- po/maya-calendar.pot 2014-04-24 15:24:58 +0000
32+++ po/maya-calendar.pot 2014-08-12 09:35:55 +0000
33@@ -8,7 +8,7 @@
34 msgstr ""
35 "Project-Id-Version: PACKAGE VERSION\n"
36 "Report-Msgid-Bugs-To: \n"
37-"POT-Creation-Date: 2014-04-24 17:24+0200\n"
38+"POT-Creation-Date: 2014-08-12 01:12+0200\n"
39 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
40 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
41 "Language-Team: LANGUAGE <LL@li.org>\n"
42@@ -17,90 +17,58 @@
43 "Content-Type: text/plain; charset=UTF-8\n"
44 "Content-Transfer-Encoding: 8bit\n"
45
46-#: ../src/EventEdition/GuestsPanel.vala:44
47-msgid "Participants:"
48-msgstr ""
49-
50-#: ../src/EventEdition/GuestsPanel.vala:47
51-msgid "Invite…"
52-msgstr ""
53-
54-#: ../src/EventEdition/GuestsPanel.vala:151
55-#: ../src/EventEdition/GuestsPanel.vala:162
56-msgid "Pending"
57-msgstr ""
58-
59-#: ../src/EventEdition/GuestsPanel.vala:156
60-msgid "Accepted"
61-msgstr ""
62-
63-#: ../src/EventEdition/GuestsPanel.vala:159
64-msgid "Declined"
65-msgstr ""
66-
67-#: ../src/EventEdition/InfoPanel.vala:59
68-msgid "From:"
69-msgstr ""
70-
71-#: ../src/EventEdition/InfoPanel.vala:65
72-msgid "All day:"
73-msgstr ""
74-
75-#: ../src/EventEdition/InfoPanel.vala:70
76-msgid "To:"
77-msgstr ""
78-
79-#: ../src/EventEdition/InfoPanel.vala:89
80-msgid "Title:"
81-msgstr ""
82-
83-#: ../src/EventEdition/InfoPanel.vala:91
84-msgid "Name of Event"
85-msgstr ""
86-
87-#: ../src/EventEdition/InfoPanel.vala:94
88-msgid "Calendar:"
89-msgstr ""
90-
91-#: ../src/EventEdition/InfoPanel.vala:112
92-msgid "Comments:"
93-msgstr ""
94-
95-#: ../src/EventEdition/EventDialog.vala:61
96+#: ../src/Grid/VAutoHider.vala:96
97+msgid "%u more…"
98+msgstr ""
99+
100+#: ../src/Translations.vala:5
101+msgid "View and schedule events"
102+msgstr ""
103+
104+#: ../src/Translations.vala:6 ../src/Application.vala:30
105+msgid "Calendar"
106+msgstr ""
107+
108+#: ../src/Translations.vala:7
109+msgid "Maya;Planner;Dates;Days;Events;"
110+msgstr ""
111+
112+#: ../src/Translations.vala:8 ../src/EventEdition/EventDialog.vala:61
113 msgid "Add Event"
114 msgstr ""
115
116-#: ../src/EventEdition/EventDialog.vala:64
117-msgid "Edit Event"
118-msgstr ""
119-
120-#: ../src/EventEdition/EventDialog.vala:92
121-msgid "General Informations"
122-msgstr ""
123-
124-#: ../src/EventEdition/EventDialog.vala:95
125-msgid "Location"
126-msgstr ""
127-
128-#: ../src/EventEdition/EventDialog.vala:98
129-msgid "Guests"
130-msgstr ""
131-
132-#: ../src/EventEdition/EventDialog.vala:101
133-msgid "Reminders"
134-msgstr ""
135-
136-#: ../src/EventEdition/EventDialog.vala:104
137-#: ../src/EventEdition/RepeatPanel.vala:162
138-msgid "Repeat"
139-msgstr ""
140-
141-#: ../src/EventEdition/EventDialog.vala:134
142-msgid "Create Event"
143-msgstr ""
144-
145-#: ../src/EventEdition/EventDialog.vala:136
146-msgid "Save Changes"
147+#: ../src/Translations.vala:9
148+msgid "About Maya"
149+msgstr ""
150+
151+#: ../src/Translations.vala:10
152+msgid "About Calendar"
153+msgstr ""
154+
155+#: ../src/Widgets/ContractorButtonWithMenu.vala:64
156+#: ../src/Widgets/ContractorButtonWithMenu.vala:73
157+msgid "Export Calendar..."
158+msgstr ""
159+
160+#: ../src/Widgets/ContractorButtonWithMenu.vala:76
161+msgid "calendar.ics"
162+msgstr ""
163+
164+#: ../src/Widgets/ContractorButtonWithMenu.vala:78 ../src/SourceDialog.vala:54
165+msgid "Cancel"
166+msgstr ""
167+
168+#: ../src/Widgets/ContractorButtonWithMenu.vala:79
169+#: ../src/SourceDialog.vala:154
170+msgid "Save"
171+msgstr ""
172+
173+#: ../src/EventEdition/LocationPanel.vala:38
174+msgid "Location:"
175+msgstr ""
176+
177+#: ../src/EventEdition/LocationPanel.vala:40
178+msgid "John Smith OR Example St."
179 msgstr ""
180
181 #: ../src/EventEdition/RepeatPanel.vala:49
182@@ -123,145 +91,150 @@
183 msgid "Yearly"
184 msgstr ""
185
186-#: ../src/EventEdition/RepeatPanel.vala:96
187+#: ../src/EventEdition/RepeatPanel.vala:100
188 msgid "Every:"
189 msgstr ""
190
191-#: ../src/EventEdition/RepeatPanel.vala:103
192+#: ../src/EventEdition/RepeatPanel.vala:107
193 msgid "Day"
194 msgstr ""
195
196-#: ../src/EventEdition/RepeatPanel.vala:103
197+#: ../src/EventEdition/RepeatPanel.vala:107
198 msgid "Days"
199 msgstr ""
200
201-#: ../src/EventEdition/RepeatPanel.vala:106
202-#: ../src/EventEdition/RepeatPanel.vala:117
203+#: ../src/EventEdition/RepeatPanel.vala:110
204+#: ../src/EventEdition/RepeatPanel.vala:121
205 msgid "Week"
206 msgstr ""
207
208-#: ../src/EventEdition/RepeatPanel.vala:106
209+#: ../src/EventEdition/RepeatPanel.vala:110
210 msgid "Weeks"
211 msgstr ""
212
213-#: ../src/EventEdition/RepeatPanel.vala:109
214+#: ../src/EventEdition/RepeatPanel.vala:113
215 msgid "Month"
216 msgstr ""
217
218-#: ../src/EventEdition/RepeatPanel.vala:109
219+#: ../src/EventEdition/RepeatPanel.vala:113
220 msgid "Months"
221 msgstr ""
222
223-#: ../src/EventEdition/RepeatPanel.vala:112
224+#: ../src/EventEdition/RepeatPanel.vala:116
225 msgid "Year"
226 msgstr ""
227
228-#: ../src/EventEdition/RepeatPanel.vala:112
229+#: ../src/EventEdition/RepeatPanel.vala:116
230 msgid "Years"
231 msgstr ""
232
233-#: ../src/EventEdition/RepeatPanel.vala:127
234+#: ../src/EventEdition/RepeatPanel.vala:131
235 msgid "Ends:"
236 msgstr ""
237
238-#: ../src/EventEdition/RepeatPanel.vala:129
239-#: ../src/EventEdition/RepeatPanel.vala:162
240+#: ../src/EventEdition/RepeatPanel.vala:133
241+#: ../src/EventEdition/RepeatPanel.vala:166
242 msgid "Repeats"
243 msgstr ""
244
245-#: ../src/EventEdition/RepeatPanel.vala:133
246+#: ../src/EventEdition/RepeatPanel.vala:137
247 msgid "Never"
248 msgstr ""
249
250-#: ../src/EventEdition/RepeatPanel.vala:134
251+#: ../src/EventEdition/RepeatPanel.vala:138
252 msgid "Until"
253 msgstr ""
254
255-#: ../src/EventEdition/RepeatPanel.vala:135
256+#: ../src/EventEdition/RepeatPanel.vala:139
257 msgid "After"
258 msgstr ""
259
260-#: ../src/EventEdition/RepeatPanel.vala:181
261+#: ../src/EventEdition/RepeatPanel.vala:166
262+#: ../src/EventEdition/EventDialog.vala:104
263+msgid "Repeat"
264+msgstr ""
265+
266+#: ../src/EventEdition/RepeatPanel.vala:185
267 msgid "The same day every month"
268 msgstr ""
269
270-#: ../src/EventEdition/RepeatPanel.vala:299
271+#: ../src/EventEdition/RepeatPanel.vala:303
272 msgid "Sunday"
273 msgstr ""
274
275-#: ../src/EventEdition/RepeatPanel.vala:302
276+#: ../src/EventEdition/RepeatPanel.vala:306
277 msgid "Monday"
278 msgstr ""
279
280-#: ../src/EventEdition/RepeatPanel.vala:305
281+#: ../src/EventEdition/RepeatPanel.vala:309
282 msgid "Tuesday"
283 msgstr ""
284
285-#: ../src/EventEdition/RepeatPanel.vala:308
286+#: ../src/EventEdition/RepeatPanel.vala:312
287 msgid "Wednesday"
288 msgstr ""
289
290-#: ../src/EventEdition/RepeatPanel.vala:311
291+#: ../src/EventEdition/RepeatPanel.vala:315
292 msgid "Thursday"
293 msgstr ""
294
295-#: ../src/EventEdition/RepeatPanel.vala:314
296+#: ../src/EventEdition/RepeatPanel.vala:318
297 msgid "Friday"
298 msgstr ""
299
300-#: ../src/EventEdition/RepeatPanel.vala:317
301+#: ../src/EventEdition/RepeatPanel.vala:321
302 msgid "Saturday"
303 msgstr ""
304
305-#: ../src/EventEdition/RepeatPanel.vala:323
306+#: ../src/EventEdition/RepeatPanel.vala:327
307 msgid "Every last %s"
308 msgstr ""
309
310-#: ../src/EventEdition/RepeatPanel.vala:326
311+#: ../src/EventEdition/RepeatPanel.vala:330
312 msgid "Every first %s"
313 msgstr ""
314
315-#: ../src/EventEdition/RepeatPanel.vala:329
316+#: ../src/EventEdition/RepeatPanel.vala:333
317 msgid "Every second %s"
318 msgstr ""
319
320-#: ../src/EventEdition/RepeatPanel.vala:332
321+#: ../src/EventEdition/RepeatPanel.vala:336
322 msgid "Every third %s"
323 msgstr ""
324
325-#: ../src/EventEdition/RepeatPanel.vala:335
326+#: ../src/EventEdition/RepeatPanel.vala:339
327 msgid "Every fourth %s"
328 msgstr ""
329
330-#: ../src/EventEdition/RepeatPanel.vala:338
331+#: ../src/EventEdition/RepeatPanel.vala:342
332 msgid "Every fifth %s"
333 msgstr ""
334
335-#: ../src/EventEdition/RepeatPanel.vala:346
336+#: ../src/EventEdition/RepeatPanel.vala:350
337 msgid "Mon"
338 msgstr ""
339
340-#: ../src/EventEdition/RepeatPanel.vala:347
341+#: ../src/EventEdition/RepeatPanel.vala:351
342 msgid "Tue"
343 msgstr ""
344
345-#: ../src/EventEdition/RepeatPanel.vala:348
346+#: ../src/EventEdition/RepeatPanel.vala:352
347 msgid "Wed"
348 msgstr ""
349
350-#: ../src/EventEdition/RepeatPanel.vala:349
351+#: ../src/EventEdition/RepeatPanel.vala:353
352 msgid "Thu"
353 msgstr ""
354
355-#: ../src/EventEdition/RepeatPanel.vala:350
356+#: ../src/EventEdition/RepeatPanel.vala:354
357 msgid "Fri"
358 msgstr ""
359
360-#: ../src/EventEdition/RepeatPanel.vala:351
361+#: ../src/EventEdition/RepeatPanel.vala:355
362 msgid "Sat"
363 msgstr ""
364
365-#: ../src/EventEdition/RepeatPanel.vala:352
366+#: ../src/EventEdition/RepeatPanel.vala:356
367 msgid "Sun"
368 msgstr ""
369
370@@ -349,42 +322,95 @@
371 msgid "Email"
372 msgstr ""
373
374-#: ../src/EventEdition/LocationPanel.vala:37
375-msgid "Location:"
376-msgstr ""
377-
378-#: ../src/EventEdition/LocationPanel.vala:39
379-msgid "John Smith OR Example St."
380-msgstr ""
381-
382-#: ../src/Sidebar/Sidebar.vala:38
383-msgid ""
384-"Your upcoming events will be displayed here when you select a date with "
385-"events."
386-msgstr ""
387-
388-#: ../src/Sidebar/EventWidget.vala:131 ../src/SourceItem.vala:98
389+#: ../src/EventEdition/EventDialog.vala:64
390+msgid "Edit Event"
391+msgstr ""
392+
393+#: ../src/EventEdition/EventDialog.vala:92
394+msgid "General Informations"
395+msgstr ""
396+
397+#: ../src/EventEdition/EventDialog.vala:95
398+msgid "Location"
399+msgstr ""
400+
401+#: ../src/EventEdition/EventDialog.vala:98
402+msgid "Guests"
403+msgstr ""
404+
405+#: ../src/EventEdition/EventDialog.vala:101
406+msgid "Reminders"
407+msgstr ""
408+
409+#: ../src/EventEdition/EventDialog.vala:140
410+msgid "Delete Event"
411+msgstr ""
412+
413+#: ../src/EventEdition/EventDialog.vala:152
414+msgid "Create Event"
415+msgstr ""
416+
417+#: ../src/EventEdition/EventDialog.vala:155
418+msgid "Save Changes"
419+msgstr ""
420+
421+#: ../src/EventEdition/GuestsPanel.vala:42
422+msgid "Participants:"
423+msgstr ""
424+
425+#: ../src/EventEdition/GuestsPanel.vala:45
426+msgid "Invite"
427+msgstr ""
428+
429+#: ../src/EventEdition/GuestsPanel.vala:226
430+msgid "Accepted"
431+msgstr ""
432+
433+#: ../src/EventEdition/GuestsPanel.vala:229
434+msgid "Declined"
435+msgstr ""
436+
437+#: ../src/EventEdition/InfoPanel.vala:59
438+msgid "From:"
439+msgstr ""
440+
441+#: ../src/EventEdition/InfoPanel.vala:65
442+msgid "All day:"
443+msgstr ""
444+
445+#: ../src/EventEdition/InfoPanel.vala:70
446+msgid "To:"
447+msgstr ""
448+
449+#: ../src/EventEdition/InfoPanel.vala:89
450+msgid "Title:"
451+msgstr ""
452+
453+#: ../src/EventEdition/InfoPanel.vala:91
454+msgid "Name of Event"
455+msgstr ""
456+
457+#: ../src/EventEdition/InfoPanel.vala:94
458+msgid "Calendar:"
459+msgstr ""
460+
461+#: ../src/EventEdition/InfoPanel.vala:112
462+msgid "Comments:"
463+msgstr ""
464+
465+#: ../src/SourceItem.vala:105 ../src/Sidebar/EventWidget.vala:132
466+msgid "Remove"
467+msgstr ""
468+
469+#: ../src/SourceItem.vala:111 ../src/Sidebar/EventWidget.vala:131
470 msgid "Edit…"
471 msgstr ""
472
473-#: ../src/Sidebar/EventWidget.vala:132 ../src/SourceItem.vala:92
474-msgid "Remove"
475-msgstr ""
476-
477-#. / TRANSLATORS: for multiple days events, shows: (date) to (date)
478-#: ../src/Sidebar/EventWidget.vala:199
479-msgid "%s to %s"
480-msgstr ""
481-
482-#: ../src/Sidebar/EventWidget.vala:213
483-msgid "All day"
484-msgstr ""
485-
486-#: ../src/SourceItem.vala:119
487+#: ../src/SourceItem.vala:135
488 msgid "Undo"
489 msgstr ""
490
491-#: ../src/SourceItem.vala:137
492+#: ../src/SourceItem.vala:153
493 msgid "Calendar \"%s\" removed."
494 msgstr ""
495
496@@ -412,12 +438,23 @@
497 msgid "Show Week Numbers"
498 msgstr ""
499
500-#: ../src/MayaToolbar.vala:73
501-msgid "About"
502-msgstr ""
503-
504-#: ../src/SourceDialog.vala:54
505-msgid "Cancel"
506+#: ../src/Sidebar/Sidebar.vala:38
507+msgid ""
508+"Your upcoming events will be displayed here when you select a date with "
509+"events."
510+msgstr ""
511+
512+#. / TRANSLATORS: for multiple days events, shows: (date) to (date)
513+#: ../src/Sidebar/EventWidget.vala:199
514+msgid "%s to %s"
515+msgstr ""
516+
517+#: ../src/Sidebar/EventWidget.vala:213
518+msgid "All day"
519+msgstr ""
520+
521+#: ../src/SourceSelector.vala:62
522+msgid "Add New Calendar…"
523 msgstr ""
524
525 #: ../src/SourceDialog.vala:55
526@@ -448,31 +485,6 @@
527 msgid "Create Calendar"
528 msgstr ""
529
530-#: ../src/SourceDialog.vala:154
531-msgid "Save"
532-msgstr ""
533-
534-#: ../src/SourceSelector.vala:68
535-msgid "Add New Calendar…"
536-msgstr ""
537-
538-#: ../src/Application.vala:30
539-msgid "Calendar"
540-msgstr ""
541-
542-#: ../src/Grid/VAutoHider.vala:96
543-msgid "%u more…"
544-msgstr ""
545-
546-#: ../src/Widgets/ContractorButtonWithMenu.vala:64
547-#: ../src/Widgets/ContractorButtonWithMenu.vala:73
548-msgid "Export Calendar..."
549-msgstr ""
550-
551-#: ../src/Widgets/ContractorButtonWithMenu.vala:76
552-msgid "calendar.ics"
553-msgstr ""
554-
555 #: ../plugins/CalDAV/CalDAVBackend.vala:39
556 msgid "CalDAV"
557 msgstr ""
558@@ -497,12 +509,8 @@
559 msgid "user.name or user.name@gmail.com"
560 msgstr ""
561
562-#: ../core/Settings/LanguagesFormat.vala:21
563-msgid "%B %e, %Y"
564-msgstr ""
565-
566-#: ../core/Settings/LanguagesFormat.vala:25
567-msgid "%A, %b %d"
568+#: ../core/Backends/LocalBackend.vala:26
569+msgid "On this computer"
570 msgstr ""
571
572 #: ../core/Backends/PlacementWidget.vala:37
573@@ -525,6 +533,10 @@
574 msgid "Keep a copy locally"
575 msgstr ""
576
577-#: ../core/Backends/LocalBackend.vala:26
578-msgid "On this computer"
579+#: ../core/Settings/LanguagesFormat.vala:21
580+msgid "%B %e, %Y"
581+msgstr ""
582+
583+#: ../core/Settings/LanguagesFormat.vala:25
584+msgid "%A, %b %d"
585 msgstr ""
586
587=== modified file 'src/MayaToolbar.vala'
588--- src/MayaToolbar.vala 2014-04-15 21:59:26 +0000
589+++ src/MayaToolbar.vala 2014-08-12 09:35:55 +0000
590@@ -70,7 +70,6 @@
591 var today = new Gtk.MenuItem.with_label (_("Today"));
592 weeknumbers = new Gtk.CheckMenuItem.with_label (_("Show Week Numbers"));
593 //var import = new Gtk.MenuItem.with_label (_("Import…"));
594- var about = new Gtk.MenuItem.with_label (_("About"));
595
596 // Append in correct order
597 menu.add (today);
598@@ -83,9 +82,6 @@
599 menu.append (sync);
600 */
601
602- menu.append (new Gtk.SeparatorMenuItem ());
603- menu.append (about);
604-
605 pack_start (button_calendar_sources);
606 pack_start (button_add);
607
608@@ -99,10 +95,6 @@
609 button_calendar_sources.clicked.connect (on_tb_sources_clicked);
610 today.activate.connect (() => { on_menu_today_toggled (); });
611 weeknumbers.toggled.connect (on_menu_show_weeks_toggled);
612- about.activate.connect (() => {
613- var app = ((Maya.Application)GLib.Application.get_default ());
614- app.show_about (app.window);
615- });
616 search_bar.search_changed.connect (() => on_search (search_bar.text));
617
618 month_switcher.left_clicked.connect (() => {Model.CalendarModel.get_default ().change_month (-1);});
619
620=== added file 'src/Translations.vala'
621--- src/Translations.vala 1970-01-01 00:00:00 +0000
622+++ src/Translations.vala 2014-08-12 09:35:55 +0000
623@@ -0,0 +1,11 @@
624+namespace Translations {
625+/* Translatable launcher (.desktop) strings to be added to */
626+/* template (.pot) file. These strings should reflect any */
627+/* changes in these launcher keys in .desktop file. */
628+public const string COMMENT = N_("View and schedule events");
629+public const string GENERIC = N_("Calendar");
630+public const string KEYWORDS = N_("Maya;Planner;Dates;Days;Events;");
631+public const string ADDEVENT = N_("Add Event");
632+public const string ABOUT = N_("About Maya");
633+public const string ABOUT2 = N_("About Calendar");
634+}
635\ No newline at end of file

Subscribers

People subscribed via source and target branches