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

[Corentin Noël]

Simplified the GtkAction creation

[Danielle Foré (danrabbit)]

Everything looks good here :)

review: Approve

=== modified file 'src/AppWindow.vala'
--- src/AppWindow.vala	2017-01-15 18:45:10 +0000
+++ src/AppWindow.vala	2017-01-26 15:47:05 +0000
@@ -498,40 +498,34 @@
     private Gtk.ActionEntry[] create_common_actions () {
         Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
 
-        Gtk.ActionEntry quit = { "CommonQuit", null, TRANSLATABLE, "<Ctrl>Q",
-                                 TRANSLATABLE, on_quit
+        Gtk.ActionEntry quit = { "CommonQuit", null, _("_Quit"), "<Ctrl>Q",
+                                 _("_Quit"), on_quit
                                };
-        quit.label = _ ("_Quit");
         actions += quit;
 
         Gtk.ActionEntry fullscreen = { "CommonFullscreen", null,
-                                       TRANSLATABLE, "F11", TRANSLATABLE, on_fullscreen
+                                       _("Fulls_creen"), "F11", _("Fulls_creen"), on_fullscreen
                                      };
-        fullscreen.label = _ ("Fulls_creen");
         actions += fullscreen;
 
-        Gtk.ActionEntry undo = { "CommonUndo", "edit-undo", TRANSLATABLE, "<Ctrl>Z",
-                                 TRANSLATABLE, on_undo
+        Gtk.ActionEntry undo = { "CommonUndo", "edit-undo", Resources.UNDO_MENU, "<Ctrl>Z",
+                                 Resources.UNDO_MENU, on_undo
                                };
-        undo.label = Resources.UNDO_MENU;
         actions += undo;
 
-        Gtk.ActionEntry redo = { "CommonRedo", "edit-redo", TRANSLATABLE, "<Ctrl><Shift>Z",
-                                 TRANSLATABLE, on_redo
+        Gtk.ActionEntry redo = { "CommonRedo", "edit-redo", Resources.REDO_MENU, "<Ctrl><Shift>Z",
+                                 Resources.REDO_MENU, on_redo
                                };
-        redo.label = Resources.REDO_MENU;
         actions += redo;
 
-        Gtk.ActionEntry jump_to_file = { "CommonJumpToFile", null, TRANSLATABLE,
-                                         "<Ctrl><Shift>M", TRANSLATABLE, on_jump_to_file
+        Gtk.ActionEntry jump_to_file = { "CommonJumpToFile", null, Resources.JUMP_TO_FILE_MENU,
+                                         "<Ctrl><Shift>M", Resources.JUMP_TO_FILE_MENU, on_jump_to_file
                                        };
-        jump_to_file.label = Resources.JUMP_TO_FILE_MENU;
         actions += jump_to_file;
 
-        Gtk.ActionEntry select_all = { "CommonSelectAll", null, TRANSLATABLE,
-                                       "<Ctrl>A", TRANSLATABLE, on_select_all
+        Gtk.ActionEntry select_all = { "CommonSelectAll", null, Resources.SELECT_ALL_MENU,
+                                       "<Ctrl>A", Resources.SELECT_ALL_MENU, on_select_all
                                      };
-        select_all.label = Resources.SELECT_ALL_MENU;
         actions += select_all;
 
         Gtk.ActionEntry select_none = { "CommonSelectNone", null, null,
 
=== modified file 'src/CollectionPage.vala'
--- src/CollectionPage.vala	2017-01-12 18:13:48 +0000
+++ src/CollectionPage.vala	2017-01-26 15:47:05 +0000
@@ -124,100 +124,75 @@
     protected override Gtk.ActionEntry[] init_collect_action_entries () {
         Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
 
-        Gtk.ActionEntry print = { "Print", null, TRANSLATABLE, "<Ctrl>P",
-                                  TRANSLATABLE, on_print
+        Gtk.ActionEntry print = { "Print", null, Resources.PRINT_MENU, "<Ctrl>P",
+                                  Resources.PRINT_MENU, on_print
                                 };
-        print.label = Resources.PRINT_MENU;
         actions += print;
 
-        Gtk.ActionEntry publish = { "Publish", Resources.PUBLISH, TRANSLATABLE, "<Ctrl><Shift>P",
-                                    TRANSLATABLE, on_publish
+        Gtk.ActionEntry publish = { "Publish", Resources.PUBLISH, Resources.PUBLISH_MENU, "<Ctrl><Shift>P",
+                                    Resources.PUBLISH_TOOLTIP, on_publish
                                   };
-        publish.label = Resources.PUBLISH_MENU;
-        publish.tooltip = Resources.PUBLISH_TOOLTIP;
         actions += publish;
 
         Gtk.ActionEntry rotate_right = { "RotateClockwise", Resources.CLOCKWISE,
-                                         TRANSLATABLE, "<Ctrl>R", TRANSLATABLE, on_rotate_clockwise
+                                         Resources.ROTATE_CW_MENU, "<Ctrl>R", Resources.ROTATE_CW_TOOLTIP, on_rotate_clockwise
                                        };
-        rotate_right.label = Resources.ROTATE_CW_MENU;
-        rotate_right.tooltip = Resources.ROTATE_CW_TOOLTIP;
         actions += rotate_right;
 
         Gtk.ActionEntry rotate_left = { "RotateCounterclockwise", Resources.COUNTERCLOCKWISE,
-                                        TRANSLATABLE, "<Ctrl><Shift>R", TRANSLATABLE, on_rotate_counterclockwise
+                                        Resources.ROTATE_CCW_MENU, "<Ctrl><Shift>R", Resources.ROTATE_CCW_TOOLTIP, on_rotate_counterclockwise
                                       };
-        rotate_left.label = Resources.ROTATE_CCW_MENU;
-        rotate_left.tooltip = Resources.ROTATE_CCW_TOOLTIP;
         actions += rotate_left;
 
-        Gtk.ActionEntry hflip = { "FlipHorizontally", Resources.HFLIP, TRANSLATABLE, null,
-                                  TRANSLATABLE, on_flip_horizontally
+        Gtk.ActionEntry hflip = { "FlipHorizontally", Resources.HFLIP, Resources.HFLIP_MENU, null,
+                                  Resources.HFLIP_TOOLTIP, on_flip_horizontally
                                 };
-        hflip.label = Resources.HFLIP_MENU;
-        hflip.tooltip = Resources.HFLIP_TOOLTIP;
         actions += hflip;
 
-        Gtk.ActionEntry vflip = { "FlipVertically", Resources.VFLIP, TRANSLATABLE, null,
-                                  TRANSLATABLE, on_flip_vertically
+        Gtk.ActionEntry vflip = { "FlipVertically", Resources.VFLIP, Resources.VFLIP_MENU, null,
+                                  Resources.VFLIP_TOOLTIP, on_flip_vertically
                                 };
-        vflip.label = Resources.VFLIP_MENU;
-        vflip.tooltip = Resources.VFLIP_TOOLTIP;
         actions += vflip;
 
-        Gtk.ActionEntry copy_adjustments = { "CopyColorAdjustments", null, TRANSLATABLE,
-                                             "<Ctrl><Shift>C", TRANSLATABLE, on_copy_adjustments
+        Gtk.ActionEntry copy_adjustments = { "CopyColorAdjustments", null, Resources.COPY_ADJUSTMENTS_MENU,
+                                             "<Ctrl><Shift>C", Resources.COPY_ADJUSTMENTS_TOOLTIP, on_copy_adjustments
                                            };
-        copy_adjustments.label = Resources.COPY_ADJUSTMENTS_MENU;
-        copy_adjustments.tooltip = Resources.COPY_ADJUSTMENTS_TOOLTIP;
         actions += copy_adjustments;
 
-        Gtk.ActionEntry paste_adjustments = { "PasteColorAdjustments", null, TRANSLATABLE,
-                                              "<Ctrl><Shift>V", TRANSLATABLE, on_paste_adjustments
+        Gtk.ActionEntry paste_adjustments = { "PasteColorAdjustments", null, Resources.PASTE_ADJUSTMENTS_MENU,
+                                              "<Ctrl><Shift>V", Resources.PASTE_ADJUSTMENTS_TOOLTIP, on_paste_adjustments
                                             };
-        paste_adjustments.label = Resources.PASTE_ADJUSTMENTS_MENU;
-        paste_adjustments.tooltip = Resources.PASTE_ADJUSTMENTS_TOOLTIP;
         actions += paste_adjustments;
 
-        Gtk.ActionEntry revert = { "Revert", null, TRANSLATABLE, null,
-                                   TRANSLATABLE, on_revert
+        Gtk.ActionEntry revert = { "Revert", null, Resources.REVERT_MENU, null,
+                                   Resources.REVERT_MENU, on_revert
                                  };
-        revert.label = Resources.REVERT_MENU;
         actions += revert;
 
-        Gtk.ActionEntry duplicate = { "Duplicate", null, TRANSLATABLE, "<Ctrl>D", TRANSLATABLE,
+        Gtk.ActionEntry duplicate = { "Duplicate", null, Resources.DUPLICATE_PHOTO_MENU, "<Ctrl>D", Resources.DUPLICATE_PHOTO_TOOLTIP,
                                       on_duplicate_photo
                                     };
-        duplicate.label = Resources.DUPLICATE_PHOTO_MENU;
-        duplicate.tooltip = Resources.DUPLICATE_PHOTO_TOOLTIP;
         actions += duplicate;
 
-        Gtk.ActionEntry adjust_date_time = { "AdjustDateTime", null, TRANSLATABLE, null,
-                                             TRANSLATABLE, on_adjust_date_time
+        Gtk.ActionEntry adjust_date_time = { "AdjustDateTime", null, Resources.ADJUST_DATE_TIME_MENU, null,
+                                             Resources.ADJUST_DATE_TIME_MENU, on_adjust_date_time
                                            };
-        adjust_date_time.label = Resources.ADJUST_DATE_TIME_MENU;
         actions += adjust_date_time;
 
-        Gtk.ActionEntry open_with = { "OpenWith", null, TRANSLATABLE, null, null, null };
-        open_with.label = Resources.OPEN_WITH_MENU;
+        Gtk.ActionEntry open_with = { "OpenWith", null, Resources.OPEN_WITH_MENU, null, null, null };
         actions += open_with;
 
-        Gtk.ActionEntry open_with_raw = { "OpenWithRaw", null, TRANSLATABLE, null, null, null };
-        open_with_raw.label = Resources.OPEN_WITH_RAW_MENU;
+        Gtk.ActionEntry open_with_raw = { "OpenWithRaw", null, Resources.OPEN_WITH_RAW_MENU, null, null, null };
         actions += open_with_raw;
 
-        Gtk.ActionEntry enhance = { "Enhance", Resources.ENHANCE, TRANSLATABLE, "<Ctrl>E",
-                                    TRANSLATABLE, on_enhance
+        Gtk.ActionEntry enhance = { "Enhance", Resources.ENHANCE, Resources.ENHANCE_MENU, "<Ctrl>E",
+                                    Resources.ENHANCE_TOOLTIP, on_enhance
                                   };
-        enhance.label = Resources.ENHANCE_MENU;
-        enhance.tooltip = Resources.ENHANCE_TOOLTIP;
         actions += enhance;
 
-        Gtk.ActionEntry slideshow = { "Slideshow", null, TRANSLATABLE, "F5", TRANSLATABLE,
+        Gtk.ActionEntry slideshow = { "Slideshow", null, _("S_lideshow"), "F5", _("Play a slideshow"),
                                       on_slideshow
                                     };
-        slideshow.label = _ ("S_lideshow");
-        slideshow.tooltip = _ ("Play a slideshow");
         actions += slideshow;
 
         return actions;
 
=== modified file 'src/MediaPage.vala'
--- src/MediaPage.vala	2017-01-12 18:13:48 +0000
+++ src/MediaPage.vala	2017-01-26 15:47:05 +0000
@@ -202,72 +202,58 @@
     protected override Gtk.ActionEntry[] init_collect_action_entries () {
         Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
 
-        Gtk.ActionEntry export = { "Export", null, TRANSLATABLE, "<Ctrl><Shift>E",
-                                   TRANSLATABLE, on_export
+        Gtk.ActionEntry export = { "Export", null, Resources.EXPORT_MENU, "<Ctrl><Shift>E",
+                                   Resources.EXPORT_MENU, on_export
                                  };
-        export.label = Resources.EXPORT_MENU;
         actions += export;
 
-        Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", null, TRANSLATABLE,
-                                                "<Shift>Delete", TRANSLATABLE, on_remove_from_library
+        Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", null, Resources.REMOVE_FROM_LIBRARY_MENU,
+                                                "<Shift>Delete", Resources.REMOVE_FROM_LIBRARY_MENU, on_remove_from_library
                                               };
-        remove_from_library.label = Resources.REMOVE_FROM_LIBRARY_MENU;
         actions += remove_from_library;
 
-        Gtk.ActionEntry move_to_trash = { "MoveToTrash", "user-trash-full", TRANSLATABLE, "Delete",
-                                          TRANSLATABLE, on_move_to_trash
+        Gtk.ActionEntry move_to_trash = { "MoveToTrash", "user-trash-full", Resources.MOVE_TO_TRASH_MENU, "Delete",
+                                          Resources.MOVE_TO_TRASH_MENU, on_move_to_trash
                                         };
-        move_to_trash.label = Resources.MOVE_TO_TRASH_MENU;
         actions += move_to_trash;
 
-        Gtk.ActionEntry new_event = { "NewEvent", null, TRANSLATABLE, "<Ctrl>N",
-                                      TRANSLATABLE, on_new_event
+        Gtk.ActionEntry new_event = { "NewEvent", null, Resources.NEW_EVENT_MENU, "<Ctrl>N",
+                                      Resources.NEW_EVENT_MENU, on_new_event
                                     };
-        new_event.label = Resources.NEW_EVENT_MENU;
         actions += new_event;
 
-        Gtk.ActionEntry increase_size = { "IncreaseSize", null, TRANSLATABLE,
-                                          "<Ctrl>plus", TRANSLATABLE, on_increase_size
+        Gtk.ActionEntry increase_size = { "IncreaseSize", null, _("Zoom _In"),
+                                          "<Ctrl>plus",  _("Increase the magnification of the thumbnails"), on_increase_size
                                         };
-        increase_size.label = _ ("Zoom _In");
-        increase_size.tooltip = _ ("Increase the magnification of the thumbnails");
         actions += increase_size;
 
-        Gtk.ActionEntry decrease_size = { "DecreaseSize", null, TRANSLATABLE,
-                                          "<Ctrl>minus", TRANSLATABLE, on_decrease_size
+        Gtk.ActionEntry decrease_size = { "DecreaseSize", null, _("Zoom _Out"),
+                                          "<Ctrl>minus", _("Decrease the magnification of the thumbnails"), on_decrease_size
                                         };
-        decrease_size.label = _ ("Zoom _Out");
-        decrease_size.tooltip = _ ("Decrease the magnification of the thumbnails");
         actions += decrease_size;
 
-        Gtk.ActionEntry flag = { "Flag", null, TRANSLATABLE, "<Ctrl>G", TRANSLATABLE, on_flag_unflag };
-        flag.label = Resources.FLAG_MENU;
+        Gtk.ActionEntry flag = { "Flag", null, Resources.FLAG_MENU, "<Ctrl>G", Resources.FLAG_MENU, on_flag_unflag };
         actions += flag;
 
-        Gtk.ActionEntry sort_photos = { "SortPhotos", null, TRANSLATABLE, null, null, null };
-        sort_photos.label = _ ("Sort _Photos");
+        Gtk.ActionEntry sort_photos = { "SortPhotos", null, _("Sort _Photos"), null, null, null };
         actions += sort_photos;
 
-        Gtk.ActionEntry filter_photos = { "FilterPhotos", null, TRANSLATABLE, null, null, null };
-        filter_photos.label = Resources.FILTER_PHOTOS_MENU;
+        Gtk.ActionEntry filter_photos = { "FilterPhotos", null, Resources.FILTER_PHOTOS_MENU, null, null, null };
         actions += filter_photos;
 
-        Gtk.ActionEntry raw_developer = { "RawDeveloper", null, TRANSLATABLE, null, null, null };
-        raw_developer.label = _ ("_Developer");
+        Gtk.ActionEntry raw_developer = { "RawDeveloper", null, _("_Developer"), null, null, null };
         actions += raw_developer;
 
         // RAW developers.
 
-        Gtk.ActionEntry dev_shotwell = { "RawDeveloperShotwell", null, TRANSLATABLE, null, TRANSLATABLE,
+        Gtk.ActionEntry dev_shotwell = { "RawDeveloperShotwell", null, _("Shotwell"), null, _("Shotwell"),
                                          on_raw_developer_shotwell
                                        };
-        dev_shotwell.label = _ ("Shotwell");
         actions += dev_shotwell;
 
-        Gtk.ActionEntry dev_camera = { "RawDeveloperCamera", null, TRANSLATABLE, null, TRANSLATABLE,
+        Gtk.ActionEntry dev_camera = { "RawDeveloperCamera", null, _("Camera"), null, _("Camera"),
                                        on_raw_developer_camera
                                      };
-        dev_camera.label = _ ("Camera");
         actions += dev_camera;
 
         return actions;
@@ -276,25 +262,19 @@
     protected override Gtk.ToggleActionEntry[] init_collect_toggle_action_entries () {
         Gtk.ToggleActionEntry[] toggle_actions = base.init_collect_toggle_action_entries ();
 
-        Gtk.ToggleActionEntry titles = { "ViewTitle", null, TRANSLATABLE, "<Ctrl><Shift>T",
-                                         TRANSLATABLE, on_display_titles, Config.Facade.get_instance ().get_display_photo_titles ()
+        Gtk.ToggleActionEntry titles = { "ViewTitle", null, _("_Titles"), "<Ctrl><Shift>T",
+                                         _("Display the title of each photo"), on_display_titles, Config.Facade.get_instance ().get_display_photo_titles ()
                                        };
-        titles.label = _ ("_Titles");
-        titles.tooltip = _ ("Display the title of each photo");
         toggle_actions += titles;
 
-        Gtk.ToggleActionEntry comments = { "ViewComment", null, TRANSLATABLE, "<Ctrl><Shift>C",
-                                           TRANSLATABLE, on_display_comments, Config.Facade.get_instance ().get_display_photo_comments ()
+        Gtk.ToggleActionEntry comments = { "ViewComment", null, _("_Comments"), "<Ctrl><Shift>C",
+                                           _("Display the comment of each photo"), on_display_comments, Config.Facade.get_instance ().get_display_photo_comments ()
                                          };
-        comments.label = _ ("_Comments");
-        comments.tooltip = _ ("Display the comment of each photo");
         toggle_actions += comments;
 
-        Gtk.ToggleActionEntry tags = { "ViewTags", null, TRANSLATABLE, "<Ctrl><Shift>G",
-                                       TRANSLATABLE, on_display_tags, Config.Facade.get_instance ().get_display_photo_tags ()
+        Gtk.ToggleActionEntry tags = { "ViewTags", null, _("Ta_gs"), "<Ctrl><Shift>G",
+                                       _("Display each photo's tags"), on_display_tags, Config.Facade.get_instance ().get_display_photo_tags ()
                                      };
-        tags.label = _ ("Ta_gs");
-        tags.tooltip = _ ("Display each photo's tags");
         toggle_actions += tags;
 
         return toggle_actions;
@@ -308,18 +288,14 @@
         // Sort criteria.
         Gtk.RadioActionEntry[] sort_crit_actions = new Gtk.RadioActionEntry[0];
 
-        Gtk.RadioActionEntry by_title = { "SortByTitle", null, TRANSLATABLE, null, TRANSLATABLE,
+        Gtk.RadioActionEntry by_title = { "SortByTitle", null, _("By _Title"), null, _("Sort photos by title"),
                                           SortBy.TITLE
                                         };
-        by_title.label = _ ("By _Title");
-        by_title.tooltip = _ ("Sort photos by title");
         sort_crit_actions += by_title;
 
-        Gtk.RadioActionEntry by_date = { "SortByExposureDate", null, TRANSLATABLE, null,
-                                         TRANSLATABLE, SortBy.EXPOSURE_DATE
+        Gtk.RadioActionEntry by_date = { "SortByExposureDate", null, _("By Exposure _Date"), null,
+                                         _("Sort photos by exposure date"), SortBy.EXPOSURE_DATE
                                        };
-        by_date.label = _ ("By Exposure _Date");
-        by_date.tooltip = _ ("Sort photos by exposure date");
         sort_crit_actions += by_date;
 
         action_group.add_radio_actions (sort_crit_actions, sort_by, on_sort_changed);
@@ -328,17 +304,13 @@
         Gtk.RadioActionEntry[] sort_order_actions = new Gtk.RadioActionEntry[0];
 
         Gtk.RadioActionEntry ascending = { "SortAscending", null,
-                                           TRANSLATABLE, null, TRANSLATABLE, SORT_ORDER_ASCENDING
+                                           _("_Ascending"), null, _("Sort photos in an ascending order"), SORT_ORDER_ASCENDING
                                          };
-        ascending.label = _ ("_Ascending");
-        ascending.tooltip = _ ("Sort photos in an ascending order");
         sort_order_actions += ascending;
 
         Gtk.RadioActionEntry descending = { "SortDescending", null,
-                                            TRANSLATABLE, null, TRANSLATABLE, SORT_ORDER_DESCENDING
+                                            _("D_escending"), null, _("Sort photos in a descending order"), SORT_ORDER_DESCENDING
                                           };
-        descending.label = _ ("D_escending");
-        descending.tooltip = _ ("Sort photos in a descending order");
         sort_order_actions += descending;
 
         action_group.add_radio_actions (sort_order_actions,
 
=== modified file 'src/PhotoPage.vala'
--- src/PhotoPage.vala	2017-01-12 18:13:48 +0000
+++ src/PhotoPage.vala	2017-01-26 15:47:05 +0000
@@ -2496,206 +2496,154 @@
     protected override Gtk.ActionEntry[] init_collect_action_entries () {
         Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
 
-        Gtk.ActionEntry export = { "Export", null, TRANSLATABLE, "<Ctrl><Shift>E",
-                                   TRANSLATABLE, on_export
+        Gtk.ActionEntry export = { "Export", null, Resources.EXPORT_MENU, "<Ctrl><Shift>E",
+                                   Resources.EXPORT_MENU, on_export
                                  };
-        export.label = Resources.EXPORT_MENU;
         actions += export;
 
-        Gtk.ActionEntry print = { "Print", null, TRANSLATABLE, "<Ctrl>P",
-                                  TRANSLATABLE, on_print
+        Gtk.ActionEntry print = { "Print", null, Resources.PRINT_MENU, "<Ctrl>P",
+                                  Resources.PRINT_MENU, on_print
                                 };
-        print.label = Resources.PRINT_MENU;
         actions += print;
 
-        Gtk.ActionEntry publish = { "Publish", Resources.PUBLISH, TRANSLATABLE, "<Ctrl><Shift>P",
-                                    TRANSLATABLE, on_publish
+        Gtk.ActionEntry publish = { "Publish", Resources.PUBLISH, Resources.PUBLISH_MENU, "<Ctrl><Shift>P",
+                                    Resources.PUBLISH_TOOLTIP, on_publish
                                   };
-        publish.label = Resources.PUBLISH_MENU;
-        publish.tooltip = Resources.PUBLISH_TOOLTIP;
         actions += publish;
 
-        Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", null, TRANSLATABLE,
-                                                "<Shift>Delete", TRANSLATABLE, on_remove_from_library
+        Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", null, Resources.REMOVE_FROM_LIBRARY_MENU,
+                                                "<Shift>Delete", Resources.REMOVE_FROM_LIBRARY_MENU, on_remove_from_library
                                               };
-        remove_from_library.label = Resources.REMOVE_FROM_LIBRARY_MENU;
         actions += remove_from_library;
 
-        Gtk.ActionEntry move_to_trash = { "MoveToTrash", "user-trash-full", TRANSLATABLE, "Delete",
-                                          TRANSLATABLE, on_move_to_trash
+        Gtk.ActionEntry move_to_trash = { "MoveToTrash", "user-trash-full", Resources.MOVE_TO_TRASH_MENU, "Delete",
+                                          Resources.MOVE_TO_TRASH_MENU, on_move_to_trash
                                         };
-        move_to_trash.label = Resources.MOVE_TO_TRASH_MENU;
         actions += move_to_trash;
 
-        Gtk.ActionEntry view = { "ViewMenu", null, TRANSLATABLE, null, null, on_view_menu };
-        view.label = _ ("_View");
+        Gtk.ActionEntry view = { "ViewMenu", null, _("_View"), null, null, on_view_menu };
         actions += view;
 
-        Gtk.ActionEntry tools = { "Tools", null, TRANSLATABLE, null, null, null };
-        tools.label = _ ("T_ools");
+        Gtk.ActionEntry tools = { "Tools", null, _("T_ools"), null, null, null };
         actions += tools;
 
-        Gtk.ActionEntry prev = { "PrevPhoto", null, TRANSLATABLE, null,
-                                 TRANSLATABLE, on_previous_photo
+        Gtk.ActionEntry prev = { "PrevPhoto", null, _("_Previous Photo"), null,
+                                 _("Previous Photo"), on_previous_photo
                                };
-        prev.label = _ ("_Previous Photo");
-        prev.tooltip = _ ("Previous Photo");
         actions += prev;
 
-        Gtk.ActionEntry next = { "NextPhoto", null, TRANSLATABLE, null,
-                                 TRANSLATABLE, on_next_photo
+        Gtk.ActionEntry next = { "NextPhoto", null, _("_Next Photo"), null,
+                                 _("Next Photo"), on_next_photo
                                };
-        next.label = _ ("_Next Photo");
-        next.tooltip = _ ("Next Photo");
         actions += next;
 
-        Gtk.ActionEntry rotate_right = { "RotateClockwise", Resources.CLOCKWISE, TRANSLATABLE,
-                                         "<Ctrl>R", TRANSLATABLE, on_rotate_clockwise
+        Gtk.ActionEntry rotate_right = { "RotateClockwise", Resources.CLOCKWISE, Resources.ROTATE_CW_MENU,
+                                         "<Ctrl>R", Resources.ROTATE_CW_TOOLTIP, on_rotate_clockwise
                                        };
-        rotate_right.label = Resources.ROTATE_CW_MENU;
-        rotate_right.tooltip = Resources.ROTATE_CW_TOOLTIP;
         actions += rotate_right;
 
         Gtk.ActionEntry rotate_left = { "RotateCounterclockwise", Resources.COUNTERCLOCKWISE,
-                                        TRANSLATABLE, "<Ctrl><Shift>R", TRANSLATABLE, on_rotate_counterclockwise
+                                        Resources.ROTATE_CCW_MENU, "<Ctrl><Shift>R", Resources.ROTATE_CCW_TOOLTIP, on_rotate_counterclockwise
                                       };
-        rotate_left.label = Resources.ROTATE_CCW_MENU;
-        rotate_left.tooltip = Resources.ROTATE_CCW_TOOLTIP;
         actions += rotate_left;
 
-        Gtk.ActionEntry hflip = { "FlipHorizontally", Resources.HFLIP, TRANSLATABLE, null,
-                                  TRANSLATABLE, on_flip_horizontally
+        Gtk.ActionEntry hflip = { "FlipHorizontally", Resources.HFLIP, Resources.HFLIP_MENU, null,
+                                  Resources.HFLIP_MENU, on_flip_horizontally
                                 };
-        hflip.label = Resources.HFLIP_MENU;
         actions += hflip;
 
-        Gtk.ActionEntry vflip = { "FlipVertically", Resources.VFLIP, TRANSLATABLE, null,
-                                  TRANSLATABLE, on_flip_vertically
+        Gtk.ActionEntry vflip = { "FlipVertically", Resources.VFLIP, Resources.VFLIP_MENU, null,
+                                  Resources.VFLIP_MENU, on_flip_vertically
                                 };
-        vflip.label = Resources.VFLIP_MENU;
         actions += vflip;
 
-        Gtk.ActionEntry enhance = { "Enhance", Resources.ENHANCE, TRANSLATABLE, "<Ctrl>E",
-                                    TRANSLATABLE, on_enhance
+        Gtk.ActionEntry enhance = { "Enhance", Resources.ENHANCE, Resources.ENHANCE_MENU, "<Ctrl>E",
+                                    Resources.ENHANCE_TOOLTIP, on_enhance
                                   };
-        enhance.label = Resources.ENHANCE_MENU;
-        enhance.tooltip = Resources.ENHANCE_TOOLTIP;
         actions += enhance;
 
-        Gtk.ActionEntry copy_adjustments = { "CopyColorAdjustments", null, TRANSLATABLE,
-                                             "<Ctrl><Shift>C", TRANSLATABLE, on_copy_adjustments
+        Gtk.ActionEntry copy_adjustments = { "CopyColorAdjustments", null, Resources.COPY_ADJUSTMENTS_MENU,
+                                             "<Ctrl><Shift>C", Resources.COPY_ADJUSTMENTS_TOOLTIP, on_copy_adjustments
                                            };
-        copy_adjustments.label = Resources.COPY_ADJUSTMENTS_MENU;
-        copy_adjustments.tooltip = Resources.COPY_ADJUSTMENTS_TOOLTIP;
         actions += copy_adjustments;
 
-        Gtk.ActionEntry paste_adjustments = { "PasteColorAdjustments", null, TRANSLATABLE,
-                                              "<Ctrl><Shift>V", TRANSLATABLE, on_paste_adjustments
+        Gtk.ActionEntry paste_adjustments = { "PasteColorAdjustments", null, Resources.PASTE_ADJUSTMENTS_MENU,
+                                              "<Ctrl><Shift>V", Resources.PASTE_ADJUSTMENTS_TOOLTIP, on_paste_adjustments
                                             };
-        paste_adjustments.label = Resources.PASTE_ADJUSTMENTS_MENU;
-        paste_adjustments.tooltip = Resources.PASTE_ADJUSTMENTS_TOOLTIP;
         actions += paste_adjustments;
 
-        Gtk.ActionEntry crop = { "Crop", Resources.CROP, TRANSLATABLE, "<Ctrl>O",
-                                 TRANSLATABLE, toggle_crop
+        Gtk.ActionEntry crop = { "Crop", Resources.CROP, Resources.CROP_MENU, "<Ctrl>O",
+                                 Resources.CROP_TOOLTIP, toggle_crop
                                };
-        crop.label = Resources.CROP_MENU;
-        crop.tooltip = Resources.CROP_TOOLTIP;
         actions += crop;
 
-        Gtk.ActionEntry straighten = { "Straighten", null, TRANSLATABLE, "<Ctrl>A",
-                                       TRANSLATABLE, toggle_straighten
+        Gtk.ActionEntry straighten = { "Straighten", null, Resources.STRAIGHTEN_MENU, "<Ctrl>A",
+                                       Resources.STRAIGHTEN_TOOLTIP, toggle_straighten
                                      };
-        straighten.label = Resources.STRAIGHTEN_MENU;
-        straighten.tooltip = Resources.STRAIGHTEN_TOOLTIP;
         actions += straighten;
 
-        Gtk.ActionEntry red_eye = { "RedEye", Resources.REDEYE, TRANSLATABLE, "<Ctrl>Y",
-                                    TRANSLATABLE, toggle_redeye
+        Gtk.ActionEntry red_eye = { "RedEye", Resources.REDEYE, Resources.RED_EYE_MENU, "<Ctrl>Y",
+                                    Resources.RED_EYE_TOOLTIP, toggle_redeye
                                   };
-        red_eye.label = Resources.RED_EYE_MENU;
-        red_eye.tooltip = Resources.RED_EYE_TOOLTIP;
         actions += red_eye;
 
-        Gtk.ActionEntry adjust = { "Adjust", Resources.ADJUST, TRANSLATABLE, "<Ctrl>D",
-                                   TRANSLATABLE, toggle_adjust
+        Gtk.ActionEntry adjust = { "Adjust", Resources.ADJUST, Resources.ADJUST_MENU, "<Ctrl>D",
+                                   Resources.ADJUST_TOOLTIP, toggle_adjust
                                  };
-        adjust.label = Resources.ADJUST_MENU;
-        adjust.tooltip = Resources.ADJUST_TOOLTIP;
         actions += adjust;
 
-        Gtk.ActionEntry revert = { "Revert", null, TRANSLATABLE,
-                                   null, TRANSLATABLE, on_revert
+        Gtk.ActionEntry revert = { "Revert", null, Resources.REVERT_MENU,
+                                   null, Resources.REVERT_MENU, on_revert
                                  };
-        revert.label = Resources.REVERT_MENU;
         actions += revert;
 
-        Gtk.ActionEntry adjust_date_time = { "AdjustDateTime", null, TRANSLATABLE, null,
-                                             TRANSLATABLE, on_adjust_date_time
+        Gtk.ActionEntry adjust_date_time = { "AdjustDateTime", null, Resources.ADJUST_DATE_TIME_MENU, null,
+                                             Resources.ADJUST_DATE_TIME_MENU, on_adjust_date_time
                                            };
-        adjust_date_time.label = Resources.ADJUST_DATE_TIME_MENU;
         actions += adjust_date_time;
 
-        Gtk.ActionEntry flag = { "Flag", null, TRANSLATABLE, "<Ctrl>G", TRANSLATABLE, on_flag_unflag };
-        flag.label = Resources.FLAG_MENU;
+        Gtk.ActionEntry flag = { "Flag", null, Resources.FLAG_MENU, "<Ctrl>G", Resources.FLAG_MENU, on_flag_unflag };
         actions += flag;
 
-        Gtk.ActionEntry increase_size = { "IncreaseSize", null, TRANSLATABLE,
-                                          "<Ctrl>plus", TRANSLATABLE, on_increase_size
+        Gtk.ActionEntry increase_size = { "IncreaseSize", null, _("Zoom _In"),
+                                          "<Ctrl>plus", _("Increase the magnification of the photo"), on_increase_size
                                         };
-        increase_size.label = _ ("Zoom _In");
-        increase_size.tooltip = _ ("Increase the magnification of the photo");
         actions += increase_size;
 
-        Gtk.ActionEntry decrease_size = { "DecreaseSize", null, TRANSLATABLE,
-                                          "<Ctrl>minus", TRANSLATABLE, on_decrease_size
+        Gtk.ActionEntry decrease_size = { "DecreaseSize", null, _("Zoom _Out"),
+                                          "<Ctrl>minus", _("Decrease the magnification of the photo"), on_decrease_size
                                         };
-        decrease_size.label = _ ("Zoom _Out");
-        decrease_size.tooltip = _ ("Decrease the magnification of the photo");
         actions += decrease_size;
 
-        Gtk.ActionEntry best_fit = { "ZoomFit", null, TRANSLATABLE,
-                                     "<Ctrl>0", TRANSLATABLE, snap_zoom_to_min
+        Gtk.ActionEntry best_fit = { "ZoomFit", null, _("Fit to _Page"),
+                                     "<Ctrl>0", _("Zoom the photo to fit on the screen"), snap_zoom_to_min
                                    };
-        best_fit.label = _ ("Fit to _Page");
-        best_fit.tooltip = _ ("Zoom the photo to fit on the screen");
         actions += best_fit;
 
-        Gtk.ActionEntry actual_size = { "Zoom100", null, TRANSLATABLE,
-                                        "<Ctrl>1", TRANSLATABLE, snap_zoom_to_isomorphic
+        /// xgettext:no-c-format
+        Gtk.ActionEntry actual_size = { "Zoom100", null, _("Zoom _100%"),
+                                        "<Ctrl>1", _("Zoom the photo to 100% magnification"), snap_zoom_to_isomorphic
                                       };
-        /// xgettext:no-c-format
-        actual_size.label = _ ("Zoom _100%");
-        /// xgettext:no-c-format
-        actual_size.tooltip = _ ("Zoom the photo to 100% magnification");
         actions += actual_size;
 
-        Gtk.ActionEntry max_size = { "Zoom200", null, TRANSLATABLE,
-                                     "<Ctrl>2", TRANSLATABLE, snap_zoom_to_max
+        /// xgettext:no-c-format
+        Gtk.ActionEntry max_size = { "Zoom200", null, _("Zoom _200%"),
+                                     "<Ctrl>2", _("Zoom the photo to 200% magnification"), snap_zoom_to_max
                                    };
-        /// xgettext:no-c-format
-        max_size.label = _ ("Zoom _200%");
-        /// xgettext:no-c-format
-        max_size.tooltip = _ ("Zoom the photo to 200% magnification");
         actions += max_size;
 
-        Gtk.ActionEntry slideshow = { "Slideshow", null, TRANSLATABLE, "F5", TRANSLATABLE,
+        Gtk.ActionEntry slideshow = { "Slideshow", null, _("S_lideshow"), "F5", _("Play a slideshow"),
                                       on_slideshow
                                     };
-        slideshow.label = _ ("S_lideshow");
-        slideshow.tooltip = _ ("Play a slideshow");
         actions += slideshow;
 
-        Gtk.ActionEntry raw_developer = { "RawDeveloper", null, TRANSLATABLE, null, null, null };
-        raw_developer.label = _ ("_Developer");
+        Gtk.ActionEntry raw_developer = { "RawDeveloper", null, _("_Developer"), null, null, null };
         actions += raw_developer;
 
-        Gtk.ActionEntry open_with = { "OpenWith", null, TRANSLATABLE, null, null, null };
-        open_with.label = Resources.OPEN_WITH_MENU;
+        Gtk.ActionEntry open_with = { "OpenWith", null, Resources.OPEN_WITH_MENU, null, null, null };
         actions += open_with;
 
-        Gtk.ActionEntry open_with_raw = { "OpenWithRaw", null, TRANSLATABLE, null, null, null };
-        open_with_raw.label = Resources.OPEN_WITH_RAW_MENU;
+        Gtk.ActionEntry open_with_raw = { "OpenWithRaw", null, Resources.OPEN_WITH_RAW_MENU, null, null, null };
         actions += open_with_raw;
 
         return actions;
@@ -2723,18 +2671,16 @@
 
         Gtk.RadioActionEntry[] developer_actions = new Gtk.RadioActionEntry[0];
 
-        Gtk.RadioActionEntry dev_shotwell = { "RawDeveloperShotwell", null, TRANSLATABLE, null, TRANSLATABLE,
+        string label_shotwell = RawDeveloper.SHOTWELL.get_label ();
+        Gtk.RadioActionEntry dev_shotwell = { "RawDeveloperShotwell", null, label_shotwell, null, label_shotwell,
                                               RawDeveloper.SHOTWELL
                                             };
-        string label_shotwell = RawDeveloper.SHOTWELL.get_label ();
-        dev_shotwell.label = label_shotwell;
         developer_actions += dev_shotwell;
 
-        Gtk.RadioActionEntry dev_camera = { "RawDeveloperCamera", null, TRANSLATABLE, null, TRANSLATABLE,
+        string label_camera = RawDeveloper.CAMERA.get_label ();
+        Gtk.RadioActionEntry dev_camera = { "RawDeveloperCamera", null, label_camera, null, label_camera,
                                             RawDeveloper.CAMERA
                                           };
-        string label_camera = RawDeveloper.CAMERA.get_label ();
-        dev_camera.label = label_camera;
         developer_actions += dev_camera;
 
         action_group.add_radio_actions (developer_actions, RawDeveloper.SHOTWELL, on_raw_developer_changed);
 
=== modified file 'src/camera/ImportPage.vala'
--- src/camera/ImportPage.vala	2017-01-12 18:13:48 +0000
+++ src/camera/ImportPage.vala	2017-01-26 15:47:05 +0000
@@ -893,11 +893,9 @@
     protected override Gtk.ToggleActionEntry[] init_collect_toggle_action_entries () {
         Gtk.ToggleActionEntry[] toggle_actions = base.init_collect_toggle_action_entries ();
 
-        Gtk.ToggleActionEntry titles = { "ViewTitle", null, TRANSLATABLE, "<Ctrl><Shift>T",
-                                         TRANSLATABLE, on_display_titles, Config.Facade.get_instance ().get_display_photo_titles ()
+        Gtk.ToggleActionEntry titles = { "ViewTitle", null, _("_Titles"), "<Ctrl><Shift>T",
+                                         _("Display the title of each photo"), on_display_titles, Config.Facade.get_instance ().get_display_photo_titles ()
                                        };
-        titles.label = _ ("_Titles");
-        titles.tooltip = _ ("Display the title of each photo");
         toggle_actions += titles;
 
         return toggle_actions;
@@ -907,17 +905,13 @@
         Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
 
         Gtk.ActionEntry import_selected = { "ImportSelected", Resources.IMPORT,
-                                            TRANSLATABLE, null, null, on_import_selected
+                                            _("Import _Selected"), null, _("Import the selected photos into your library"), on_import_selected
                                           };
-        import_selected.label = _ ("Import _Selected");
-        import_selected.tooltip = _ ("Import the selected photos into your library");
         actions += import_selected;
 
-        Gtk.ActionEntry import_all = { "ImportAll", Resources.IMPORT_ALL, TRANSLATABLE,
-                                       null, null, on_import_all
+        Gtk.ActionEntry import_all = { "ImportAll", Resources.IMPORT_ALL, _("Import _All"),
+                                       null, _("Import all the photos into your library"), on_import_all
                                      };
-        import_all.label = _ ("Import _All");
-        import_all.tooltip = _ ("Import all the photos into your library");
         actions += import_all;
 
         return actions;
 
=== modified file 'src/direct/DirectPhotoPage.vala'
--- src/direct/DirectPhotoPage.vala	2017-01-15 01:09:26 +0000
+++ src/direct/DirectPhotoPage.vala	2017-01-26 15:47:05 +0000
@@ -56,175 +56,129 @@
     protected override Gtk.ActionEntry[] init_collect_action_entries () {
         Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
 
-        Gtk.ActionEntry file = { "FileMenu", null, TRANSLATABLE, null, null, null };
-        file.label = _ ("_File");
+        Gtk.ActionEntry file = { "FileMenu", null, _("_File"), null, null, null };
         actions += file;
 
-        Gtk.ActionEntry save = { "Save", "document-save", TRANSLATABLE, "<Ctrl>S", TRANSLATABLE,
+        Gtk.ActionEntry save = { "Save", "document-save", _("_Save"), "<Ctrl>S", _("Save photo"),
                                  on_save
                                };
-        save.label = _ ("_Save");
-        save.tooltip = _ ("Save photo");
         actions += save;
 
-        Gtk.ActionEntry save_as = { "SaveAs", "document-save-as", TRANSLATABLE,
-                                    "<Ctrl><Shift>S", TRANSLATABLE, on_save_as
+        Gtk.ActionEntry save_as = { "SaveAs", "document-save-as", _("Save _As..."),
+                                    "<Ctrl><Shift>S", _("Save photo with a different name"), on_save_as
                                   };
-        save_as.label = _ ("Save _As...");
-        save_as.tooltip = _ ("Save photo with a different name");
         actions += save_as;
 
-        Gtk.ActionEntry print = { "Print", null, TRANSLATABLE, "<Ctrl>P",
-                                  TRANSLATABLE, on_print
+        Gtk.ActionEntry print = { "Print", null, Resources.PRINT_MENU, "<Ctrl>P",
+                                  _("Print the photo to a printer connected to your computer"), on_print
                                 };
-        print.label = Resources.PRINT_MENU;
-        print.tooltip = _ ("Print the photo to a printer connected to your computer");
         actions += print;
 
-        Gtk.ActionEntry edit = { "EditMenu", null, TRANSLATABLE, null, null, null };
-        edit.label = _ ("_Edit");
+        Gtk.ActionEntry edit = { "EditMenu", null, _("_Edit"), null, null, null };
         actions += edit;
 
-        Gtk.ActionEntry photo = { "PhotoMenu", null, null, null, null, null };
-        photo.label = _ ("_Photo");
+        Gtk.ActionEntry photo = { "PhotoMenu", null, _("_Photo"), null, null, null };
         actions += photo;
 
-        Gtk.ActionEntry tools = { "Tools", null, TRANSLATABLE, null, null, null };
-        tools.label = _ ("T_ools");
+        Gtk.ActionEntry tools = { "Tools", null, _("T_ools"), null, null, null };
         actions += tools;
 
-        Gtk.ActionEntry prev = { "PrevPhoto", null, TRANSLATABLE, null,
-                                 TRANSLATABLE, on_previous_photo
+        Gtk.ActionEntry prev = { "PrevPhoto", null, _("_Previous Photo"), null,
+                                 _("Previous Photo"), on_previous_photo
                                };
-        prev.label = _ ("_Previous Photo");
-        prev.tooltip = _ ("Previous Photo");
         actions += prev;
 
-        Gtk.ActionEntry next = { "NextPhoto", null, TRANSLATABLE, null,
-                                 TRANSLATABLE, on_next_photo
+        Gtk.ActionEntry next = { "NextPhoto", null, _("_Next Photo"), null,
+                                 _("Next Photo"), on_next_photo
                                };
-        next.label = _ ("_Next Photo");
-        next.tooltip = _ ("Next Photo");
         actions += next;
 
         Gtk.ActionEntry rotate_right = { "RotateClockwise", Resources.CLOCKWISE,
-                                         TRANSLATABLE, "<Ctrl>R", TRANSLATABLE, on_rotate_clockwise
+                                         Resources.ROTATE_CW_MENU, "<Ctrl>R", Resources.ROTATE_CCW_TOOLTIP, on_rotate_clockwise
                                        };
-        rotate_right.label = Resources.ROTATE_CW_MENU;
-        rotate_right.tooltip = Resources.ROTATE_CCW_TOOLTIP;
         actions += rotate_right;
 
         Gtk.ActionEntry rotate_left = { "RotateCounterclockwise", Resources.COUNTERCLOCKWISE,
-                                        TRANSLATABLE, "<Ctrl><Shift>R", TRANSLATABLE, on_rotate_counterclockwise
+                                        Resources.ROTATE_CCW_MENU, "<Ctrl><Shift>R", Resources.ROTATE_CCW_TOOLTIP, on_rotate_counterclockwise
                                       };
-        rotate_left.label = Resources.ROTATE_CCW_MENU;
-        rotate_left.tooltip = Resources.ROTATE_CCW_TOOLTIP;
         actions += rotate_left;
 
-        Gtk.ActionEntry hflip = { "FlipHorizontally", Resources.HFLIP, TRANSLATABLE, null,
-                                  TRANSLATABLE, on_flip_horizontally
+        Gtk.ActionEntry hflip = { "FlipHorizontally", Resources.HFLIP, Resources.HFLIP_MENU, null,
+                                  Resources.HFLIP_MENU, on_flip_horizontally
                                 };
-        hflip.label = Resources.HFLIP_MENU;
         actions += hflip;
 
-        Gtk.ActionEntry vflip = { "FlipVertically", Resources.VFLIP, TRANSLATABLE, null,
-                                  TRANSLATABLE, on_flip_vertically
+        Gtk.ActionEntry vflip = { "FlipVertically", Resources.VFLIP, Resources.VFLIP_MENU, null,
+                                  Resources.VFLIP_MENU, on_flip_vertically
                                 };
-        vflip.label = Resources.VFLIP_MENU;
         actions += vflip;
 
-        Gtk.ActionEntry enhance = { "Enhance", Resources.ENHANCE, TRANSLATABLE, "<Ctrl>E",
-                                    TRANSLATABLE, on_enhance
+        Gtk.ActionEntry enhance = { "Enhance", Resources.ENHANCE, Resources.ENHANCE_MENU, "<Ctrl>E",
+                                    Resources.ENHANCE_TOOLTIP, on_enhance
                                   };
-        enhance.label = Resources.ENHANCE_MENU;
-        enhance.tooltip = Resources.ENHANCE_TOOLTIP;
         actions += enhance;
 
-        Gtk.ActionEntry crop = { "Crop", Resources.CROP, TRANSLATABLE, "<Ctrl>O",
-                                 TRANSLATABLE, toggle_crop
+        Gtk.ActionEntry crop = { "Crop", Resources.CROP, Resources.CROP_MENU, "<Ctrl>O",
+                                 Resources.CROP_TOOLTIP, toggle_crop
                                };
-        crop.label = Resources.CROP_MENU;
-        crop.tooltip = Resources.CROP_TOOLTIP;
         actions += crop;
 
-        Gtk.ActionEntry straighten = { "Straighten", null, TRANSLATABLE, "<Ctrl>A",
-                                       TRANSLATABLE, toggle_straighten
+        Gtk.ActionEntry straighten = { "Straighten", null, Resources.STRAIGHTEN_MENU, "<Ctrl>A",
+                                       Resources.STRAIGHTEN_TOOLTIP, toggle_straighten
                                      };
-        straighten.label = Resources.STRAIGHTEN_MENU;
-        straighten.tooltip = Resources.STRAIGHTEN_TOOLTIP;
         actions += straighten;
 
-        Gtk.ActionEntry red_eye = { "RedEye", Resources.REDEYE, TRANSLATABLE, "<Ctrl>Y",
-                                    TRANSLATABLE, toggle_redeye
+        Gtk.ActionEntry red_eye = { "RedEye", Resources.REDEYE, Resources.RED_EYE_MENU, "<Ctrl>Y",
+                                    Resources.RED_EYE_TOOLTIP, toggle_redeye
                                   };
-        red_eye.label = Resources.RED_EYE_MENU;
-        red_eye.tooltip = Resources.RED_EYE_TOOLTIP;
         actions += red_eye;
 
-        Gtk.ActionEntry adjust = { "Adjust", Resources.ADJUST, TRANSLATABLE, "<Ctrl>D",
-                                   TRANSLATABLE, toggle_adjust
+        Gtk.ActionEntry adjust = { "Adjust", Resources.ADJUST, Resources.ADJUST_MENU, "<Ctrl>D",
+                                   Resources.ADJUST_TOOLTIP, toggle_adjust
                                  };
-        adjust.label = Resources.ADJUST_MENU;
-        adjust.tooltip = Resources.ADJUST_TOOLTIP;
         actions += adjust;
 
-        Gtk.ActionEntry revert = { "Revert", null, TRANSLATABLE,
-                                   null, TRANSLATABLE, on_revert
+        Gtk.ActionEntry revert = { "Revert", null, Resources.REVERT_MENU,
+                                   null, Resources.REVERT_MENU, on_revert
                                  };
-        revert.label = Resources.REVERT_MENU;
         actions += revert;
 
-        Gtk.ActionEntry adjust_date_time = { "AdjustDateTime", null, TRANSLATABLE, null,
-                                             TRANSLATABLE, on_adjust_date_time
+        Gtk.ActionEntry adjust_date_time = { "AdjustDateTime", null, Resources.ADJUST_DATE_TIME_MENU, null,
+                                             Resources.ADJUST_DATE_TIME_MENU, on_adjust_date_time
                                            };
-        adjust_date_time.label = Resources.ADJUST_DATE_TIME_MENU;
         actions += adjust_date_time;
 
-        Gtk.ActionEntry view = { "ViewMenu", null, TRANSLATABLE, null, null, null };
-        view.label = _ ("_View");
+        Gtk.ActionEntry view = { "ViewMenu", null, _("_View"), null, null, null };
         actions += view;
 
-        Gtk.ActionEntry help = { "HelpMenu", null, TRANSLATABLE, null, null, null };
-        help.label = _ ("_Help");
+        Gtk.ActionEntry help = { "HelpMenu", null, _("_Help"), null, null, null };
         actions += help;
 
-        Gtk.ActionEntry increase_size = { "IncreaseSize", null, TRANSLATABLE,
-                                          "<Ctrl>plus", TRANSLATABLE, on_increase_size
+        Gtk.ActionEntry increase_size = { "IncreaseSize", null, _("Zoom _In"),
+                                          "<Ctrl>plus", _("Increase the magnification of the photo"), on_increase_size
                                         };
-        increase_size.label = _ ("Zoom _In");
-        increase_size.tooltip = _ ("Increase the magnification of the photo");
         actions += increase_size;
 
-        Gtk.ActionEntry decrease_size = { "DecreaseSize", null, TRANSLATABLE,
-                                          "<Ctrl>minus", TRANSLATABLE, on_decrease_size
+        Gtk.ActionEntry decrease_size = { "DecreaseSize", null, _("Zoom _Out"),
+                                          "<Ctrl>minus", _("Decrease the magnification of the photo"), on_decrease_size
                                         };
-        decrease_size.label = _ ("Zoom _Out");
-        decrease_size.tooltip = _ ("Decrease the magnification of the photo");
         actions += decrease_size;
 
-        Gtk.ActionEntry best_fit = { "ZoomFit", null, TRANSLATABLE,
-                                     "<Ctrl>0", TRANSLATABLE, snap_zoom_to_min
+        Gtk.ActionEntry best_fit = { "ZoomFit", null, _("Fit to _Page"),
+                                     "<Ctrl>0", _("Zoom the photo to fit on the screen"), snap_zoom_to_min
                                    };
-        best_fit.label = _ ("Fit to _Page");
-        best_fit.tooltip = _ ("Zoom the photo to fit on the screen");
         actions += best_fit;
 
-        Gtk.ActionEntry actual_size = { "Zoom100", null, TRANSLATABLE,
-                                        "<Ctrl>1", TRANSLATABLE, snap_zoom_to_isomorphic
+        /// xgettext:no-c-format
+        Gtk.ActionEntry actual_size = { "Zoom100", null, _("Zoom _100%"),
+                                        "<Ctrl>1", _("Zoom the photo to 100% magnification"), snap_zoom_to_isomorphic
                                       };
-        /// xgettext:no-c-format
-        actual_size.label = _ ("Zoom _100%");
-        /// xgettext:no-c-format
-        actual_size.tooltip = _ ("Zoom the photo to 100% magnification");
         actions += actual_size;
 
-        Gtk.ActionEntry max_size = { "Zoom200", null, TRANSLATABLE,
-                                     "<Ctrl>2", TRANSLATABLE, snap_zoom_to_max
+        /// xgettext:no-c-format
+        Gtk.ActionEntry max_size = { "Zoom200", null, _("Zoom _200%"),
+                                     "<Ctrl>2", _("Zoom the photo to 200% magnification"), snap_zoom_to_max
                                    };
-        /// xgettext:no-c-format
-        max_size.label = _ ("Zoom _200%");
-        /// xgettext:no-c-format
-        max_size.tooltip = _ ("Zoom the photo to 200% magnification");
         actions += max_size;
 
         return actions;
 
=== modified file 'src/events/EventPage.vala'
--- src/events/EventPage.vala	2017-01-12 18:13:48 +0000
+++ src/events/EventPage.vala	2017-01-26 15:47:05 +0000
@@ -64,13 +64,11 @@
         Gtk.ActionEntry[] new_actions = base.init_collect_action_entries ();
 
         Gtk.ActionEntry make_primary = { "MakePrimary", null,
-                                         TRANSLATABLE, null, TRANSLATABLE, on_make_primary
+                                         Resources.MAKE_KEY_PHOTO_MENU, null, Resources.MAKE_KEY_PHOTO_MENU, on_make_primary
                                        };
-        make_primary.label = Resources.MAKE_KEY_PHOTO_MENU;
         new_actions += make_primary;
 
-        Gtk.ActionEntry rename = { "Rename", null, TRANSLATABLE, null, TRANSLATABLE, on_rename };
-        rename.label = Resources.RENAME_EVENT_MENU;
+        Gtk.ActionEntry rename = { "Rename", null, Resources.RENAME_EVENT_MENU, null, Resources.RENAME_EVENT_MENU, on_rename };
         new_actions += rename;
 
         return new_actions;
 
=== modified file 'src/events/EventsDirectoryPage.vala'
--- src/events/EventsDirectoryPage.vala	2017-01-12 18:13:48 +0000
+++ src/events/EventsDirectoryPage.vala	2017-01-26 15:47:05 +0000
@@ -140,14 +140,12 @@
     protected override Gtk.ActionEntry[] init_collect_action_entries () {
         Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
 
-        Gtk.ActionEntry rename = { "Rename", null, TRANSLATABLE, "F2", TRANSLATABLE, on_rename };
-        rename.label = Resources.RENAME_EVENT_MENU;
+        Gtk.ActionEntry rename = { "Rename", null, Resources.RENAME_EVENT_MENU, "F2", Resources.RENAME_EVENT_MENU, on_rename };
         actions += rename;
 
-        Gtk.ActionEntry merge = { "Merge", Resources.MERGE, TRANSLATABLE, null, Resources.MERGE_TOOLTIP,
+        Gtk.ActionEntry merge = { "Merge", Resources.MERGE, Resources.MERGE_MENU, null, Resources.MERGE_TOOLTIP,
                                   on_merge
                                 };
-        merge.label = Resources.MERGE_MENU;
         actions += merge;
 
         return actions;
@@ -156,11 +154,9 @@
     protected override Gtk.ToggleActionEntry[] init_collect_toggle_action_entries () {
         Gtk.ToggleActionEntry[] toggle_actions = base.init_collect_toggle_action_entries ();
 
-        Gtk.ToggleActionEntry comments = { "ViewComment", null, TRANSLATABLE, "<Ctrl><Shift>C",
-                                           TRANSLATABLE, on_display_comments, Config.Facade.get_instance ().get_display_event_comments ()
+        Gtk.ToggleActionEntry comments = { "ViewComment", null, _("_Comments"), "<Ctrl><Shift>C",
+                                           _("Display the comment of each event"), on_display_comments, Config.Facade.get_instance ().get_display_event_comments ()
                                          };
-        comments.label = _ ("_Comments");
-        comments.tooltip = _ ("Display the comment of each event");
         toggle_actions += comments;
 
         return toggle_actions;
 
=== modified file 'src/library/ImportQueuePage.vala'
--- src/library/ImportQueuePage.vala	2017-01-12 18:13:48 +0000
+++ src/library/ImportQueuePage.vala	2017-01-26 15:47:05 +0000
@@ -72,11 +72,9 @@
     protected override Gtk.ActionEntry[] init_collect_action_entries () {
         Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
 
-        Gtk.ActionEntry stop = { "Stop", null, TRANSLATABLE, null, TRANSLATABLE,
+        Gtk.ActionEntry stop = { "Stop", null, _("_Stop Import"), null, _("Stop importing photos"),
                                  on_stop
                                };
-        stop.label = _ ("_Stop Import");
-        stop.tooltip = _ ("Stop importing photos");
         actions += stop;
 
         return actions;
 
=== modified file 'src/library/LibraryWindow.vala'
--- src/library/LibraryWindow.vala	2017-01-12 18:13:48 +0000
+++ src/library/LibraryWindow.vala	2017-01-26 15:47:05 +0000
@@ -300,78 +300,61 @@
         Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
 
         Gtk.ActionEntry import = { "CommonFileImport", Resources.IMPORT,
-                                   TRANSLATABLE, "<Ctrl>I", TRANSLATABLE, on_file_import
+                                   _("_Import From Folder…"), "<Ctrl>I", _("Import photos from disk to library"), on_file_import
                                  };
-        import.label = _ ("_Import From Folder…");
-        import.tooltip = _ ("Import photos from disk to library");
         actions += import;
 
-        Gtk.ActionEntry sort = { "CommonSortEvents", null, TRANSLATABLE, null, null, null };
-        sort.label = _ ("Sort _Events");
+        Gtk.ActionEntry sort = { "CommonSortEvents", null,  _("Sort _Events"), null, null, null };
         actions += sort;
 
-        Gtk.ActionEntry preferences = { "CommonPreferences", null, TRANSLATABLE,
-                                        null, TRANSLATABLE, on_preferences
+        Gtk.ActionEntry preferences = { "CommonPreferences", null, Resources.PREFERENCES_MENU,
+                                        null, Resources.PREFERENCES_MENU, on_preferences
                                       };
-        preferences.label = Resources.PREFERENCES_MENU;
         actions += preferences;
 
-        Gtk.ActionEntry empty = { "CommonEmptyTrash", null, TRANSLATABLE, null, TRANSLATABLE,
+        Gtk.ActionEntry empty = { "CommonEmptyTrash", null, _("_Empty Trash"), null, _("Delete all photos in the trash"),
                                   on_empty_trash
                                 };
-        empty.label = _ ("_Empty Trash");
-        empty.tooltip = _ ("Delete all photos in the trash");
         actions += empty;
 
-        Gtk.ActionEntry jump_to_event = { "CommonJumpToEvent", null, TRANSLATABLE, null,
-                                          TRANSLATABLE, on_jump_to_event
+        Gtk.ActionEntry jump_to_event = { "CommonJumpToEvent", null, _("View Eve_nt for Photo"), null,
+                                          _("View Eve_nt for Photo"), on_jump_to_event
                                         };
-        jump_to_event.label = _ ("View Eve_nt for Photo");
         actions += jump_to_event;
 
-        Gtk.ActionEntry find = { "CommonFind", null, TRANSLATABLE, null, null,
+        Gtk.ActionEntry find = { "CommonFind", null, _("_Find"), null, _("Find photos and videos by search criteria"),
                                  on_find
                                };
-        find.label = _ ("_Find");
-        find.tooltip = _ ("Find photos and videos by search criteria");
         actions += find;
 
         // add the common action for the FilterPhotos submenu (the submenu contains items from
         // SearchFilterActions)
-        Gtk.ActionEntry filter_photos = { "CommonFilterPhotos", null, TRANSLATABLE, null, null, null };
-        filter_photos.label = Resources.FILTER_PHOTOS_MENU;
+        Gtk.ActionEntry filter_photos = { "CommonFilterPhotos", null, Resources.FILTER_PHOTOS_MENU, null, null, null };
         actions += filter_photos;
 
-        Gtk.ActionEntry new_search = { "CommonNewSearch", null, TRANSLATABLE, "<Ctrl>S", null,
+        Gtk.ActionEntry new_search = { "CommonNewSearch", null, _("New Smart Album…"), "<Ctrl>S", null,
                                        on_new_search
                                      };
-        new_search.label =  _ ("New Smart Album…");
         actions += new_search;
 
         // top-level menus
 
-        Gtk.ActionEntry file = { "FileMenu", null, TRANSLATABLE, null, null, null };
-        file.label = _ ("_File");
+        Gtk.ActionEntry file = { "FileMenu", null, _("_File"), null, null, null };
         actions += file;
 
-        Gtk.ActionEntry edit = { "EditMenu", null, TRANSLATABLE, null, null, null };
-        edit.label = _ ("_Edit");
+        Gtk.ActionEntry edit = { "EditMenu", null, _("_Edit"), null, null, null };
         actions += edit;
 
-        Gtk.ActionEntry photo = { "PhotoMenu", null, TRANSLATABLE, null, null, null };
-        photo.label = _ ("_Photo");
+        Gtk.ActionEntry photo = { "PhotoMenu", null, _("_Photo"), null, null, null };
         actions += photo;
 
-        Gtk.ActionEntry photos = { "PhotosMenu", null, TRANSLATABLE, null, null, null };
-        photos.label = _ ("_Photos");
+        Gtk.ActionEntry photos = { "PhotosMenu", null, _("_Photos"), null, null, null };
         actions += photos;
 
-        Gtk.ActionEntry tags = { "TagsMenu", null, TRANSLATABLE, null, null, null };
-        tags.label = _ ("Ta_gs");
+        Gtk.ActionEntry tags = { "TagsMenu", null, _("Ta_gs"), null, null, null };
         actions += tags;
 
-        Gtk.ActionEntry help = { "HelpMenu", null, TRANSLATABLE, null, null, null };
-        help.label = _ ("_Help");
+        Gtk.ActionEntry help = { "HelpMenu", null, _("_Help"), null, null, null };
         actions += help;
 
         return actions;
@@ -385,17 +368,14 @@
                                           };
         actions += searchbar;
 
-        Gtk.ToggleActionEntry sidebar = { "CommonDisplaySidebar", null, TRANSLATABLE,
-                                          "F9", TRANSLATABLE, on_display_sidebar, is_sidebar_visible ()
+        Gtk.ToggleActionEntry sidebar = { "CommonDisplaySidebar", null, _("S_idebar"),
+                                          "F9", _("Display the sidebar"), on_display_sidebar, is_sidebar_visible ()
                                         };
-        sidebar.label = _ ("S_idebar");
-        sidebar.tooltip = _ ("Display the sidebar");
         actions += sidebar;
 
-        Gtk.ToggleActionEntry meta_sidebar = { "CommonDisplayMetadataSidebar", null, TRANSLATABLE,
-                                               "F10", TRANSLATABLE, on_display_metadata_sidebar, is_metadata_sidebar_visible ()
+        Gtk.ToggleActionEntry meta_sidebar = { "CommonDisplayMetadataSidebar", null, _("Edit Photo In_fo"),
+                                               "F10", _("Edit Photo In_fo"), on_display_metadata_sidebar, is_metadata_sidebar_visible ()
                                              };
-        meta_sidebar.label = _ ("Edit Photo In_fo");
         actions += meta_sidebar;
 
         return actions;
@@ -405,19 +385,15 @@
         Gtk.RadioActionEntry[] actions = new Gtk.RadioActionEntry[0];
 
         Gtk.RadioActionEntry ascending = { "CommonSortEventsAscending",
-                                           null, TRANSLATABLE, null, TRANSLATABLE,
+                                           null, _("_Ascending"), null, _("Sort photos in an ascending order"),
                                            SORT_EVENTS_ORDER_ASCENDING
                                          };
-        ascending.label = _ ("_Ascending");
-        ascending.tooltip = _ ("Sort photos in an ascending order");
         actions += ascending;
 
         Gtk.RadioActionEntry descending = { "CommonSortEventsDescending",
-                                            null, TRANSLATABLE, null, TRANSLATABLE,
+                                            null, _("D_escending"), null, _("Sort photos in a descending order"),
                                             SORT_EVENTS_ORDER_DESCENDING
                                           };
-        descending.label = _ ("D_escending");
-        descending.tooltip = _ ("Sort photos in a descending order");
         actions += descending;
 
         group.add_radio_actions (actions, SORT_EVENTS_ORDER_ASCENDING, on_events_sort_changed);
 
=== modified file 'src/library/OfflinePage.vala'
--- src/library/OfflinePage.vala	2017-01-12 18:13:48 +0000
+++ src/library/OfflinePage.vala	2017-01-26 15:47:05 +0000
@@ -69,11 +69,9 @@
     protected override Gtk.ActionEntry[] init_collect_action_entries () {
         Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
 
-        Gtk.ActionEntry remove = { "RemoveFromLibrary", null, TRANSLATABLE, "Delete",
-                                       TRANSLATABLE, on_remove_from_library
+        Gtk.ActionEntry remove = { "RemoveFromLibrary", null, Resources.REMOVE_FROM_LIBRARY_MENU, "Delete",
+                                       Resources.DELETE_FROM_LIBRARY_TOOLTIP, on_remove_from_library
                                      };
-        remove.label = Resources.REMOVE_FROM_LIBRARY_MENU;
-        remove.tooltip = Resources.DELETE_FROM_LIBRARY_TOOLTIP;
         actions += remove;
 
         return actions;
 
=== modified file 'src/library/TrashPage.vala'
--- src/library/TrashPage.vala	2017-01-12 18:13:48 +0000
+++ src/library/TrashPage.vala	2017-01-26 15:47:05 +0000
@@ -121,18 +121,14 @@
     protected override Gtk.ActionEntry[] init_collect_action_entries () {
         Gtk.ActionEntry[] actions = base.init_collect_action_entries ();
 
-        Gtk.ActionEntry delete_action = { "Delete", null, TRANSLATABLE, "Delete",
-                                          TRANSLATABLE, on_delete
+        Gtk.ActionEntry delete_action = { "Delete", null, Resources.DELETE_PHOTOS_MENU, "Delete",
+                                          Resources.DELETE_FROM_TRASH_TOOLTIP, on_delete
                                         };
-        delete_action.label = Resources.DELETE_PHOTOS_MENU;
-        delete_action.tooltip = Resources.DELETE_FROM_TRASH_TOOLTIP;
         actions += delete_action;
 
-        Gtk.ActionEntry restore = { "Restore", null, TRANSLATABLE, "Restore", TRANSLATABLE,
+        Gtk.ActionEntry restore = { "Restore", null, Resources.RESTORE_PHOTOS_MENU, "Restore", Resources.RESTORE_PHOTOS_TOOLTIP,
                                     on_restore
                                   };
-        restore.label = Resources.RESTORE_PHOTOS_MENU;
-        restore.tooltip = Resources.RESTORE_PHOTOS_TOOLTIP;
         actions += restore;
 
         return actions;
 
=== modified file 'src/searches/Branch.vala'
--- src/searches/Branch.vala	2017-01-12 18:13:48 +0000
+++ src/searches/Branch.vala	2017-01-26 15:47:05 +0000
@@ -86,8 +86,7 @@
         Gtk.ActionGroup group = new Gtk.ActionGroup ("SidebarDefault");
         Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
 
-        Gtk.ActionEntry new_search = { "CommonNewSearch", null, TRANSLATABLE, null, null, on_new_search };
-        new_search.label = _ ("New Smart Album…");
+        Gtk.ActionEntry new_search = { "CommonNewSearch", null, _("New Smart Album…"), null, null, on_new_search };
         actions += new_search;
 
         group.add_actions (actions, this);
 
=== modified file 'src/sidebar/Tree.vala'
--- src/sidebar/Tree.vala	2017-01-12 18:13:48 +0000
+++ src/sidebar/Tree.vala	2017-01-26 15:47:05 +0000
@@ -206,12 +206,10 @@
         Gtk.ActionGroup group = new Gtk.ActionGroup ("SidebarDefault");
         Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
 
-        Gtk.ActionEntry new_search = { "CommonNewSearch", null, TRANSLATABLE, null, null, on_new_search };
-        new_search.label = _ ("New Smart Album…");
+        Gtk.ActionEntry new_search = { "CommonNewSearch", null, _("New Smart Album…"), null, null, on_new_search };
         actions += new_search;
 
-        Gtk.ActionEntry new_tag = { "CommonNewTag", null, TRANSLATABLE, null, null, on_new_tag };
-        new_tag.label = _ ("New _Tag...");
+        Gtk.ActionEntry new_tag = { "CommonNewTag", null, _("New _Tag..."), null, null, on_new_tag };
         actions += new_tag;
 
         group.add_actions (actions, this);
 
=== modified file 'src/tags/Branch.vala'
--- src/tags/Branch.vala	2017-01-12 18:13:48 +0000
+++ src/tags/Branch.vala	2017-01-26 15:47:05 +0000
@@ -145,8 +145,7 @@
         Gtk.ActionGroup group = new Gtk.ActionGroup ("SidebarDefault");
         Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
 
-        Gtk.ActionEntry new_tag = { "CommonNewTag", null, TRANSLATABLE, null, null, on_new_tag };
-        new_tag.label = Resources.NEW_CHILD_TAG_SIDEBAR_MENU;
+        Gtk.ActionEntry new_tag = { "CommonNewTag", null, Resources.NEW_CHILD_TAG_SIDEBAR_MENU, null, null, on_new_tag };
         actions += new_tag;
 
         group.add_actions (actions, this);