From 3d85acd2e001c0b86108c20e71e76c868747cdc4 Mon Sep 17 00:00:00 2001 From: DrSlony Date: Sun, 3 Jun 2012 12:32:55 +0100 Subject: [PATCH] Added markup to popups when default raw and non-raw profiles are not found --- rtdata/languages/English | 9 +++++---- rtdata/languages/default | 8 ++++---- rtgui/main.cc | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/rtdata/languages/English b/rtdata/languages/English index b6ea5d2eb..6137b0271 100644 --- a/rtdata/languages/English +++ b/rtdata/languages/English @@ -1,3 +1,4 @@ + !!!!!!!!!!!!!!!!!!!!!!!!! ! Untranslated keys follow; remove the ! prefix after an entry is translated. !!!!!!!!!!!!!!!!!!!!!!!!! @@ -546,8 +547,8 @@ !NAVIGATOR_V_NA;V = n/a !NAVIGATOR_V_VALUE;V = %1 !NAVIGATOR_XY_NA;x = n/a, y = n/a -!OPTIONS_DEFIMG_MISSING;The default profile for standard images could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\nDefault internal values will be used. -!OPTIONS_DEFRAW_MISSING;The default profile for raw images could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\nDefault internal values will be used. +!OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\nDefault internal values will be used. +!OPTIONS_DEFRAW_MISSING;The default profile for raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\nDefault internal values will be used. !PARTIALPASTE_BASICGROUP;Basic Settings !PARTIALPASTE_CACORRECTION;C/A Correction !PARTIALPASTE_CHANNELMIXER;Channel mixer @@ -668,8 +669,8 @@ !PREFERENCES_FLATFIELDSHOTS;shots !PREFERENCES_FLATFIELDTEMPLATES;templates !PREFERENCES_FLATFIELD;Flat Field -!PREFERENCES_FORIMAGE;For image files -!PREFERENCES_FORRAW;For raw files +!PREFERENCES_FORIMAGE;For non-raw photos +!PREFERENCES_FORRAW;For raw photos !PREFERENCES_GIMPPATH;GIMP installation directory !PREFERENCES_GTKTHEME;GTK default !PREFERENCES_HINT;Hint diff --git a/rtdata/languages/default b/rtdata/languages/default index 1124c1c7a..d64a3d8a0 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -542,8 +542,8 @@ NAVIGATOR_S_VALUE;S = %1 NAVIGATOR_V_NA;V = n/a NAVIGATOR_V_VALUE;V = %1 NAVIGATOR_XY_NA;x = n/a, y = n/a -OPTIONS_DEFIMG_MISSING;The default profile for standard images could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\nDefault internal values will be used. -OPTIONS_DEFRAW_MISSING;The default profile for raw images could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\nDefault internal values will be used. +OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\nDefault internal values will be used. +OPTIONS_DEFRAW_MISSING;The default profile for raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\nDefault internal values will be used. PARTIALPASTE_BASICGROUP;Basic Settings PARTIALPASTE_CACORRECTION;C/A Correction PARTIALPASTE_CHANNELMIXER;Channel mixer @@ -664,8 +664,8 @@ PREFERENCES_FLATFIELDSDIR;Flat Fields directory PREFERENCES_FLATFIELDSHOTS;shots PREFERENCES_FLATFIELDTEMPLATES;templates PREFERENCES_FLATFIELD;Flat Field -PREFERENCES_FORIMAGE;For image files -PREFERENCES_FORRAW;For raw files +PREFERENCES_FORIMAGE;For non-raw photos +PREFERENCES_FORRAW;For raw photos PREFERENCES_GIMPPATH;GIMP installation directory PREFERENCES_GTKTHEME;GTK default PREFERENCES_HINT;Hint diff --git a/rtgui/main.cc b/rtgui/main.cc index 33fe7375a..fa8ec991c 100644 --- a/rtgui/main.cc +++ b/rtgui/main.cc @@ -162,11 +162,11 @@ int main(int argc, char **argv) // alerting users if the default raw and image profiles are missing if (options.is_defProfRawMissing()) { - Gtk::MessageDialog msgd (Glib::ustring::compose(M("OPTIONS_DEFRAW_MISSING"), options.defProfRaw), false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); + Gtk::MessageDialog msgd (Glib::ustring::compose(M("OPTIONS_DEFRAW_MISSING"), options.defProfRaw), true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); msgd.run (); } if (options.is_defProfImgMissing()) { - Gtk::MessageDialog msgd (Glib::ustring::compose(M("OPTIONS_DEFIMG_MISSING"), options.defProfImg), false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); + Gtk::MessageDialog msgd (Glib::ustring::compose(M("OPTIONS_DEFIMG_MISSING"), options.defProfImg), true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true); msgd.run (); }