diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala
index 76f39693c..b0fe3a948 100644
--- a/rtdata/languages/Catala
+++ b/rtdata/languages/Catala
@@ -1179,6 +1179,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !MAIN_MSG_PATHDOESNTEXIST;The path\n\n<b>%1</b>\n\ndoesn't exist. Please set a correct path in the Preference window.
 !MAIN_MSG_SETPATHFIRST;You have to set a target path first in Preferences\nin order to use this function!
 !MAIN_MSG_WRITEFAILED;Failed to write\n\n<b>"%1"</b>\n\nMake sure that the folder exists and that you have write permission to it.
+!NAVIGATOR_NA; --
 !PARTIALPASTE_CHANNELMIXERBW;Black-and-White
 !PARTIALPASTE_COLORAPP;CIE Color Appearance Model 2002
 !PARTIALPASTE_GRADIENT;Graduated filter
@@ -1210,6 +1211,9 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: <b>-</b>
 !PREFERENCES_GREY30;Yb=30 CIE L#60
 !PREFERENCES_GREY40;Yb=40 CIE L#70
 !PREFERENCES_GREY;Output device's Yb luminance (%)
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction
 !PREFERENCES_RGBDTL_TOOLTIP;Noise Reduction requires a baseline of about 128MB RAM for a 10MPix image or 512MB for a 40MPix image, and additionally 128MB RAM per thread. The more threads run in parallel, the faster the computation. Leave the setting at "0" to automatically use as many threads as possible.
 !PREFERENCES_TAB_PERFORMANCE;Performance
diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified)
index 53bc035d1..6353c051b 100644
--- a/rtdata/languages/Chinese (Simplified)	
+++ b/rtdata/languages/Chinese (Simplified)	
@@ -1000,24 +1000,16 @@ ZOOMBAR_SMALL;小
 !MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: <b>Alt-l</b>
 !MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-L</b>
 !MAIN_TOOLTIP_TOGGLE;Toggle the <b>Before</b>/<b>After</b> view.\nShortcut: <b>Shift-b</b>
-!NAVIGATOR_B_NA;B = n/a
-!NAVIGATOR_B_VALUE;B = %1
-!NAVIGATOR_G_NA;G = n/a
-!NAVIGATOR_G_VALUE;G = %1
-!NAVIGATOR_H_NA;H = n/a
-!NAVIGATOR_H_VALUE;H = %1
-!NAVIGATOR_LAB_A_NA;a = n/a
-!NAVIGATOR_LAB_A_VALUE;a = %1
-!NAVIGATOR_LAB_B_NA;b = n/a
-!NAVIGATOR_LAB_B_VALUE;b = %1
-!NAVIGATOR_LAB_L_NA;L = n/a
-!NAVIGATOR_LAB_L_VALUE;L = %1
-!NAVIGATOR_R_NA;R = n/a
-!NAVIGATOR_R_VALUE;R = %1
-!NAVIGATOR_S_NA;S = n/a
-!NAVIGATOR_S_VALUE;S = %1
-!NAVIGATOR_V_NA;V = n/a
-!NAVIGATOR_V_VALUE;V = %1
+!NAVIGATOR_B;B:
+!NAVIGATOR_G;G:
+!NAVIGATOR_H;H:
+!NAVIGATOR_LAB_A;a:
+!NAVIGATOR_LAB_B;b:
+!NAVIGATOR_LAB_L;L:
+!NAVIGATOR_NA; --
+!NAVIGATOR_R;R:
+!NAVIGATOR_S;S:
+!NAVIGATOR_V;V:
 !OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> 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 <b>raw photos</b> 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_CHANNELMIXERBW;Black-and-White
@@ -1093,8 +1085,10 @@ ZOOMBAR_SMALL;小
 !PREFERENCES_GREY40;Yb=40 CIE L#70
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_HISTOGRAMPOSITIONLEFT;Histogram in left panel
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
 !PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
-!PREFERENCES_LANGAUTODETECT;Use OS language setting
+!PREFERENCES_LANGAUTODETECT;Use system language
 !PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
 !PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File Operations"
 !PREFERENCES_MENUGROUPLABEL;Group "Color Label"
@@ -1103,6 +1097,7 @@ ZOOMBAR_SMALL;小
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs Mode (if available on second monitor)
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails
 !PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
 !PREFERENCES_PANFACTORFRAME;Pan Rate Amplification
diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional)
index 68c843882..f3689ca28 100644
--- a/rtdata/languages/Chinese (Traditional)	
+++ b/rtdata/languages/Chinese (Traditional)	
@@ -860,26 +860,18 @@ TP_WBALANCE_TEMPERATURE;色溫
 !MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: <b>Alt-l</b>
 !MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-L</b>
 !MAIN_TOOLTIP_THRESHOLD;Threshold
-!NAVIGATOR_B_NA;B = n/a
-!NAVIGATOR_B_VALUE;B = %1
-!NAVIGATOR_G_NA;G = n/a
-!NAVIGATOR_G_VALUE;G = %1
-!NAVIGATOR_H_NA;H = n/a
-!NAVIGATOR_H_VALUE;H = %1
-!NAVIGATOR_LAB_A_NA;a = n/a
-!NAVIGATOR_LAB_A_VALUE;a = %1
-!NAVIGATOR_LAB_B_NA;b = n/a
-!NAVIGATOR_LAB_B_VALUE;b = %1
-!NAVIGATOR_LAB_L_NA;L = n/a
-!NAVIGATOR_LAB_L_VALUE;L = %1
-!NAVIGATOR_R_NA;R = n/a
-!NAVIGATOR_R_VALUE;R = %1
-!NAVIGATOR_S_NA;S = n/a
-!NAVIGATOR_S_VALUE;S = %1
-!NAVIGATOR_V_NA;V = n/a
-!NAVIGATOR_V_VALUE;V = %1
-!NAVIGATOR_XY_FULL;Width = %1, Height = %2
-!NAVIGATOR_XY_NA;x = n/a, y = n/a
+!NAVIGATOR_B;B:
+!NAVIGATOR_G;G:
+!NAVIGATOR_H;H:
+!NAVIGATOR_LAB_A;a:
+!NAVIGATOR_LAB_B;b:
+!NAVIGATOR_LAB_L;L:
+!NAVIGATOR_NA; --
+!NAVIGATOR_R;R:
+!NAVIGATOR_S;S:
+!NAVIGATOR_V;V:
+!NAVIGATOR_XY_FULL;Width: %1, Height: %2
+!NAVIGATOR_XY_NA;x: --, y: --
 !OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> 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 <b>raw photos</b> 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_CHANNELMIXERBW;Black-and-White
@@ -974,8 +966,10 @@ TP_WBALANCE_TEMPERATURE;色溫
 !PREFERENCES_GREY40;Yb=40 CIE L#70
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_HISTOGRAMPOSITIONLEFT;Histogram in left panel
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
 !PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
-!PREFERENCES_LANGAUTODETECT;Use OS language setting
+!PREFERENCES_LANGAUTODETECT;Use system language
 !PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
 !PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File Operations"
 !PREFERENCES_MENUGROUPLABEL;Group "Color Label"
@@ -985,6 +979,7 @@ TP_WBALANCE_TEMPERATURE;色溫
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs Mode (if available on second monitor)
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails
 !PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
 !PREFERENCES_PANFACTORFRAME;Pan Rate Amplification
diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech
index abc49813c..e7ffa05ff 100644
--- a/rtdata/languages/Czech
+++ b/rtdata/languages/Czech
@@ -780,7 +780,7 @@ PREFERENCES_INTENT_PERCEPTUAL;Vnímání
 PREFERENCES_INTENT_RELATIVE;Relativní kolorimetrie
 PREFERENCES_INTENT_SATURATION;Sytost
 PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Ukázat vložené JPEG náhledy u needitovaných snímků
-PREFERENCES_LANGAUTODETECT;Použít jazykové nastavení OS
+PREFERENCES_LANGAUTODETECT;Použít systémový jazyk
 PREFERENCES_MENUGROUPEXTPROGS;Skupina "Otevřít pomocí"
 PREFERENCES_MENUGROUPFILEOPERATIONS;Skupina "Souborové operace"
 PREFERENCES_MENUGROUPLABEL;Skupina "Barevné štítky"
diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk
index 03fa79b00..45878fba4 100644
--- a/rtdata/languages/Dansk
+++ b/rtdata/languages/Dansk
@@ -855,26 +855,18 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-L</b>
 !MAIN_TOOLTIP_THRESHOLD;Threshold
 !MAIN_TOOLTIP_TOGGLE;Toggle the <b>Before</b>/<b>After</b> view.\nShortcut: <b>Shift-b</b>
-!NAVIGATOR_B_NA;B = n/a
-!NAVIGATOR_B_VALUE;B = %1
-!NAVIGATOR_G_NA;G = n/a
-!NAVIGATOR_G_VALUE;G = %1
-!NAVIGATOR_H_NA;H = n/a
-!NAVIGATOR_H_VALUE;H = %1
-!NAVIGATOR_LAB_A_NA;a = n/a
-!NAVIGATOR_LAB_A_VALUE;a = %1
-!NAVIGATOR_LAB_B_NA;b = n/a
-!NAVIGATOR_LAB_B_VALUE;b = %1
-!NAVIGATOR_LAB_L_NA;L = n/a
-!NAVIGATOR_LAB_L_VALUE;L = %1
-!NAVIGATOR_R_NA;R = n/a
-!NAVIGATOR_R_VALUE;R = %1
-!NAVIGATOR_S_NA;S = n/a
-!NAVIGATOR_S_VALUE;S = %1
-!NAVIGATOR_V_NA;V = n/a
-!NAVIGATOR_V_VALUE;V = %1
-!NAVIGATOR_XY_FULL;Width = %1, Height = %2
-!NAVIGATOR_XY_NA;x = n/a, y = n/a
+!NAVIGATOR_B;B:
+!NAVIGATOR_G;G:
+!NAVIGATOR_H;H:
+!NAVIGATOR_LAB_A;a:
+!NAVIGATOR_LAB_B;b:
+!NAVIGATOR_LAB_L;L:
+!NAVIGATOR_NA; --
+!NAVIGATOR_R;R:
+!NAVIGATOR_S;S:
+!NAVIGATOR_V;V:
+!NAVIGATOR_XY_FULL;Width: %1, Height: %2
+!NAVIGATOR_XY_NA;x: --, y: --
 !OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> 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 <b>raw photos</b> 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_CHANNELMIXERBW;Black-and-White
@@ -969,8 +961,10 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !PREFERENCES_GREY40;Yb=40 CIE L#70
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_HISTOGRAMPOSITIONLEFT;Histogram in left panel
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
 !PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
-!PREFERENCES_LANGAUTODETECT;Use OS language setting
+!PREFERENCES_LANGAUTODETECT;Use system language
 !PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
 !PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File Operations"
 !PREFERENCES_MENUGROUPLABEL;Group "Color Label"
@@ -980,6 +974,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs Mode (if available on second monitor)
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails
 !PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
 !PREFERENCES_PANFACTORFRAME;Pan Rate Amplification
diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch
index 1e62a0e3f..bbdcab611 100644
--- a/rtdata/languages/Deutsch
+++ b/rtdata/languages/Deutsch
@@ -1410,6 +1410,7 @@ ZOOMPANEL_ZOOMOUT;Herauszoomen <b>-</b>
 !MAIN_MSG_OPERATIONCANCELLED;Operation cancelled
 !MAIN_MSG_PATHDOESNTEXIST;The path\n\n<b>%1</b>\n\ndoesn't exist. Please set a correct path in the Preference window.
 !MAIN_MSG_SETPATHFIRST;You have to set a target path first in Preferences\nin order to use this function!
+!NAVIGATOR_NA; --
 !PARTIALPASTE_CHANNELMIXERBW;Black-and-White
 !PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE enhancement steps
 !PREFERENCES_BEHADDALLHINT;Set all parameters to the <b>Add</b> mode.\nAdjustments of parameters in the batch tool panel will be <b>deltas</b> to the stored values.
@@ -1419,6 +1420,9 @@ ZOOMPANEL_ZOOMOUT;Herauszoomen <b>-</b>
 !PREFERENCES_CUSTPROFBUILDKEYFORMAT;Keys format
 !PREFERENCES_CUSTPROFBUILDKEYFORMAT_NAME;Name
 !PREFERENCES_CUSTPROFBUILDKEYFORMAT_TID;TagID
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
 !PROFILEPANEL_GLOBALPROFILES;Bundled profiles
 !PROFILEPANEL_MODE_TIP;Processing profile fill mode.\n\nButton pressed: partial profiles will be converted to full profiles; the missing values will be replaced with hard-coded defaults.\n\nButton released: profiles will be applied as they are, altering only those values which they contain.
diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK)
index bc9f96a1b..439415e81 100644
--- a/rtdata/languages/English (UK)	
+++ b/rtdata/languages/English (UK)	
@@ -34,6 +34,7 @@ PREFERENCES_INTENT_ABSOLUTE;Absolute Colourimetric
 PREFERENCES_INTENT_RELATIVE;Relative Colourimetric
 PREFERENCES_MENUGROUPLABEL;Group "Colour Label"
 PREFERENCES_MONITORICC;Monitor colour profile
+PREFERENCES_NAVGUIDEBRUSH;Navigator guide colour
 PREFERENCES_TAB_COLORMGR;Colour Management
 TOOLBAR_TOOLTIP_STRAIGHTEN;<b>Straighten</b> / <b>fine rotation</b>.\nShortcut: <b>s</b>\n\nIndicate the vertical or horizontal by drawing a guide line over the image preview. Angle of rotation will be shown next to the guide line. Centre of rotation is the geometrical centre of the image.
 TP_BWMIX_CC_ENABLED;Adjust complementary colour
@@ -649,26 +650,18 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-L</b>
 !MAIN_TOOLTIP_THRESHOLD;Threshold
 !MAIN_TOOLTIP_TOGGLE;Toggle the <b>Before</b>/<b>After</b> view.\nShortcut: <b>Shift-b</b>
-!NAVIGATOR_B_NA;B = n/a
-!NAVIGATOR_B_VALUE;B = %1
-!NAVIGATOR_G_NA;G = n/a
-!NAVIGATOR_G_VALUE;G = %1
-!NAVIGATOR_H_NA;H = n/a
-!NAVIGATOR_H_VALUE;H = %1
-!NAVIGATOR_LAB_A_NA;a = n/a
-!NAVIGATOR_LAB_A_VALUE;a = %1
-!NAVIGATOR_LAB_B_NA;b = n/a
-!NAVIGATOR_LAB_B_VALUE;b = %1
-!NAVIGATOR_LAB_L_NA;L = n/a
-!NAVIGATOR_LAB_L_VALUE;L = %1
-!NAVIGATOR_R_NA;R = n/a
-!NAVIGATOR_R_VALUE;R = %1
-!NAVIGATOR_S_NA;S = n/a
-!NAVIGATOR_S_VALUE;S = %1
-!NAVIGATOR_V_NA;V = n/a
-!NAVIGATOR_V_VALUE;V = %1
-!NAVIGATOR_XY_FULL;Width = %1, Height = %2
-!NAVIGATOR_XY_NA;x = n/a, y = n/a
+!NAVIGATOR_B;B:
+!NAVIGATOR_G;G:
+!NAVIGATOR_H;H:
+!NAVIGATOR_LAB_A;a:
+!NAVIGATOR_LAB_B;b:
+!NAVIGATOR_LAB_L;L:
+!NAVIGATOR_NA; --
+!NAVIGATOR_R;R:
+!NAVIGATOR_S;S:
+!NAVIGATOR_V;V:
+!NAVIGATOR_XY_FULL;Width: %1, Height: %2
+!NAVIGATOR_XY_NA;x: --, y: --
 !OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> 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 <b>raw photos</b> 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
