Photos

Merge lp:~tintou/pantheon-photos/gtkaction into lp:~pantheon-photos/pantheon-photos/trunk

  1. gtkaction
  2. Merge into trunk
Proposed by Corentin Noël
Status: Merged
Approved by: Danielle Foré
Approved revision: 3134
Merged at revision: 3134
Proposed branch: lp:~tintou/pantheon-photos/gtkaction
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 1217 lines (+216/-423)
15 files modified
src/AppWindow.vala (+11/-17)
src/CollectionPage.vala (+24/-49)
src/MediaPage.vala (+29/-57)
src/PhotoPage.vala (+62/-116)
src/camera/ImportPage.vala (+5/-11)
src/direct/DirectPhotoPage.vala (+47/-93)
src/events/EventPage.vala (+2/-4)
src/events/EventsDirectoryPage.vala (+4/-8)
src/library/ImportQueuePage.vala (+1/-3)
src/library/LibraryWindow.vala (+22/-46)
src/library/OfflinePage.vala (+2/-4)
src/library/TrashPage.vala (+3/-7)
src/searches/Branch.vala (+1/-2)
src/sidebar/Tree.vala (+2/-4)
src/tags/Branch.vala (+1/-2)
To merge this branch: bzr merge lp:~tintou/pantheon-photos/gtkaction
Reviewer Review Type Date Requested Status
Danielle Foré Approve
Review via email: mp+315689@code.launchpad.net

Commit message

Simplified the GtkAction creation

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) wrote :

