Author: post
Date: 2011-09-10 17:49:27 +0200 (Sat, 10 Sep 2011)
New Revision: 4035
Modified:
trunk/librawstudio/rs-lens-db-editor.c
trunk/plugins/lensfun/lensfun-version.c
trunk/plugins/output-jpegfile/output-jpegfile.c
trunk/plugins/output-picasa/output-picasa.c
trunk/plugins/output-pngfile/output-pngfile.c
trunk/plugins/output-tifffile/output-tifffile.c
trunk/src/filename.c
trunk/src/gtk-interface.c
trunk/src/rs-actions.c
trunk/src/rs-batch.c
trunk/src/rs-store.c
trunk/src/rs-toolbox.c
Log:
Make capitalization more consistent (use headline caps for menu items and
buttons).
Modified: trunk/librawstudio/rs-lens-db-editor.c
===================================================================
--- trunk/librawstudio/rs-lens-db-editor.c 2011-09-10 15:02:21 UTC (rev
4034)
+++ trunk/librawstudio/rs-lens-db-editor.c 2011-09-10 15:49:27 UTC (rev
4035)
@@ -502,7 +502,7 @@
if (error)
dialog = gui_dialog_make_from_text(GTK_STOCK_DIALOG_ERROR,
_("Error updating lensfun database"), error);
else
- dialog = gui_dialog_make_from_text(GTK_STOCK_DIALOG_INFO,
_("Lensfun database updated"), error);
+ dialog = gui_dialog_make_from_text(GTK_STOCK_DIALOG_INFO,
_("LensFun database updated"), error);
gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE,
GTK_RESPONSE_ACCEPT);
gtk_widget_show_all(dialog);
Modified: trunk/plugins/lensfun/lensfun-version.c
===================================================================
--- trunk/plugins/lensfun/lensfun-version.c 2011-09-10 15:02:21 UTC (rev
4034)
+++ trunk/plugins/lensfun/lensfun-version.c 2011-09-10 15:49:27 UTC (rev
4035)
@@ -105,7 +105,7 @@
g_free(library_path);
if (version == 0)
- g_warning("Lensfun library version is unknown.");
+ g_warning("LensFun library version is unknown.");
return version;
}
@@ -132,7 +132,7 @@
guint
rs_guess_lensfun_version()
{
- g_warning("Lensfun library version is unknown.");
+ g_warning("LensFun library version is unknown.");
return 0;
}
Modified: trunk/plugins/output-jpegfile/output-jpegfile.c
===================================================================
--- trunk/plugins/output-jpegfile/output-jpegfile.c 2011-09-10 15:02:21 UTC
(rev 4034)
+++ trunk/plugins/output-jpegfile/output-jpegfile.c 2011-09-10 15:49:27 UTC
(rev 4035)
@@ -104,7 +104,7 @@
g_object_class_install_property(object_class,
PROP_METADATA, g_param_spec_boolean(
- "copy-metadata", "Copy Metadata", _("Copy EXIF
metadata"),
+ "copy-metadata", "Copy Metadata", _("Copy Exif
metadata"),
TRUE, G_PARAM_READWRITE)
);
Modified: trunk/plugins/output-picasa/output-picasa.c
===================================================================
--- trunk/plugins/output-picasa/output-picasa.c 2011-09-10 15:02:21 UTC (rev
4034)
+++ trunk/plugins/output-picasa/output-picasa.c 2011-09-10 15:49:27 UTC (rev
4035)
@@ -116,7 +116,7 @@
G_PARAM_READABLE));
g_object_class_install_property(object_class,
PROP_METADATA, g_param_spec_boolean(
- "copy-metadata", "Copy Metadata", _("Retain EXIF
metadata"),
+ "copy-metadata", "Copy Metadata", _("Retain Exif
metadata"),
TRUE, G_PARAM_READWRITE)
);
output_class->execute = execute;
Modified: trunk/plugins/output-pngfile/output-pngfile.c
===================================================================
--- trunk/plugins/output-pngfile/output-pngfile.c 2011-09-10 15:02:21 UTC
(rev 4034)
+++ trunk/plugins/output-pngfile/output-pngfile.c 2011-09-10 15:49:27 UTC
(rev 4035)
@@ -92,7 +92,7 @@
);
g_object_class_install_property(object_class,
PROP_METADATA, g_param_spec_boolean(
- "copy-metadata", "Copy Metadata", _("Copy EXIF metadata
to XMP"),
+ "copy-metadata", "Copy Metadata", _("Copy Exif metadata
to XMP"),
TRUE, G_PARAM_READWRITE)
);
Modified: trunk/plugins/output-tifffile/output-tifffile.c
===================================================================
--- trunk/plugins/output-tifffile/output-tifffile.c 2011-09-10 15:02:21 UTC
(rev 4034)
+++ trunk/plugins/output-tifffile/output-tifffile.c 2011-09-10 15:49:27 UTC
(rev 4035)
@@ -93,7 +93,7 @@
);
g_object_class_install_property(object_class,
PROP_METADATA, g_param_spec_boolean(
- "copy-metadata", "Copy Metadata", _("Copy EXIF
metadata"),
+ "copy-metadata", "Copy Metadata", _("Copy Exif
metadata"),
TRUE, G_PARAM_READWRITE)
);
Modified: trunk/src/filename.c
===================================================================
--- trunk/src/filename.c 2011-09-10 15:02:21 UTC (rev 4034)
+++ trunk/src/filename.c 2011-09-10 15:49:27 UTC (rev 4035)
@@ -376,20 +376,20 @@
filename_add_clicked(GtkButton *button, gpointer user_data)
{
gui_menu_popup(GTK_WIDGET(button), user_data,
- _("%f - Original filename"), add_f,
- _("%p - Path of original file"), add_p,
- _("%2c - Incremental counter"), add_c,
- _("%s - Setting id (A, B or C)"), add_s,
- _("%d - Date from EXIF (YYYY-MM-DD)"), add_d,
- _("%DY - Year from EXIF (YYYY)"), add_DY,
- _("%Dy - Year from EXIF (YY)"), add_Dy,
- _("%Dm - Month from EXIF (MM)"), add_Dm,
- _("%DM - Month from EXIF (Text)"), add_DM,
- _("%Dd - Date from EXIF (DD)"), add_Dd,
- _("%DD - Day of week from EXIF"), add_DD,
+ _("%f - Original Filename"), add_f,
+ _("%p - Path of Original File"), add_p,
+ _("%2c - Incremental Counter"), add_c,
+ _("%s - Setting ID (A, B or C)"), add_s,
+ _("%d - Date from Exif (YYYY-MM-DD)"), add_d,
+ _("%DY - Year from Exif (YYYY)"), add_DY,
+ _("%Dy - Year from Exif (YY)"), add_Dy,
+ _("%Dm - Month from Exif (MM)"), add_Dm,
+ _("%DM - Month from Exif (Text)"), add_DM,
+ _("%Dd - Date from Exif (DD)"), add_Dd,
+ _("%DD - Day of Week from Exif"), add_DD,
_("%t - Time from EXIF (HH:MM:SS)"), add_t,
- _("%w - Week Number from EXIF (Start Sunday)"), add_w,
- _("%W - Week Number from EXIF (Start Monday)"), add_W,
+ _("%w - Week Number from Exif (Start Sunday)"), add_w,
+ _("%W - Week Number from Exif (Start Monday)"), add_W,
_("%Mi - ISO Value of Image"), add_Mi,
_("%Ma - Aperture (2.8)"), add_Ma,
_("%Ms - Shutter Time in Seconds (0.008)"), add_Ms,
Modified: trunk/src/gtk-interface.c
===================================================================
--- trunk/src/gtk-interface.c 2011-09-10 15:02:21 UTC (rev 4034)
+++ trunk/src/gtk-interface.c 2011-09-10 15:49:27 UTC (rev 4035)
@@ -828,7 +828,7 @@
directory_hbox = gtk_hbox_new(FALSE, 0);
directory_label = gtk_label_new(_("Directory:"));
- directory_chooser = gtk_file_chooser_button_new(_("Choose output
directory"),
+ directory_chooser = gtk_file_chooser_button_new(_("Choose Output
Directory"),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
directory = rs_conf_get_string("quick-export-directory");
@@ -844,7 +844,7 @@
/* Filename */
filename_hbox = gtk_hbox_new(FALSE, 0);
- filename_label = gtk_label_new(_("Filename template:"));
+ filename_label = gtk_label_new(_("Filename Template:"));
filename_chooser = rs_filename_chooser_button_new(NULL,
"quick-export-filename");
filename_entry = g_object_get_data(G_OBJECT(filename_chooser), "entry");
g_signal_connect(filename_entry, "changed",
G_CALLBACK(filename_entry_changed), quick);
@@ -857,7 +857,7 @@
/* Example filename */
example_hbox = gtk_hbox_new(FALSE, 0);
- example_label1 = gtk_label_new(_("Filename example:"));
+ example_label1 = gtk_label_new(_("Filename Example:"));
example_label2 = gtk_label_new(NULL);
quick->example_label = example_label2;
@@ -868,7 +868,7 @@
/* Filetype */
filetype_hbox = gtk_hbox_new(FALSE, 0);
- filetype_label = gtk_label_new(_("File type:"));
+ filetype_label = gtk_label_new(_("File Type:"));
filetype_box = gui_confbox_filetype_new("quick-export-filetype");
filetype_event = gtk_event_box_new();
quick->event = filetype_event;
@@ -945,7 +945,7 @@
preview_page = gtk_vbox_new(FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (preview_page), 6);
colorsel_hbox = gtk_hbox_new(FALSE, 0);
- colorsel_label = gtk_label_new(_("Preview background color:"));
+ colorsel_label = gtk_label_new(_("Preview Background Color:"));
gtk_misc_set_alignment(GTK_MISC(colorsel_label), 0.0, 0.5);
colorsel = gtk_color_button_new();
@@ -960,7 +960,7 @@
if (!rs_conf_get_integer(CONF_HISTHEIGHT, &histogram_height))
histogram_height = 128;
histsize_hbox = gtk_hbox_new(FALSE, 0);
- histsize_label = gtk_label_new(_("Histogram height:"));
+ histsize_label = gtk_label_new(_("Histogram Height:"));
gtk_misc_set_alignment(GTK_MISC(histsize_label), 0.0, 0.5);
histsize_adj = gtk_adjustment_new(histogram_height, 15.0, 500.0, 1.0,
10.0, 0.0);
g_signal_connect(histsize_adj, "value_changed",
@@ -970,12 +970,12 @@
gtk_box_pack_start (GTK_BOX (histsize_hbox), histsize, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (preview_page), histsize_hbox, FALSE, TRUE,
0);
- system_theme_check = checkbox_from_conf(CONF_USE_SYSTEM_THEME, _("Use
system theme"), DEFAULT_CONF_USE_SYSTEM_THEME);
+ system_theme_check = checkbox_from_conf(CONF_USE_SYSTEM_THEME, _("Use
System Theme"), DEFAULT_CONF_USE_SYSTEM_THEME);
gtk_box_pack_start (GTK_BOX (preview_page), system_theme_check, FALSE,
TRUE, 0);
g_signal_connect ((gpointer) system_theme_check, "toggled",
G_CALLBACK (gui_preference_use_system_theme), rs);
- local_cache_check = checkbox_from_conf(CONF_CACHEDIR_IS_LOCAL, _("Place
cache in home directory"), FALSE);
+ local_cache_check = checkbox_from_conf(CONF_CACHEDIR_IS_LOCAL, _("Place
Cache in Home Directory"), FALSE);
gtk_box_pack_start (GTK_BOX (preview_page), local_cache_check, FALSE,
TRUE, 0);
cs_hbox = gtk_hbox_new(FALSE, 0);
@@ -1067,7 +1067,7 @@
gtk_container_set_border_width (GTK_CONTAINER (notebook), 6);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), preview_page,
gtk_label_new(_("General")));
//gtk_notebook_append_page(GTK_NOTEBOOK(notebook), batch_page,
gtk_label_new(_("Batch")));
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
gui_make_preference_quick_export(), gtk_label_new(_("Quick export")));
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
gui_make_preference_quick_export(), gtk_label_new(_("Quick Export")));
gtk_box_pack_start (GTK_BOX (vbox), notebook, FALSE, FALSE, 0);
button_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
@@ -1511,7 +1511,7 @@
GtkWidget *directory_expander;
dir_selector_vbox = gtk_vbox_new(FALSE, 0);
- checkbox_recursive = checkbox_from_conf(CONF_LOAD_RECURSIVE ,_("Open
recursive"), DEFAULT_CONF_LOAD_RECURSIVE);
+ checkbox_recursive = checkbox_from_conf(CONF_LOAD_RECURSIVE ,_("Open
Recursive"), DEFAULT_CONF_LOAD_RECURSIVE);
dir_selector_separator = gtk_hseparator_new();
dir_selector = rs_dir_selector_new();
g_signal_connect(G_OBJECT(dir_selector), "directory-activated",
G_CALLBACK(directory_activated), rs);
@@ -1522,7 +1522,7 @@
directory_expander = gui_box(_("Directory"), dir_selector_vbox,
"OPEN_DIRECTORY_EXPANDER", TRUE);
library_vbox = rs_tag_gui_toolbox_new(rs_library_get_singleton(),
rs->store);
- library_expander = gui_box(_("Tag search"), library_vbox,
"OPEN_LIBRARY_SEARCH_EXPANDER", TRUE);
+ library_expander = gui_box(_("Tag Search"), library_vbox,
"OPEN_LIBRARY_SEARCH_EXPANDER", TRUE);
gtk_box_pack_start (GTK_BOX(open_box), library_expander, FALSE, TRUE,
0);
gtk_box_pack_start (GTK_BOX(open_box), directory_expander, TRUE, TRUE,
0);
Modified: trunk/src/rs-actions.c
===================================================================
--- trunk/src/rs-actions.c 2011-09-10 15:02:21 UTC (rev 4034)
+++ trunk/src/rs-actions.c 2011-09-10 15:49:27 UTC (rev 4035)
@@ -465,11 +465,11 @@
cb_saturation = gtk_check_button_new_with_label (_("Saturation"));
cb_hue = gtk_check_button_new_with_label (_("Hue"));
cb_contrast = gtk_check_button_new_with_label (_("Contrast"));
- cb_whitebalance = gtk_check_button_new_with_label (_("White balance"));
+ cb_whitebalance = gtk_check_button_new_with_label (_("White Balance"));
cb_sharpen = gtk_check_button_new_with_label (_("Sharpen"));
cb_denoise_luma = gtk_check_button_new_with_label (_("Denoise"));
- cb_denoise_chroma = gtk_check_button_new_with_label (_("Color
denoise"));
- cb_channelmixer = gtk_check_button_new_with_label (_("Channel mixer"));
+ cb_denoise_chroma = gtk_check_button_new_with_label (_("Color
Denoise"));
+ cb_channelmixer = gtk_check_button_new_with_label (_("Channel Mixer"));
cb_tca = gtk_check_button_new_with_label (_("TCA"));
cb_vignetting = gtk_check_button_new_with_label (_("Vignetting"));
cb_curve = gtk_check_button_new_with_label (_("Curve"));
@@ -495,7 +495,7 @@
gtk_box_pack_start (GTK_BOX (cb_box), cb_curve, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (cb_box), b_all_none, FALSE, TRUE, 0);
- dialog = gui_dialog_make_from_widget(GTK_STOCK_DIALOG_QUESTION,
_("Select settings to copy"), cb_box);
+ dialog = gui_dialog_make_from_widget(GTK_STOCK_DIALOG_QUESTION,
_("Select Settings to Copy"), cb_box);
gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
@@ -937,7 +937,7 @@
GtkWidget *entry = rs_library_tag_entry_new(rs_library_get_singleton());
GtkWidget *apply_button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
- gtk_window_set_title(GTK_WINDOW(popup), _("Add tags to selected
photo(s)."));
+ gtk_window_set_title(GTK_WINDOW(popup), _("Add Tags to Selected
Photo(s)."));
gtk_window_set_position(GTK_WINDOW(popup), GTK_WIN_POS_MOUSE);
gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 5);
gtk_box_pack_start(GTK_BOX(box), entry, FALSE, TRUE, 0);
@@ -1461,23 +1461,23 @@
{ "ExportToGimp", GTK_STOCK_EXECUTE, _("_Export to Gimp"),
"<control>G", NULL, ACTION_CB(export_to_gimp) },
{ "CopyImage", GTK_STOCK_COPY, _("_Copy Image to Clipboard"),
"<control><shift>C", NULL, ACTION_CB(copy_image) },
{ "Reload", GTK_STOCK_REFRESH, _("_Reload directory"), "<control>R",
NULL, ACTION_CB(reload) },
- { "DeleteFlagged", GTK_STOCK_DELETE, _("_Delete flagged photos"),
"<control><shift>D", NULL, ACTION_CB(delete_flagged) },
+ { "DeleteFlagged", GTK_STOCK_DELETE, _("_Delete Flagged Photos"),
"<control><shift>D", NULL, ACTION_CB(delete_flagged) },
{ "Quit", GTK_STOCK_QUIT, _("_Quit"), "<control>Q", NULL,
ACTION_CB(quit) },
/* Edit menu */
- { "RevertSettings", GTK_STOCK_UNDO, _("_Revert settings"),
"<control>Z", NULL, ACTION_CB(revert_settings) },
- { "CopySettings", GTK_STOCK_COPY, _("_Copy settings"), "<control>C",
NULL, ACTION_CB(copy_settings) },
- { "PasteSettings", GTK_STOCK_PASTE, _("_Paste settings"), "<control>V",
NULL, ACTION_CB(paste_settings) },
- { "ResetSettings", GTK_STOCK_REFRESH, _("_Reset settings"), NULL, NULL,
ACTION_CB(reset_settings) },
- { "SaveDefaultSettings", NULL, _("_Save camera default settings"),
NULL, NULL, ACTION_CB(save_default_settings) },
+ { "RevertSettings", GTK_STOCK_UNDO, _("_Revert Settings"),
"<control>Z", NULL, ACTION_CB(revert_settings) },
+ { "CopySettings", GTK_STOCK_COPY, _("_Copy Settings"), "<control>C",
NULL, ACTION_CB(copy_settings) },
+ { "PasteSettings", GTK_STOCK_PASTE, _("_Paste Settings"), "<control>V",
NULL, ACTION_CB(paste_settings) },
+ { "ResetSettings", GTK_STOCK_REFRESH, _("_Reset Settings"), NULL, NULL,
ACTION_CB(reset_settings) },
+ { "SaveDefaultSettings", NULL, _("_Save Camera Default Settings"),
NULL, NULL, ACTION_CB(save_default_settings) },
{ "Preferences", GTK_STOCK_PREFERENCES, _("_Preferences"), NULL, NULL,
ACTION_CB(preferences) },
/* Photo menu */
- { "FlagPhoto", GTK_STOCK_DELETE, _("_Flag photo for deletion"),
"Delete", NULL, ACTION_CB(flag_for_deletion) },
+ { "FlagPhoto", GTK_STOCK_DELETE, _("_Flag Photo for Deletion"),
"Delete", NULL, ACTION_CB(flag_for_deletion) },
{ "Priority1", NULL, _("_1"), "1", NULL, ACTION_CB(priority_1) },
{ "Priority2", NULL, _("_2"), "2", NULL, ACTION_CB(priority_2) },
{ "Priority3", NULL, _("_3"), "3", NULL, ACTION_CB(priority_3) },
- { "RemovePriority", NULL, _("_Remove priority"), "0", NULL,
ACTION_CB(priority_0) },
+ { "RemovePriority", NULL, _("_Remove Priority"), "0", NULL,
ACTION_CB(priority_0) },
{ "AutoWB", NULL, _("_Auto"), "A", NULL, ACTION_CB(auto_wb) },
{ "CameraWB", NULL, _("_Camera"), "C", NULL, ACTION_CB(camera_wb) },
{ "Crop", RS_STOCK_CROP, _("_Crop"), "<shift>C", NULL, ACTION_CB(crop)
},
@@ -1486,23 +1486,23 @@
{ "Unstraighten", NULL, _("_Unstraighten"), NULL, NULL,
ACTION_CB(unstraighten) },
{ "Group", NULL, _("_Group"), NULL, NULL, ACTION_CB(group_photos) },
{ "Ungroup", NULL, _("_Ungroup"), NULL, NULL, ACTION_CB(ungroup_photos)
},
- { "AutoGroup", NULL, _("_Auto group"), NULL, NULL,
ACTION_CB(auto_group_photos) },
+ { "AutoGroup", NULL, _("_Auto Group"), NULL, NULL,
ACTION_CB(auto_group_photos) },
{ "TagPhoto", NULL, _("_Tag Photo..."), "<alt>T", NULL,
ACTION_CB(tag_photo) },
{ "RotateClockwise", RS_STOCK_ROTATE_CLOCKWISE, _("Rotate Clockwise"),
"<alt>Right", NULL, ACTION_CB(rotate_clockwise) },
- { "RotateCounterClockwise", RS_STOCK_ROTATE_COUNTER_CLOCKWISE,
_("Rotate Counter Clockwise"), "<alt>Left", NULL,
ACTION_CB(rotate_counter_clockwise) },
+ { "RotateCounterClockwise", RS_STOCK_ROTATE_COUNTER_CLOCKWISE,
_("Rotate Counterclockwise"), "<alt>Left", NULL,
ACTION_CB(rotate_counter_clockwise) },
{ "Flip", RS_STOCK_FLIP, _("Flip"), NULL, NULL, ACTION_CB(flip) },
{ "Mirror", RS_STOCK_MIRROR, _("Mirror"), NULL, NULL, ACTION_CB(mirror)
},
/* View menu */
- { "PreviousPhoto", GTK_STOCK_GO_BACK, _("_Previous photo"),
"<control>Left", NULL, ACTION_CB(previous_photo) },
+ { "PreviousPhoto", GTK_STOCK_GO_BACK, _("_Previous Photo"),
"<control>Left", NULL, ACTION_CB(previous_photo) },
{ "NextPhoto", GTK_STOCK_GO_FORWARD, _("_Next Photo"),
"<control>Right", NULL, ACTION_CB(next_photo) },
{ "LensDbEditor", NULL, _("_Lens Library"), "<control>L", NULL,
ACTION_CB(lens_db_editor) },
{ "TetheredShooting", NULL, _("_Tethered Shooting"), "F9", NULL,
ACTION_CB(tethered_shooting) },
/* Batch menu */
- { "AddToBatch", GTK_STOCK_ADD, _("_Add to batch queue"), "Insert",
NULL, ACTION_CB(add_to_batch) },
- { "AddViewToBatch", NULL, _("_Add view to queue..."),
"<control>Insert", NULL, ACTION_CB(add_view_to_batch) },
- { "RemoveFromBatch", GTK_STOCK_REMOVE, _("_Remove from batch queue"),
"<control>Delete", NULL, ACTION_CB(remove_from_batch) },
+ { "AddToBatch", GTK_STOCK_ADD, _("_Add to Batch Queue"), "Insert",
NULL, ACTION_CB(add_to_batch) },
+ { "AddViewToBatch", NULL, _("_Add View to Queue..."),
"<control>Insert", NULL, ACTION_CB(add_view_to_batch) },
+ { "RemoveFromBatch", GTK_STOCK_REMOVE, _("_Remove from Batch Queue"),
"<control>Delete", NULL, ACTION_CB(remove_from_batch) },
{ "ProcessBatch", GTK_STOCK_EXECUTE, _("_Start"), NULL, NULL,
ACTION_CB(ProcessBatch) },
/* help menu */
@@ -1516,18 +1516,18 @@
static guint n_actionentries = G_N_ELEMENTS (actionentries);
GtkToggleActionEntry toggleentries[] = {
- { "ZommToFit", GTK_STOCK_ZOOM_FIT, _("_Zoom to fit"), "asterisk", NULL,
ACTION_CB(zoom_to_fit), TRUE },
+ { "ZommToFit", GTK_STOCK_ZOOM_FIT, _("_Zoom to Fit"), "asterisk", NULL,
ACTION_CB(zoom_to_fit), TRUE },
{ "Iconbox", NULL, _("_Iconbox"), "<control>I", NULL,
ACTION_CB(iconbox), TRUE },
{ "Toolbox", NULL, _("_Toolbox"), "<control>T", NULL,
ACTION_CB(toolbox), TRUE },
{ "Fullscreen", GTK_STOCK_FULLSCREEN, _("_Fullscreen"), "F11", NULL,
ACTION_CB(fullscreen), FALSE },
- { "FullscreenPreview", GTK_STOCK_FULLSCREEN, _("_Show Photo On
Secondary Monitor"), "F10", NULL, ACTION_CB(fullscreen_preview), FALSE },
+ { "FullscreenPreview", GTK_STOCK_FULLSCREEN, _("_Show Photo on
Secondary Monitor"), "F10", NULL, ACTION_CB(fullscreen_preview), FALSE },
{ "ShowFilenames", NULL, _("Show Filenames in Iconbox"), NULL, NULL,
ACTION_CB(show_filenames), show_filenames },
{ "Load8Bit", NULL, _("Load non-RAW images"), NULL, NULL,
ACTION_CB(load_8bit), load_8bit },
{ "LoadSelected", NULL, _("Do not Load Selected Images"), "Pause",
NULL, ACTION_CB(load_selected), FALSE },
- { "ExposureMask", NULL, _("_Exposure mask"), "<control>E", NULL,
ACTION_CB(exposure_mask), FALSE },
+ { "ExposureMask", NULL, _("_Exposure Mask"), "<control>E", NULL,
ACTION_CB(exposure_mask), FALSE },
{ "Split", NULL, _("_Split"), "<control>D", NULL, ACTION_CB(split),
FALSE },
#if GTK_CHECK_VERSION(2,12,0)
- { "Lightsout", NULL, _("_Lights out"), "F12", NULL,
ACTION_CB(lightsout), FALSE },
+ { "Lightsout", NULL, _("_Lights Out"), "F12", NULL,
ACTION_CB(lightsout), FALSE },
#endif
};
static guint n_toggleentries = G_N_ELEMENTS (toggleentries);
Modified: trunk/src/rs-batch.c
===================================================================
--- trunk/src/rs-batch.c 2011-09-10 15:02:21 UTC (rev 4034)
+++ trunk/src/rs-batch.c 2011-09-10 15:49:27 UTC (rev 4035)
@@ -806,7 +806,7 @@
queue->remove_button =
gui_button_new_from_stock_with_label(GTK_STOCK_REMOVE, _("Remove"));
g_signal_connect ((gpointer) queue->remove_button, "clicked",
G_CALLBACK (batch_button_remove_clicked), queue);
- queue->remove_all_button =
gui_button_new_from_stock_with_label(GTK_STOCK_REMOVE, _("Remove all"));
+ queue->remove_all_button =
gui_button_new_from_stock_with_label(GTK_STOCK_REMOVE, _("Remove All"));
g_signal_connect ((gpointer) queue->remove_all_button,
"clicked", G_CALLBACK (batch_button_remove_all_clicked), queue);
gtk_box_pack_start(GTK_BOX (box), queue->start_button, FALSE,
FALSE, 0);
@@ -916,7 +916,7 @@
edit_settings_clicked(GtkButton *button, RS_QUEUE *queue)
{
RSOutput *output = queue->output;
- GtkWidget *dialog = gtk_dialog_new_with_buttons (_("Edit output
settings"),
+ GtkWidget *dialog = gtk_dialog_new_with_buttons (_("Edit Output
Settings"),
NULL,
GTK_DIALOG_MODAL |
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_OK,
@@ -952,7 +952,7 @@
/* Make window */
queue->size_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
g_signal_connect(G_OBJECT(queue->size_window), "delete_event",
G_CALLBACK(gtk_widget_hide_on_delete), queue);
- gtk_window_set_title (GTK_WINDOW(queue->size_window), _("Photo size"));
+ gtk_window_set_title (GTK_WINDOW(queue->size_window), _("Photo Size"));
gtk_window_set_position(GTK_WINDOW(queue->size_window),
GTK_WIN_POS_MOUSE);
gtk_widget_realize (queue->size_window);
gdk_window_set_type_hint(queue->size_window->window,
GDK_WINDOW_TYPE_HINT_UTILITY);
@@ -960,10 +960,10 @@
/* Chooser */
lockbox = gui_confbox_new(CONF_BATCH_SIZE_LOCK);
- gui_confbox_add_entry(lockbox, "scale", _("Constant scale"),
GINT_TO_POINTER(LOCK_SCALE));
- gui_confbox_add_entry(lockbox, "width", _("Constant width"),
GINT_TO_POINTER(LOCK_WIDTH));
- gui_confbox_add_entry(lockbox, "height", _("Constant height"),
GINT_TO_POINTER(LOCK_HEIGHT));
- gui_confbox_add_entry(lockbox, "bounding-box", _("Maximum size"),
GINT_TO_POINTER(LOCK_BOUNDING_BOX));
+ gui_confbox_add_entry(lockbox, "scale", _("Constant Scale"),
GINT_TO_POINTER(LOCK_SCALE));
+ gui_confbox_add_entry(lockbox, "width", _("Constant Width"),
GINT_TO_POINTER(LOCK_WIDTH));
+ gui_confbox_add_entry(lockbox, "height", _("Constant Height"),
GINT_TO_POINTER(LOCK_HEIGHT));
+ gui_confbox_add_entry(lockbox, "bounding-box", _("Maximum Size"),
GINT_TO_POINTER(LOCK_BOUNDING_BOX));
gui_confbox_load_conf(lockbox, "scale");
gtk_widget_show(gui_confbox_get_widget(lockbox));
@@ -976,16 +976,16 @@
gtk_table_set_row_spacings(GTK_TABLE(table), 0);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, TRUE, 0);
- queue->size_width[0] = gtk_label_new(_("Photo width:"));
+ queue->size_width[0] = gtk_label_new(_("Photo Width:"));
queue->size_width[1] = gtk_spin_button_new_with_range(10.0, 10000.0,
1.0);
- queue->size_width[2] = gtk_label_new(_("pixels"));
+ queue->size_width[2] = gtk_label_new(_("Pixels"));
gtk_spin_button_set_value(GTK_SPIN_BUTTON(queue->size_width[1]),
(gdouble) queue->width);
g_signal_connect(G_OBJECT(queue->size_width[1]), "value_changed",
G_CALLBACK(size_width_changed), queue);
gtk_table_attach_defaults(GTK_TABLE(table), queue->size_width[0], 0, 1,
0, 1);
gtk_table_attach_defaults(GTK_TABLE(table), queue->size_width[1], 1, 2,
0, 1);
gtk_table_attach_defaults(GTK_TABLE(table), queue->size_width[2], 2, 3,
0, 1);
- queue->size_height[0] = gtk_label_new(_("Photo height:"));
+ queue->size_height[0] = gtk_label_new(_("Photo Height:"));
queue->size_height[1] = gtk_spin_button_new_with_range(10.0, 10000.0,
1.0);
queue->size_height[2] = gtk_label_new(_("pixels"));
gtk_spin_button_set_value(GTK_SPIN_BUTTON(queue->size_height[1]),
(gdouble) queue->height);
@@ -994,7 +994,7 @@
gtk_table_attach_defaults(GTK_TABLE(table), queue->size_height[1], 1,
2, 1, 2);
gtk_table_attach_defaults(GTK_TABLE(table), queue->size_height[2], 2,
3, 1, 2);
- queue->size_scale[0] = gtk_label_new(_("Photo scale:"));
+ queue->size_scale[0] = gtk_label_new(_("Photo Scale:"));
queue->size_scale[1] = gtk_spin_button_new_with_range(10.0, 10000.0,
1.0);
queue->size_scale[2] = gtk_label_new(_("%"));
gtk_spin_button_set_value(GTK_SPIN_BUTTON(queue->size_scale[1]),
(gdouble) queue->scale);
@@ -1032,17 +1032,17 @@
switch (queue->size_lock)
{
case LOCK_WIDTH:
- g_string_printf(gs, _("Constant width:\n%d"),
queue->width);
+ g_string_printf(gs, _("Constant Width:\n%d"),
queue->width);
break;
case LOCK_HEIGHT:
- g_string_printf(gs, _("Constant height:\n%d"),
queue->height);
+ g_string_printf(gs, _("Constant Height:\n%d"),
queue->height);
break;
case LOCK_SCALE:
g_string_printf(gs, _("Constant Scale:\n%d"),
queue->scale);
g_string_append(gs, "%"); /* FIXME: merge with the
above line after release */
break;
case LOCK_BOUNDING_BOX:
- g_string_printf(gs, _("Maximum size:\n%d x %d"),
queue->width, queue->height);
+ g_string_printf(gs, _("Maximum Size:\n%d x %d"),
queue->width, queue->height);
break;
}
@@ -1065,18 +1065,18 @@
GtkWidget *size_button;
gpointer active;
- chooser = gtk_file_chooser_button_new(_("Choose output directory"),
+ chooser = gtk_file_chooser_button_new(_("Choose Output Directory"),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
if (g_path_is_absolute(queue->directory))
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser),
queue->directory);
g_signal_connect (chooser, "current_folder_changed",
G_CALLBACK (chooser_changed), queue);
gtk_box_pack_start (GTK_BOX (vbox), gui_framed(chooser,
- _("Output directory:"), GTK_SHADOW_NONE), FALSE, FALSE, 0);
+ _("Output Directory:"), GTK_SHADOW_NONE), FALSE, FALSE, 0);
filename = rs_filename_chooser_button_new(&queue->filename,
CONF_BATCH_FILENAME);
gtk_box_pack_start (GTK_BOX (vbox), gui_framed(filename,
- _("Filename template:"), GTK_SHADOW_NONE), FALSE, FALSE, 0);
+ _("Filename Template:"), GTK_SHADOW_NONE), FALSE, FALSE, 0);
filetype_confbox = gui_confbox_filetype_new(CONF_BATCH_FILETYPE);
gui_confbox_set_callback(filetype_confbox, queue, filetype_changed);
@@ -1087,7 +1087,7 @@
active = GUINT_TO_POINTER(g_type_from_name("RSJpegfile"));
filetype_changed(active, queue);
- GtkWidget *edit_settings = gtk_button_new_with_label(_("Edit output
settings"));
+ GtkWidget *edit_settings = gtk_button_new_with_label(_("Edit Output
Settings"));
g_signal_connect ((gpointer) edit_settings, "clicked", G_CALLBACK
(edit_settings_clicked), queue);
gtk_box_pack_start (GTK_BOX (vbox), edit_settings, FALSE, TRUE, 0);
@@ -1101,7 +1101,7 @@
gtk_box_pack_start (GTK_BOX (hbox), queue->size_label, FALSE, FALSE, 1);
gtk_box_pack_end (GTK_BOX (hbox), size_button, FALSE, FALSE, 1);
- gtk_box_pack_start (GTK_BOX (vbox), gui_framed(hbox, _("Export
dimensions"), GTK_SHADOW_IN), FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), gui_framed(hbox, _("Export
Dimensions"), GTK_SHADOW_IN), FALSE, TRUE, 0);
return(vbox);
}
Modified: trunk/src/rs-store.c
===================================================================
--- trunk/src/rs-store.c 2011-09-10 15:02:21 UTC (rev 4034)
+++ trunk/src/rs-store.c 2011-09-10 15:49:27 UTC (rev 4035)
@@ -671,12 +671,12 @@
g_string_append_printf(store->tooltip_text, _("<b>Model</b>: %s\n"),
metadata->model_ascii);
if (metadata->focallength > 0)
-
g_string_append_printf(store->tooltip_text, _("<b>Focal length</b>: %dmm\n"),
metadata->focallength);
+
g_string_append_printf(store->tooltip_text, _("<b>Focal Length</b>: %dmm\n"),
metadata->focallength);
if (metadata->shutterspeed >
0.0 && metadata->shutterspeed < 4)
-
g_string_append_printf(store->tooltip_text, _("<b>Shutter speed</b>: %.1fs\n"),
1.0/metadata->shutterspeed);
+
g_string_append_printf(store->tooltip_text, _("<b>Shutter Speed</b>: %.1fs\n"),
1.0/metadata->shutterspeed);
else if (metadata->shutterspeed
>= 4)
-
g_string_append_printf(store->tooltip_text, _("<b>Shutter speed</b>:
1/%.0fs\n"), metadata->shutterspeed);
+
g_string_append_printf(store->tooltip_text, _("<b>Shutter Speed</b>:
1/%.0fs\n"), metadata->shutterspeed);
if (metadata->aperture > 0.0)
g_string_append_printf(store->tooltip_text, _("<b>Aperture</b>: F/%.01f\n"),
metadata->aperture);
Modified: trunk/src/rs-toolbox.c
===================================================================
--- trunk/src/rs-toolbox.c 2011-09-10 15:02:21 UTC (rev 4034)
+++ trunk/src/rs-toolbox.c 2011-09-10 15:49:27 UTC (rev 4035)
@@ -787,7 +787,7 @@
toolbox->channelmixer[snapshot][row] = basic_slider(toolbox,
snapshot, channelmixertable, row, &channelmixer[row]);
/* ROW HARDCODED TO 0 */
- toolbox->lensbutton[snapshot] = gtk_button_new_with_label(_("Edit
lens"));
+ toolbox->lensbutton[snapshot] = gtk_button_new_with_label(_("Edit
Lens"));
toolbox->lenslabel[snapshot] = basic_label(toolbox, snapshot,
lenstable, row, toolbox->lensbutton[snapshot]);
toolbox_lens_set_label(toolbox, snapshot);
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