@@ -800,12 +793,14 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
 !PREFERENCES_GREY40;Yb=40 CIE L#70
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_HISTOGRAMPOSITIONLEFT;Histogram in left panel
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
 !PREFERENCES_HLTHRESHOLD;Threshold for clipped highlights
 !PREFERENCES_IMPROCPARAMS;Default Image Processing Parameters
 !PREFERENCES_INTENT_PERCEPTUAL;Perceptual
 !PREFERENCES_INTENT_SATURATION;Saturation
 !PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
-!PREFERENCES_LANGAUTODETECT;Use OS language setting
+!PREFERENCES_LANGAUTODETECT;Use system language
 !PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
 !PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File Operations"
 !PREFERENCES_MENUGROUPPROFILEOPERATIONS;Group "Processing Profile Operations"
diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US)
index 705525801..275aef982 100644
--- a/rtdata/languages/English (US)	
+++ b/rtdata/languages/English (US)	
@@ -589,26 +589,18 @@
 !MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-L</b>
 !MAIN_TOOLTIP_THRESHOLD;Threshold
 !MAIN_TOOLTIP_TOGGLE;Toggle the <b>Before</b>/<b>After</b> view.\nShortcut: <b>Shift-b</b>
-!NAVIGATOR_B_NA;B = n/a
-!NAVIGATOR_B_VALUE;B = %1
-!NAVIGATOR_G_NA;G = n/a
-!NAVIGATOR_G_VALUE;G = %1
-!NAVIGATOR_H_NA;H = n/a
-!NAVIGATOR_H_VALUE;H = %1
-!NAVIGATOR_LAB_A_NA;a = n/a
-!NAVIGATOR_LAB_A_VALUE;a = %1
-!NAVIGATOR_LAB_B_NA;b = n/a
-!NAVIGATOR_LAB_B_VALUE;b = %1
-!NAVIGATOR_LAB_L_NA;L = n/a
-!NAVIGATOR_LAB_L_VALUE;L = %1
-!NAVIGATOR_R_NA;R = n/a
-!NAVIGATOR_R_VALUE;R = %1
-!NAVIGATOR_S_NA;S = n/a
-!NAVIGATOR_S_VALUE;S = %1
-!NAVIGATOR_V_NA;V = n/a
-!NAVIGATOR_V_VALUE;V = %1
-!NAVIGATOR_XY_FULL;Width = %1, Height = %2
-!NAVIGATOR_XY_NA;x = n/a, y = n/a
+!NAVIGATOR_B;B:
+!NAVIGATOR_G;G:
+!NAVIGATOR_H;H:
+!NAVIGATOR_LAB_A;a:
+!NAVIGATOR_LAB_B;b:
+!NAVIGATOR_LAB_L;L:
+!NAVIGATOR_NA; --
+!NAVIGATOR_R;R:
+!NAVIGATOR_S;S:
+!NAVIGATOR_V;V:
+!NAVIGATOR_XY_FULL;Width: %1, Height: %2
+!NAVIGATOR_XY_NA;x: --, y: --
 !OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> 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 <b>raw photos</b> 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
@@ -749,6 +741,8 @@
 !PREFERENCES_GREY40;Yb=40 CIE L#70
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_HISTOGRAMPOSITIONLEFT;Histogram in left panel
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
 !PREFERENCES_HLTHRESHOLD;Threshold for clipped highlights
 !PREFERENCES_ICCDIR;Directory containing color profiles
 !PREFERENCES_IMPROCPARAMS;Default Image Processing Parameters
@@ -757,7 +751,7 @@
 !PREFERENCES_INTENT_RELATIVE;Relative Colorimetric
 !PREFERENCES_INTENT_SATURATION;Saturation
 !PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
-!PREFERENCES_LANGAUTODETECT;Use OS language setting
+!PREFERENCES_LANGAUTODETECT;Use system language
 !PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
 !PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File Operations"
 !PREFERENCES_MENUGROUPLABEL;Group "Color Label"
@@ -768,6 +762,7 @@
 !PREFERENCES_MONITORICC;Monitor color profile
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs Mode (if available on second monitor)
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_OUTDIRFOLDERHINT;Save images to the selected folder.
 !PREFERENCES_OUTDIRFOLDER;Save to folder
 !PREFERENCES_OUTDIRTEMPLATEHINT;You can use the following formatting strings:\n<b>%f</b>, <b>%d1</b>, <b>%d2</b>, ..., <b>%p1</b>, <b>%p2</b>, ..., <b>%r</b>, <b>%s1</b>, <b>%s2</b>, ...\n\nThese formatting strings refer to the different parts of the photo's pathname, some attributes of the photo or an arbitrary sequence index in the batch job.\n\nFor example, if the photo being processed has the following pathname:\n<b><i>/home/tom/photos/2010-10-31/dsc0042.nef</i></b>\nthe meaning of the formatting strings are:\n<b>%d4</b> = <i>home</i>\n<b>%d3</b> = <i>tom</i>\n<b>%d2</b> = <i>photos</i>\n<b>%d1</b> = <i>2010-10-31</i>\n<b>%f</b> = <i>dsc0042</i>\n<b>%p1</b> = <i>/home/tom/photos/2010-10-31/</i>\n<b>%p2</b> = <i>/home/tom/photos/</i>\n<b>%p3</b> = <i>/home/tom/</i>\n<b>%p4</b> = <i>/home/</i>\n\n<b>%r</b> will be replaced by the rank of the photo.  If the photo is unranked, %r will be replaced by '0'.  If the photo is in the trash bin, %r will be replaced by 'x'.\n\n<b>%s1</b>, <b>%s2</b>, etc. will be replaced by a sequence index which is padded to between 1 and 9 digits. The sequence index will start at one each time the queue processing is started and is incremented by one for each image processed.\n\nIf you want to save the output image where the original is, write:\n<b>%p1/%f</b>\n\nIf you want to save the output image in a directory named "<i>converted</i>" located in the directory of the opened image, write:\n<b>%p1/converted/%f</b>\n\nIf you want to save the output image in a directory named "<i>/home/tom/photos/converted/2010-10-31</i>", write:\n<b>%p2/converted/%d1/%f</b>
diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol
index 118464a4a..6f4171596 100644
--- a/rtdata/languages/Espanol
+++ b/rtdata/languages/Espanol
@@ -823,7 +823,7 @@ PREFERENCES_INTENT_PERCEPTUAL;Perceptual
 PREFERENCES_INTENT_RELATIVE;Colorimétrico relativo
 PREFERENCES_INTENT_SATURATION;Saturación
 PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Mostrar miniatura JPEG incrustada si foto Raw no se ha editado
-PREFERENCES_LANGAUTODETECT;Usar configuración de idioma del SO
+PREFERENCES_LANGAUTODETECT;Usar idioma del sistema
 PREFERENCES_LINEDENOISE;Filtro de ruido de línea
 PREFERENCES_MENUGROUPEXTPROGS;Grupo "Abrir con"
 PREFERENCES_MENUGROUPFILEOPERATIONS;Grupo "Operaciones de archivo"
@@ -1582,6 +1582,10 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: <b>-</b>
 !HISTORY_MSG_253;CbDL Reduce artifacts
 !HISTORY_MSG_254;CbDL - Hueskin
 !HISTORY_MSG_255;CbDL - Algorithm
+!NAVIGATOR_NA; --
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !TP_BWMIX_ALGO;Algorithm OYCPM
 !TP_BWMIX_ALGO_LI;Linear
 !TP_BWMIX_ALGO_SP;Special effects
diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara
index 2791057ab..418e4bf1e 100644
--- a/rtdata/languages/Euskara
+++ b/rtdata/languages/Euskara
@@ -855,26 +855,18 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
 !MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-L</b>
 !MAIN_TOOLTIP_THRESHOLD;Threshold
 !MAIN_TOOLTIP_TOGGLE;Toggle the <b>Before</b>/<b>After</b> view.\nShortcut: <b>Shift-b</b>
