--- a/SettingsDialog.st	Mon Jan 30 16:07:57 2006 +0100
+++ b/SettingsDialog.st	Mon Jan 30 18:06:47 2006 +0100
@@ -630,7 +630,7 @@
 
     ^ self 
         createItemName:aName 
-        label:(resources string:applicationLabel) 
+        label:applicationLabel 
         class:locClass 
         icon:locIcon 
         expandParent:doExpand 
@@ -833,7 +833,9 @@
     "create all the categories"
 
     (aName includes:$/) ifFalse:[ ^ self].
-    self treeName:aName butLast:1 do:[:currentLabel :currentName| | length icon|
+    self treeName:aName butLast:1 do:[:currentLabel :currentName| 
+        |length icon|
+
         currentLabel notEmpty ifTrue:[
             icon := self categoryIcons at:currentName ifAbsent:[nil].
             self createItemName:currentName label:currentLabel icon:icon replaceExisting:true.
@@ -841,7 +843,7 @@
     ].
 !
 
-createItemForApplication:anApplication class:aClass label:aLabel icon:aIcon expandParent:expandParent replaceExisting:doReplaceExisting
+createItemForApplication:anApplication class:aClass label:aLabel icon:anIcon expandParent:expandParent replaceExisting:doReplaceExisting
     "create an application item in my application list"
 
     | newItem parent locIcon item|
@@ -853,7 +855,7 @@
 
     doReplaceExisting ifTrue:[
         parent children notNil ifTrue:[
-            (item := parent children detect:[ :aItem | aItem application == anApplication] ifNone:[nil]) notNil ifTrue:[
+            (item := parent children detect:[ :anItem | anItem application == anApplication] ifNone:[nil]) notNil ifTrue:[
                 ^ item.
             ]
         ]
@@ -864,7 +866,7 @@
     newItem label:aLabel "allBold".
     newItem nameString:(anApplication itemPathName , aLabel).
     newItem applicationClass:aClass.
-    locIcon := aIcon.
+    locIcon := anIcon.
     locIcon isNil ifTrue:[ locIcon := self class defaultSettingsAppIcon].
     newItem icon:locIcon.
     parent add:newItem.
@@ -874,21 +876,24 @@
     ^ newItem
 !
 
-createItemName:aNameString label:aLabel class:aClass icon:aIcon
-    ^ self createItemName:aNameString label:aLabel class:aClass icon:aIcon expandParent:false
+createItemName:aNameString label:aLabel class:aClass icon:anIcon
+    ^ self createItemName:aNameString label:aLabel class:aClass icon:anIcon expandParent:false
 !
 
-createItemName:aNameString label:aLabel class:aClass icon:aIcon expandParent:expandParent
+createItemName:aNameString label:aLabel class:aClass icon:anIcon expandParent:expandParent
     ^ self
-        createItemName:aNameString label:aLabel class:aClass icon:aIcon 
+        createItemName:aNameString 
+        label:aLabel 
+        class:aClass 
+        icon:anIcon 
         expandParent:expandParent
         replaceExisting:true
 !
 
-createItemName:aNameString label:aLabel class:aClass icon:aIcon expandParent:expandParent replaceExisting:doReplaceExisting
+createItemName:aNameString label:untranslatedLabel class:aClass icon:anIcon expandParent:expandParent replaceExisting:doReplaceExisting
     "create an application item in my application list"
 
-    | newItem parentsName parent locIcon item|
+    |newItem parentsName parent locIcon item|
 
     (aNameString includes:$/) ifTrue:[
         parentsName := aNameString copyTo:(aNameString lastIndexOf:$/)-1.
@@ -908,10 +913,10 @@
 
     newItem := self class itemClass new.  
     "/ newItem label:(resources string:aLabel) "allBold".
-    newItem label:aLabel "allBold".
+    newItem label:(resources string:untranslatedLabel) "allBold".
     newItem nameString:aNameString.
     newItem applicationClass:aClass.
-    locIcon := aIcon.
+    locIcon := anIcon.
     locIcon isNil ifTrue:[ locIcon := self class defaultSettingsAppIcon].
     newItem icon:locIcon.
     parent add:newItem.
@@ -921,16 +926,16 @@
     ^ newItem
 !
 
-createItemName:aNameString label:aLabel icon:aIcon
+createItemName:aNameString label:aLabel icon:anIcon
     "create an application item in my application list"
 
-    self createItemName:aNameString label:aLabel class:nil icon:aIcon expandParent:false
+    self createItemName:aNameString label:aLabel class:nil icon:anIcon expandParent:false
 !
 
-createItemName:aNameString label:aLabel icon:aIcon replaceExisting:doReplaceExisting
+createItemName:aNameString label:aLabel icon:anIcon replaceExisting:doReplaceExisting
     "create an application item in my application list"
 
-    self createItemName:aNameString label:aLabel class:nil icon:aIcon expandParent:false replaceExisting:doReplaceExisting
+    self createItemName:aNameString label:aLabel class:nil icon:anIcon expandParent:false replaceExisting:doReplaceExisting
 !
 
 getItemForName:aName
@@ -945,23 +950,23 @@
     ^ searchItem
 !
 
-removeItem:aItem 
+removeItem:anItem 
     "remove a application from the settingsTree"
 
     |parent remParent|
 
-    aItem application release.
+    anItem application release.
 
-    parent := aItem parent.
+    parent := anItem parent.
     parent isNil ifTrue:[" already removed " ^ self].
-    parent remove:aItem.
+    parent remove:anItem.
     
     [parent isCategory and:[parent children isEmptyOrNil]] whileTrue:[
         remParent := parent.
         parent := remParent parent.
         parent remove:remParent.
     ].
-    self applicationList remove:aItem ifAbsent:[nil].
+    self applicationList remove:anItem ifAbsent:[nil].
     self selectedItem value:parent.
 !
 
@@ -1295,7 +1300,7 @@
 !SettingsDialog class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/SettingsDialog.st,v 1.63 2005-10-05 11:37:37 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/SettingsDialog.st,v 1.64 2006-01-30 17:06:47 cg Exp $'
 ! !
 
 SettingsDialog initialize!