--- a/UserPreferences.st	Wed Oct 26 23:35:39 2016 +0100
+++ b/UserPreferences.st	Fri Nov 18 20:48:04 2016 +0000
@@ -695,7 +695,7 @@
           nextPutLine:'Smalltalk loadBinaries: ' , (Smalltalk loadBinaries storeString) , '.';
           nextPutLine:'StandardSystemView includeHostNameInLabel: ' , (StandardSystemView includeHostNameInLabel storeString) , '.';
 
-          "/ claus - I dont think its a good idea to save those ...
+          "/ claus - I don't think its a good idea to save those ...
     "/      nextPutLine:'"/ Class updateChanges: ' , (Class updatingChanges storeString) , '.';
     "/      nextPutLine:'"/ ObjectMemory nameForChanges: ' , (ObjectMemory nameForChanges storeString) , '.';
 
@@ -874,6 +874,8 @@
     ^ modified ? false
 ! !
 
+
+
 !UserPreferences methodsFor:'accessing-locale'!
 
 dateInputFormat
@@ -909,14 +911,22 @@
     "toDo: migrate from ClassVar in Number;
      use this for new applications"
 
-    ^ $.
+    ^ self at:#decimalPointCharacter ifAbsent:[ $. ]
+!
+
+decimalPointCharacter:aCharacter
+    ^ self at:#decimalPointCharacter put:aCharacter
 !
 
 thousandsSeparatorCharacter
     "toDo: migrate from ClassVar elsewhere;
      use this for new applications"
 
-    ^ $'
+    ^ self at:#thousandsSeparatorCharacter ifAbsent:[ $, ]
+!
+
+thousandsSeparatorCharacter:aCharacter
+    ^ self at:#thousandsSeparatorCharacter put:aCharacter
 ! !
 
 !UserPreferences methodsFor:'accessing-misc'!
@@ -1861,8 +1871,9 @@
 enableVMWareDrawingBugWorkaround:aBoolean
     "change the flag which enables a workaround for a redraw bug when running X/Linux in the VMWare virtual machine"
 
+    "/ self assert:(aBoolean isBoolean).
     self at:#enableVMWareDrawingBugWorkaround put:aBoolean.
-    (Screen notNil and:[Screen current notNil and:[Screen current platformName == #X11]]) ifTrue:[
+    (Screen notNil and:[Screen current notNil and:[Screen current isX11Platform]]) ifTrue:[
         Screen current maxOperationsUntilFlush:(aBoolean ifTrue:[1] ifFalse:[nil])
     ].
 
@@ -2450,12 +2461,12 @@
 !
 
 toolTipAutoHideDelay:aTimeDuration
-    "set the time, tooltips are shown. 0 means: dont hide"
+    "set the time, tooltips are shown. 0 means: don't hide"
 
     self at:#toolTipAutoHideDelay put:aTimeDuration.
     FlyByHelp showTime: (aTimeDuration isInteger
-			    ifTrue:[aTimeDuration]
-			    ifFalse:[aTimeDuration asSeconds]).
+                            ifTrue:[aTimeDuration]
+                            ifFalse:[aTimeDuration asSeconds]).
 
     "
      UserPreferences current toolTipAutoHideDelay:10 seconds
@@ -2673,6 +2684,30 @@
     "
 !
 
+confirmCheckinOfPrivateClasses
+    "If set, a confirmation dialog is shown when attempting to checkin a private class."
+
+    ^ self at:#confirmCheckinOfPrivateClasses ifAbsent:[true].
+
+    "
+     UserPreferences current confirmCheckinOfPrivateClasses
+     UserPreferences current confirmCheckinOfPrivateClasses:true
+     UserPreferences current confirmCheckinOfPrivateClasses:false
+    "
+!
+
+confirmCheckinOfPrivateClasses:aBoolean
+    "If set, a confirmation dialog is shown when attempting to checkin a private class."
+
+    self at:#confirmCheckinOfPrivateClasses put:aBoolean.
+
+    "
+     UserPreferences current confirmCheckinOfPrivateClasses
+     UserPreferences current confirmCheckinOfPrivateClasses:true
+     UserPreferences current confirmCheckinOfPrivateClasses:false
+    "
+!
+
 enforceCodeStyle
     "return the flag which controls enforcing a certain code style (in some browsers)"
 
@@ -3456,42 +3491,6 @@
     "Modified: / 21-04-2011 / 12:34:46 / cg"
 !
 
-doesNotUnderstand:aMessage
-    |k def numArgs|
-
-    k := aMessage selector.
-    (numArgs := aMessage numArgs) == 0 ifTrue:[
-	(self includesKey:k) ifTrue:[
-	    ^ self at:k
-	].
-	((def := self class default) includesKey:k) ifTrue:[
-	    ^ def at:k
-	].
-	^ self defaultValue
-    ].
-
-    "/ this is needed, if a setting is loaded (via the settings.stx) at a time
-    "/ when the corresponding package which uses that setting is not yet loaded;
-    "/ for example: libsvn settings, with no libsvn being present.
-    "/ if obsolete keys accumulate over time, we might need a settings cleanup GUI to
-    "/ care for that.
-
-    ((numArgs == 1) and:[ (k endsWith:$:)])
-    ifTrue:[
-	k := (k copyButLast) asSymbol.
-	^ self at:k put:(aMessage arg1)
-    ].
-
-    numArgs == 1 ifTrue:[
-	('UserPreferences [info]: obsolete settings key: ' , aMessage selector , ' - ignored.') infoPrintCR.
-	^ nil
-    ].
-
-    ^ super doesNotUnderstand:aMessage
-
-    "Modified (comment): / 19-08-2011 / 14:01:56 / cg"
-!
-
 emphasis:e andColor:c
     ^ Text addEmphasis:e to:(#color->c).
 
@@ -5858,6 +5857,41 @@
 
 !UserPreferences methodsFor:'misc'!
 
+doesNotUnderstand:aMessage
+    |k def numArgs|
+
+    k := aMessage selector.
+    (numArgs := aMessage numArgs) == 0 ifTrue:[
+        (self includesKey:k) ifTrue:[
+            ^ self at:k
+        ].
+        ((def := self class default) includesKey:k) ifTrue:[
+            ^ def at:k
+        ].
+        ^ self defaultValue
+    ].
+
+    "/ this is needed, if a setting is loaded (via the settings.stx) at a time
+    "/ when the corresponding package which uses that setting is not yet loaded;
+    "/ for example: libsvn settings, with no libsvn being present.
+    "/ if obsolete keys accumulate over time, we might need a settings cleanup GUI to
+    "/ care for that.
+
+    (numArgs == 1 and:[k endsWith:$:]) ifTrue:[
+        k := k copyButLast asSymbol.
+        ^ self at:k put:(aMessage arg1)
+    ].
+
+    numArgs == 1 ifTrue:[
+        Logger info:'obsolete settings key ignored: %1' with:aMessage selector.
+        ^ nil
+    ].
+
+    ^ super doesNotUnderstand:aMessage
+
+    "Modified (comment): / 19-08-2011 / 14:01:56 / cg"
+!
+
 flyByHelpSettingChanged
     FlyByHelp notNil ifTrue:[
 	(self at:#flyByHelpActive ifAbsent:true) ifTrue:[