-!NAVIGATOR_B_NA;B = n/a
-!NAVIGATOR_B_VALUE;B = %1
-!NAVIGATOR_G_NA;G = n/a
-!NAVIGATOR_G_VALUE;G = %1
-!NAVIGATOR_H_NA;H = n/a
-!NAVIGATOR_H_VALUE;H = %1
-!NAVIGATOR_LAB_A_NA;a = n/a
-!NAVIGATOR_LAB_A_VALUE;a = %1
-!NAVIGATOR_LAB_B_NA;b = n/a
-!NAVIGATOR_LAB_B_VALUE;b = %1
-!NAVIGATOR_LAB_L_NA;L = n/a
-!NAVIGATOR_LAB_L_VALUE;L = %1
-!NAVIGATOR_R_NA;R = n/a
-!NAVIGATOR_R_VALUE;R = %1
-!NAVIGATOR_S_NA;S = n/a
-!NAVIGATOR_S_VALUE;S = %1
-!NAVIGATOR_V_NA;V = n/a
-!NAVIGATOR_V_VALUE;V = %1
-!NAVIGATOR_XY_FULL;Width = %1, Height = %2
-!NAVIGATOR_XY_NA;x = n/a, y = n/a
+!NAVIGATOR_B;B:
+!NAVIGATOR_G;G:
+!NAVIGATOR_H;H:
+!NAVIGATOR_LAB_A;a:
+!NAVIGATOR_LAB_B;b:
+!NAVIGATOR_LAB_L;L:
+!NAVIGATOR_NA; --
+!NAVIGATOR_R;R:
+!NAVIGATOR_S;S:
+!NAVIGATOR_V;V:
+!NAVIGATOR_XY_FULL;Width: %1, Height: %2
+!NAVIGATOR_XY_NA;x: --, y: --
 !OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> 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 <b>raw photos</b> 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_CHANNELMIXERBW;Black-and-White
@@ -969,8 +961,10 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
 !PREFERENCES_GREY40;Yb=40 CIE L#70
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_HISTOGRAMPOSITIONLEFT;Histogram in left panel
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
 !PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
-!PREFERENCES_LANGAUTODETECT;Use OS language setting
+!PREFERENCES_LANGAUTODETECT;Use system language
 !PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
 !PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File Operations"
 !PREFERENCES_MENUGROUPLABEL;Group "Color Label"
@@ -980,6 +974,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs Mode (if available on second monitor)
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails
 !PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
 !PREFERENCES_PANFACTORFRAME;Pan Rate Amplification
diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais
index b691a5a5d..b5c8c56a1 100644
--- a/rtdata/languages/Francais
+++ b/rtdata/languages/Francais
@@ -1415,6 +1415,10 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: <b>-</b>
 !HISTORY_MSG_253;CbDL Reduce artifacts
 !HISTORY_MSG_254;CbDL - Hueskin
 !HISTORY_MSG_255;CbDL - Algorithm
+!NAVIGATOR_NA; --
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !TP_BWMIX_ALGO;Algorithm OYCPM
 !TP_BWMIX_ALGO_LI;Linear
 !TP_BWMIX_ALGO_SP;Special effects
diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek
index ca283d879..e08e10c96 100644
--- a/rtdata/languages/Greek
+++ b/rtdata/languages/Greek
@@ -854,26 +854,18 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
 !MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-L</b>
 !MAIN_TOOLTIP_THRESHOLD;Threshold
 !MAIN_TOOLTIP_TOGGLE;Toggle the <b>Before</b>/<b>After</b> view.\nShortcut: <b>Shift-b</b>
-!NAVIGATOR_B_NA;B = n/a
-!NAVIGATOR_B_VALUE;B = %1
-!NAVIGATOR_G_NA;G = n/a
-!NAVIGATOR_G_VALUE;G = %1
-!NAVIGATOR_H_NA;H = n/a
-!NAVIGATOR_H_VALUE;H = %1
-!NAVIGATOR_LAB_A_NA;a = n/a
-!NAVIGATOR_LAB_A_VALUE;a = %1
-!NAVIGATOR_LAB_B_NA;b = n/a
-!NAVIGATOR_LAB_B_VALUE;b = %1
-!NAVIGATOR_LAB_L_NA;L = n/a
-!NAVIGATOR_LAB_L_VALUE;L = %1
-!NAVIGATOR_R_NA;R = n/a
-!NAVIGATOR_R_VALUE;R = %1
-!NAVIGATOR_S_NA;S = n/a
-!NAVIGATOR_S_VALUE;S = %1
-!NAVIGATOR_V_NA;V = n/a
-!NAVIGATOR_V_VALUE;V = %1
-!NAVIGATOR_XY_FULL;Width = %1, Height = %2
-!NAVIGATOR_XY_NA;x = n/a, y = n/a
+!NAVIGATOR_B;B:
+!NAVIGATOR_G;G:
+!NAVIGATOR_H;H:
+!NAVIGATOR_LAB_A;a:
+!NAVIGATOR_LAB_B;b:
+!NAVIGATOR_LAB_L;L:
+!NAVIGATOR_NA; --
+!NAVIGATOR_R;R:
+!NAVIGATOR_S;S:
+!NAVIGATOR_V;V:
+!NAVIGATOR_XY_FULL;Width: %1, Height: %2
+!NAVIGATOR_XY_NA;x: --, y: --
 !OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> 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 <b>raw photos</b> 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_CHANNELMIXERBW;Black-and-White
@@ -968,8 +960,10 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
 !PREFERENCES_GREY40;Yb=40 CIE L#70
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_HISTOGRAMPOSITIONLEFT;Histogram in left panel
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
 !PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
-!PREFERENCES_LANGAUTODETECT;Use OS language setting
+!PREFERENCES_LANGAUTODETECT;Use system language
 !PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
 !PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File Operations"
 !PREFERENCES_MENUGROUPLABEL;Group "Color Label"
@@ -979,6 +973,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs Mode (if available on second monitor)
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails
 !PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
 !PREFERENCES_PANFACTORFRAME;Pan Rate Amplification
diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew
index 756bccc60..19edd3fb4 100644
--- a/rtdata/languages/Hebrew
+++ b/rtdata/languages/Hebrew
@@ -855,26 +855,18 @@ TP_WBALANCE_TEMPERATURE;מידת חום
 !MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-L</b>
 !MAIN_TOOLTIP_THRESHOLD;Threshold
 !MAIN_TOOLTIP_TOGGLE;Toggle the <b>Before</b>/<b>After</b> view.\nShortcut: <b>Shift-b</b>
-!NAVIGATOR_B_NA;B = n/a
-!NAVIGATOR_B_VALUE;B = %1
-!NAVIGATOR_G_NA;G = n/a
-!NAVIGATOR_G_VALUE;G = %1
-!NAVIGATOR_H_NA;H = n/a
-!NAVIGATOR_H_VALUE;H = %1
-!NAVIGATOR_LAB_A_NA;a = n/a
-!NAVIGATOR_LAB_A_VALUE;a = %1
-!NAVIGATOR_LAB_B_NA;b = n/a
-!NAVIGATOR_LAB_B_VALUE;b = %1
-!NAVIGATOR_LAB_L_NA;L = n/a
-!NAVIGATOR_LAB_L_VALUE;L = %1
-!NAVIGATOR_R_NA;R = n/a
-!NAVIGATOR_R_VALUE;R = %1
-!NAVIGATOR_S_NA;S = n/a
-!NAVIGATOR_S_VALUE;S = %1
-!NAVIGATOR_V_NA;V = n/a
-!NAVIGATOR_V_VALUE;V = %1
-!NAVIGATOR_XY_FULL;Width = %1, Height = %2
-!NAVIGATOR_XY_NA;x = n/a, y = n/a
+!NAVIGATOR_B;B:
+!NAVIGATOR_G;G:
+!NAVIGATOR_H;H:
+!NAVIGATOR_LAB_A;a:
+!NAVIGATOR_LAB_B;b:
+!NAVIGATOR_LAB_L;L:
+!NAVIGATOR_NA; --
+!NAVIGATOR_R;R:
+!NAVIGATOR_S;S:
+!NAVIGATOR_V;V:
+!NAVIGATOR_XY_FULL;Width: %1, Height: %2
+!NAVIGATOR_XY_NA;x: --, y: --
 !OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> 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 <b>raw photos</b> 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_CHANNELMIXERBW;Black-and-White
@@ -969,8 +961,10 @@ TP_WBALANCE_TEMPERATURE;מידת חום
 !PREFERENCES_GREY40;Yb=40 CIE L#70
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_HISTOGRAMPOSITIONLEFT;Histogram in left panel
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
 !PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
