diff --git a/mozilla/camino/English.lproj/MainMenu.nib/objects.nib b/mozilla/camino/English.lproj/MainMenu.nib/objects.nib index 297a662ebbe..8813d564eb4 100644 Binary files a/mozilla/camino/English.lproj/MainMenu.nib/objects.nib and b/mozilla/camino/English.lproj/MainMenu.nib/objects.nib differ diff --git a/mozilla/camino/MainController.mm b/mozilla/camino/MainController.mm index 798600fc450..4011ed5ea33 100644 --- a/mozilla/camino/MainController.mm +++ b/mozilla/camino/MainController.mm @@ -290,7 +290,8 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; // Bookmarks menu actions. -(IBAction) importBookmarks:(id)aSender { - + // IE favorites: ~/Library/Preferences/Explorer/Favorites.html + // Omniweb favorites: ~/Library/Application Support/Omniweb/Bookmarks.html } -(IBAction) addBookmark:(id)aSender diff --git a/mozilla/camino/MainMenu.nib/classes.nib b/mozilla/camino/MainMenu.nib/classes.nib index 1ebcc627582..d3f1ca53460 100644 --- a/mozilla/camino/MainMenu.nib/classes.nib +++ b/mozilla/camino/MainMenu.nib/classes.nib @@ -21,6 +21,7 @@ goBack = id; goForward = id; goHome = id; + importBookmarks = id; manageBookmarks = id; newTab = id; newWindow = id; diff --git a/mozilla/camino/MainMenu.nib/objects.nib b/mozilla/camino/MainMenu.nib/objects.nib index 297a662ebbe..8813d564eb4 100644 Binary files a/mozilla/camino/MainMenu.nib/objects.nib and b/mozilla/camino/MainMenu.nib/objects.nib differ diff --git a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib index 1ebcc627582..d3f1ca53460 100644 --- a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib +++ b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib @@ -21,6 +21,7 @@ goBack = id; goForward = id; goHome = id; + importBookmarks = id; manageBookmarks = id; newTab = id; newWindow = id; diff --git a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib index 297a662ebbe..8813d564eb4 100644 Binary files a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib and b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/objects.nib differ diff --git a/mozilla/camino/src/application/MainController.mm b/mozilla/camino/src/application/MainController.mm index 798600fc450..4011ed5ea33 100644 --- a/mozilla/camino/src/application/MainController.mm +++ b/mozilla/camino/src/application/MainController.mm @@ -290,7 +290,8 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; // Bookmarks menu actions. -(IBAction) importBookmarks:(id)aSender { - + // IE favorites: ~/Library/Preferences/Explorer/Favorites.html + // Omniweb favorites: ~/Library/Application Support/Omniweb/Bookmarks.html } -(IBAction) addBookmark:(id)aSender diff --git a/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib b/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib index 1ebcc627582..d3f1ca53460 100644 --- a/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib +++ b/mozilla/chimera/English.lproj/MainMenu.nib/classes.nib @@ -21,6 +21,7 @@ goBack = id; goForward = id; goHome = id; + importBookmarks = id; manageBookmarks = id; newTab = id; newWindow = id; diff --git a/mozilla/chimera/English.lproj/MainMenu.nib/objects.nib b/mozilla/chimera/English.lproj/MainMenu.nib/objects.nib index 297a662ebbe..8813d564eb4 100644 Binary files a/mozilla/chimera/English.lproj/MainMenu.nib/objects.nib and b/mozilla/chimera/English.lproj/MainMenu.nib/objects.nib differ diff --git a/mozilla/chimera/MainController.mm b/mozilla/chimera/MainController.mm index 798600fc450..4011ed5ea33 100644 --- a/mozilla/chimera/MainController.mm +++ b/mozilla/chimera/MainController.mm @@ -290,7 +290,8 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; // Bookmarks menu actions. -(IBAction) importBookmarks:(id)aSender { - + // IE favorites: ~/Library/Preferences/Explorer/Favorites.html + // Omniweb favorites: ~/Library/Application Support/Omniweb/Bookmarks.html } -(IBAction) addBookmark:(id)aSender diff --git a/mozilla/chimera/MainMenu.nib/classes.nib b/mozilla/chimera/MainMenu.nib/classes.nib index 1ebcc627582..d3f1ca53460 100644 --- a/mozilla/chimera/MainMenu.nib/classes.nib +++ b/mozilla/chimera/MainMenu.nib/classes.nib @@ -21,6 +21,7 @@ goBack = id; goForward = id; goHome = id; + importBookmarks = id; manageBookmarks = id; newTab = id; newWindow = id; diff --git a/mozilla/chimera/MainMenu.nib/objects.nib b/mozilla/chimera/MainMenu.nib/objects.nib index 297a662ebbe..8813d564eb4 100644 Binary files a/mozilla/chimera/MainMenu.nib/objects.nib and b/mozilla/chimera/MainMenu.nib/objects.nib differ diff --git a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib index 1ebcc627582..d3f1ca53460 100644 --- a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib +++ b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/classes.nib @@ -21,6 +21,7 @@ goBack = id; goForward = id; goHome = id; + importBookmarks = id; manageBookmarks = id; newTab = id; newWindow = id; diff --git a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib index 297a662ebbe..8813d564eb4 100644 Binary files a/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib and b/mozilla/chimera/resources/localized/English.lproj/MainMenu.nib/objects.nib differ diff --git a/mozilla/chimera/src/application/MainController.mm b/mozilla/chimera/src/application/MainController.mm index 798600fc450..4011ed5ea33 100644 --- a/mozilla/chimera/src/application/MainController.mm +++ b/mozilla/chimera/src/application/MainController.mm @@ -290,7 +290,8 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; // Bookmarks menu actions. -(IBAction) importBookmarks:(id)aSender { - + // IE favorites: ~/Library/Preferences/Explorer/Favorites.html + // Omniweb favorites: ~/Library/Application Support/Omniweb/Bookmarks.html } -(IBAction) addBookmark:(id)aSender