Everything looks good here :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/AppWindow.vala'
2--- src/AppWindow.vala 2017-01-15 18:45:10 +0000
3+++ src/AppWindow.vala 2017-01-26 15:47:05 +0000
4@@ -498,40 +498,34 @@
5 private Gtk.ActionEntry[] create_common_actions () {
6 Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
7
8- Gtk.ActionEntry quit = { "CommonQuit", null, TRANSLATABLE, "<Ctrl>Q",
9- TRANSLATABLE, on_quit
10+ Gtk.ActionEntry quit = { "CommonQuit", null, _("_Quit"), "<Ctrl>Q",
11+ _("_Quit"), on_quit
12 };
13- quit.label = _ ("_Quit");
14 actions += quit;
15
16 Gtk.ActionEntry fullscreen = { "CommonFullscreen", null,
17- TRANSLATABLE, "F11", TRANSLATABLE, on_fullscreen
18+ _("Fulls_creen"), "F11", _("Fulls_creen"), on_fullscreen
19 };
20- fullscreen.label = _ ("Fulls_creen");
21 actions += fullscreen;
22
23- Gtk.ActionEntry undo = { "CommonUndo", "edit-undo", TRANSLATABLE, "<Ctrl>Z",
24- TRANSLATABLE, on_undo
25+ Gtk.ActionEntry undo = { "CommonUndo", "edit-undo", Resources.UNDO_MENU, "<Ctrl>Z",
26+ Resources.UNDO_MENU, on_undo
27 };
28- undo.label = Resources.UNDO_MENU;
29 actions += undo;
30
31- Gtk.ActionEntry redo = { "CommonRedo", "edit-redo", TRANSLATABLE, "<Ctrl><Shift>Z",
32- TRANSLATABLE, on_redo
33+ Gtk.ActionEntry redo = { "CommonRedo", "edit-redo", Resources.REDO_MENU, "<Ctrl><Shift>Z",
34+ Resources.REDO_MENU, on_redo
35 };
36- redo.label = Resources.REDO_MENU;
37 actions += redo;
38
39- Gtk.ActionEntry jump_to_file = { "CommonJumpToFile", null, TRANSLATABLE,
40- "<Ctrl><Shift>M", TRANSLATABLE, on_jump_to_file
41+ Gtk.ActionEntry jump_to_file = { "CommonJumpToFile", null, Resources.JUMP_TO_FILE_MENU,
42+ "<Ctrl><Shift>M", Resources.JUMP_TO_FILE_MENU, on_jump_to_file
43 };
44- jump_to_file.label = Resources.JUMP_TO_FILE_MENU;
45 actions += jump_to_file;
46
47- Gtk.ActionEntry select_all = { "CommonSelectAll", null, TRANSLATABLE,
48- "<Ctrl>A", TRANSLATABLE, on_select_all
49+ Gtk.ActionEntry select_all = { "CommonSelectAll", null, Resources.SELECT_ALL_MENU,
50+ "<Ctrl>A", Resources.SELECT_ALL_MENU, on_select_all
51 };
52- select_all.label = Resources.SELECT_ALL_MENU;
53 actions += select_all;
54
55 Gtk.ActionEntry select_none = { "CommonSelectNone", null, null,
56
57=== modified file 'src/CollectionPage.vala'
58--- src/CollectionPage.vala 2017-01-12 18:13:48 +0000
59+++ src/CollectionPage.vala 2017-01-26 15:47:05 +0000
60@@ -124,100 +124,75 @@
61 protected override Gtk.ActionEntry[] init_collect_action_entries () {
62 Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
63
64- Gtk.ActionEntry print = { "Print", null, TRANSLATABLE, "<Ctrl>P",
65- TRANSLATABLE, on_print
66+ Gtk.ActionEntry print = { "Print", null, Resources.PRINT_MENU, "<Ctrl>P",
67+ Resources.PRINT_MENU, on_print
68 };
69- print.label = Resources.PRINT_MENU;
70 actions += print;
71
72- Gtk.ActionEntry publish = { "Publish", Resources.PUBLISH, TRANSLATABLE, "<Ctrl><Shift>P",
73- TRANSLATABLE, on_publish
74+ Gtk.ActionEntry publish = { "Publish", Resources.PUBLISH, Resources.PUBLISH_MENU, "<Ctrl><Shift>P",
75+ Resources.PUBLISH_TOOLTIP, on_publish
76 };
77- publish.label = Resources.PUBLISH_MENU;
78- publish.tooltip = Resources.PUBLISH_TOOLTIP;
79 actions += publish;
80
81 Gtk.ActionEntry rotate_right = { "RotateClockwise", Resources.CLOCKWISE,
82- TRANSLATABLE, "<Ctrl>R", TRANSLATABLE, on_rotate_clockwise
83+ Resources.ROTATE_CW_MENU, "<Ctrl>R", Resources.ROTATE_CW_TOOLTIP, on_rotate_clockwise
84 };
85- rotate_right.label = Resources.ROTATE_CW_MENU;
86- rotate_right.tooltip = Resources.ROTATE_CW_TOOLTIP;
87 actions += rotate_right;
88
89 Gtk.ActionEntry rotate_left = { "RotateCounterclockwise", Resources.COUNTERCLOCKWISE,
90- TRANSLATABLE, "<Ctrl><Shift>R", TRANSLATABLE, on_rotate_counterclockwise
91+ Resources.ROTATE_CCW_MENU, "<Ctrl><Shift>R", Resources.ROTATE_CCW_TOOLTIP, on_rotate_counterclockwise
92 };
93- rotate_left.label = Resources.ROTATE_CCW_MENU;
94- rotate_left.tooltip = Resources.ROTATE_CCW_TOOLTIP;
95 actions += rotate_left;
96
97- Gtk.ActionEntry hflip = { "FlipHorizontally", Resources.HFLIP, TRANSLATABLE, null,
98- TRANSLATABLE, on_flip_horizontally
99+ Gtk.ActionEntry hflip = { "FlipHorizontally", Resources.HFLIP, Resources.HFLIP_MENU, null,
100+ Resources.HFLIP_TOOLTIP, on_flip_horizontally
101 };
102- hflip.label = Resources.HFLIP_MENU;
103- hflip.tooltip = Resources.HFLIP_TOOLTIP;
104 actions += hflip;
105
106- Gtk.ActionEntry vflip = { "FlipVertically", Resources.VFLIP, TRANSLATABLE, null,
107- TRANSLATABLE, on_flip_vertically
108+ Gtk.ActionEntry vflip = { "FlipVertically", Resources.VFLIP, Resources.VFLIP_MENU, null,
109+ Resources.VFLIP_TOOLTIP, on_flip_vertically
110 };
111- vflip.label = Resources.VFLIP_MENU;
112- vflip.tooltip = Resources.VFLIP_TOOLTIP;
113 actions += vflip;
114
115- Gtk.ActionEntry copy_adjustments = { "CopyColorAdjustments", null, TRANSLATABLE,
116- "<Ctrl><Shift>C", TRANSLATABLE, on_copy_adjustments
117+ Gtk.ActionEntry copy_adjustments = { "CopyColorAdjustments", null, Resources.COPY_ADJUSTMENTS_MENU,
118+ "<Ctrl><Shift>C", Resources.COPY_ADJUSTMENTS_TOOLTIP, on_copy_adjustments
119 };
120- copy_adjustments.label = Resources.COPY_ADJUSTMENTS_MENU;
121- copy_adjustments.tooltip = Resources.COPY_ADJUSTMENTS_TOOLTIP;
122 actions += copy_adjustments;
123
124- Gtk.ActionEntry paste_adjustments = { "PasteColorAdjustments", null, TRANSLATABLE,
125- "<Ctrl><Shift>V", TRANSLATABLE, on_paste_adjustments
126+ Gtk.ActionEntry paste_adjustments = { "PasteColorAdjustments", null, Resources.PASTE_ADJUSTMENTS_MENU,
127+ "<Ctrl><Shift>V", Resources.PASTE_ADJUSTMENTS_TOOLTIP, on_paste_adjustments
128 };
129- paste_adjustments.label = Resources.PASTE_ADJUSTMENTS_MENU;
130- paste_adjustments.tooltip = Resources.PASTE_ADJUSTMENTS_TOOLTIP;
131 actions += paste_adjustments;
132
133- Gtk.ActionEntry revert = { "Revert", null, TRANSLATABLE, null,
134- TRANSLATABLE, on_revert
135+ Gtk.ActionEntry revert = { "Revert", null, Resources.REVERT_MENU, null,
136+ Resources.REVERT_MENU, on_revert
137 };
138- revert.label = Resources.REVERT_MENU;
139 actions += revert;
140
141- Gtk.ActionEntry duplicate = { "Duplicate", null, TRANSLATABLE, "<Ctrl>D", TRANSLATABLE,
142+ Gtk.ActionEntry duplicate = { "Duplicate", null, Resources.DUPLICATE_PHOTO_MENU, "<Ctrl>D", Resources.DUPLICATE_PHOTO_TOOLTIP,
143 on_duplicate_photo
144 };
145- duplicate.label = Resources.DUPLICATE_PHOTO_MENU;
146- duplicate.tooltip = Resources.DUPLICATE_PHOTO_TOOLTIP;
147 actions += duplicate;
148
149- Gtk.ActionEntry adjust_date_time = { "AdjustDateTime", null, TRANSLATABLE, null,
150- TRANSLATABLE, on_adjust_date_time
151+ Gtk.ActionEntry adjust_date_time = { "AdjustDateTime", null, Resources.ADJUST_DATE_TIME_MENU, null,
152+ Resources.ADJUST_DATE_TIME_MENU, on_adjust_date_time
153 };
154- adjust_date_time.label = Resources.ADJUST_DATE_TIME_MENU;
155 actions += adjust_date_time;
156
157- Gtk.ActionEntry open_with = { "OpenWith", null, TRANSLATABLE, null, null, null };
158- open_with.label = Resources.OPEN_WITH_MENU;
159+ Gtk.ActionEntry open_with = { "OpenWith", null, Resources.OPEN_WITH_MENU, null, null, null };
160 actions += open_with;
161
162- Gtk.ActionEntry open_with_raw = { "OpenWithRaw", null, TRANSLATABLE, null, null, null };
163- open_with_raw.label = Resources.OPEN_WITH_RAW_MENU;
164+ Gtk.ActionEntry open_with_raw = { "OpenWithRaw", null, Resources.OPEN_WITH_RAW_MENU, null, null, null };
165 actions += open_with_raw;
166
167- Gtk.ActionEntry enhance = { "Enhance", Resources.ENHANCE, TRANSLATABLE, "<Ctrl>E",
168- TRANSLATABLE, on_enhance
169+ Gtk.ActionEntry enhance = { "Enhance", Resources.ENHANCE, Resources.ENHANCE_MENU, "<Ctrl>E",
170+ Resources.ENHANCE_TOOLTIP, on_enhance
171 };
172- enhance.label = Resources.ENHANCE_MENU;
173- enhance.tooltip = Resources.ENHANCE_TOOLTIP;
174 actions += enhance;
175
176- Gtk.ActionEntry slideshow = { "Slideshow", null, TRANSLATABLE, "F5", TRANSLATABLE,
177+ Gtk.ActionEntry slideshow = { "Slideshow", null, _("S_lideshow"), "F5", _("Play a slideshow"),
178 on_slideshow
179 };
180- slideshow.label = _ ("S_lideshow");
181- slideshow.tooltip = _ ("Play a slideshow");
182 actions += slideshow;
183
184 return actions;
185
186=== modified file 'src/MediaPage.vala'
187--- src/MediaPage.vala 2017-01-12 18:13:48 +0000
188+++ src/MediaPage.vala 2017-01-26 15:47:05 +0000
189@@ -202,72 +202,58 @@
190 protected override Gtk.ActionEntry[] init_collect_action_entries () {
191 Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
192
193- Gtk.ActionEntry export = { "Export", null, TRANSLATABLE, "<Ctrl><Shift>E",
194- TRANSLATABLE, on_export
195+ Gtk.ActionEntry export = { "Export", null, Resources.EXPORT_MENU, "<Ctrl><Shift>E",
196+ Resources.EXPORT_MENU, on_export
197 };
198- export.label = Resources.EXPORT_MENU;
199 actions += export;
200
201- Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", null, TRANSLATABLE,
202- "<Shift>Delete", TRANSLATABLE, on_remove_from_library
203+ Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", null, Resources.REMOVE_FROM_LIBRARY_MENU,
204+ "<Shift>Delete", Resources.REMOVE_FROM_LIBRARY_MENU, on_remove_from_library
205 };
206- remove_from_library.label = Resources.REMOVE_FROM_LIBRARY_MENU;
207 actions += remove_from_library;
208
209- Gtk.ActionEntry move_to_trash = { "MoveToTrash", "user-trash-full", TRANSLATABLE, "Delete",
210- TRANSLATABLE, on_move_to_trash
211+ Gtk.ActionEntry move_to_trash = { "MoveToTrash", "user-trash-full", Resources.MOVE_TO_TRASH_MENU, "Delete",
212+ Resources.MOVE_TO_TRASH_MENU, on_move_to_trash
213 };
214- move_to_trash.label = Resources.MOVE_TO_TRASH_MENU;
215 actions += move_to_trash;
216
217- Gtk.ActionEntry new_event = { "NewEvent", null, TRANSLATABLE, "<Ctrl>N",
218- TRANSLATABLE, on_new_event
219+ Gtk.ActionEntry new_event = { "NewEvent", null, Resources.NEW_EVENT_MENU, "<Ctrl>N",
220+ Resources.NEW_EVENT_MENU, on_new_event
221 };
222- new_event.label = Resources.NEW_EVENT_MENU;
223 actions += new_event;
224
225- Gtk.ActionEntry increase_size = { "IncreaseSize", null, TRANSLATABLE,
226- "<Ctrl>plus", TRANSLATABLE, on_increase_size
227+ Gtk.ActionEntry increase_size = { "IncreaseSize", null, _("Zoom _In"),
228+ "<Ctrl>plus", _("Increase the magnification of the thumbnails"), on_increase_size
229 };
230- increase_size.label = _ ("Zoom _In");
231- increase_size.tooltip = _ ("Increase the magnification of the thumbnails");
232 actions += increase_size;
233
234- Gtk.ActionEntry decrease_size = { "DecreaseSize", null, TRANSLATABLE,
235- "<Ctrl>minus", TRANSLATABLE, on_decrease_size
236+ Gtk.ActionEntry decrease_size = { "DecreaseSize", null, _("Zoom _Out"),
237+ "<Ctrl>minus", _("Decrease the magnification of the thumbnails"), on_decrease_size
238 };
239- decrease_size.label = _ ("Zoom _Out");
240- decrease_size.tooltip = _ ("Decrease the magnification of the thumbnails");
241 actions += decrease_size;
242
243- Gtk.ActionEntry flag = { "Flag", null, TRANSLATABLE, "<Ctrl>G", TRANSLATABLE, on_flag_unflag };
244- flag.label = Resources.FLAG_MENU;
245+ Gtk.ActionEntry flag = { "Flag", null, Resources.FLAG_MENU, "<Ctrl>G", Resources.FLAG_MENU, on_flag_unflag };
246 actions += flag;
247
248- Gtk.ActionEntry sort_photos = { "SortPhotos", null, TRANSLATABLE, null, null, null };
249- sort_photos.label = _ ("Sort _Photos");
250+ Gtk.ActionEntry sort_photos = { "SortPhotos", null, _("Sort _Photos"), null, null, null };
251 actions += sort_photos;
252
253- Gtk.ActionEntry filter_photos = { "FilterPhotos", null, TRANSLATABLE, null, null, null };
254- filter_photos.label = Resources.FILTER_PHOTOS_MENU;
255+ Gtk.ActionEntry filter_photos = { "FilterPhotos", null, Resources.FILTER_PHOTOS_MENU, null, null, null };
256 actions += filter_photos;
257
258- Gtk.ActionEntry raw_developer = { "RawDeveloper", null, TRANSLATABLE, null, null, null };
259- raw_developer.label = _ ("_Developer");
260+ Gtk.ActionEntry raw_developer = { "RawDeveloper", null, _("_Developer"), null, null, null };
261 actions += raw_developer;
262
263 // RAW developers.
264
265- Gtk.ActionEntry dev_shotwell = { "RawDeveloperShotwell", null, TRANSLATABLE, null, TRANSLATABLE,
266+ Gtk.ActionEntry dev_shotwell = { "RawDeveloperShotwell", null, _("Shotwell"), null, _("Shotwell"),
267 on_raw_developer_shotwell
268 };
269- dev_shotwell.label = _ ("Shotwell");
270 actions += dev_shotwell;
271
272- Gtk.ActionEntry dev_camera = { "RawDeveloperCamera", null, TRANSLATABLE, null, TRANSLATABLE,
273+ Gtk.ActionEntry dev_camera = { "RawDeveloperCamera", null, _("Camera"), null, _("Camera"),
274 on_raw_developer_camera
275 };
276- dev_camera.label = _ ("Camera");
277 actions += dev_camera;
278
279 return actions;
280@@ -276,25 +262,19 @@
281 protected override Gtk.ToggleActionEntry[] init_collect_toggle_action_entries () {
282 Gtk.ToggleActionEntry[] toggle_actions = base.init_collect_toggle_action_entries ();
283
284- Gtk.ToggleActionEntry titles = { "ViewTitle", null, TRANSLATABLE, "<Ctrl><Shift>T",
285- TRANSLATABLE, on_display_titles, Config.Facade.get_instance ().get_display_photo_titles ()
286+ Gtk.ToggleActionEntry titles = { "ViewTitle", null, _("_Titles"), "<Ctrl><Shift>T",
287+ _("Display the title of each photo"), on_display_titles, Config.Facade.get_instance ().get_display_photo_titles ()
288 };
289- titles.label = _ ("_Titles");
290- titles.tooltip = _ ("Display the title of each photo");
291 toggle_actions += titles;
292
293- Gtk.ToggleActionEntry comments = { "ViewComment", null, TRANSLATABLE, "<Ctrl><Shift>C",
294- TRANSLATABLE, on_display_comments, Config.Facade.get_instance ().get_display_photo_comments ()
295+ Gtk.ToggleActionEntry comments = { "ViewComment", null, _("_Comments"), "<Ctrl><Shift>C",
296+ _("Display the comment of each photo"), on_display_comments, Config.Facade.get_instance ().get_display_photo_comments ()
297 };
298- comments.label = _ ("_Comments");
299- comments.tooltip = _ ("Display the comment of each photo");
300 toggle_actions += comments;
301
302- Gtk.ToggleActionEntry tags = { "ViewTags", null, TRANSLATABLE, "<Ctrl><Shift>G",
303- TRANSLATABLE, on_display_tags, Config.Facade.get_instance ().get_display_photo_tags ()
304+ Gtk.ToggleActionEntry tags = { "ViewTags", null, _("Ta_gs"), "<Ctrl><Shift>G",
305+ _("Display each photo's tags"), on_display_tags, Config.Facade.get_instance ().get_display_photo_tags ()
306 };
307- tags.label = _ ("Ta_gs");
308- tags.tooltip = _ ("Display each photo's tags");
309 toggle_actions += tags;
310
311 return toggle_actions;
312@@ -308,18 +288,14 @@
313 // Sort criteria.
314 Gtk.RadioActionEntry[] sort_crit_actions = new Gtk.RadioActionEntry[0];
315
316- Gtk.RadioActionEntry by_title = { "SortByTitle", null, TRANSLATABLE, null, TRANSLATABLE,
317+ Gtk.RadioActionEntry by_title = { "SortByTitle", null, _("By _Title"), null, _("Sort photos by title"),
318 SortBy.TITLE
319 };
320- by_title.label = _ ("By _Title");
321- by_title.tooltip = _ ("Sort photos by title");
322 sort_crit_actions += by_title;
323
324- Gtk.RadioActionEntry by_date = { "SortByExposureDate", null, TRANSLATABLE, null,
325- TRANSLATABLE, SortBy.EXPOSURE_DATE
326+ Gtk.RadioActionEntry by_date = { "SortByExposureDate", null, _("By Exposure _Date"), null,
327+ _("Sort photos by exposure date"), SortBy.EXPOSURE_DATE
328 };
329- by_date.label = _ ("By Exposure _Date");
330- by_date.tooltip = _ ("Sort photos by exposure date");
331 sort_crit_actions += by_date;
332
333 action_group.add_radio_actions (sort_crit_actions, sort_by, on_sort_changed);
334@@ -328,17 +304,13 @@
335 Gtk.RadioActionEntry[] sort_order_actions = new Gtk.RadioActionEntry[0];
336
337 Gtk.RadioActionEntry ascending = { "SortAscending", null,
338- TRANSLATABLE, null, TRANSLATABLE, SORT_ORDER_ASCENDING
339+ _("_Ascending"), null, _("Sort photos in an ascending order"), SORT_ORDER_ASCENDING
340 };
341- ascending.label = _ ("_Ascending");
342- ascending.tooltip = _ ("Sort photos in an ascending order");
343 sort_order_actions += ascending;
344
345 Gtk.RadioActionEntry descending = { "SortDescending", null,
346- TRANSLATABLE, null, TRANSLATABLE, SORT_ORDER_DESCENDING
347+ _("D_escending"), null, _("Sort photos in a descending order"), SORT_ORDER_DESCENDING
348 };
349- descending.label = _ ("D_escending");
350- descending.tooltip = _ ("Sort photos in a descending order");
351 sort_order_actions += descending;
352
353 action_group.add_radio_actions (sort_order_actions,
354
355=== modified file 'src/PhotoPage.vala'
356--- src/PhotoPage.vala 2017-01-12 18:13:48 +0000
357+++ src/PhotoPage.vala 2017-01-26 15:47:05 +0000
358@@ -2496,206 +2496,154 @@
359 protected override Gtk.ActionEntry[] init_collect_action_entries () {
360 Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
361
362- Gtk.ActionEntry export = { "Export", null, TRANSLATABLE, "<Ctrl><Shift>E",
363- TRANSLATABLE, on_export
364+ Gtk.ActionEntry export = { "Export", null, Resources.EXPORT_MENU, "<Ctrl><Shift>E",
365+ Resources.EXPORT_MENU, on_export
366 };
367- export.label = Resources.EXPORT_MENU;
368 actions += export;
369
370- Gtk.ActionEntry print = { "Print", null, TRANSLATABLE, "<Ctrl>P",
371- TRANSLATABLE, on_print
372+ Gtk.ActionEntry print = { "Print", null, Resources.PRINT_MENU, "<Ctrl>P",
373+ Resources.PRINT_MENU, on_print
374 };
375- print.label = Resources.PRINT_MENU;
376 actions += print;
377
378- Gtk.ActionEntry publish = { "Publish", Resources.PUBLISH, TRANSLATABLE, "<Ctrl><Shift>P",
379- TRANSLATABLE, on_publish
380+ Gtk.ActionEntry publish = { "Publish", Resources.PUBLISH, Resources.PUBLISH_MENU, "<Ctrl><Shift>P",
381+ Resources.PUBLISH_TOOLTIP, on_publish
382 };
383- publish.label = Resources.PUBLISH_MENU;
384- publish.tooltip = Resources.PUBLISH_TOOLTIP;
385 actions += publish;
386
387- Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", null, TRANSLATABLE,
388- "<Shift>Delete", TRANSLATABLE, on_remove_from_library
389+ Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", null, Resources.REMOVE_FROM_LIBRARY_MENU,
390+ "<Shift>Delete", Resources.REMOVE_FROM_LIBRARY_MENU, on_remove_from_library
391 };
392- remove_from_library.label = Resources.REMOVE_FROM_LIBRARY_MENU;
393 actions += remove_from_library;
394
395- Gtk.ActionEntry move_to_trash = { "MoveToTrash", "user-trash-full", TRANSLATABLE, "Delete",
396- TRANSLATABLE, on_move_to_trash
397+ Gtk.ActionEntry move_to_trash = { "MoveToTrash", "user-trash-full", Resources.MOVE_TO_TRASH_MENU, "Delete",
398+ Resources.MOVE_TO_TRASH_MENU, on_move_to_trash
399 };
400- move_to_trash.label = Resources.MOVE_TO_TRASH_MENU;
401 actions += move_to_trash;
402
403- Gtk.ActionEntry view = { "ViewMenu", null, TRANSLATABLE, null, null, on_view_menu };
404- view.label = _ ("_View");
405+ Gtk.ActionEntry view = { "ViewMenu", null, _("_View"), null, null, on_view_menu };
406 actions += view;
407
408- Gtk.ActionEntry tools = { "Tools", null, TRANSLATABLE, null, null, null };
409- tools.label = _ ("T_ools");
410+ Gtk.ActionEntry tools = { "Tools", null, _("T_ools"), null, null, null };
411 actions += tools;
412
413- Gtk.ActionEntry prev = { "PrevPhoto", null, TRANSLATABLE, null,
414- TRANSLATABLE, on_previous_photo
415+ Gtk.ActionEntry prev = { "PrevPhoto", null, _("_Previous Photo"), null,
416+ _("Previous Photo"), on_previous_photo
417 };
418- prev.label = _ ("_Previous Photo");
419- prev.tooltip = _ ("Previous Photo");
420 actions += prev;
421
422- Gtk.ActionEntry next = { "NextPhoto", null, TRANSLATABLE, null,
423- TRANSLATABLE, on_next_photo
424+ Gtk.ActionEntry next = { "NextPhoto", null, _("_Next Photo"), null,
425+ _("Next Photo"), on_next_photo
426 };
427- next.label = _ ("_Next Photo");
428- next.tooltip = _ ("Next Photo");
429 actions += next;
430
431- Gtk.ActionEntry rotate_right = { "RotateClockwise", Resources.CLOCKWISE, TRANSLATABLE,
432- "<Ctrl>R", TRANSLATABLE, on_rotate_clockwise
433+ Gtk.ActionEntry rotate_right = { "RotateClockwise", Resources.CLOCKWISE, Resources.ROTATE_CW_MENU,
434+ "<Ctrl>R", Resources.ROTATE_CW_TOOLTIP, on_rotate_clockwise
435 };
436- rotate_right.label = Resources.ROTATE_CW_MENU;
437- rotate_right.tooltip = Resources.ROTATE_CW_TOOLTIP;
438 actions += rotate_right;
439
440 Gtk.ActionEntry rotate_left = { "RotateCounterclockwise", Resources.COUNTERCLOCKWISE,
441- TRANSLATABLE, "<Ctrl><Shift>R", TRANSLATABLE, on_rotate_counterclockwise
442+ Resources.ROTATE_CCW_MENU, "<Ctrl><Shift>R", Resources.ROTATE_CCW_TOOLTIP, on_rotate_counterclockwise
443 };
444- rotate_left.label = Resources.ROTATE_CCW_MENU;
445- rotate_left.tooltip = Resources.ROTATE_CCW_TOOLTIP;
446 actions += rotate_left;
447
448- Gtk.ActionEntry hflip = { "FlipHorizontally", Resources.HFLIP, TRANSLATABLE, null,
449- TRANSLATABLE, on_flip_horizontally
450+ Gtk.ActionEntry hflip = { "FlipHorizontally", Resources.HFLIP, Resources.HFLIP_MENU, null,
451+ Resources.HFLIP_MENU, on_flip_horizontally
452 };
453- hflip.label = Resources.HFLIP_MENU;
454 actions += hflip;
455
456- Gtk.ActionEntry vflip = { "FlipVertically", Resources.VFLIP, TRANSLATABLE, null,
457- TRANSLATABLE, on_flip_vertically
458+ Gtk.ActionEntry vflip = { "FlipVertically", Resources.VFLIP, Resources.VFLIP_MENU, null,
459+ Resources.VFLIP_MENU, on_flip_vertically
460 };
461- vflip.label = Resources.VFLIP_MENU;
462 actions += vflip;
463
464- Gtk.ActionEntry enhance = { "Enhance", Resources.ENHANCE, TRANSLATABLE, "<Ctrl>E",
465- TRANSLATABLE, on_enhance
466+ Gtk.ActionEntry enhance = { "Enhance", Resources.ENHANCE, Resources.ENHANCE_MENU, "<Ctrl>E",
467+ Resources.ENHANCE_TOOLTIP, on_enhance
468 };
469- enhance.label = Resources.ENHANCE_MENU;
470- enhance.tooltip = Resources.ENHANCE_TOOLTIP;
471 actions += enhance;
472
473- Gtk.ActionEntry copy_adjustments = { "CopyColorAdjustments", null, TRANSLATABLE,
474- "<Ctrl><Shift>C", TRANSLATABLE, on_copy_adjustments
475+ Gtk.ActionEntry copy_adjustments = { "CopyColorAdjustments", null, Resources.COPY_ADJUSTMENTS_MENU,
476+ "<Ctrl><Shift>C", Resources.COPY_ADJUSTMENTS_TOOLTIP, on_copy_adjustments
477 };
478- copy_adjustments.label = Resources.COPY_ADJUSTMENTS_MENU;
479- copy_adjustments.tooltip = Resources.COPY_ADJUSTMENTS_TOOLTIP;
480 actions += copy_adjustments;
481
482- Gtk.ActionEntry paste_adjustments = { "PasteColorAdjustments", null, TRANSLATABLE,
483- "<Ctrl><Shift>V", TRANSLATABLE, on_paste_adjustments
484+ Gtk.ActionEntry paste_adjustments = { "PasteColorAdjustments", null, Resources.PASTE_ADJUSTMENTS_MENU,
485+ "<Ctrl><Shift>V", Resources.PASTE_ADJUSTMENTS_TOOLTIP, on_paste_adjustments
486 };
487- paste_adjustments.label = Resources.PASTE_ADJUSTMENTS_MENU;
488- paste_adjustments.tooltip = Resources.PASTE_ADJUSTMENTS_TOOLTIP;
489 actions += paste_adjustments;
490
491- Gtk.ActionEntry crop = { "Crop", Resources.CROP, TRANSLATABLE, "<Ctrl>O",
492- TRANSLATABLE, toggle_crop
493+ Gtk.ActionEntry crop = { "Crop", Resources.CROP, Resources.CROP_MENU, "<Ctrl>O",
494+ Resources.CROP_TOOLTIP, toggle_crop
495 };
496- crop.label = Resources.CROP_MENU;
497- crop.tooltip = Resources.CROP_TOOLTIP;
498 actions += crop;
499
500- Gtk.ActionEntry straighten = { "Straighten", null, TRANSLATABLE, "<Ctrl>A",
501- TRANSLATABLE, toggle_straighten
502+ Gtk.ActionEntry straighten = { "Straighten", null, Resources.STRAIGHTEN_MENU, "<Ctrl>A",
503+ Resources.STRAIGHTEN_TOOLTIP, toggle_straighten
504 };
505- straighten.label = Resources.STRAIGHTEN_MENU;
506- straighten.tooltip = Resources.STRAIGHTEN_TOOLTIP;
507 actions += straighten;
508
509- Gtk.ActionEntry red_eye = { "RedEye", Resources.REDEYE, TRANSLATABLE, "<Ctrl>Y",
510- TRANSLATABLE, toggle_redeye
511+ Gtk.ActionEntry red_eye = { "RedEye", Resources.REDEYE, Resources.RED_EYE_MENU, "<Ctrl>Y",
512+ Resources.RED_EYE_TOOLTIP, toggle_redeye
513 };
514- red_eye.label = Resources.RED_EYE_MENU;
515- red_eye.tooltip = Resources.RED_EYE_TOOLTIP;
516 actions += red_eye;
517
518- Gtk.ActionEntry adjust = { "Adjust", Resources.ADJUST, TRANSLATABLE, "<Ctrl>D",
519- TRANSLATABLE, toggle_adjust
520+ Gtk.ActionEntry adjust = { "Adjust", Resources.ADJUST, Resources.ADJUST_MENU, "<Ctrl>D",
521+ Resources.ADJUST_TOOLTIP, toggle_adjust
522 };
523- adjust.label = Resources.ADJUST_MENU;
524- adjust.tooltip = Resources.ADJUST_TOOLTIP;
525 actions += adjust;
526
527- Gtk.ActionEntry revert = { "Revert", null, TRANSLATABLE,
528- null, TRANSLATABLE, on_revert
529+ Gtk.ActionEntry revert = { "Revert", null, Resources.REVERT_MENU,
530+ null, Resources.REVERT_MENU, on_revert
531 };
532- revert.label = Resources.REVERT_MENU;
533 actions += revert;
534
535- Gtk.ActionEntry adjust_date_time = { "AdjustDateTime", null, TRANSLATABLE, null,
536- TRANSLATABLE, on_adjust_date_time
537+ Gtk.ActionEntry adjust_date_time = { "AdjustDateTime", null, Resources.ADJUST_DATE_TIME_MENU, null,
538+ Resources.ADJUST_DATE_TIME_MENU, on_adjust_date_time
539 };
540- adjust_date_time.label = Resources.ADJUST_DATE_TIME_MENU;
541 actions += adjust_date_time;
542
543- Gtk.ActionEntry flag = { "Flag", null, TRANSLATABLE, "<Ctrl>G", TRANSLATABLE, on_flag_unflag };
544- flag.label = Resources.FLAG_MENU;
545+ Gtk.ActionEntry flag = { "Flag", null, Resources.FLAG_MENU, "<Ctrl>G", Resources.FLAG_MENU, on_flag_unflag };
546 actions += flag;
547
548- Gtk.ActionEntry increase_size = { "IncreaseSize", null, TRANSLATABLE,
549- "<Ctrl>plus", TRANSLATABLE, on_increase_size
550+ Gtk.ActionEntry increase_size = { "IncreaseSize", null, _("Zoom _In"),
551+ "<Ctrl>plus", _("Increase the magnification of the photo"), on_increase_size
552 };
553- increase_size.label = _ ("Zoom _In");
554- increase_size.tooltip = _ ("Increase the magnification of the photo");
555 actions += increase_size;
556
557- Gtk.ActionEntry decrease_size = { "DecreaseSize", null, TRANSLATABLE,
558- "<Ctrl>minus", TRANSLATABLE, on_decrease_size
559+ Gtk.ActionEntry decrease_size = { "DecreaseSize", null, _("Zoom _Out"),
560+ "<Ctrl>minus", _("Decrease the magnification of the photo"), on_decrease_size
561 };
562- decrease_size.label = _ ("Zoom _Out");
563- decrease_size.tooltip = _ ("Decrease the magnification of the photo");
564 actions += decrease_size;
565
566- Gtk.ActionEntry best_fit = { "ZoomFit", null, TRANSLATABLE,
567- "<Ctrl>0", TRANSLATABLE, snap_zoom_to_min
568+ Gtk.ActionEntry best_fit = { "ZoomFit", null, _("Fit to _Page"),
569+ "<Ctrl>0", _("Zoom the photo to fit on the screen"), snap_zoom_to_min
570 };
571- best_fit.label = _ ("Fit to _Page");
572- best_fit.tooltip = _ ("Zoom the photo to fit on the screen");
573 actions += best_fit;
574
575- Gtk.ActionEntry actual_size = { "Zoom100", null, TRANSLATABLE,
576- "<Ctrl>1", TRANSLATABLE, snap_zoom_to_isomorphic
577+ /// xgettext:no-c-format
578+ Gtk.ActionEntry actual_size = { "Zoom100", null, _("Zoom _100%"),
579+ "<Ctrl>1", _("Zoom the photo to 100% magnification"), snap_zoom_to_isomorphic
580 };
581- /// xgettext:no-c-format
582- actual_size.label = _ ("Zoom _100%");
583- /// xgettext:no-c-format
584- actual_size.tooltip = _ ("Zoom the photo to 100% magnification");
585 actions += actual_size;
586
587- Gtk.ActionEntry max_size = { "Zoom200", null, TRANSLATABLE,
588- "<Ctrl>2", TRANSLATABLE, snap_zoom_to_max
589+ /// xgettext:no-c-format
590+ Gtk.ActionEntry max_size = { "Zoom200", null, _("Zoom _200%"),
591+ "<Ctrl>2", _("Zoom the photo to 200% magnification"), snap_zoom_to_max
592 };
593- /// xgettext:no-c-format
594- max_size.label = _ ("Zoom _200%");
595- /// xgettext:no-c-format
596- max_size.tooltip = _ ("Zoom the photo to 200% magnification");
597 actions += max_size;
598
599- Gtk.ActionEntry slideshow = { "Slideshow", null, TRANSLATABLE, "F5", TRANSLATABLE,
600+ Gtk.ActionEntry slideshow = { "Slideshow", null, _("S_lideshow"), "F5", _("Play a slideshow"),
601 on_slideshow
602 };
603- slideshow.label = _ ("S_lideshow");
604- slideshow.tooltip = _ ("Play a slideshow");
605 actions += slideshow;
606
607- Gtk.ActionEntry raw_developer = { "RawDeveloper", null, TRANSLATABLE, null, null, null };
608- raw_developer.label = _ ("_Developer");
609+ Gtk.ActionEntry raw_developer = { "RawDeveloper", null, _("_Developer"), null, null, null };
610 actions += raw_developer;
611
612- Gtk.ActionEntry open_with = { "OpenWith", null, TRANSLATABLE, null, null, null };
613- open_with.label = Resources.OPEN_WITH_MENU;
614+ Gtk.ActionEntry open_with = { "OpenWith", null, Resources.OPEN_WITH_MENU, null, null, null };
615 actions += open_with;
616
617- Gtk.ActionEntry open_with_raw = { "OpenWithRaw", null, TRANSLATABLE, null, null, null };
618- open_with_raw.label = Resources.OPEN_WITH_RAW_MENU;
619+ Gtk.ActionEntry open_with_raw = { "OpenWithRaw", null, Resources.OPEN_WITH_RAW_MENU, null, null, null };
620 actions += open_with_raw;
621
622 return actions;
623@@ -2723,18 +2671,16 @@
624
625 Gtk.RadioActionEntry[] developer_actions = new Gtk.RadioActionEntry[0];
626
627- Gtk.RadioActionEntry dev_shotwell = { "RawDeveloperShotwell", null, TRANSLATABLE, null, TRANSLATABLE,
628+ string label_shotwell = RawDeveloper.SHOTWELL.get_label ();
629+ Gtk.RadioActionEntry dev_shotwell = { "RawDeveloperShotwell", null, label_shotwell, null, label_shotwell,
630 RawDeveloper.SHOTWELL
631 };
632- string label_shotwell = RawDeveloper.SHOTWELL.get_label ();
633- dev_shotwell.label = label_shotwell;
634 developer_actions += dev_shotwell;
635
636- Gtk.RadioActionEntry dev_camera = { "RawDeveloperCamera", null, TRANSLATABLE, null, TRANSLATABLE,
637+ string label_camera = RawDeveloper.CAMERA.get_label ();
638+ Gtk.RadioActionEntry dev_camera = { "RawDeveloperCamera", null, label_camera, null, label_camera,
639 RawDeveloper.CAMERA
640 };
641- string label_camera = RawDeveloper.CAMERA.get_label ();
642- dev_camera.label = label_camera;
643 developer_actions += dev_camera;
644
645 action_group.add_radio_actions (developer_actions, RawDeveloper.SHOTWELL, on_raw_developer_changed);
646
647=== modified file 'src/camera/ImportPage.vala'
648--- src/camera/ImportPage.vala 2017-01-12 18:13:48 +0000
649+++ src/camera/ImportPage.vala 2017-01-26 15:47:05 +0000
650@@ -893,11 +893,9 @@
651 protected override Gtk.ToggleActionEntry[] init_collect_toggle_action_entries () {
652 Gtk.ToggleActionEntry[] toggle_actions = base.init_collect_toggle_action_entries ();
653
654- Gtk.ToggleActionEntry titles = { "ViewTitle", null, TRANSLATABLE, "<Ctrl><Shift>T",
655- TRANSLATABLE, on_display_titles, Config.Facade.get_instance ().get_display_photo_titles ()
656+ Gtk.ToggleActionEntry titles = { "ViewTitle", null, _("_Titles"), "<Ctrl><Shift>T",
657+ _("Display the title of each photo"), on_display_titles, Config.Facade.get_instance ().get_display_photo_titles ()
658 };
659- titles.label = _ ("_Titles");
660- titles.tooltip = _ ("Display the title of each photo");
661 toggle_actions += titles;
662
663 return toggle_actions;
664@@ -907,17 +905,13 @@
665 Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
666
667 Gtk.ActionEntry import_selected = { "ImportSelected", Resources.IMPORT,
668- TRANSLATABLE, null, null, on_import_selected
669+ _("Import _Selected"), null, _("Import the selected photos into your library"), on_import_selected
670 };
671- import_selected.label = _ ("Import _Selected");
672- import_selected.tooltip = _ ("Import the selected photos into your library");
673 actions += import_selected;
674
675- Gtk.ActionEntry import_all = { "ImportAll", Resources.IMPORT_ALL, TRANSLATABLE,
676- null, null, on_import_all
677+ Gtk.ActionEntry import_all = { "ImportAll", Resources.IMPORT_ALL, _("Import _All"),
678+ null, _("Import all the photos into your library"), on_import_all
679 };
680- import_all.label = _ ("Import _All");
681- import_all.tooltip = _ ("Import all the photos into your library");
682 actions += import_all;
683
684 return actions;
685
686=== modified file 'src/direct/DirectPhotoPage.vala'
687--- src/direct/DirectPhotoPage.vala 2017-01-15 01:09:26 +0000
688+++ src/direct/DirectPhotoPage.vala 2017-01-26 15:47:05 +0000
689@@ -56,175 +56,129 @@
690 protected override Gtk.ActionEntry[] init_collect_action_entries () {
691 Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
692
693- Gtk.ActionEntry file = { "FileMenu", null, TRANSLATABLE, null, null, null };
694- file.label = _ ("_File");
695+ Gtk.ActionEntry file = { "FileMenu", null, _("_File"), null, null, null };
696 actions += file;
697
698- Gtk.ActionEntry save = { "Save", "document-save", TRANSLATABLE, "<Ctrl>S", TRANSLATABLE,
699+ Gtk.ActionEntry save = { "Save", "document-save", _("_Save"), "<Ctrl>S", _("Save photo"),
700 on_save
701 };
702- save.label = _ ("_Save");
703- save.tooltip = _ ("Save photo");
704 actions += save;
705
706- Gtk.ActionEntry save_as = { "SaveAs", "document-save-as", TRANSLATABLE,
707- "<Ctrl><Shift>S", TRANSLATABLE, on_save_as
708+ Gtk.ActionEntry save_as = { "SaveAs", "document-save-as", _("Save _As..."),
709+ "<Ctrl><Shift>S", _("Save photo with a different name"), on_save_as
710 };
711- save_as.label = _ ("Save _As...");
712- save_as.tooltip = _ ("Save photo with a different name");
713 actions += save_as;
714
715- Gtk.ActionEntry print = { "Print", null, TRANSLATABLE, "<Ctrl>P",
716- TRANSLATABLE, on_print
717+ Gtk.ActionEntry print = { "Print", null, Resources.PRINT_MENU, "<Ctrl>P",
718+ _("Print the photo to a printer connected to your computer"), on_print
719 };
720- print.label = Resources.PRINT_MENU;
721- print.tooltip = _ ("Print the photo to a printer connected to your computer");
722 actions += print;
723
724- Gtk.ActionEntry edit = { "EditMenu", null, TRANSLATABLE, null, null, null };
725- edit.label = _ ("_Edit");
726+ Gtk.ActionEntry edit = { "EditMenu", null, _("_Edit"), null, null, null };
727 actions += edit;
728
729- Gtk.ActionEntry photo = { "PhotoMenu", null, null, null, null, null };
730- photo.label = _ ("_Photo");
731+ Gtk.ActionEntry photo = { "PhotoMenu", null, _("_Photo"), null, null, null };
732 actions += photo;
733
734- Gtk.ActionEntry tools = { "Tools", null, TRANSLATABLE, null, null, null };
735- tools.label = _ ("T_ools");
736+ Gtk.ActionEntry tools = { "Tools", null, _("T_ools"), null, null, null };
737 actions += tools;
738
739- Gtk.ActionEntry prev = { "PrevPhoto", null, TRANSLATABLE, null,
740- TRANSLATABLE, on_previous_photo
741+ Gtk.ActionEntry prev = { "PrevPhoto", null, _("_Previous Photo"), null,
742+ _("Previous Photo"), on_previous_photo
743 };
744- prev.label = _ ("_Previous Photo");
745- prev.tooltip = _ ("Previous Photo");
746 actions += prev;
747
748- Gtk.ActionEntry next = { "NextPhoto", null, TRANSLATABLE, null,
749- TRANSLATABLE, on_next_photo
750+ Gtk.ActionEntry next = { "NextPhoto", null, _("_Next Photo"), null,
751+ _("Next Photo"), on_next_photo
752 };
753- next.label = _ ("_Next Photo");
754- next.tooltip = _ ("Next Photo");
755 actions += next;
756
757 Gtk.ActionEntry rotate_right = { "RotateClockwise", Resources.CLOCKWISE,
758- TRANSLATABLE, "<Ctrl>R", TRANSLATABLE, on_rotate_clockwise
759+ Resources.ROTATE_CW_MENU, "<Ctrl>R", Resources.ROTATE_CCW_TOOLTIP, on_rotate_clockwise
760 };
761- rotate_right.label = Resources.ROTATE_CW_MENU;
762- rotate_right.tooltip = Resources.ROTATE_CCW_TOOLTIP;
763 actions += rotate_right;
764
765 Gtk.ActionEntry rotate_left = { "RotateCounterclockwise", Resources.COUNTERCLOCKWISE,
766- TRANSLATABLE, "<Ctrl><Shift>R", TRANSLATABLE, on_rotate_counterclockwise
767+ Resources.ROTATE_CCW_MENU, "<Ctrl><Shift>R", Resources.ROTATE_CCW_TOOLTIP, on_rotate_counterclockwise
768 };
769- rotate_left.label = Resources.ROTATE_CCW_MENU;
770- rotate_left.tooltip = Resources.ROTATE_CCW_TOOLTIP;
771 actions += rotate_left;
772
773- Gtk.ActionEntry hflip = { "FlipHorizontally", Resources.HFLIP, TRANSLATABLE, null,
774- TRANSLATABLE, on_flip_horizontally
775+ Gtk.ActionEntry hflip = { "FlipHorizontally", Resources.HFLIP, Resources.HFLIP_MENU, null,
776+ Resources.HFLIP_MENU, on_flip_horizontally
777 };
778- hflip.label = Resources.HFLIP_MENU;
779 actions += hflip;
780
781- Gtk.ActionEntry vflip = { "FlipVertically", Resources.VFLIP, TRANSLATABLE, null,
782- TRANSLATABLE, on_flip_vertically
783+ Gtk.ActionEntry vflip = { "FlipVertically", Resources.VFLIP, Resources.VFLIP_MENU, null,
784+ Resources.VFLIP_MENU, on_flip_vertically
785 };
786- vflip.label = Resources.VFLIP_MENU;
787 actions += vflip;
788
789- Gtk.ActionEntry enhance = { "Enhance", Resources.ENHANCE, TRANSLATABLE, "<Ctrl>E",
790- TRANSLATABLE, on_enhance
791+ Gtk.ActionEntry enhance = { "Enhance", Resources.ENHANCE, Resources.ENHANCE_MENU, "<Ctrl>E",
792+ Resources.ENHANCE_TOOLTIP, on_enhance
793 };
794- enhance.label = Resources.ENHANCE_MENU;
795- enhance.tooltip = Resources.ENHANCE_TOOLTIP;
796 actions += enhance;
797
798- Gtk.ActionEntry crop = { "Crop", Resources.CROP, TRANSLATABLE, "<Ctrl>O",
799- TRANSLATABLE, toggle_crop
800+ Gtk.ActionEntry crop = { "Crop", Resources.CROP, Resources.CROP_MENU, "<Ctrl>O",
801+ Resources.CROP_TOOLTIP, toggle_crop
802 };
803- crop.label = Resources.CROP_MENU;
804- crop.tooltip = Resources.CROP_TOOLTIP;
805 actions += crop;
806
807- Gtk.ActionEntry straighten = { "Straighten", null, TRANSLATABLE, "<Ctrl>A",
808- TRANSLATABLE, toggle_straighten
809+ Gtk.ActionEntry straighten = { "Straighten", null, Resources.STRAIGHTEN_MENU, "<Ctrl>A",
810+ Resources.STRAIGHTEN_TOOLTIP, toggle_straighten
811 };
812- straighten.label = Resources.STRAIGHTEN_MENU;
813- straighten.tooltip = Resources.STRAIGHTEN_TOOLTIP;
814 actions += straighten;
815
816- Gtk.ActionEntry red_eye = { "RedEye", Resources.REDEYE, TRANSLATABLE, "<Ctrl>Y",
817- TRANSLATABLE, toggle_redeye
818+ Gtk.ActionEntry red_eye = { "RedEye", Resources.REDEYE, Resources.RED_EYE_MENU, "<Ctrl>Y",
819+ Resources.RED_EYE_TOOLTIP, toggle_redeye
820 };
821- red_eye.label = Resources.RED_EYE_MENU;
822- red_eye.tooltip = Resources.RED_EYE_TOOLTIP;
823 actions += red_eye;
824
825- Gtk.ActionEntry adjust = { "Adjust", Resources.ADJUST, TRANSLATABLE, "<Ctrl>D",
826- TRANSLATABLE, toggle_adjust
827+ Gtk.ActionEntry adjust = { "Adjust", Resources.ADJUST, Resources.ADJUST_MENU, "<Ctrl>D",
828+ Resources.ADJUST_TOOLTIP, toggle_adjust
829 };
830- adjust.label = Resources.ADJUST_MENU;
831- adjust.tooltip = Resources.ADJUST_TOOLTIP;
832 actions += adjust;
833
834- Gtk.ActionEntry revert = { "Revert", null, TRANSLATABLE,
835- null, TRANSLATABLE, on_revert
836+ Gtk.ActionEntry revert = { "Revert", null, Resources.REVERT_MENU,
837+ null, Resources.REVERT_MENU, on_revert
838 };
839- revert.label = Resources.REVERT_MENU;
840 actions += revert;
841
842- Gtk.ActionEntry adjust_date_time = { "AdjustDateTime", null, TRANSLATABLE, null,
843- TRANSLATABLE, on_adjust_date_time
844+ Gtk.ActionEntry adjust_date_time = { "AdjustDateTime", null, Resources.ADJUST_DATE_TIME_MENU, null,
845+ Resources.ADJUST_DATE_TIME_MENU, on_adjust_date_time
846 };
847- adjust_date_time.label = Resources.ADJUST_DATE_TIME_MENU;
848 actions += adjust_date_time;
849
850- Gtk.ActionEntry view = { "ViewMenu", null, TRANSLATABLE, null, null, null };
851- view.label = _ ("_View");
852+ Gtk.ActionEntry view = { "ViewMenu", null, _("_View"), null, null, null };
853 actions += view;
854
855- Gtk.ActionEntry help = { "HelpMenu", null, TRANSLATABLE, null, null, null };
856- help.label = _ ("_Help");
857+ Gtk.ActionEntry help = { "HelpMenu", null, _("_Help"), null, null, null };
858 actions += help;
859
860- Gtk.ActionEntry increase_size = { "IncreaseSize", null, TRANSLATABLE,
861- "<Ctrl>plus", TRANSLATABLE, on_increase_size
862+ Gtk.ActionEntry increase_size = { "IncreaseSize", null, _("Zoom _In"),
863+ "<Ctrl>plus", _("Increase the magnification of the photo"), on_increase_size
864 };
865- increase_size.label = _ ("Zoom _In");
866- increase_size.tooltip = _ ("Increase the magnification of the photo");
867 actions += increase_size;
868
869- Gtk.ActionEntry decrease_size = { "DecreaseSize", null, TRANSLATABLE,
870- "<Ctrl>minus", TRANSLATABLE, on_decrease_size
871+ Gtk.ActionEntry decrease_size = { "DecreaseSize", null, _("Zoom _Out"),
872+ "<Ctrl>minus", _("Decrease the magnification of the photo"), on_decrease_size
873 };
874- decrease_size.label = _ ("Zoom _Out");
875- decrease_size.tooltip = _ ("Decrease the magnification of the photo");
876 actions += decrease_size;
877
878- Gtk.ActionEntry best_fit = { "ZoomFit", null, TRANSLATABLE,
879- "<Ctrl>0", TRANSLATABLE, snap_zoom_to_min
880+ Gtk.ActionEntry best_fit = { "ZoomFit", null, _("Fit to _Page"),
881+ "<Ctrl>0", _("Zoom the photo to fit on the screen"), snap_zoom_to_min
882 };
883- best_fit.label = _ ("Fit to _Page");
884- best_fit.tooltip = _ ("Zoom the photo to fit on the screen");
885 actions += best_fit;
886
887- Gtk.ActionEntry actual_size = { "Zoom100", null, TRANSLATABLE,
888- "<Ctrl>1", TRANSLATABLE, snap_zoom_to_isomorphic
889+ /// xgettext:no-c-format
890+ Gtk.ActionEntry actual_size = { "Zoom100", null, _("Zoom _100%"),
891+ "<Ctrl>1", _("Zoom the photo to 100% magnification"), snap_zoom_to_isomorphic
892 };
893- /// xgettext:no-c-format
894- actual_size.label = _ ("Zoom _100%");
895- /// xgettext:no-c-format
896- actual_size.tooltip = _ ("Zoom the photo to 100% magnification");
897 actions += actual_size;
898
899- Gtk.ActionEntry max_size = { "Zoom200", null, TRANSLATABLE,
900- "<Ctrl>2", TRANSLATABLE, snap_zoom_to_max
901+ /// xgettext:no-c-format
902+ Gtk.ActionEntry max_size = { "Zoom200", null, _("Zoom _200%"),
903+ "<Ctrl>2", _("Zoom the photo to 200% magnification"), snap_zoom_to_max
904 };
905- /// xgettext:no-c-format
906- max_size.label = _ ("Zoom _200%");
907- /// xgettext:no-c-format
908- max_size.tooltip = _ ("Zoom the photo to 200% magnification");
909 actions += max_size;
910
911 return actions;
912
913=== modified file 'src/events/EventPage.vala'
914--- src/events/EventPage.vala 2017-01-12 18:13:48 +0000
915+++ src/events/EventPage.vala 2017-01-26 15:47:05 +0000
916@@ -64,13 +64,11 @@
917 Gtk.ActionEntry[] new_actions = base.init_collect_action_entries ();
918
919 Gtk.ActionEntry make_primary = { "MakePrimary", null,
920- TRANSLATABLE, null, TRANSLATABLE, on_make_primary
921+ Resources.MAKE_KEY_PHOTO_MENU, null, Resources.MAKE_KEY_PHOTO_MENU, on_make_primary
922 };
923- make_primary.label = Resources.MAKE_KEY_PHOTO_MENU;
924 new_actions += make_primary;
925
926- Gtk.ActionEntry rename = { "Rename", null, TRANSLATABLE, null, TRANSLATABLE, on_rename };
927- rename.label = Resources.RENAME_EVENT_MENU;
928+ Gtk.ActionEntry rename = { "Rename", null, Resources.RENAME_EVENT_MENU, null, Resources.RENAME_EVENT_MENU, on_rename };
929 new_actions += rename;
930
931 return new_actions;
932
933=== modified file 'src/events/EventsDirectoryPage.vala'
934--- src/events/EventsDirectoryPage.vala 2017-01-12 18:13:48 +0000
935+++ src/events/EventsDirectoryPage.vala 2017-01-26 15:47:05 +0000
936@@ -140,14 +140,12 @@
937 protected override Gtk.ActionEntry[] init_collect_action_entries () {
938 Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
939
940- Gtk.ActionEntry rename = { "Rename", null, TRANSLATABLE, "F2", TRANSLATABLE, on_rename };
941- rename.label = Resources.RENAME_EVENT_MENU;
942+ Gtk.ActionEntry rename = { "Rename", null, Resources.RENAME_EVENT_MENU, "F2", Resources.RENAME_EVENT_MENU, on_rename };
943 actions += rename;
944
945- Gtk.ActionEntry merge = { "Merge", Resources.MERGE, TRANSLATABLE, null, Resources.MERGE_TOOLTIP,
946+ Gtk.ActionEntry merge = { "Merge", Resources.MERGE, Resources.MERGE_MENU, null, Resources.MERGE_TOOLTIP,
947 on_merge
948 };
949- merge.label = Resources.MERGE_MENU;
950 actions += merge;
951
952 return actions;
953@@ -156,11 +154,9 @@
954 protected override Gtk.ToggleActionEntry[] init_collect_toggle_action_entries () {
955 Gtk.ToggleActionEntry[] toggle_actions = base.init_collect_toggle_action_entries ();
956
957- Gtk.ToggleActionEntry comments = { "ViewComment", null, TRANSLATABLE, "<Ctrl><Shift>C",
958- TRANSLATABLE, on_display_comments, Config.Facade.get_instance ().get_display_event_comments ()
959+ Gtk.ToggleActionEntry comments = { "ViewComment", null, _("_Comments"), "<Ctrl><Shift>C",
960+ _("Display the comment of each event"), on_display_comments, Config.Facade.get_instance ().get_display_event_comments ()
961 };
962- comments.label = _ ("_Comments");
963- comments.tooltip = _ ("Display the comment of each event");
964 toggle_actions += comments;
965
966 return toggle_actions;
967
968=== modified file 'src/library/ImportQueuePage.vala'
969--- src/library/ImportQueuePage.vala 2017-01-12 18:13:48 +0000
970+++ src/library/ImportQueuePage.vala 2017-01-26 15:47:05 +0000
971@@ -72,11 +72,9 @@
972 protected override Gtk.ActionEntry[] init_collect_action_entries () {
973 Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
974
975- Gtk.ActionEntry stop = { "Stop", null, TRANSLATABLE, null, TRANSLATABLE,
976+ Gtk.ActionEntry stop = { "Stop", null, _("_Stop Import"), null, _("Stop importing photos"),
977 on_stop
978 };
979- stop.label = _ ("_Stop Import");
980- stop.tooltip = _ ("Stop importing photos");
981 actions += stop;
982
983 return actions;
984
985=== modified file 'src/library/LibraryWindow.vala'
986--- src/library/LibraryWindow.vala 2017-01-12 18:13:48 +0000
987+++ src/library/LibraryWindow.vala 2017-01-26 15:47:05 +0000
988@@ -300,78 +300,61 @@
989 Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
990
991 Gtk.ActionEntry import = { "CommonFileImport", Resources.IMPORT,
992- TRANSLATABLE, "<Ctrl>I", TRANSLATABLE, on_file_import
993+ _("_Import From Folder…"), "<Ctrl>I", _("Import photos from disk to library"), on_file_import
994 };
995- import.label = _ ("_Import From Folder…");
996- import.tooltip = _ ("Import photos from disk to library");
997 actions += import;
998
999- Gtk.ActionEntry sort = { "CommonSortEvents", null, TRANSLATABLE, null, null, null };
1000- sort.label = _ ("Sort _Events");
1001+ Gtk.ActionEntry sort = { "CommonSortEvents", null, _("Sort _Events"), null, null, null };
1002 actions += sort;
1003
1004- Gtk.ActionEntry preferences = { "CommonPreferences", null, TRANSLATABLE,
1005- null, TRANSLATABLE, on_preferences
1006+ Gtk.ActionEntry preferences = { "CommonPreferences", null, Resources.PREFERENCES_MENU,
1007+ null, Resources.PREFERENCES_MENU, on_preferences
1008 };
1009- preferences.label = Resources.PREFERENCES_MENU;
1010 actions += preferences;
1011
1012- Gtk.ActionEntry empty = { "CommonEmptyTrash", null, TRANSLATABLE, null, TRANSLATABLE,
1013+ Gtk.ActionEntry empty = { "CommonEmptyTrash", null, _("_Empty Trash"), null, _("Delete all photos in the trash"),
1014 on_empty_trash
1015 };
1016- empty.label = _ ("_Empty Trash");
1017- empty.tooltip = _ ("Delete all photos in the trash");
1018 actions += empty;
1019
1020- Gtk.ActionEntry jump_to_event = { "CommonJumpToEvent", null, TRANSLATABLE, null,
1021- TRANSLATABLE, on_jump_to_event
1022+ Gtk.ActionEntry jump_to_event = { "CommonJumpToEvent", null, _("View Eve_nt for Photo"), null,
1023+ _("View Eve_nt for Photo"), on_jump_to_event
1024 };
1025- jump_to_event.label = _ ("View Eve_nt for Photo");
1026 actions += jump_to_event;
1027
1028- Gtk.ActionEntry find = { "CommonFind", null, TRANSLATABLE, null, null,
1029+ Gtk.ActionEntry find = { "CommonFind", null, _("_Find"), null, _("Find photos and videos by search criteria"),
1030 on_find
1031 };
1032- find.label = _ ("_Find");
1033- find.tooltip = _ ("Find photos and videos by search criteria");
1034 actions += find;
1035
1036 // add the common action for the FilterPhotos submenu (the submenu contains items from
1037 // SearchFilterActions)
1038- Gtk.ActionEntry filter_photos = { "CommonFilterPhotos", null, TRANSLATABLE, null, null, null };
1039- filter_photos.label = Resources.FILTER_PHOTOS_MENU;
1040+ Gtk.ActionEntry filter_photos = { "CommonFilterPhotos", null, Resources.FILTER_PHOTOS_MENU, null, null, null };
1041 actions += filter_photos;
1042
1043- Gtk.ActionEntry new_search = { "CommonNewSearch", null, TRANSLATABLE, "<Ctrl>S", null,
1044+ Gtk.ActionEntry new_search = { "CommonNewSearch", null, _("New Smart Album…"), "<Ctrl>S", null,
1045 on_new_search
1046 };
1047- new_search.label = _ ("New Smart Album…");
1048 actions += new_search;
1049
1050 // top-level menus
1051
1052- Gtk.ActionEntry file = { "FileMenu", null, TRANSLATABLE, null, null, null };
1053- file.label = _ ("_File");
1054+ Gtk.ActionEntry file = { "FileMenu", null, _("_File"), null, null, null };
1055 actions += file;
1056
1057- Gtk.ActionEntry edit = { "EditMenu", null, TRANSLATABLE, null, null, null };
1058- edit.label = _ ("_Edit");
1059+ Gtk.ActionEntry edit = { "EditMenu", null, _("_Edit"), null, null, null };
1060 actions += edit;
1061
1062- Gtk.ActionEntry photo = { "PhotoMenu", null, TRANSLATABLE, null, null, null };
1063- photo.label = _ ("_Photo");
1064+ Gtk.ActionEntry photo = { "PhotoMenu", null, _("_Photo"), null, null, null };
1065 actions += photo;
1066
1067- Gtk.ActionEntry photos = { "PhotosMenu", null, TRANSLATABLE, null, null, null };
1068- photos.label = _ ("_Photos");
1069+ Gtk.ActionEntry photos = { "PhotosMenu", null, _("_Photos"), null, null, null };
1070 actions += photos;
1071
1072- Gtk.ActionEntry tags = { "TagsMenu", null, TRANSLATABLE, null, null, null };
1073- tags.label = _ ("Ta_gs");
1074+ Gtk.ActionEntry tags = { "TagsMenu", null, _("Ta_gs"), null, null, null };
1075 actions += tags;
1076
1077- Gtk.ActionEntry help = { "HelpMenu", null, TRANSLATABLE, null, null, null };
1078- help.label = _ ("_Help");
1079+ Gtk.ActionEntry help = { "HelpMenu", null, _("_Help"), null, null, null };
1080 actions += help;
1081
1082 return actions;
1083@@ -385,17 +368,14 @@
1084 };
1085 actions += searchbar;
1086
1087- Gtk.ToggleActionEntry sidebar = { "CommonDisplaySidebar", null, TRANSLATABLE,
1088- "F9", TRANSLATABLE, on_display_sidebar, is_sidebar_visible ()
1089+ Gtk.ToggleActionEntry sidebar = { "CommonDisplaySidebar", null, _("S_idebar"),
1090+ "F9", _("Display the sidebar"), on_display_sidebar, is_sidebar_visible ()
1091 };
1092- sidebar.label = _ ("S_idebar");
1093- sidebar.tooltip = _ ("Display the sidebar");
1094 actions += sidebar;
1095
1096- Gtk.ToggleActionEntry meta_sidebar = { "CommonDisplayMetadataSidebar", null, TRANSLATABLE,
1097- "F10", TRANSLATABLE, on_display_metadata_sidebar, is_metadata_sidebar_visible ()
1098+ Gtk.ToggleActionEntry meta_sidebar = { "CommonDisplayMetadataSidebar", null, _("Edit Photo In_fo"),
1099+ "F10", _("Edit Photo In_fo"), on_display_metadata_sidebar, is_metadata_sidebar_visible ()
1100 };
1101- meta_sidebar.label = _ ("Edit Photo In_fo");
1102 actions += meta_sidebar;
1103
1104 return actions;
1105@@ -405,19 +385,15 @@
1106 Gtk.RadioActionEntry[] actions = new Gtk.RadioActionEntry[0];
1107
1108 Gtk.RadioActionEntry ascending = { "CommonSortEventsAscending",
1109- null, TRANSLATABLE, null, TRANSLATABLE,
1110+ null, _("_Ascending"), null, _("Sort photos in an ascending order"),
1111 SORT_EVENTS_ORDER_ASCENDING
1112 };
1113- ascending.label = _ ("_Ascending");
1114- ascending.tooltip = _ ("Sort photos in an ascending order");
1115 actions += ascending;
1116
1117 Gtk.RadioActionEntry descending = { "CommonSortEventsDescending",
1118- null, TRANSLATABLE, null, TRANSLATABLE,
1119+ null, _("D_escending"), null, _("Sort photos in a descending order"),
1120 SORT_EVENTS_ORDER_DESCENDING
1121 };
1122- descending.label = _ ("D_escending");
1123- descending.tooltip = _ ("Sort photos in a descending order");
1124 actions += descending;
1125
1126 group.add_radio_actions (actions, SORT_EVENTS_ORDER_ASCENDING, on_events_sort_changed);
1127
1128=== modified file 'src/library/OfflinePage.vala'
1129--- src/library/OfflinePage.vala 2017-01-12 18:13:48 +0000
1130+++ src/library/OfflinePage.vala 2017-01-26 15:47:05 +0000
1131@@ -69,11 +69,9 @@
1132 protected override Gtk.ActionEntry[] init_collect_action_entries () {
1133 Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
1134
1135- Gtk.ActionEntry remove = { "RemoveFromLibrary", null, TRANSLATABLE, "Delete",
1136- TRANSLATABLE, on_remove_from_library
1137+ Gtk.ActionEntry remove = { "RemoveFromLibrary", null, Resources.REMOVE_FROM_LIBRARY_MENU, "Delete",
1138+ Resources.DELETE_FROM_LIBRARY_TOOLTIP, on_remove_from_library
1139 };
1140- remove.label = Resources.REMOVE_FROM_LIBRARY_MENU;
1141- remove.tooltip = Resources.DELETE_FROM_LIBRARY_TOOLTIP;
1142 actions += remove;
1143
1144 return actions;
1145
1146=== modified file 'src/library/TrashPage.vala'
1147--- src/library/TrashPage.vala 2017-01-12 18:13:48 +0000
1148+++ src/library/TrashPage.vala 2017-01-26 15:47:05 +0000
1149@@ -121,18 +121,14 @@
1150 protected override Gtk.ActionEntry[] init_collect_action_entries () {
1151 Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
1152
1153- Gtk.ActionEntry delete_action = { "Delete", null, TRANSLATABLE, "Delete",
1154- TRANSLATABLE, on_delete
1155+ Gtk.ActionEntry delete_action = { "Delete", null, Resources.DELETE_PHOTOS_MENU, "Delete",
1156+ Resources.DELETE_FROM_TRASH_TOOLTIP, on_delete
1157 };
1158- delete_action.label = Resources.DELETE_PHOTOS_MENU;
1159- delete_action.tooltip = Resources.DELETE_FROM_TRASH_TOOLTIP;
1160 actions += delete_action;
1161
1162- Gtk.ActionEntry restore = { "Restore", null, TRANSLATABLE, "Restore", TRANSLATABLE,
1163+ Gtk.ActionEntry restore = { "Restore", null, Resources.RESTORE_PHOTOS_MENU, "Restore", Resources.RESTORE_PHOTOS_TOOLTIP,
1164 on_restore
1165 };
1166- restore.label = Resources.RESTORE_PHOTOS_MENU;
1167- restore.tooltip = Resources.RESTORE_PHOTOS_TOOLTIP;
1168 actions += restore;
1169
1170 return actions;
1171
1172=== modified file 'src/searches/Branch.vala'
1173--- src/searches/Branch.vala 2017-01-12 18:13:48 +0000
1174+++ src/searches/Branch.vala 2017-01-26 15:47:05 +0000
1175@@ -86,8 +86,7 @@
1176 Gtk.ActionGroup group = new Gtk.ActionGroup ("SidebarDefault");
1177 Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
1178
1179- Gtk.ActionEntry new_search = { "CommonNewSearch", null, TRANSLATABLE, null, null, on_new_search };
1180- new_search.label = _ ("New Smart Album…");
1181+ Gtk.ActionEntry new_search = { "CommonNewSearch", null, _("New Smart Album…"), null, null, on_new_search };
1182 actions += new_search;
1183
1184 group.add_actions (actions, this);
1185
1186=== modified file 'src/sidebar/Tree.vala'
1187--- src/sidebar/Tree.vala 2017-01-12 18:13:48 +0000
1188+++ src/sidebar/Tree.vala 2017-01-26 15:47:05 +0000
1189@@ -206,12 +206,10 @@
1190 Gtk.ActionGroup group = new Gtk.ActionGroup ("SidebarDefault");
1191 Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
1192
1193- Gtk.ActionEntry new_search = { "CommonNewSearch", null, TRANSLATABLE, null, null, on_new_search };
1194- new_search.label = _ ("New Smart Album…");
1195+ Gtk.ActionEntry new_search = { "CommonNewSearch", null, _("New Smart Album…"), null, null, on_new_search };
1196 actions += new_search;
1197
1198- Gtk.ActionEntry new_tag = { "CommonNewTag", null, TRANSLATABLE, null, null, on_new_tag };
1199- new_tag.label = _ ("New _Tag...");
1200+ Gtk.ActionEntry new_tag = { "CommonNewTag", null, _("New _Tag..."), null, null, on_new_tag };
1201 actions += new_tag;
1202
1203 group.add_actions (actions, this);
1204
1205=== modified file 'src/tags/Branch.vala'
1206--- src/tags/Branch.vala 2017-01-12 18:13:48 +0000
1207+++ src/tags/Branch.vala 2017-01-26 15:47:05 +0000
1208@@ -145,8 +145,7 @@
1209 Gtk.ActionGroup group = new Gtk.ActionGroup ("SidebarDefault");
1210 Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
1211
1212- Gtk.ActionEntry new_tag = { "CommonNewTag", null, TRANSLATABLE, null, null, on_new_tag };
1213- new_tag.label = Resources.NEW_CHILD_TAG_SIDEBAR_MENU;
1214+ Gtk.ActionEntry new_tag = { "CommonNewTag", null, Resources.NEW_CHILD_TAG_SIDEBAR_MENU, null, null, on_new_tag };
1215 actions += new_tag;
1216
1217 group.add_actions (actions, this);

Subscribers

People subscribed via source and target branches

to all changes: