--- a/Tools__NewSystemBrowser.st	Tue Mar 06 18:57:26 2012 +0100
+++ b/Tools__NewSystemBrowser.st	Wed Mar 07 12:05:36 2012 +0100
@@ -400,7 +400,7 @@
 'Search Class'
 
 #gotoClassEntryField
-'Goto class (uppercase) or class which implements this method (lowercase)'
+'Goto class (uppercase) or method which implements this selector (lowercase)'
 
 "/#gotoClassEntryField
 "/'Goto Class'
@@ -435,7 +435,7 @@
     ].
     ^ spec.
 
-    "Modified: / 08-11-2011 / 12:21:23 / cg"
+    "Modified: / 07-03-2012 / 11:57:59 / cg"
 ! !
 
 !NewSystemBrowser class methodsFor:'image specs'!
@@ -47556,7 +47556,7 @@
 !
 
 switchToClassNameOrSelectorMatching:aMatchString
-    |className class implementors answer classesMatchingCaseless|
+    |className class implementors answer classesMatchingCaseless matchStringLowercase classesWithPrefixCaseless|
 
     aMatchString knownAsSymbol ifTrue:[
         class := Smalltalk classNamed:aMatchString.
@@ -47565,6 +47565,8 @@
             ^ self.
         ].
         classesMatchingCaseless := Smalltalk keys select:[:nm | nm sameAs:aMatchString].
+"/        matchStringLowercase := aMatchString asLowercase.
+"/        classesWithPrefixCaseless := Smalltalk keys select:[:nm | nm asLowercase startsWith:aMatchString].
 
 "/        impl := Smalltalk allImplementorsOf:aMatchString asSymbol.
 "/        impl notEmptyOrNil ifTrue:[
@@ -47599,7 +47601,9 @@
                 ] ifFalse:[
                     answer := Dialog 
                         choose:(resources 
-                                        stringWithCRs:'No class named "%1.\But there are %2 implementors of it and %3 classes with a similar name.\\Goto one of them ?' 
+                                        stringWithCRs:'No class named "%1".\But there are %2 implementors of it and %3 '
+                                                      , (classesMatchingCaseless size == 1 ifTrue:['class'] ifFalse:['classes'])
+                                                      ,' with a similar name.\\Goto one of them ?' 
                                         with:aMatchString allBold
                                         with:implementors size
                                         with:classesMatchingCaseless size)
@@ -47645,7 +47649,7 @@
     ]
 
     "Modified: / 04-07-2006 / 18:48:25 / fm"
-    "Modified: / 01-03-2012 / 07:39:53 / cg"
+    "Modified (comment): / 07-03-2012 / 12:05:07 / cg"
 !
 
 switchToClassNamed:aString
@@ -52871,10 +52875,10 @@
 searchFieldCreated:anInputField
     anInputField emptyFieldReplacementText:
         "/(resources string:'Class Search & History').
-        (resources string:'Search (Ctrl-L)').
+        (resources string:'Search Class/Selector (Ctrl-L)').
 
     "Modified: / 09-02-2010 / 21:56:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 15-07-2011 / 19:14:45 / cg"
+    "Modified: / 07-03-2012 / 11:59:16 / cg"
 !
 
 searchFieldPanelCreated:aPanel
@@ -56125,11 +56129,11 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1727 2012-03-06 17:57:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1728 2012-03-07 11:05:36 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1727 2012-03-06 17:57:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1728 2012-03-07 11:05:36 cg Exp $'
 !
 
 version_SVN