adding an import bookmarks menu command.

git-svn-id: svn://10.0.0.236/trunk@120148 18797224-902f-48f8-a5cc-f745e15eee43

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

mozilla/camino/MainMenu.nib/classes.nib

@@ -21,6 +21,7 @@
                 goBack = id; 
                 goForward = id; 
                 goHome = id; 
+                importBookmarks = id; 
                 manageBookmarks = id; 
                 newTab = id; 
                 newWindow = id; 

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; 

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

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; 

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

mozilla/chimera/MainMenu.nib/classes.nib

@@ -21,6 +21,7 @@
                 goBack = id; 
                 goForward = id; 
                 goHome = id; 
+                importBookmarks = id; 
                 manageBookmarks = id; 
                 newTab = id; 
                 newWindow = id; 

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; 

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