-!PREFERENCES_LANGAUTODETECT;Use OS language setting
+!PREFERENCES_LANGAUTODETECT;Use system language
 !PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
 !PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File Operations"
 !PREFERENCES_MENUGROUPLABEL;Group "Color Label"
@@ -980,6 +974,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs Mode (if available on second monitor)
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails
 !PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
 !PREFERENCES_PANFACTORFRAME;Pan Rate Amplification
diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese
index 01541e578..332341f40 100644
--- a/rtdata/languages/Japanese
+++ b/rtdata/languages/Japanese
@@ -1442,3 +1442,10 @@ ZOOMPANEL_ZOOMFITSCREEN;画面に合わせる\nショートカット: <b>f</b>
 ZOOMPANEL_ZOOMIN;ズームイン\nショートカット: <b>+</b>
 ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: <b>-</b>
 
+!!!!!!!!!!!!!!!!!!!!!!!!!
+! Untranslated keys follow; remove the ! prefix after an entry is translated.
+!!!!!!!!!!!!!!!!!!!!!!!!!
+
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian
index 293d11b70..0f8a02c4b 100644
--- a/rtdata/languages/Latvian
+++ b/rtdata/languages/Latvian
@@ -855,26 +855,18 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
 !MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-L</b>
 !MAIN_TOOLTIP_THRESHOLD;Threshold
 !MAIN_TOOLTIP_TOGGLE;Toggle the <b>Before</b>/<b>After</b> view.\nShortcut: <b>Shift-b</b>
-!NAVIGATOR_B_NA;B = n/a
-!NAVIGATOR_B_VALUE;B = %1
-!NAVIGATOR_G_NA;G = n/a
-!NAVIGATOR_G_VALUE;G = %1
-!NAVIGATOR_H_NA;H = n/a
-!NAVIGATOR_H_VALUE;H = %1
-!NAVIGATOR_LAB_A_NA;a = n/a
-!NAVIGATOR_LAB_A_VALUE;a = %1
-!NAVIGATOR_LAB_B_NA;b = n/a
-!NAVIGATOR_LAB_B_VALUE;b = %1
-!NAVIGATOR_LAB_L_NA;L = n/a
-!NAVIGATOR_LAB_L_VALUE;L = %1
-!NAVIGATOR_R_NA;R = n/a
-!NAVIGATOR_R_VALUE;R = %1
-!NAVIGATOR_S_NA;S = n/a
-!NAVIGATOR_S_VALUE;S = %1
-!NAVIGATOR_V_NA;V = n/a
-!NAVIGATOR_V_VALUE;V = %1
-!NAVIGATOR_XY_FULL;Width = %1, Height = %2
-!NAVIGATOR_XY_NA;x = n/a, y = n/a
+!NAVIGATOR_B;B:
+!NAVIGATOR_G;G:
+!NAVIGATOR_H;H:
+!NAVIGATOR_LAB_A;a:
+!NAVIGATOR_LAB_B;b:
+!NAVIGATOR_LAB_L;L:
+!NAVIGATOR_NA; --
+!NAVIGATOR_R;R:
+!NAVIGATOR_S;S:
+!NAVIGATOR_V;V:
+!NAVIGATOR_XY_FULL;Width: %1, Height: %2
+!NAVIGATOR_XY_NA;x: --, y: --
 !OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> 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 <b>raw photos</b> 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_CHANNELMIXERBW;Black-and-White
@@ -969,8 +961,10 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
 !PREFERENCES_GREY40;Yb=40 CIE L#70
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_HISTOGRAMPOSITIONLEFT;Histogram in left panel
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
 !PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
-!PREFERENCES_LANGAUTODETECT;Use OS language setting
+!PREFERENCES_LANGAUTODETECT;Use system language
 !PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
 !PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File Operations"
 !PREFERENCES_MENUGROUPLABEL;Group "Color Label"
@@ -980,6 +974,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs Mode (if available on second monitor)
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails
 !PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
 !PREFERENCES_PANFACTORFRAME;Pan Rate Amplification
diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar
index 6b8d4a86c..596eda014 100644
--- a/rtdata/languages/Magyar
+++ b/rtdata/languages/Magyar
@@ -1163,7 +1163,8 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !MAIN_TOOLTIP_BACKCOLOR0;Background color of the preview: <b>Theme-based</b>\nShortcut: <b>9</b>
 !MAIN_TOOLTIP_BACKCOLOR1;Background color of the preview: <b>Black</b>\nShortcut: <b>9</b>
 !MAIN_TOOLTIP_BACKCOLOR2;Background color of the preview: <b>White</b>\nShortcut: <b>9</b>
-!NAVIGATOR_XY_FULL;Width = %1, Height = %2
+!NAVIGATOR_NA; --
+!NAVIGATOR_XY_FULL;Width: %1, Height: %2
 !OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> 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 <b>raw photos</b> 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_CHANNELMIXERBW;Black-and-White
@@ -1198,7 +1199,10 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
 !PREFERENCES_GREY30;Yb=30 CIE L#60
 !PREFERENCES_GREY40;Yb=40 CIE L#70
 !PREFERENCES_GREY;Output device's Yb luminance (%)
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
 !PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction
 !PREFERENCES_RGBDTL_TOOLTIP;Noise Reduction requires a baseline of about 128MB RAM for a 10MPix image or 512MB for a 40MPix image, and additionally 128MB RAM per thread. The more threads run in parallel, the faster the computation. Leave the setting at "0" to automatically use as many threads as possible.
 !PREFERENCES_TAB_PERFORMANCE;Performance
diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands
index 2d586bc66..688ea7d6e 100644
--- a/rtdata/languages/Nederlands
+++ b/rtdata/languages/Nederlands
@@ -1445,5 +1445,9 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: <b>-</b>
 ! Untranslated keys follow; remove the ! prefix after an entry is translated.
 !!!!!!!!!!!!!!!!!!!!!!!!!
 
+!NAVIGATOR_NA; --
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !TP_DIRPYREQUALIZER_HUESKIN_TOOLTIP;This pyramid is for the upper part, so far as the algorithm at its maximum efficiency.\nTo the lower part, the transition zones.\nIf you need to move the area significantly to the left or right - or if there are artifacts: the <b>white balance is incorrect</b>\nYou can slightly reduce the zone to prevent the rest of the image is affected
 !TP_ICM_FILEDLGFILTERICMDNG;Color profiles + DNG
diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM
index d138a6118..176dd75b5 100644
--- a/rtdata/languages/Norsk BM	
+++ b/rtdata/languages/Norsk BM	
@@ -854,26 +854,18 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-L</b>
 !MAIN_TOOLTIP_THRESHOLD;Threshold
 !MAIN_TOOLTIP_TOGGLE;Toggle the <b>Before</b>/<b>After</b> view.\nShortcut: <b>Shift-b</b>
-!NAVIGATOR_B_NA;B = n/a
-!NAVIGATOR_B_VALUE;B = %1
-!NAVIGATOR_G_NA;G = n/a
-!NAVIGATOR_G_VALUE;G = %1
-!NAVIGATOR_H_NA;H = n/a
-!NAVIGATOR_H_VALUE;H = %1
-!NAVIGATOR_LAB_A_NA;a = n/a
-!NAVIGATOR_LAB_A_VALUE;a = %1
-!NAVIGATOR_LAB_B_NA;b = n/a
-!NAVIGATOR_LAB_B_VALUE;b = %1
-!NAVIGATOR_LAB_L_NA;L = n/a
-!NAVIGATOR_LAB_L_VALUE;L = %1
-!NAVIGATOR_R_NA;R = n/a
-!NAVIGATOR_R_VALUE;R = %1
-!NAVIGATOR_S_NA;S = n/a
-!NAVIGATOR_S_VALUE;S = %1
-!NAVIGATOR_V_NA;V = n/a
-!NAVIGATOR_V_VALUE;V = %1
-!NAVIGATOR_XY_FULL;Width = %1, Height = %2
-!NAVIGATOR_XY_NA;x = n/a, y = n/a
+!NAVIGATOR_B;B:
+!NAVIGATOR_G;G:
+!NAVIGATOR_H;H:
+!NAVIGATOR_LAB_A;a:
+!NAVIGATOR_LAB_B;b:
+!NAVIGATOR_LAB_L;L:
+!NAVIGATOR_NA; --
+!NAVIGATOR_R;R:
+!NAVIGATOR_S;S:
+!NAVIGATOR_V;V:
+!NAVIGATOR_XY_FULL;Width: %1, Height: %2
+!NAVIGATOR_XY_NA;x: --, y: --
 !OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> 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 <b>raw photos</b> 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_CHANNELMIXERBW;Black-and-White
