--- a/Parser.st	Tue Mar 29 08:38:48 2016 +0100
+++ b/Parser.st	Fri Apr 01 11:11:33 2016 +0100
@@ -11014,7 +11014,7 @@
         menuLabels := self userfriendlyMenuItemNameListFor:list.
 
         menuLabels := (Array
-                        with:('Declare ' , nameOfUnknownVariable allBold , ' as:')
+                        with:('Declare %1 as:' bindWith: nameOfUnknownVariable allBold)
                         with:'-'
                       ) , menuLabels.
         valueList := #(nil nil) , list.
@@ -11055,7 +11055,7 @@
     ].
     varType = #ClassVariable ifTrue:[
         (self classToCompileFor notNil and:[self classToCompileFor theNonMetaclass isSharedPool]) ifTrue:[
-            ^ 'Pool Constant (= Class Variable)'
+            ^ 'Class Variable (= Pool Constant)'
         ].
         ^ 'Class Variable'
     ].
@@ -11078,10 +11078,22 @@
 !
 
 userfriendlyMenuItemNameListFor:listOfPossibleVariableTypes
-    ^ listOfPossibleVariableTypes
-        collect:[:varType | self userfriendlyMenuItemNameFor:varType]
+    |list stx_libtool resources|
+
+    list := listOfPossibleVariableTypes
+                                collect:[:varType | self userfriendlyMenuItemNameFor:varType].
+
+        stx_libtool := Smalltalk at:#stx_libtool.
+        stx_libtool notNil ifTrue:[
+            resources := stx_libtool classResources.
+                resources notNil ifTrue:[
+                        list := list collect:[:s | resources string:s]
+                ]
+        ].
+    ^ list
 
     "Created: / 20-10-2010 / 18:42:13 / cg"
+    "Modified (format): / 30-03-2016 / 02:54:30 / cg"
 ! !
 
 !Parser::Correction class methodsFor:'documentation'!
@@ -12222,6 +12234,9 @@
 !
 
 typeMappingFor:aTypeSymbol
+    "map some common types; this is needed because there are som many synonyms
+     used in the various Smalltalk dialects.."
+
     |e|
 
     e := #(
@@ -12248,7 +12263,7 @@
         (sword           int16          )
         (handle          voidPointer    )
         (lpstr           charPointer    )
-        (hresult         uint32         )
+        (hresult         hresult        )   "/ preserved !!
         (ulongReturn     ulongReturn    )
         (none            void           )
         (struct          voidPointer    )
@@ -12260,9 +12275,9 @@
         (SDWORD          int32          )
         (WORD            uint16         )
         (SWORD           int16          )
+        (LPSTR           charPointer    )
         (HANDLE          voidPointer    )
-        (LPSTR           charPointer    )
-        (HRESULT         uint32         )
+        (HRESULT         hresult         )
     ) detect:[:p | p first = aTypeSymbol] ifNone:nil.
 
     e notNil ifTrue:[ ^ e second ].
@@ -12298,7 +12313,7 @@
     ^ aTypeSymbol asSymbol
 
     "Created: / 01-08-2006 / 15:35:52 / cg"
-    "Modified: / 14-06-2007 / 17:18:54 / cg"
+    "Modified (comment): / 30-03-2016 / 13:49:33 / cg"
 ! !
 
 !Parser::PrimitiveSpecParser methodsFor:'reading next token'!