--- a/Tools_SearchDialog.st	Tue May 13 15:17:35 2008 +0200
+++ b/Tools_SearchDialog.st	Tue May 13 15:28:05 2008 +0200
@@ -486,7 +486,7 @@
     |b|
 
     b := CheckBox 
-		label:(resources string:'Classes nameSpace (''%1'')' with:ns name).
+                label:(resources string:'Classes'' nameSpace ("%1")' with:ns name).
     self addCheckBox:b forSearchArea:#currentClassesNameSpace.
     ^ b.
 !
@@ -495,7 +495,7 @@
     |b|
 
     b := CheckBox 
-                label:(resources string:'Classes package (''%1'')' with:pkg).
+                label:(resources string:'Classes'' package ("%1")' with:pkg).
     self addCheckBox:b forSearchArea:#currentClassesPackage.
     ^ b.
 
@@ -506,7 +506,7 @@
     |b|
 
     b := CheckBox 
-            label:(resources string:'Current nameSpace (''%1'')' with:currentNamespace name).
+            label:(resources string:'Current nameSpace ("%1")' with:currentNamespace name).
     self addCheckBox:b forSearchArea:#currentNameSpace.
     ^ b.
 
@@ -517,7 +517,7 @@
     |b|
 
     b := CheckBox 
-            label:(resources string:'Current package (''%1'')' with:currentPackage).
+            label:(resources string:'Current package ("%1")' with:currentPackage).
     self addCheckBox:b forSearchArea:#currentPackage.
     ^ b.
 
@@ -528,7 +528,7 @@
     |b|
 
     b := CheckBox 
-            label:(resources string:'Classes package (''%1'')' with:pkg).
+            label:(resources string:'Classes'' package ("%1")' with:pkg).
     self addCheckBox:b forSearchArea:#currentClassesPackage.
     ^ b.
 
@@ -561,55 +561,55 @@
 !
 
 addCheckBoxForOwnerAndItsPrivateClasses
-    |b lbl|
+    |b lbl arg|
 
     (currentClass notNil and:[ currentClass isPrivate. ]) ifTrue:[ 
-	lbl := resources string:'Owner (%1) & all its private classes'
-		    with:currentClass owningClass name.
+        lbl := 'Owner (%1) & all its private classes'.
+        arg := currentClass owningClass name.
     ] ifFalse:[ 
-	lbl := resources string:'Owners & all their private classes'.
+        lbl := 'Owners & all their private classes'.
     ].
-    b := CheckBox label:lbl.
+    b := CheckBox label:(resources string:lbl with:arg).
     self addCheckBox:b forSearchArea:#ownersWithPrivateClasses.
     (selectedClasses contains:[ :cls | cls isPrivate. ]) ifFalse:[ 
-	b disable.
+        b disable.
     ].
     ^ b.
 !
 
 addCheckBoxForOwnerAndItsSubclassesAndItsPrivateClasses
-    |b lbl|
+    |b lbl arg|
 
     (currentClass notNil and:[ currentClass isPrivate. ]) ifTrue:[ 
-	lbl := resources 
-		    string:'Owner (%1) & its subclasses & all its private classes'
-		    with:currentClass owningClass name.
+        lbl := 'Owner (%1) & its subclasses & all its private classes'.
+        arg := currentClass owningClass name.
     ] ifFalse:[ 
-	lbl := resources 
-		    string:'Owners & their subclasses & all their private classes'.
+        lbl := 'Owners & their subclasses & all their private classes'.
     ].
-    b := CheckBox label:lbl.
+    b := CheckBox label:(resources string:lbl with:arg).
     self addCheckBox:b forSearchArea:#ownersHierarchiesWithPrivateClasses.
     (selectedClasses contains:[ :cls | cls isPrivate. ]) ifFalse:[ 
-	b disable.
+        b disable.
     ].
     ^ b.
 !
 
 addCheckBoxForSelectedClass
-    |b lbl|
+    |b lbl arg|
 
     (browser isMethodListBrowser or:[ currentClass isNil. ]) ifTrue:[ 
-	selectedClasses size == 1 ifTrue:[ 
-	    lbl := resources string:'Selected class (''%1'')'
-			with:selectedClasses first theNonMetaclass name.
-	] ifFalse:[ 
-	    lbl := resources string:'Selected classes (%1)' with:selectedClasses size.
-	].
+        selectedClasses size == 1 ifTrue:[ 
+            lbl := 'Selected class ("%1")'.
+            arg := selectedClasses first theNonMetaclass name.
+        ] ifFalse:[ 
+            lbl := 'Selected classes (%1)'.
+            arg := selectedClasses size.
+        ].
     ] ifFalse:[ 
-	lbl := resources string:'Class (''%1'')' with:currentClass name.
+        lbl := 'Class ("%1")'.
+        arg := currentClass name.
     ].
-    b := CheckBox label:lbl.
+    b := CheckBox label:(resources string:lbl with:arg).
     self addCheckBox:b forSearchArea:#classes.
     ^ b.
 !
@@ -679,16 +679,16 @@
 !
 
 addCheckBoxForSelectedClassCategory
-    |b lbl|
+    |b lbl arg|
 
     currentClassCategory notNil ifTrue:[ 
-	lbl := resources string:'Class category (''%1'')'
-		    with:currentClassCategory.
+        lbl := 'Class category ("%1")'.
+        arg := currentClassCategory.
     ] ifFalse:[ 
-	lbl := resources string:'Selected classes categories (%1)'
-		    with:selectedCategories size.
+        lbl := 'Selected classes categories (%1)'.
+        arg := selectedCategories size.
     ].
-    b := CheckBox label:lbl.
+    b := CheckBox label:(resources string:lbl with:arg).
     self addCheckBox:b forSearchArea:#classCategories.
     ^ b.
 !
@@ -703,16 +703,16 @@
 !
 
 addCheckBoxForSelectedPackage
-    |b lbl|
+    |b lbl arg|
 
     currentClassCategory notNil ifTrue:[ 
-        lbl := resources string:'Class category (''%1'')'
-                    with:currentClassCategory.
+        lbl := 'Class category ("%1")'.
+        arg := currentClassCategory.
     ] ifFalse:[ 
-        lbl := resources string:'Selected classes categories (%1)'
-                    with:selectedCategories size.
+        lbl := 'Selected classes categories (%1)'.
+        arg := selectedCategories size.
     ].
-    b := CheckBox label:lbl.
+    b := CheckBox label:(resources string:lbl with:arg).
     self addCheckBox:b forSearchArea:#classCategories.
     ^ b.
 !
@@ -1089,5 +1089,5 @@
 !SearchDialog class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_SearchDialog.st,v 1.26 2008-05-13 13:17:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_SearchDialog.st,v 1.27 2008-05-13 13:28:05 cg Exp $'
 ! !