Commit 8932d5fa authored by Clint Rogers's avatar Clint Rogers

#3403: Removed many unused strings.

Should make translation easier.
parent 53742e15
......@@ -473,55 +473,46 @@ public abstract class AppWindow : PageWindow {
Gtk.ActionEntry quit = { "CommonQuit", Gtk.Stock.QUIT, TRANSLATABLE, "<Ctrl>Q",
TRANSLATABLE, on_quit };
quit.label = _("_Quit");
quit.tooltip = _("Quit Shotwell");
actions += quit;
Gtk.ActionEntry about = { "CommonAbout", Gtk.Stock.ABOUT, TRANSLATABLE, null,
TRANSLATABLE, on_about };
about.label = _("_About");
about.tooltip = _("About Shotwell");
actions += about;
Gtk.ActionEntry fullscreen = { "CommonFullscreen", Gtk.Stock.FULLSCREEN,
TRANSLATABLE, "F11", TRANSLATABLE, on_fullscreen };
fullscreen.label = _("Fulls_creen");
fullscreen.tooltip = _("Use Shotwell at fullscreen");
actions += fullscreen;
Gtk.ActionEntry help_contents = { "CommonHelpContents", Gtk.Stock.HELP,
TRANSLATABLE, "F1", TRANSLATABLE, on_help_contents };
help_contents.label = _("_Contents");
help_contents.tooltip = _("More information on Shotwell");
actions += help_contents;
Gtk.ActionEntry help_faq = { "CommonHelpFAQ", null, TRANSLATABLE, null,
TRANSLATABLE, on_help_faq };
help_faq.label = _("_Frequently Asked Questions");
help_faq.tooltip = _("Answers to common questions about Shotwell");
actions += help_faq;
Gtk.ActionEntry undo = { "CommonUndo", Gtk.Stock.UNDO, TRANSLATABLE, "<Ctrl>Z",
TRANSLATABLE, on_undo };
undo.label = Resources.UNDO_MENU;
undo.tooltip = Resources.UNDO_TOOLTIP;
actions += undo;
Gtk.ActionEntry redo = { "CommonRedo", Gtk.Stock.REDO, TRANSLATABLE, "<Ctrl><Shift>Z",
TRANSLATABLE, on_redo };
redo.label = Resources.REDO_MENU;
redo.tooltip = Resources.REDO_TOOLTIP;
actions += redo;
Gtk.ActionEntry jump_to_file = { "CommonJumpToFile", Gtk.Stock.JUMP_TO, TRANSLATABLE,
"<Ctrl><Shift>M", TRANSLATABLE, on_jump_to_file };
jump_to_file.label = Resources.JUMP_TO_FILE_MENU;
jump_to_file.tooltip = Resources.JUMP_TO_FILE_TOOLTIP;
actions += jump_to_file;
Gtk.ActionEntry select_all = { "CommonSelectAll", Gtk.Stock.SELECT_ALL, TRANSLATABLE,
"<Ctrl>A", TRANSLATABLE, on_select_all };
select_all.label = Resources.SELECT_ALL_MENU;
select_all.tooltip = Resources.SELECT_ALL_TOOLTIP;
actions += select_all;
Gtk.ActionEntry select_none = { "CommonSelectNone", null, null,
......@@ -878,12 +869,12 @@ public abstract class AppWindow : PageWindow {
}
public void decorate_undo_action() {
decorate_command_manager_action("CommonUndo", Resources.UNDO_MENU, Resources.UNDO_TOOLTIP,
decorate_command_manager_action("CommonUndo", Resources.UNDO_MENU, "",
get_command_manager().get_undo_description());
}
public void decorate_redo_action() {
decorate_command_manager_action("CommonRedo", Resources.REDO_MENU, Resources.REDO_TOOLTIP,
decorate_command_manager_action("CommonRedo", Resources.REDO_MENU, "",
get_command_manager().get_redo_description());
}
......
......@@ -134,7 +134,6 @@ public abstract class CollectionPage : MediaPage {
Gtk.ActionEntry print = { "Print", Gtk.Stock.PRINT, TRANSLATABLE, "<Ctrl>P",
TRANSLATABLE, on_print };
print.label = Resources.PRINT_MENU;
print.tooltip = Resources.PRINT_TOOLTIP;
actions += print;
Gtk.ActionEntry publish = { "Publish", Resources.PUBLISH, TRANSLATABLE, "<Ctrl><Shift>P",
......@@ -158,13 +157,11 @@ public abstract class CollectionPage : MediaPage {
Gtk.ActionEntry hflip = { "FlipHorizontally", Resources.HFLIP, TRANSLATABLE, null,
TRANSLATABLE, 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 };
vflip.label = Resources.VFLIP_MENU;
vflip.tooltip = Resources.VFLIP_TOOLTIP;
actions += vflip;
Gtk.ActionEntry enhance = { "Enhance", Resources.ENHANCE, TRANSLATABLE, "<Ctrl>E",
......@@ -176,7 +173,6 @@ public abstract class CollectionPage : MediaPage {
Gtk.ActionEntry revert = { "Revert", Gtk.Stock.REVERT_TO_SAVED, TRANSLATABLE, null,
TRANSLATABLE, on_revert };
revert.label = Resources.REVERT_MENU;
revert.tooltip = Resources.REVERT_TOOLTIP;
actions += revert;
Gtk.ActionEntry set_background = { "SetBackground", null, TRANSLATABLE, "<Ctrl>B",
......@@ -194,19 +190,16 @@ public abstract class CollectionPage : MediaPage {
Gtk.ActionEntry adjust_date_time = { "AdjustDateTime", null, TRANSLATABLE, null,
TRANSLATABLE, on_adjust_date_time };
adjust_date_time.label = Resources.ADJUST_DATE_TIME_MENU;
adjust_date_time.tooltip = Resources.ADJUST_DATE_TIME_TOOLTIP;
actions += adjust_date_time;
Gtk.ActionEntry external_edit = { "ExternalEdit", Gtk.Stock.EDIT, TRANSLATABLE, "<Ctrl>Return",
TRANSLATABLE, on_external_edit };
external_edit.label = Resources.EXTERNAL_EDIT_MENU;
external_edit.tooltip = Resources.EXTERNAL_EDIT_TOOLTIP;
actions += external_edit;
Gtk.ActionEntry edit_raw = { "ExternalEditRAW", null, TRANSLATABLE, "<Ctrl><Shift>Return",
TRANSLATABLE, on_external_edit_raw };
edit_raw.label = Resources.EXTERNAL_EDIT_RAW_MENU;
edit_raw.tooltip = Resources.EXTERNAL_EDIT_RAW_TOOLTIP;
actions += edit_raw;
Gtk.ActionEntry slideshow = { "Slideshow", null, TRANSLATABLE, "F5", TRANSLATABLE,
......@@ -544,7 +537,7 @@ public abstract class CollectionPage : MediaPage {
return;
RotateMultipleCommand command = new RotateMultipleCommand(get_view().get_selected(),
Rotation.MIRROR, Resources.HFLIP_LABEL, Resources.HFLIP_TOOLTIP, _("Flipping Horizontally"),
Rotation.MIRROR, Resources.HFLIP_LABEL, "", _("Flipping Horizontally"),
_("Undoing Flip Horizontally"));
get_command_manager().execute(command);
}
......@@ -554,7 +547,7 @@ public abstract class CollectionPage : MediaPage {
return;
RotateMultipleCommand command = new RotateMultipleCommand(get_view().get_selected(),
Rotation.UPSIDE_DOWN, Resources.VFLIP_LABEL, Resources.VFLIP_TOOLTIP, _("Flipping Vertically"),
Rotation.UPSIDE_DOWN, Resources.VFLIP_LABEL, "", _("Flipping Vertically"),
_("Undoing Flip Vertically"));
get_command_manager().execute(command);
}
......
......@@ -541,7 +541,7 @@ public class EditTitleCommand : SingleDataSourceCommand {
private string? old_title;
public EditTitleCommand(MediaSource source, string new_title) {
base(source, Resources.EDIT_TITLE_LABEL, Resources.EDIT_TITLE_TOOLTIP);
base(source, Resources.EDIT_TITLE_LABEL, "");
this.new_title = new_title;
old_title = source.get_title();
......@@ -561,7 +561,7 @@ public class EditMultipleTitlesCommand : MultipleDataSourceAtOnceCommand {
public Gee.HashMap<MediaSource, string?> old_titles = new Gee.HashMap<MediaSource, string?>();
public EditMultipleTitlesCommand(Gee.Collection<MediaSource> media_sources, string new_title) {
base (media_sources, Resources.EDIT_TITLE_LABEL, Resources.EDIT_TITLE_TOOLTIP);
base (media_sources, Resources.EDIT_TITLE_LABEL, "");
this.new_title = new_title;
foreach (MediaSource media in media_sources)
......@@ -584,7 +584,7 @@ public class RenameEventCommand : SimpleProxyableCommand {
private string? old_name;
public RenameEventCommand(Event event, string new_name) {
base(event, Resources.RENAME_EVENT_LABEL, Resources.RENAME_EVENT_TOOLTIP);
base(event, Resources.RENAME_EVENT_LABEL, "");
this.new_name = new_name;
old_name = event.get_raw_name();
......@@ -604,7 +604,7 @@ public class SetKeyPhotoCommand : SingleDataSourceCommand {
private MediaSource old_primary_source;
public SetKeyPhotoCommand(Event event, MediaSource new_primary_source) {
base(event, Resources.MAKE_KEY_PHOTO_LABEL, Resources.MAKE_KEY_PHOTO_TOOLTIP);
base(event, Resources.MAKE_KEY_PHOTO_LABEL, "");
this.new_primary_source = new_primary_source;
old_primary_source = event.get_primary_source();
......@@ -621,7 +621,7 @@ public class SetKeyPhotoCommand : SingleDataSourceCommand {
public class RevertSingleCommand : GenericPhotoTransformationCommand {
public RevertSingleCommand(Photo photo) {
base(photo, Resources.REVERT_LABEL, Resources.REVERT_TOOLTIP);
base(photo, Resources.REVERT_LABEL, "");
}
public override void execute_on_photo(Photo photo) {
......@@ -645,7 +645,7 @@ public class RevertSingleCommand : GenericPhotoTransformationCommand {
public class RevertMultipleCommand : MultiplePhotoTransformationCommand {
public RevertMultipleCommand(Gee.Iterable<DataView> iter) {
base(iter, _("Reverting"), _("Undoing Revert"), Resources.REVERT_LABEL,
Resources.REVERT_TOOLTIP);
"");
}
public override void execute_on_source(DataSource source) {
......@@ -836,7 +836,7 @@ public abstract class MovePhotosCommand : Command {
public class NewEventCommand : MovePhotosCommand {
public NewEventCommand(Gee.Iterable<DataView> iter) {
base(Resources.NEW_EVENT_LABEL, Resources.NEW_EVENT_TOOLTIP);
base(Resources.NEW_EVENT_LABEL, "");
// get the primary or "key" source for the new event (which is simply the first one)
MediaSource key_source = null;
......@@ -856,7 +856,7 @@ public class NewEventCommand : MovePhotosCommand {
real_command = new RealMovePhotosCommand(new_event, iter, _("Creating New Event"),
_("Removing Event"), Resources.NEW_EVENT_LABEL,
Resources.NEW_EVENT_TOOLTIP);
"");
}
}
......@@ -866,13 +866,13 @@ public class SetEventCommand : MovePhotosCommand {
real_command = new RealMovePhotosCommand(new_event, iter, _("Moving Photos to New Event"),
_("Setting Photos to Previous Event"), Resources.SET_PHOTO_EVENT_LABEL,
Resources.SET_PHOTO_EVENT_TOOLTIP);
"");
}
}
public class MergeEventsCommand : MovePhotosCommand {
public MergeEventsCommand(Gee.Iterable<DataView> iter) {
base (Resources.MERGE_LABEL, Resources.MERGE_TOOLTIP);
base (Resources.MERGE_LABEL, "");
// the master event is the first one found with a name, otherwise the first one in the lot
Event master_event = null;
......@@ -896,7 +896,7 @@ public class MergeEventsCommand : MovePhotosCommand {
assert(media_thumbs.size > 0);
real_command = new RealMovePhotosCommand(master_event, media_thumbs, _("Merging"),
_("Unmerging"), Resources.MERGE_LABEL, Resources.MERGE_TOOLTIP);
_("Unmerging"), Resources.MERGE_LABEL, "");
}
}
......@@ -975,7 +975,7 @@ public class SetRatingSingleCommand : SingleDataSourceCommand {
private bool incrementing;
public SetRatingSingleCommand(DataSource source, Rating rating) {
base (source, Resources.rating_label(rating), Resources.rating_tooltip(rating));
base (source, Resources.rating_label(rating), "");
set_direct = true;
new_rating = rating;
......@@ -984,8 +984,7 @@ public class SetRatingSingleCommand : SingleDataSourceCommand {
public SetRatingSingleCommand.inc_dec(DataSource source, bool is_incrementing) {
base (source, is_incrementing ? Resources.INCREASE_RATING_LABEL :
Resources.DECREASE_RATING_LABEL, is_incrementing ? Resources.INCREASE_RATING_TOOLTIP :
Resources.DECREASE_RATING_TOOLTIP);
Resources.DECREASE_RATING_LABEL, "");
set_direct = false;
incrementing = is_incrementing;
......@@ -1017,7 +1016,7 @@ public class SetRatingCommand : MultipleDataSourceCommand {
public SetRatingCommand(Gee.Iterable<DataView> iter, Rating rating) {
base (iter, Resources.rating_progress(rating), _("Restoring previous rating"),
Resources.rating_label(rating), Resources.rating_tooltip(rating));
Resources.rating_label(rating), "");
set_direct = true;
new_rating = rating;
......@@ -1029,7 +1028,7 @@ public class SetRatingCommand : MultipleDataSourceCommand {
is_incrementing ? _("Increasing ratings") : _("Decreasing ratings"),
is_incrementing ? _("Decreasing ratings") : _("Increasing ratings"),
is_incrementing ? Resources.INCREASE_RATING_LABEL : Resources.DECREASE_RATING_LABEL,
is_incrementing ? Resources.INCREASE_RATING_TOOLTIP : Resources.DECREASE_RATING_TOOLTIP);
"");
set_direct = false;
incrementing = is_incrementing;
......@@ -1077,7 +1076,7 @@ public class AdjustDateTimePhotoCommand : SingleDataSourceCommand {
private bool modify_original;
public AdjustDateTimePhotoCommand(Dateable dateable, int64 time_shift, bool modify_original) {
base(dateable, Resources.ADJUST_DATE_TIME_LABEL, Resources.ADJUST_DATE_TIME_TOOLTIP);
base(dateable, Resources.ADJUST_DATE_TIME_LABEL, "");
this.dateable = dateable;
this.time_shift = time_shift;
......@@ -1118,7 +1117,7 @@ public class AdjustDateTimePhotosCommand : MultipleDataSourceCommand {
public AdjustDateTimePhotosCommand(Gee.Iterable<DataView> iter, int64 time_shift,
bool keep_relativity, bool modify_originals) {
base(iter, _("Adjusting Date and Time"), _("Undoing Date and Time Adjustment"),
Resources.ADJUST_DATE_TIME_LABEL, Resources.ADJUST_DATE_TIME_TOOLTIP);
Resources.ADJUST_DATE_TIME_LABEL, "");
this.time_shift = time_shift;
this.keep_relativity = keep_relativity;
......@@ -1207,7 +1206,7 @@ public class AddTagsCommand : PageCommand {
new Gee.HashMap<SourceProxy, Gee.ArrayList<MediaSource>>();
public AddTagsCommand(string[] names, Gee.Collection<MediaSource> sources) {
base (Resources.add_tags_label(names), Resources.ADD_TAGS_TOOLTIP);
base (Resources.add_tags_label(names), "");
// load/create the tags here rather than in execute() so that we can merely use the proxy
// to access it ... this is important with the redo() case, where the tags may have been
......@@ -1313,7 +1312,7 @@ public class ModifyTagsCommand : SingleDataSourceCommand {
private Gee.ArrayList<SourceProxy> to_remove = new Gee.ArrayList<SourceProxy>();
public ModifyTagsCommand(MediaSource media, Gee.Collection<Tag> new_tag_list) {
base (media, Resources.MODIFY_TAGS_LABEL, Resources.MODIFY_TAGS_TOOLTIP);
base (media, Resources.MODIFY_TAGS_LABEL, "");
this.media = media;
......
......@@ -276,14 +276,11 @@ public abstract class MediaPage : CheckerboardPage {
Gtk.ActionEntry export = { "Export", Gtk.Stock.SAVE_AS, TRANSLATABLE, "<Ctrl><Shift>E",
TRANSLATABLE, on_export };
export.label = Resources.EXPORT_MENU;
export.tooltip = Resources.EXPORT_TOOLTIP;
export.tooltip = _("Export the selected items to disk");
actions += export;
Gtk.ActionEntry send_to = { "SendTo", "document-send", TRANSLATABLE, null,
TRANSLATABLE, on_send_to };
send_to.label = Resources.SEND_TO_MENU;
send_to.tooltip = Resources.SEND_TO_TOOLTIP;
actions += send_to;
Gtk.ActionEntry edit = { "EditMenu", null, TRANSLATABLE, null, null, null };
......@@ -293,13 +290,11 @@ public abstract class MediaPage : CheckerboardPage {
Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", Gtk.Stock.REMOVE, TRANSLATABLE,
"<Shift>Delete", TRANSLATABLE, on_remove_from_library };
remove_from_library.label = Resources.REMOVE_FROM_LIBRARY_MENU;
remove_from_library.tooltip = Resources.REMOVE_FROM_LIBRARY_PLURAL_TOOLTIP;
actions += remove_from_library;
Gtk.ActionEntry move_to_trash = { "MoveToTrash", "user-trash-full", TRANSLATABLE, "Delete",
TRANSLATABLE, on_move_to_trash };
move_to_trash.label = Resources.MOVE_TO_TRASH_MENU;
move_to_trash.tooltip = Resources.MOVE_TO_TRASH_PLURAL_TOOLTIP;
actions += move_to_trash;
Gtk.ActionEntry photos = { "PhotosMenu", null, TRANSLATABLE, null, null, null };
......@@ -317,19 +312,16 @@ public abstract class MediaPage : CheckerboardPage {
Gtk.ActionEntry new_event = { "NewEvent", Gtk.Stock.NEW, TRANSLATABLE, "<Ctrl>N",
TRANSLATABLE, on_new_event };
new_event.label = Resources.NEW_EVENT_MENU;
new_event.tooltip = Resources.NEW_EVENT_TOOLTIP;
actions += new_event;
Gtk.ActionEntry add_tags = { "AddTags", null, TRANSLATABLE, "<Ctrl>T", TRANSLATABLE,
on_add_tags };
add_tags.label = Resources.ADD_TAGS_MENU;
add_tags.tooltip = Resources.ADD_TAGS_TOOLTIP;
actions += add_tags;
Gtk.ActionEntry modify_tags = { "ModifyTags", null, TRANSLATABLE, "<Ctrl>M", TRANSLATABLE,
on_modify_tags };
modify_tags.label = Resources.MODIFY_TAGS_MENU;
modify_tags.tooltip = Resources.MODIFY_TAGS_TOOLTIP;
actions += modify_tags;
Gtk.ActionEntry increase_size = { "IncreaseSize", Gtk.Stock.ZOOM_IN, TRANSLATABLE,
......@@ -346,7 +338,6 @@ public abstract class MediaPage : CheckerboardPage {
Gtk.ActionEntry flag = { "Flag", null, TRANSLATABLE, "<Ctrl>G", TRANSLATABLE, on_flag_unflag };
flag.label = Resources.FLAG_MENU;
flag.tooltip = Resources.FLAG_TOOLTIP;
actions += flag;
Gtk.ActionEntry set_rating = { "Rate", null, TRANSLATABLE, null, null, null };
......@@ -356,61 +347,51 @@ public abstract class MediaPage : CheckerboardPage {
Gtk.ActionEntry increase_rating = { "IncreaseRating", null, TRANSLATABLE,
"greater", TRANSLATABLE, on_increase_rating };
increase_rating.label = Resources.INCREASE_RATING_MENU;
increase_rating.tooltip = Resources.INCREASE_RATING_TOOLTIP;
actions += increase_rating;
Gtk.ActionEntry decrease_rating = { "DecreaseRating", null, TRANSLATABLE,
"less", TRANSLATABLE, on_decrease_rating };
decrease_rating.label = Resources.DECREASE_RATING_MENU;
decrease_rating.tooltip = Resources.DECREASE_RATING_TOOLTIP;
actions += decrease_rating;
Gtk.ActionEntry rate_rejected = { "RateRejected", null, TRANSLATABLE,
"9", TRANSLATABLE, on_rate_rejected };
rate_rejected.label = Resources.rating_menu(Rating.REJECTED);
rate_rejected.tooltip = Resources.rating_tooltip(Rating.REJECTED);
actions += rate_rejected;
Gtk.ActionEntry rate_unrated = { "RateUnrated", null, TRANSLATABLE,
"0", TRANSLATABLE, on_rate_unrated };
rate_unrated.label = Resources.rating_menu(Rating.UNRATED);
rate_unrated.tooltip = Resources.rating_tooltip(Rating.UNRATED);
actions += rate_unrated;
Gtk.ActionEntry rate_one = { "RateOne", null, TRANSLATABLE,
"1", TRANSLATABLE, on_rate_one };
rate_one.label = Resources.rating_menu(Rating.ONE);
rate_one.tooltip = Resources.rating_tooltip(Rating.ONE);
actions += rate_one;
Gtk.ActionEntry rate_two = { "RateTwo", null, TRANSLATABLE,
"2", TRANSLATABLE, on_rate_two };
rate_two.label = Resources.rating_menu(Rating.TWO);
rate_two.tooltip = Resources.rating_tooltip(Rating.TWO);
actions += rate_two;
Gtk.ActionEntry rate_three = { "RateThree", null, TRANSLATABLE,
"3", TRANSLATABLE, on_rate_three };
rate_three.label = Resources.rating_menu(Rating.THREE);
rate_three.tooltip = Resources.rating_tooltip(Rating.THREE);
actions += rate_three;
Gtk.ActionEntry rate_four = { "RateFour", null, TRANSLATABLE,
"4", TRANSLATABLE, on_rate_four };
rate_four.label = Resources.rating_menu(Rating.FOUR);
rate_four.tooltip = Resources.rating_tooltip(Rating.FOUR);
actions += rate_four;
Gtk.ActionEntry rate_five = { "RateFive", null, TRANSLATABLE,
"5", TRANSLATABLE, on_rate_five };
rate_five.label = Resources.rating_menu(Rating.FIVE);
rate_five.tooltip = Resources.rating_tooltip(Rating.FIVE);
actions += rate_five;
Gtk.ActionEntry edit_title = { "EditTitle", null, TRANSLATABLE, "F2", TRANSLATABLE,
on_edit_title };
edit_title.label = Resources.EDIT_TITLE_MENU;
edit_title.tooltip = Resources.EDIT_TITLE_TOOLTIP;
actions += edit_title;
Gtk.ActionEntry view = { "ViewMenu", null, TRANSLATABLE, null, null, null };
......@@ -559,7 +540,7 @@ public abstract class MediaPage : CheckerboardPage {
set_action_sensitive("Flag", selected_count > 0);
string flag_label = Resources.FLAG_MENU;
string flag_tooltip = Resources.FLAG_TOOLTIP;
if (selected_count > 0) {
bool all_flagged = true;
foreach (DataSource source in get_view().get_selected_sources()) {
......@@ -573,14 +554,12 @@ public abstract class MediaPage : CheckerboardPage {
if (all_flagged) {
flag_label = Resources.UNFLAG_MENU;
flag_tooltip = Resources.UNFLAG_TOOLTIP;
}
}
Gtk.Action? flag_action = get_action("Flag");
if (flag_action != null) {
flag_action.label = flag_label;
flag_action.tooltip = flag_tooltip;
}
}
......
......@@ -1837,11 +1837,11 @@ public abstract class EditingHostPage : SinglePhotoPage {
}
public void on_flip_horizontally() {
rotate(Rotation.MIRROR, Resources.HFLIP_LABEL, Resources.HFLIP_TOOLTIP);
rotate(Rotation.MIRROR, Resources.HFLIP_LABEL, "");
}
public void on_flip_vertically() {
rotate(Rotation.UPSIDE_DOWN, Resources.VFLIP_LABEL, Resources.VFLIP_TOOLTIP);
rotate(Rotation.UPSIDE_DOWN, Resources.VFLIP_LABEL, "");
}
public void on_revert() {
......@@ -2253,13 +2253,11 @@ public class LibraryPhotoPage : EditingHostPage {
Gtk.ActionEntry export = { "Export", Gtk.Stock.SAVE_AS, TRANSLATABLE, "<Ctrl><Shift>E",
TRANSLATABLE, on_export };
export.label = Resources.EXPORT_MENU;
export.tooltip = Resources.EXPORT_TOOLTIP;
actions += export;
Gtk.ActionEntry print = { "Print", Gtk.Stock.PRINT, TRANSLATABLE, "<Ctrl>P",
TRANSLATABLE, on_print };
print.label = Resources.PRINT_MENU;
print.tooltip = Resources.PRINT_TOOLTIP;
actions += print;
Gtk.ActionEntry publish = { "Publish", Resources.PUBLISH, TRANSLATABLE, "<Ctrl><Shift>P",
......@@ -2275,13 +2273,11 @@ public class LibraryPhotoPage : EditingHostPage {
Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", Gtk.Stock.REMOVE, TRANSLATABLE,
"<Shift>Delete", TRANSLATABLE, on_remove_from_library };
remove_from_library.label = Resources.REMOVE_FROM_LIBRARY_MENU;
remove_from_library.tooltip = Resources.REMOVE_FROM_LIBRARY_SINGULAR_TOOLTIP;
actions += remove_from_library;
Gtk.ActionEntry move_to_trash = { "MoveToTrash", "user-trash-full", TRANSLATABLE, "Delete",
TRANSLATABLE, on_move_to_trash };
move_to_trash.label = Resources.MOVE_TO_TRASH_MENU;
move_to_trash.tooltip = Resources.MOVE_TO_TRASH_SINGULAR_TOOLTIP;
actions += move_to_trash;
Gtk.ActionEntry view = { "ViewMenu", null, TRANSLATABLE, null, null, on_view_menu };
......@@ -2323,13 +2319,11 @@ public class LibraryPhotoPage : EditingHostPage {
Gtk.ActionEntry hflip = { "FlipHorizontally", Resources.HFLIP, TRANSLATABLE, null,
TRANSLATABLE, 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 };
vflip.label = Resources.VFLIP_MENU;
vflip.tooltip = Resources.VFLIP_TOOLTIP;
actions += vflip;
Gtk.ActionEntry enhance = { "Enhance", Resources.ENHANCE, TRANSLATABLE, "<Ctrl>E",
......@@ -2359,37 +2353,31 @@ public class LibraryPhotoPage : EditingHostPage {
Gtk.ActionEntry revert = { "Revert", Gtk.Stock.REVERT_TO_SAVED, TRANSLATABLE,
null, TRANSLATABLE, on_revert };
revert.label = Resources.REVERT_MENU;
revert.tooltip = Resources.REVERT_TOOLTIP;
actions += revert;
Gtk.ActionEntry edit_title = { "EditTitle", null, TRANSLATABLE, "F2", TRANSLATABLE,
on_edit_title };
edit_title.label = Resources.EDIT_TITLE_MENU;
edit_title.tooltip = Resources.EDIT_TITLE_TOOLTIP;
actions += edit_title;
Gtk.ActionEntry adjust_date_time = { "AdjustDateTime", null, TRANSLATABLE, null,
TRANSLATABLE, on_adjust_date_time };
adjust_date_time.label = Resources.ADJUST_DATE_TIME_MENU;
adjust_date_time.tooltip = Resources.ADJUST_DATE_TIME_TOOLTIP;
actions += adjust_date_time;
Gtk.ActionEntry external_edit = { "ExternalEdit", Gtk.Stock.EDIT, TRANSLATABLE,
"<Ctrl>Return", TRANSLATABLE, on_external_edit };
external_edit.label = Resources.EXTERNAL_EDIT_MENU;
external_edit.tooltip = Resources.EXTERNAL_EDIT_TOOLTIP;
actions += external_edit;
Gtk.ActionEntry edit_raw = { "ExternalEditRAW", null, TRANSLATABLE, "<Ctrl><Shift>Return",
TRANSLATABLE, on_external_edit_raw };
edit_raw.label = Resources.EXTERNAL_EDIT_RAW_MENU;
edit_raw.tooltip = Resources.EXTERNAL_EDIT_RAW_TOOLTIP;
actions += edit_raw;
Gtk.ActionEntry send_to = { "SendTo", "document-send", TRANSLATABLE, null,
TRANSLATABLE, on_send_to };
send_to.label = Resources.SEND_TO_MENU;
send_to.tooltip = Resources.SEND_TO_TOOLTIP;
actions += send_to;
Gtk.ActionEntry set_background = { "SetBackground", null, TRANSLATABLE, "<Ctrl>B",
......@@ -2400,7 +2388,6 @@ public class LibraryPhotoPage : EditingHostPage {
Gtk.ActionEntry flag = { "Flag", null, TRANSLATABLE, "<Ctrl>G", TRANSLATABLE, on_flag_unflag };
flag.label = Resources.FLAG_MENU;
flag.tooltip = Resources.FLAG_TOOLTIP;
actions += flag;
Gtk.ActionEntry set_rating = { "Rate", null, TRANSLATABLE, null, null, null };
......@@ -2410,55 +2397,46 @@ public class LibraryPhotoPage : EditingHostPage {
Gtk.ActionEntry increase_rating = { "IncreaseRating", null, TRANSLATABLE,
"greater", TRANSLATABLE, on_increase_rating };
increase_rating.label = Resources.INCREASE_RATING_MENU;
increase_rating.tooltip = Resources.INCREASE_RATING_TOOLTIP;
actions += increase_rating;
Gtk.ActionEntry decrease_rating = { "DecreaseRating", null, TRANSLATABLE,
"less", TRANSLATABLE, on_decrease_rating };
decrease_rating.label = Resources.DECREASE_RATING_MENU;
decrease_rating.tooltip = Resources.DECREASE_RATING_TOOLTIP;
actions += decrease_rating;
Gtk.ActionEntry rate_rejected = { "RateRejected", null, TRANSLATABLE,
"9", TRANSLATABLE, on_rate_rejected };
rate_rejected.label = Resources.rating_menu(Rating.REJECTED);
rate_rejected.tooltip = Resources.rating_tooltip(Rating.REJECTED);
actions += rate_rejected;
Gtk.ActionEntry rate_unrated = { "RateUnrated", null, TRANSLATABLE,
"0", TRANSLATABLE, on_rate_unrated };
rate_unrated.label = Resources.rating_menu(Rating.UNRATED);
rate_unrated.tooltip = Resources.rating_tooltip(Rating.UNRATED);
actions += rate_unrated;
Gtk.ActionEntry rate_one = { "RateOne", null, TRANSLATABLE,
"1", TRANSLATABLE, on_rate_one };
rate_one.label = Resources.rating_menu(Rating.ONE);
rate_one.tooltip = Resources.rating_tooltip(Rating.ONE);
actions += rate_one;
Gtk.ActionEntry rate_two = { "RateTwo", null, TRANSLATABLE,
"2", TRANSLATABLE, on_rate_two };
rate_two.label = Resources.rating_menu(Rating.TWO);
rate_two.tooltip = Resources.rating_tooltip(Rating.TWO);
actions += rate_two;
Gtk.ActionEntry rate_three = { "RateThree", null, TRANSLATABLE,
"3", TRANSLATABLE, on_rate_three };
rate_three.label = Resources.rating_menu(Rating.THREE);
rate_three.tooltip = Resources.rating_tooltip(Rating.THREE);
actions += rate_three;
Gtk.ActionEntry rate_four = { "RateFour", null, TRANSLATABLE,
"4", TRANSLATABLE, on_rate_four };
rate_four.label = Resources.rating_menu(Rating.FOUR);
rate_four.tooltip = Resources.rating_tooltip(Rating.FOUR);
actions += rate_four;
Gtk.ActionEntry rate_five = { "RateFive", null, TRANSLATABLE,
"5", TRANSLATABLE, on_rate_five };
rate_five.label = Resources.rating_menu(Rating.FIVE);
rate_five.tooltip = Resources.rating_tooltip(Rating.FIVE);
actions += rate_five;
Gtk.ActionEntry help = { "HelpMenu", null, TRANSLATABLE, null, null, null };
......@@ -2502,13 +2480,11 @@ public class LibraryPhotoPage : EditingHostPage {
Gtk.ActionEntry add_tags = { "AddTags", null, TRANSLATABLE, "<Ctrl>T", TRANSLATABLE,
on_add_tags };
add_tags.label = Resources.ADD_TAGS_MENU;
add_tags.tooltip = Resources.ADD_TAGS_TOOLTIP;
actions += add_tags;
Gtk.ActionEntry modify_tags = { "ModifyTags", null, TRANSLATABLE, "<Ctrl>M", TRANSLATABLE,
on_modify_tags };
modify_tags.label = Resources.MODIFY_TAGS_MENU;
modify_tags.tooltip = Resources.MODIFY_TAGS_TOOLTIP;
actions += modify_tags;
Gtk.ActionEntry slideshow = { "Slideshow", null, TRANSLATABLE, "F5", TRANSLATABLE,
......@@ -2613,7 +2589,6 @@ public class LibraryPhotoPage : EditingHostPage {
bool is_flagged = ((LibraryPhoto) get_photo()).is_flagged();
action.label = is_flagged ? Resources.UNFLAG_MENU : Resources.FLAG_MENU;
action.tooltip = is_flagged ? Resources.UNFLAG_TOOLTIP : Resources.FLAG_TOOLTIP;
action.sensitive = true;
} else {
set_action_sensitive("Flag", false);
......
......@@ -139,11 +139,9 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string HFLIP_MENU = _("Flip Hori_zontally");
public const string HFLIP_LABEL = _("Flip Horizontally");
public const string HFLIP_TOOLTIP = _("Flip the photos horizontally");
public const string VFLIP_MENU = _("Flip Verti_cally");
public const string VFLIP_LABEL = _("Flip Vertically");
public const string VFLIP_TOOLTIP = _("Flip the photos vertically");
public const string ENHANCE_MENU = _("_Enhance");
public const string ENHANCE_LABEL = _("Enhance");
......@@ -163,7 +161,6 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string REVERT_MENU = _("Re_vert to Original");
public const string REVERT_LABEL = _("Revert to Original");
public const string REVERT_TOOLTIP = _("Revert to the original photo");
public const string REVERT_EDITABLE_MENU = _("Revert External E_dits");
public const string REVERT_EDITABLE_TOOLTIP = _("Revert to the master photo");
......@@ -174,30 +171,24 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string UNDO_MENU = _("_Undo");
public const string UNDO_LABEL = _("Undo");
public const string UNDO_TOOLTIP = _("Undo the last action");
public const string REDO_MENU = _("_Redo");
public const string REDO_LABEL = _("Redo");
public const string REDO_TOOLTIP = _("Redo the last undone action");
public const string RENAME_EVENT_MENU = _("Re_name Event...");
public const string RENAME_EVENT_LABEL = _("Rename Event");
public const string RENAME_EVENT_TOOLTIP = _("Rename the selected event");
public const string MAKE_KEY_PHOTO_MENU = _("Make _Key Photo for Event");
public const string MAKE_KEY_PHOTO_LABEL = _("Make Key Photo for Event");
public const string MAKE_KEY_PHOTO_TOOLTIP = _("Make the selected photo the thumbnail for the event");
public const string NEW_EVENT_MENU = _("_New Event");
public const string NEW_EVENT_LABEL = _("New Event");
public const string NEW_EVENT_TOOLTIP = _("Create new event from the selected photos");
public const string SET_PHOTO_EVENT_LABEL = _("Move Photos");
public const string SET_PHOTO_EVENT_TOOLTIP = _("Move photos to an event");
public const string MERGE_MENU = _("_Merge Events");
public const string MERGE_LABEL = _("Merge");
public const string MERGE_TOOLTIP = _("Merge into a single event");
public const string RATING_MENU = _("_Set Rating");
public const string RATING_LABEL = _("Set Rating");
......@@ -205,11 +196,9 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string INCREASE_RATING_MENU = _("_Increase");
public const string INCREASE_RATING_LABEL = _("Increase Rating");
public const string INCREASE_RATING_TOOLTIP = _("Increase the rating of your photo");
public const string DECREASE_RATING_MENU = _("_Decrease");
public const string DECREASE_RATING_LABEL = _("Decrease Rating");
public const string DECREASE_RATING_TOOLTIP = _("Decrease the rating of your photo");
public const string RATE_UNRATED_MENU = _("_Unrated");
public const string RATE_UNRATED_COMBO_BOX = _("Unrated");
......@@ -247,10 +236,8 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string DUPLICATE_PHOTO_TOOLTIP = _("Make a duplicate of the photo");
public const string EXPORT_MENU = _("_Export...");
public const string EXPORT_TOOLTIP = _("Export to disk");
public const string PRINT_MENU = _("_Print...");
public const string PRINT_TOOLTIP = _("Print the photo to a printer connected to your computer");
public const string PUBLISH_MENU = _("Pu_blish...");
public const string PUBLISH_LABEL = _("Publish");
......@@ -258,37 +245,28 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string EDIT_TITLE_MENU = _("E_dit Title...");
public const string EDIT_TITLE_LABEL = _("Edit Title");
public const string EDIT_TITLE_TOOLTIP = _("Edit title of the selected photo");
public const string ADJUST_DATE_TIME_MENU = _("_Adjust Date and Time...");
public const string ADJUST_DATE_TIME_LABEL = _("Adjust Date and Time");
public const string ADJUST_DATE_TIME_TOOLTIP = _("Adjust date and time of selected photos");
public const string ADD_TAGS_MENU = _("Add _Tags...");
public const string ADD_TAGS_TITLE = _("Add Tags");
public const string ADD_TAGS_TOOLTIP = _("Add one or more tags to the selected photos");
public const string PREFERENCES_MENU = _("_Preferences");
public const string PREFERENCES_TOOLTIP = _("Edit preferences");
public const string EXTERNAL_EDIT_MENU = _("_Open With External Editor");
public const string EXTERNAL_EDIT_TOOLTIP = _("Open the selected photo with an external image editor");
public const string EXTERNAL_EDIT_RAW_MENU = _("Open With RA_W Editor");
public const string EXTERNAL_EDIT_RAW_TOOLTIP = _("Open the selected photo with a RAW image editor");
public const string SEND_TO_MENU = _("Send _To...");
public const string SEND_TO_TOOLTIP = _("Send photos by mail or instant message");
public const string FIND_MENU = _("_Find...");
public const string FIND_LABEL = _("Find");