@@ -968,8 +960,10 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !PREFERENCES_GREY40;Yb=40 CIE L#70
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_HISTOGRAMPOSITIONLEFT;Histogram in left panel
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
 !PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
-!PREFERENCES_LANGAUTODETECT;Use OS language setting
+!PREFERENCES_LANGAUTODETECT;Use system language
 !PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
 !PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File Operations"
 !PREFERENCES_MENUGROUPLABEL;Group "Color Label"
@@ -979,6 +973,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs Mode (if available on second monitor)
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails
 !PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
 !PREFERENCES_PANFACTORFRAME;Pan Rate Amplification
diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish
index dcaa81b80..5333e5d70 100644
--- a/rtdata/languages/Polish
+++ b/rtdata/languages/Polish
@@ -704,7 +704,7 @@ PREFERENCES_INTENT_PERCEPTUAL;Percepcyjny
 PREFERENCES_INTENT_RELATIVE;Względnie kolorymetryczny
 PREFERENCES_INTENT_SATURATION;Nasyceniowy
 PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Pokaż osadzoną miniaturę raw, jeśli nieedytowany
-PREFERENCES_LANGAUTODETECT;Użycie systemowych ustawień językowych
+PREFERENCES_LANGAUTODETECT;Użyj języka systemowego
 PREFERENCES_MENUGROUPEXTPROGS;Grupuj "Otwórz za pomocą"
 PREFERENCES_MENUGROUPFILEOPERATIONS;Grupuj operacje plików
 PREFERENCES_MENUGROUPLABEL;Grupuj operacje etykiet
@@ -1374,12 +1374,16 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: <b>-</b>
 !HISTORY_MSG_253;CbDL Reduce artifacts
 !HISTORY_MSG_254;CbDL - Hueskin
 !HISTORY_MSG_255;CbDL - Algorithm
+!NAVIGATOR_NA; --
 !PARTIALPASTE_CHANNELMIXERBW;Black-and-White
 !PARTIALPASTE_GRADIENT;Graduated filter
 !PARTIALPASTE_PCVIGNETTE;Vignette filter
 !PREFERENCES_CUSTPROFBUILDKEYFORMAT;Keys format
 !PREFERENCES_CUSTPROFBUILDKEYFORMAT_NAME;Name
 !PREFERENCES_CUSTPROFBUILDKEYFORMAT_TID;TagID
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
 !PROFILEPANEL_GLOBALPROFILES;Bundled profiles
 !PROFILEPANEL_MYPROFILES;My profiles
diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters)
index ce886e1b7..a52cf0880 100644
--- a/rtdata/languages/Polish (Latin Characters)	
+++ b/rtdata/languages/Polish (Latin Characters)	
@@ -704,7 +704,7 @@ PREFERENCES_INTENT_PERCEPTUAL;Percepcyjny
 PREFERENCES_INTENT_RELATIVE;Wzglednie kolorymetryczny
 PREFERENCES_INTENT_SATURATION;Nasyceniowy
 PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Pokaz osadzona miniature raw, jesli nieedytowany
-PREFERENCES_LANGAUTODETECT;Uzycie systemowych ustawien jezykowych
+PREFERENCES_LANGAUTODETECT;Uzyj jezyka systemowego
 PREFERENCES_MENUGROUPEXTPROGS;Grupuj "Otworz za pomoca"
 PREFERENCES_MENUGROUPFILEOPERATIONS;Grupuj operacje plikow
 PREFERENCES_MENUGROUPLABEL;Grupuj operacje etykiet
@@ -1374,12 +1374,16 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: <b>-</b>
 !HISTORY_MSG_253;CbDL Reduce artifacts
 !HISTORY_MSG_254;CbDL - Hueskin
 !HISTORY_MSG_255;CbDL - Algorithm
+!NAVIGATOR_NA; --
 !PARTIALPASTE_CHANNELMIXERBW;Black-and-White
 !PARTIALPASTE_GRADIENT;Graduated filter
 !PARTIALPASTE_PCVIGNETTE;Vignette filter
 !PREFERENCES_CUSTPROFBUILDKEYFORMAT;Keys format
 !PREFERENCES_CUSTPROFBUILDKEYFORMAT_NAME;Name
 !PREFERENCES_CUSTPROFBUILDKEYFORMAT_TID;TagID
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_USEBUNDLEDPROFILES;Use bundled profiles
 !PROFILEPANEL_GLOBALPROFILES;Bundled profiles
 !PROFILEPANEL_MYPROFILES;My profiles
diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil)
index d075e2fb8..fc2149c83 100644
--- a/rtdata/languages/Portugues (Brasil)	
+++ b/rtdata/languages/Portugues (Brasil)	
@@ -855,26 +855,18 @@ TP_WBALANCE_TEMPERATURE;Temperatura
 !MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-L</b>
 !MAIN_TOOLTIP_THRESHOLD;Threshold
 !MAIN_TOOLTIP_TOGGLE;Toggle the <b>Before</b>/<b>After</b> view.\nShortcut: <b>Shift-b</b>
-!NAVIGATOR_B_NA;B = n/a
-!NAVIGATOR_B_VALUE;B = %1
-!NAVIGATOR_G_NA;G = n/a
-!NAVIGATOR_G_VALUE;G = %1
-!NAVIGATOR_H_NA;H = n/a
-!NAVIGATOR_H_VALUE;H = %1
-!NAVIGATOR_LAB_A_NA;a = n/a
-!NAVIGATOR_LAB_A_VALUE;a = %1
-!NAVIGATOR_LAB_B_NA;b = n/a
-!NAVIGATOR_LAB_B_VALUE;b = %1
-!NAVIGATOR_LAB_L_NA;L = n/a
-!NAVIGATOR_LAB_L_VALUE;L = %1
-!NAVIGATOR_R_NA;R = n/a
-!NAVIGATOR_R_VALUE;R = %1
-!NAVIGATOR_S_NA;S = n/a
-!NAVIGATOR_S_VALUE;S = %1
-!NAVIGATOR_V_NA;V = n/a
-!NAVIGATOR_V_VALUE;V = %1
-!NAVIGATOR_XY_FULL;Width = %1, Height = %2
-!NAVIGATOR_XY_NA;x = n/a, y = n/a
+!NAVIGATOR_B;B:
+!NAVIGATOR_G;G:
+!NAVIGATOR_H;H:
+!NAVIGATOR_LAB_A;a:
+!NAVIGATOR_LAB_B;b:
+!NAVIGATOR_LAB_L;L:
+!NAVIGATOR_NA; --
+!NAVIGATOR_R;R:
+!NAVIGATOR_S;S:
+!NAVIGATOR_V;V:
+!NAVIGATOR_XY_FULL;Width: %1, Height: %2
+!NAVIGATOR_XY_NA;x: --, y: --
 !OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> 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 <b>raw photos</b> 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_CHANNELMIXERBW;Black-and-White
@@ -969,8 +961,10 @@ TP_WBALANCE_TEMPERATURE;Temperatura
 !PREFERENCES_GREY40;Yb=40 CIE L#70
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_HISTOGRAMPOSITIONLEFT;Histogram in left panel
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
 !PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
-!PREFERENCES_LANGAUTODETECT;Use OS language setting
+!PREFERENCES_LANGAUTODETECT;Use system language
 !PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
 !PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File Operations"
 !PREFERENCES_MENUGROUPLABEL;Group "Color Label"
