--- a/BookmarkMenuBuilder.st	Sun Jan 12 23:30:25 2014 +0000
+++ b/BookmarkMenuBuilder.st	Wed Apr 01 10:38:01 2015 +0100
@@ -25,6 +25,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 BookmarkVisitor subclass:#BookmarkMenuBuilder
 	instanceVariableNames:'resources menu stack toolbar'
 	classVariableNames:''
@@ -108,10 +110,11 @@
 !
 
 menuItemAddBookmark:anObject labeled: label
-    ^ MenuItem 
+    ^ (MenuItem 
         label:(resources string:label)
         itemValue:#menuAddBookmarkTo:
-        argument:anObject.
+        argument:anObject)
+        translateLabel:false.
 
     "Created: / 21-06-2011 / 07:59:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 08-07-2011 / 11:39:40 / cg"
@@ -119,7 +122,9 @@
 
 menuItemFolder: folder
 
-    ^ MenuItem label:folder label
+    ^ (MenuItem 
+        label:folder label)
+        translateLabel:false.
 
     "Created: / 21-06-2011 / 08:08:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -130,10 +135,12 @@
     label := anObject label.
     icon := anObject icon.
     icon notNil ifTrue:[ label := LabelAndIcon label:label icon:icon ].
-    ^ MenuItem 
-                label:label
-                itemValue:#switchToBookmarkEntry:
-                argument:anObject.
+    ^ (MenuItem
+        label:label
+        itemValue:#switchToBookmarkEntry:
+        argument:anObject)
+            activeHelpKey:(anObject flyByHelpText);
+            translateLabel:false.
 
     "Created: / 21-06-2011 / 07:55:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 29-11-2011 / 11:21:20 / cg"
@@ -190,16 +197,15 @@
 
 !BookmarkMenuBuilder class methodsFor:'documentation'!
 
-version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/BookmarkMenuBuilder.st,v 1.7 2013-08-31 17:41:19 cg Exp $'
+version
+    ^ '$Header: /cvs/stx/stx/libtool/BookmarkMenuBuilder.st,v 1.10 2015-02-20 15:37:15 cg Exp $'
 !
 
-version_HG
-
-    ^ '$Changeset: <not expanded> $'
+version_CVS
+    ^ '$Header: /cvs/stx/stx/libtool/BookmarkMenuBuilder.st,v 1.10 2015-02-20 15:37:15 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: BookmarkMenuBuilder.st,v 1.7 2013-08-31 17:41:19 cg Exp $'
+    ^ '$Id: BookmarkMenuBuilder.st,v 1.10 2015-02-20 15:37:15 cg Exp $'
 ! !