Merging defloat and default. First time I've ever done this, so please check that I haven't clobbered your recent efforts in default.

rtdata/languages/Deutsch

@@ -40,6 +40,8 @@ CURVEEDITOR_SHADOWS;Schatten
 CURVEEDITOR_TOOLTIPLINEAR;Kurve zurücksetzen (Linear)
 CURVEEDITOR_TOOLTIPLOAD;Kurve aus Datei laden
 CURVEEDITOR_TOOLTIPSAVE;Kurve speichern
+CURVEEDITOR_TOOLTIPCOPY;Kurve in Zwischenablage kopieren
+CURVEEDITOR_TOOLTIPPASTE;Kurve aus Zwischenablage einfügen
 CURVEEDITOR_TYPE;Typ
 EDITWINDOW_TITLE;Bildbearbeitung
 EXIFFILTER_APERTURE;Blende

rtdata/languages/default

@@ -25,6 +25,8 @@ CURVEEDITOR_SHADOWS;Shadows
 CURVEEDITOR_TOOLTIPLINEAR;Reset curve to linear
 CURVEEDITOR_TOOLTIPLOAD;Load a curve from file
 CURVEEDITOR_TOOLTIPSAVE;Save current curve
+CURVEEDITOR_TOOLTIPCOPY;Copy current curve to clipboard
+CURVEEDITOR_TOOLTIPPASTE;Paste curve from clipboard
 CURVEEDITOR_TYPE;Type:
 EDITWINDOW_TITLE;Image Edit
 EXIFFILTER_APERTURE;Aperture
@@ -149,11 +151,13 @@ HISTOGRAM_BUTTON_B;B
 HISTOGRAM_BUTTON_G;G
 HISTOGRAM_BUTTON_L;L
 HISTOGRAM_BUTTON_R;R
+HISTOGRAM_BUTTON_RAW;Raw
 HISTOGRAM_LABEL;Histogram
 HISTOGRAM_TOOLTIP_B;Show/Hide BLUE histogram
 HISTOGRAM_TOOLTIP_G;Show/Hide GREEN histogram
 HISTOGRAM_TOOLTIP_L;Show/Hide CIELAB Luminance histogram
 HISTOGRAM_TOOLTIP_R;Show/Hide RED histogram
+HISTOGRAM_TOOLTIP_RAW;Show/Hide RAW histogram
 HISTORY_CHANGED;Changed
 HISTORY_CUSTOMCURVE;Custom Curve
 HISTORY_DELSNAPSHOT;Del
@@ -480,8 +484,8 @@ PARTIALPASTE_PREPROCESS_LINEDENOISE;Line noise filter
 PARTIALPASTE_RAWCACORR_AUTO;CA auto correction
 PARTIALPASTE_RAWCACORR_CABLUE;CA Blue
 PARTIALPASTE_RAWCACORR_CARED;CA Red
-PARTIALPASTE_RAWEXPOS_LINEAR;Exposure linear corr. factor
-PARTIALPASTE_RAWEXPOS_PRESER;Exposure HL preserving corr. (EV)
+PARTIALPASTE_RAWEXPOS_LINEAR;Raw white point linear corr. factor
+PARTIALPASTE_RAWEXPOS_PRESER;Raw white point HL preserving corr. (EV)
 PARTIALPASTE_RAWGROUP;Raw settings
 PARTIALPASTE_RAW_DCBENHANCE;Apply DCB enhancement step
 PARTIALPASTE_RAW_DCBITERATIONS;Number of DCB iterations
@@ -690,7 +694,7 @@ TP_COLORDENOISE_RADIUS;Radius
 TP_COLORSHIFT_BLUEYELLOW;Blue-Yellow
 TP_COLORSHIFT_GREENMAGENTA;Green-Magenta
 TP_COLORSHIFT_LABEL;Color Shift
-TP_CROP_DPI;DPI=
+TP_CROP_PPI;PPI=
 TP_CROP_FIXRATIO;Fix Ratio:
 TP_CROP_GTDIAGONALS;Rule of diagonals
 TP_CROP_GTGRID;Grid
@@ -734,7 +738,7 @@ TP_EQUALIZER_FINEST;finest
 TP_EQUALIZER_LABEL;Wavelet equalizer
 TP_EQUALIZER_LARGEST;coarsest
 TP_EQUALIZER_NEUTRAL;Neutral
-TP_EXPOSCORR_LABEL;Exposure
+TP_EXPOSCORR_LABEL;Raw white point
 TP_EXPOSURE_AUTOLEVELS;Auto Levels
 TP_EXPOSURE_BLACKLEVEL;Black
 TP_EXPOSURE_BRIGHTNESS;Brightness
@@ -755,6 +759,8 @@ TP_FLATFIELD_BT_HORIZONTAL;Horizontal
 TP_FLATFIELD_BT_VERTHORIZ;Vert. + Horiz.
 TP_FLATFIELD_BT_VERTICAL;Vertical
 TP_FLATFIELD_LABEL;Flat Field
+TP_GAMMA_OUTPUT;Output gamma
+TP_GAMMA_COMMENT;(output profile disabled except "default")
 TP_HLREC_CIELAB;CIELab Blending
 TP_HLREC_COLOR;Color Propagation
 TP_HLREC_LABEL;Highlight Reconstruction

rtdata/options/options.lin

@@ -103,7 +103,7 @@ ColorCorrection=1
 [Crop Settings]
 Ratio=3:2
 FixRatio=true
-DPI=600
+PPI=300
 
 [Color Management]
 ICCDirectory=

rtdata/options/options.osx

@@ -103,7 +103,7 @@ ColorCorrection=1
 [Crop Settings]
 Ratio=3:2
 FixRatio=true
-DPI=600
+PPI=300
 
 [Color Management]
 ICCDirectory=

rtdata/options/options.win

@@ -104,7 +104,7 @@ ColorCorrection=1
 [Crop Settings]
 Ratio=3:2
 FixRatio=true
-DPI=600
+PPI=300
 
 [Color Management]
 # Auto-determined by RT on first start

rtdata/profiles/crisp.pp3

@@ -145,6 +145,7 @@ InputProfile=(camera)
 ApplyGammaBeforeInputProfile=false
 WorkingProfile=sRGB
 OutputProfile=No ICM: sRGB output
+Gammafree=default
 
 [Equalizer]
 Enabled=false

rtdata/profiles/default.pp3

@@ -145,6 +145,7 @@ InputProfile=(camera)
 ApplyGammaBeforeInputProfile=false
 WorkingProfile=sRGB
 OutputProfile=No ICM: sRGB output
+Gammafree=default
 
 [Equalizer]
 Enabled=false

rtdata/profiles/neutral.pp3

@@ -145,6 +145,7 @@ InputProfile=(camera)
 ApplyGammaBeforeInputProfile=false
 WorkingProfile=sRGB
 OutputProfile=No ICM: sRGB output
+Gammafree=default
 
 [Equalizer]
 Enabled=false