@@ -980,6 +974,7 @@ TP_WBALANCE_TEMPERATURE;Temperatura
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs Mode (if available on second monitor)
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails
 !PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
 !PREFERENCES_PANFACTORFRAME;Pan Rate Amplification
diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian
index e25a7b230..40cea4a6d 100644
--- a/rtdata/languages/Russian
+++ b/rtdata/languages/Russian
@@ -1391,6 +1391,10 @@ ZOOMPANEL_ZOOMOUT;Удалить <b>-</b>
 !HISTORY_MSG_254;CbDL - Hueskin
 !HISTORY_MSG_255;CbDL - Algorithm
 !MAIN_TOOLTIP_HIDEHP;Show/Hide the left panel (including the history).\nShortcut: <b>l</b>
+!NAVIGATOR_NA; --
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !TP_COLORAPP_DATACIE_TOOLTIP;When enabled, histograms in CIECAM02 curves show approximate values/ranges for J or Q, and C, s or M after the CIECAM02 adjustments.\nThis selection does not impact the main histogram panel.\n\nWhen disabled, histograms in CIECAM02 curves show Lab values before CIECAM02 adjustments.
 !TP_COLORAPP_DEGREE_AUTO_TOOLTIP;If the check-box is checked (recommended), RT calculates an optimum value, which is then used by CAT02, and also for the entire CIECAM02.\nTo set the value manually, uncheck the check-box first (values above 65 are recommended).
 !TP_COLORAPP_DEGREE_TOOLTIP;Amount of CIE Chromatic Adaptation Transform 2002.
diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters)
index c35899c6a..2564c0388 100644
--- a/rtdata/languages/Serbian (Cyrilic Characters)	
+++ b/rtdata/languages/Serbian (Cyrilic Characters)	
@@ -1092,7 +1092,8 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !MAIN_TOOLTIP_PREVIEWL;Preview the <b>Luminosity</b>.\nShortcut: <b>v</b>\n\n0.299*R + 0.587*G + 0.114*B
 !MAIN_TOOLTIP_PREVIEWR;Preview the <b>Red channel</b>.\nShortcut: <b>r</b>
 !MAIN_TOOLTIP_THRESHOLD;Threshold
-!NAVIGATOR_XY_FULL;Width = %1, Height = %2
+!NAVIGATOR_NA; --
+!NAVIGATOR_XY_FULL;Width: %1, Height: %2
 !OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> 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 <b>raw photos</b> 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_CHANNELMIXERBW;Black-and-White
@@ -1131,7 +1132,10 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
 !PREFERENCES_GREY30;Yb=30 CIE L#60
 !PREFERENCES_GREY40;Yb=40 CIE L#70
 !PREFERENCES_GREY;Output device's Yb luminance (%)
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
 !PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction
 !PREFERENCES_RGBDTL_TOOLTIP;Noise Reduction requires a baseline of about 128MB RAM for a 10MPix image or 512MB for a 40MPix image, and additionally 128MB RAM per thread. The more threads run in parallel, the faster the computation. Leave the setting at "0" to automatically use as many threads as possible.
 !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation
diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters)
index 5b09ab8a6..170946b3a 100644
--- a/rtdata/languages/Serbian (Latin Characters)	
+++ b/rtdata/languages/Serbian (Latin Characters)	
@@ -1092,7 +1092,8 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
 !MAIN_TOOLTIP_PREVIEWL;Preview the <b>Luminosity</b>.\nShortcut: <b>v</b>\n\n0.299*R + 0.587*G + 0.114*B
 !MAIN_TOOLTIP_PREVIEWR;Preview the <b>Red channel</b>.\nShortcut: <b>r</b>
 !MAIN_TOOLTIP_THRESHOLD;Threshold
-!NAVIGATOR_XY_FULL;Width = %1, Height = %2
+!NAVIGATOR_NA; --
+!NAVIGATOR_XY_FULL;Width: %1, Height: %2
 !OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> 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 <b>raw photos</b> 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_CHANNELMIXERBW;Black-and-White
@@ -1131,7 +1132,10 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
 !PREFERENCES_GREY30;Yb=30 CIE L#60
 !PREFERENCES_GREY40;Yb=40 CIE L#70
 !PREFERENCES_GREY;Output device's Yb luminance (%)
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
 !PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_RGBDTL_LABEL;Max number of threads for Noise Reduction
 !PREFERENCES_RGBDTL_TOOLTIP;Noise Reduction requires a baseline of about 128MB RAM for a 10MPix image or 512MB for a 40MPix image, and additionally 128MB RAM per thread. The more threads run in parallel, the faster the computation. Leave the setting at "0" to automatically use as many threads as possible.
 !PREFERENCES_SHOWEXPOSURECOMPENSATION;Append exposure compensation
diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak
index 1a15c886f..199fd479a 100644
--- a/rtdata/languages/Slovak
+++ b/rtdata/languages/Slovak
@@ -935,13 +935,11 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
 !MAIN_TOOLTIP_SHOWHIDERP1;Show/Hide the right panel.\nShortcut: <b>Alt-l</b>
 !MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-L</b>
 !MAIN_TOOLTIP_THRESHOLD;Threshold
-!NAVIGATOR_LAB_A_NA;a = n/a
-!NAVIGATOR_LAB_A_VALUE;a = %1
-!NAVIGATOR_LAB_B_NA;b = n/a
-!NAVIGATOR_LAB_B_VALUE;b = %1
-!NAVIGATOR_LAB_L_NA;L = n/a
-!NAVIGATOR_LAB_L_VALUE;L = %1
-!NAVIGATOR_XY_FULL;Width = %1, Height = %2
+!NAVIGATOR_LAB_A;a:
+!NAVIGATOR_LAB_B;b:
+!NAVIGATOR_LAB_L;L:
+!NAVIGATOR_NA; --
+!NAVIGATOR_XY_FULL;Width: %1, Height: %2
 !OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> 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 <b>raw photos</b> 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_CHANNELMIXERBW;Black-and-White
@@ -1031,8 +1029,10 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
 !PREFERENCES_GREY40;Yb=40 CIE L#70
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_HISTOGRAMPOSITIONLEFT;Histogram in left panel
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
 !PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
-!PREFERENCES_LANGAUTODETECT;Use OS language setting
+!PREFERENCES_LANGAUTODETECT;Use system language
 !PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
 !PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File Operations"
 !PREFERENCES_MENUGROUPLABEL;Group "Color Label"
@@ -1041,6 +1041,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
 !PREFERENCES_MENUOPTIONS;Context Menu Options
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs Mode (if available on second monitor)
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
 !PREFERENCES_PANFACTORFRAME;Pan Rate Amplification
 !PREFERENCES_PANFACTORLABEL;Factor
diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi
index 6a88de348..991beef8b 100644
--- a/rtdata/languages/Suomi
+++ b/rtdata/languages/Suomi
@@ -856,26 +856,18 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
 !MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-L</b>
 !MAIN_TOOLTIP_THRESHOLD;Threshold
 !MAIN_TOOLTIP_TOGGLE;Toggle the <b>Before</b>/<b>After</b> view.\nShortcut: <b>Shift-b</b>
-!NAVIGATOR_B_NA;B = n/a
-!NAVIGATOR_B_VALUE;B = %1
-!NAVIGATOR_G_NA;G = n/a
-!NAVIGATOR_G_VALUE;G = %1
-!NAVIGATOR_H_NA;H = n/a
-!NAVIGATOR_H_VALUE;H = %1
-!NAVIGATOR_LAB_A_NA;a = n/a
-!NAVIGATOR_LAB_A_VALUE;a = %1
-!NAVIGATOR_LAB_B_NA;b = n/a
-!NAVIGATOR_LAB_B_VALUE;b = %1
-!NAVIGATOR_LAB_L_NA;L = n/a
-!NAVIGATOR_LAB_L_VALUE;L = %1
-!NAVIGATOR_R_NA;R = n/a
-!NAVIGATOR_R_VALUE;R = %1
-!NAVIGATOR_S_NA;S = n/a
-!NAVIGATOR_S_VALUE;S = %1
-!NAVIGATOR_V_NA;V = n/a
-!NAVIGATOR_V_VALUE;V = %1
-!NAVIGATOR_XY_FULL;Width = %1, Height = %2
-!NAVIGATOR_XY_NA;x = n/a, y = n/a
+!NAVIGATOR_B;B:
+!NAVIGATOR_G;G:
+!NAVIGATOR_H;H:
+!NAVIGATOR_LAB_A;a:
+!NAVIGATOR_LAB_B;b:
+!NAVIGATOR_LAB_L;L:
+!NAVIGATOR_NA; --
+!NAVIGATOR_R;R:
+!NAVIGATOR_S;S:
+!NAVIGATOR_V;V:
+!NAVIGATOR_XY_FULL;Width: %1, Height: %2
+!NAVIGATOR_XY_NA;x: --, y: --
 !OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> 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 <b>raw photos</b> 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_CHANNELMIXERBW;Black-and-White
@@ -970,8 +962,10 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
 !PREFERENCES_GREY40;Yb=40 CIE L#70
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_HISTOGRAMPOSITIONLEFT;Histogram in left panel
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
 !PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
-!PREFERENCES_LANGAUTODETECT;Use OS language setting
+!PREFERENCES_LANGAUTODETECT;Use system language
 !PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
 !PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File Operations"
 !PREFERENCES_MENUGROUPLABEL;Group "Color Label"
@@ -981,6 +975,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs Mode (if available on second monitor)
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails
 !PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
 !PREFERENCES_PANFACTORFRAME;Pan Rate Amplification
diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish
index 6aa1f0d8b..ba00e3ed4 100644
--- a/rtdata/languages/Swedish
+++ b/rtdata/languages/Swedish
@@ -1428,5 +1428,9 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: <b>-</b>
 !FILEBROWSER_POPUPRANK3;Rank 3 ***
 !FILEBROWSER_POPUPRANK4;Rank 4 ****
 !FILEBROWSER_POPUPRANK5;Rank 5 *****
+!NAVIGATOR_NA; --
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !TP_DIRPYREQUALIZER_HUESKIN_TOOLTIP;This pyramid is for the upper part, so far as the algorithm at its maximum efficiency.\nTo the lower part, the transition zones.\nIf you need to move the area significantly to the left or right - or if there are artifacts: the <b>white balance is incorrect</b>\nYou can slightly reduce the zone to prevent the rest of the image is affected
 !TP_ICM_FILEDLGFILTERICMDNG;Color profiles + DNG
diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish
index 9a644efd0..4687611cd 100644
--- a/rtdata/languages/Turkish
+++ b/rtdata/languages/Turkish
@@ -855,26 +855,18 @@ TP_WBALANCE_TEMPERATURE;Isı
 !MAIN_TOOLTIP_SHOWHIDETP1;Show/Hide the top panel.\nShortcut: <b>Shift-L</b>
 !MAIN_TOOLTIP_THRESHOLD;Threshold
 !MAIN_TOOLTIP_TOGGLE;Toggle the <b>Before</b>/<b>After</b> view.\nShortcut: <b>Shift-b</b>
-!NAVIGATOR_B_NA;B = n/a
-!NAVIGATOR_B_VALUE;B = %1
-!NAVIGATOR_G_NA;G = n/a
-!NAVIGATOR_G_VALUE;G = %1
-!NAVIGATOR_H_NA;H = n/a
-!NAVIGATOR_H_VALUE;H = %1
-!NAVIGATOR_LAB_A_NA;a = n/a
-!NAVIGATOR_LAB_A_VALUE;a = %1
-!NAVIGATOR_LAB_B_NA;b = n/a
-!NAVIGATOR_LAB_B_VALUE;b = %1
-!NAVIGATOR_LAB_L_NA;L = n/a
-!NAVIGATOR_LAB_L_VALUE;L = %1
-!NAVIGATOR_R_NA;R = n/a
-!NAVIGATOR_R_VALUE;R = %1
-!NAVIGATOR_S_NA;S = n/a
-!NAVIGATOR_S_VALUE;S = %1
-!NAVIGATOR_V_NA;V = n/a
-!NAVIGATOR_V_VALUE;V = %1
-!NAVIGATOR_XY_FULL;Width = %1, Height = %2
-!NAVIGATOR_XY_NA;x = n/a, y = n/a
+!NAVIGATOR_B;B:
+!NAVIGATOR_G;G:
+!NAVIGATOR_H;H:
+!NAVIGATOR_LAB_A;a:
+!NAVIGATOR_LAB_B;b:
+!NAVIGATOR_LAB_L;L:
+!NAVIGATOR_NA; --
+!NAVIGATOR_R;R:
+!NAVIGATOR_S;S:
+!NAVIGATOR_V;V:
+!NAVIGATOR_XY_FULL;Width: %1, Height: %2
+!NAVIGATOR_XY_NA;x: --, y: --
 !OPTIONS_DEFIMG_MISSING;The default profile for <b>non-raw photos</b> 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 <b>raw photos</b> 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_CHANNELMIXERBW;Black-and-White
@@ -969,8 +961,10 @@ TP_WBALANCE_TEMPERATURE;Isı
 !PREFERENCES_GREY40;Yb=40 CIE L#70
 !PREFERENCES_GREY;Output device's Yb luminance (%)
 !PREFERENCES_HISTOGRAMPOSITIONLEFT;Histogram in left panel
+!PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+!PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
 !PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
-!PREFERENCES_LANGAUTODETECT;Use OS language setting
+!PREFERENCES_LANGAUTODETECT;Use system language
 !PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
 !PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File Operations"
 !PREFERENCES_MENUGROUPLABEL;Group "Color Label"
@@ -980,6 +974,7 @@ TP_WBALANCE_TEMPERATURE;Isı
 !PREFERENCES_METADATA;Metadata
 !PREFERENCES_MULTITABDUALMON;Multiple Editor Tabs Mode (if available on second monitor)
 !PREFERENCES_MULTITAB;Multiple Editor Tabs Mode
+!PREFERENCES_NAVGUIDEBRUSH;Navigator guide color
 !PREFERENCES_OVERLAY_FILENAMES;Overlay filenames on thumbnails
 !PREFERENCES_OVERWRITEOUTPUTFILE;Overwrite existing output files
 !PREFERENCES_PANFACTORFRAME;Pan Rate Amplification
diff --git a/rtdata/languages/default b/rtdata/languages/default
index aa928c172..f0a00913e 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -741,8 +741,8 @@ PREFERENCES_GREY30;Yb=30 CIE L#60
 PREFERENCES_GREY40;Yb=40 CIE L#70
 PREFERENCES_GREY;Output device's Yb luminance (%)
 PREFERENCES_HISTOGRAMPOSITIONLEFT;Histogram in left panel
-PREFERENCES_HISTOGRAMWORKING;Histogram and Navigator using Working Profile
-PREFERENCES_HISTOGRAM_TOOLTIP;if enabled use Working Profile instead of Output Profile (with gamma), for Navigator and histogram display
+PREFERENCES_HISTOGRAMWORKING;Use working profile for main histogram and Navigator
+PREFERENCES_HISTOGRAM_TOOLTIP;If enabled, the working profile is used for rendering the main histogram and the Navigator, otherwise the gamma-corrected output profile is used.
 PREFERENCES_HLTHRESHOLD;Threshold for clipped highlights
 PREFERENCES_ICCDIR;Directory containing color profiles
 PREFERENCES_IMPROCPARAMS;Default Image Processing Parameters
@@ -751,7 +751,7 @@ PREFERENCES_INTENT_PERCEPTUAL;Perceptual
 PREFERENCES_INTENT_RELATIVE;Relative Colorimetric
 PREFERENCES_INTENT_SATURATION;Saturation
 PREFERENCES_INTERNALTHUMBIFUNTOUCHED;Show embedded JPEG thumbnail if raw is unedited
-PREFERENCES_LANGAUTODETECT;Use OS language setting
+PREFERENCES_LANGAUTODETECT;Use system language
 PREFERENCES_MENUGROUPEXTPROGS;Group "Open with"
 PREFERENCES_MENUGROUPFILEOPERATIONS;Group "File Operations"
 PREFERENCES_MENUGROUPLABEL;Group "Color Label"