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 69aaa404d2e..84555e62a1d 100644
--- a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib
+++ b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/classes.nib
@@ -1,237 +1,268 @@
 {
-    IBClasses = (
-        {
-            CLASS = BookmarkMenu; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {mItemBeforeCustomItems = NSMenuItem; }; 
-            SUPERCLASS = NSMenu; 
-        }, 
-        {CLASS = BookmarkMenuBuilder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {
-            CLASS = BrowserToolbarController; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = ToolbarController; 
-        }, 
-        {
-            ACTIONS = {
-                addBookmark = id; 
-                addBookmarkFolder = id; 
-                addBookmarkForLink = id; 
-                addBookmarkSeparator = id; 
-                addBookmarkWithoutPrompt = id; 
-                addTabGroup = id; 
-                addTabGroupWithoutPrompt = id; 
-                addToAddressBook = id; 
-                back = id; 
-                cancelLocationSheet = id; 
-                cancelSearchSheet = id; 
-                closeCurrentTab = id; 
-                closeOtherTabs = id; 
-                closeSendersTab = id; 
-                copyAddressToClipboard = id; 
-                copyImage = id; 
-                copyImageLocation = id; 
-                copyLinkLocation = id; 
-                endLocationSheet = id; 
-                endSearchSheet = id; 
-                forward = id; 
-                frameToNewTab = id; 
-                frameToNewWindow = id; 
-                frameToThisWindow = id; 
-                getInfo = id; 
-                goToLocationFromToolbarURLField = id; 
-                home = id; 
-                makeTextBigger = id; 
-                makeTextDefaultSize = id; 
-                makeTextSmaller = id; 
-                manageBookmarks = id; 
-                manageHistory = id; 
-                moveTabToNewWindow = id; 
-                newTab = id; 
-                nextTab = id; 
-                openFeedPrefPane = id; 
-                openLinkInNewTab = id; 
-                openLinkInNewWindow = id; 
-                pageSetup = id; 
-                previousTab = id; 
-                printDocument = id; 
-                reload = id; 
-                reloadAllTabs = id; 
-                reloadSendersTab = id; 
-                reloadWithNewCharset = id; 
-                saveFrameAs = id; 
-                saveImageAs = id; 
-                saveLinkAs = id; 
-                savePageAs = id; 
-                searchFieldTriggered = id; 
-                searchForSelection = id; 
-                sendURL = id; 
-                sendURLFromLink = id; 
-                showBookmarksInfo = id; 
-                showPageInfo = id; 
-                showSiteCertificate = id; 
-                stop = id; 
-                toggleStatusBar = id; 
-                viewOnlyThisImage = id; 
-                viewPageSource = id; 
-                viewSource = id; 
-            }; 
-            CLASS = BrowserWindowController; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                mBackItem = NSMenuItem; 
-                mContentView = BrowserContentView; 
-                mCopyItem = NSMenuItem; 
-                mForwardItem = NSMenuItem; 
-                mImageLinkMenu = NSMenu; 
-                mImageMailToLinkMenu = NSMenu; 
-                mImageMenu = NSMenu; 
-                mInputMenu = NSMenu; 
-                mLinkMenu = NSMenu; 
-                mLocationSheetURLField = NSTextField; 
-                mLocationSheetWindow = NSWindow; 
-                mLocationToolbarView = ExtendedSplitView; 
-                mMailToLinkMenu = NSMenu; 
-                mPageMenu = NSMenu; 
-                mPersonalToolbar = BookmarkToolbar; 
-                mProgress = NSProgressIndicator; 
-                mProxyIcon = PageProxyIcon; 
-                mSearchBar = WebSearchField; 
-                mSearchSheetTextField = WebSearchField; 
-                mSearchSheetWindow = NSWindow; 
-                mStatus = NSTextField; 
-                mStatusBar = NSView; 
-                mTabBarMenu = NSMenu; 
-                mTabBrowser = BrowserTabView; 
-                mTabMenu = NSMenu; 
-                mURLBar = AutoCompleteTextField; 
-            }; 
-            SUPERCLASS = NSWindowController; 
-        }, 
-        {
-            ACTIONS = {
-                addBookmark = id; 
-                addBookmarkFolder = id; 
-                addBookmarkSeparator = id; 
-                addBookmarkWithoutPrompt = id; 
-                addTabGroup = id; 
-                addTabGroupWithoutPrompt = id; 
-                fillForm = id; 
-                find = id; 
-                findActions = id; 
-                getInfo = id; 
-                miniaturizeAll = id; 
-                showPageInfo = id; 
-            }; 
-            CLASS = FirstResponder; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = NSObject; 
-        }, 
-        {CLASS = GoMenu; LANGUAGE = ObjC; SUPERCLASS = HistoryMenu; }, 
-        {
-            CLASS = HistoryMenu; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {mItemBeforeHistoryItems = NSMenuItem; }; 
-            SUPERCLASS = NSMenu; 
-        }, 
-        {
-            ACTIONS = {
-                aboutPlugins = id; 
-                aboutServers = id; 
-                aboutWindow = id; 
-                clearHistory = id; 
-                closeAllWindows = id; 
-                closeCurrentTab = id; 
-                connectToServer = id; 
-                displayPreferencesWindow = id; 
-                doSearch = id; 
-                downloadsWindow = id; 
-                emptyCache = id; 
-                exportBookmarks = id; 
-                feedbackLink = id; 
-                findInPage = id; 
-                goBack = id; 
-                goForward = id; 
-                goHome = id; 
-                importBookmarks = id; 
-                infoLink = id; 
-                keyboardShortcutsLink = id; 
-                makeTextBigger = id; 
-                makeTextDefaultSize = id; 
-                makeTextSmaller = id; 
-                manageBookmarks = id; 
-                newTab = id; 
-                newWindow = id; 
-                nextTab = id; 
-                openFile = id; 
-                openLocation = id; 
-                openMenuBookmark = id; 
-                pageSetup = id; 
-                previousTab = id; 
-                printDocument = id; 
-                reload = id; 
-                reloadAllTabs = id; 
-                reloadWithCharset = id; 
-                resetBrowser = id; 
-                savePage = id; 
-                sendURL = id; 
-                setFileExtension = id; 
-                showCertificates = id; 
-                showHistory = id; 
-                stop = id; 
-                supportLink = id; 
-                toggleAutoCharsetDetection = id; 
-                toggleBookmarksToolbar = id; 
-                toggleOfflineMode = id; 
-                viewPageSource = id; 
-                zoomAll = id; 
-            }; 
-            CLASS = MainController; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                mAddBookmarkMenuItem = NSMenuItem; 
-                mAddBookmarkWithoutPromptMenuItem = NSMenuItem; 
-                mAddTabGroupMenuItem = NSMenuItem; 
-                mAddTabGroupWithoutPromptMenuItem = NSMenuItem; 
-                mApplication = NSApplication; 
-                mAutoUpdater = SUUpdater; 
-                mBookmarksHelperMenu = NSMenu; 
-                mBookmarksMenu = BookmarkMenu; 
-                mBookmarksToolbarMenuItem = NSMenuItem; 
-                mCloseTabMenuItem = NSMenuItem; 
-                mCloseWindowMenuItem = NSMenuItem; 
-                mCreateBookmarksFolderMenuItem = NSMenuItem; 
-                mCreateBookmarksSeparatorMenuItem = NSMenuItem; 
-                mDockMenu = BookmarkMenu; 
-                mExportPanelView = NSView; 
-                mFilterView = NSView; 
-                mServersSubmenu = NSMenu; 
-                mShowAllBookmarksMenuItem = NSMenuItem; 
-                mTextEncodingsMenu = NSMenu; 
-            }; 
-            SUPERCLASS = NSObject; 
-        }, 
-        {
-            ACTIONS = {load = id; }; 
-            CLASS = MyBrowserView; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {progress = id; progressSuper = id; status = id; urlbar = id; }; 
-            SUPERCLASS = NSView; 
-        }, 
-        {CLASS = NSObject; LANGUAGE = ObjC; }, 
-        {
-            ACTIONS = {checkForUpdates = id; }; 
-            CLASS = SUUpdater; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = NSObject; 
-        }, 
-        {CLASS = ThrobberHandler; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {
-            CLASS = ToolbarController; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {mBrowserView = id; mWindow = id; }; 
-            SUPERCLASS = NSObject; 
+    IBClasses =     (
+                {
+            CLASS = BookmarkMenu;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                mItemBeforeCustomItems = NSMenuItem;
+            };
+            SUPERCLASS = NSMenu;
+        },
+                {
+            CLASS = BookmarkMenuBuilder;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSObject;
+        },
+                {
+            CLASS = BrowserToolbarController;
+            LANGUAGE = ObjC;
+            SUPERCLASS = ToolbarController;
+        },
+                {
+            ACTIONS =             {
+                addBookmark = id;
+                addBookmarkFolder = id;
+                addBookmarkForLink = id;
+                addBookmarkSeparator = id;
+                addBookmarkWithoutPrompt = id;
+                addTabGroup = id;
+                addTabGroupWithoutPrompt = id;
+                addToAddressBook = id;
+                back = id;
+                cancelLocationSheet = id;
+                cancelSearchSheet = id;
+                closeCurrentTab = id;
+                closeOtherTabs = id;
+                closeSendersTab = id;
+                copyAddressToClipboard = id;
+                copyImage = id;
+                copyImageLocation = id;
+                copyLinkLocation = id;
+                endLocationSheet = id;
+                endSearchSheet = id;
+                forward = id;
+                frameToNewTab = id;
+                frameToNewWindow = id;
+                frameToThisWindow = id;
+                getInfo = id;
+                goToLocationFromToolbarURLField = id;
+                home = id;
+                makeTextBigger = id;
+                makeTextDefaultSize = id;
+                makeTextSmaller = id;
+                manageBookmarks = id;
+                manageHistory = id;
+                moveTabToNewWindow = id;
+                newTab = id;
+                nextTab = id;
+                openFeedPrefPane = id;
+                openLinkInNewTab = id;
+                openLinkInNewWindow = id;
+                pageSetup = id;
+                previousTab = id;
+                printDocument = id;
+                reload = id;
+                reloadAllTabs = id;
+                reloadSendersTab = id;
+                reloadWithNewCharset = id;
+                saveFrameAs = id;
+                saveImageAs = id;
+                saveLinkAs = id;
+                savePageAs = id;
+                searchFieldTriggered = id;
+                searchForSelection = id;
+                sendURL = id;
+                sendURLFromLink = id;
+                showBookmarksInfo = id;
+                showPageInfo = id;
+                showSiteCertificate = id;
+                stop = id;
+                toggleStatusBar = id;
+                viewOnlyThisImage = id;
+                viewPageSource = id;
+                viewSource = id;
+            };
+            CLASS = BrowserWindowController;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                mBackItem = NSMenuItem;
+                mContentView = BrowserContentView;
+                mCopyItem = NSMenuItem;
+                mForwardItem = NSMenuItem;
+                mImageLinkMenu = NSMenu;
+                mImageMailToLinkMenu = NSMenu;
+                mImageMenu = NSMenu;
+                mInputMenu = NSMenu;
+                mLinkMenu = NSMenu;
+                mLocationSheetURLField = NSTextField;
+                mLocationSheetWindow = NSWindow;
+                mLocationToolbarView = ExtendedSplitView;
+                mMailToLinkMenu = NSMenu;
+                mPageMenu = NSMenu;
+                mPersonalToolbar = BookmarkToolbar;
+                mProgress = NSProgressIndicator;
+                mProxyIcon = PageProxyIcon;
+                mSearchBar = WebSearchField;
+                mSearchSheetTextField = WebSearchField;
+                mSearchSheetWindow = NSWindow;
+                mStatus = NSTextField;
+                mStatusBar = NSView;
+                mTabBarMenu = NSMenu;
+                mTabBrowser = BrowserTabView;
+                mTabMenu = NSMenu;
+                mURLBar = AutoCompleteTextField;
+            };
+            SUPERCLASS = NSWindowController;
+        },
+                {
+            ACTIONS =             {
+                addBookmark = id;
+                addBookmarkFolder = id;
+                addBookmarkSeparator = id;
+                addBookmarkWithoutPrompt = id;
+                addTabGroup = id;
+                addTabGroupWithoutPrompt = id;
+                fillForm = id;
+                find = id;
+                findActions = id;
+                getInfo = id;
+                miniaturizeAll = id;
+                showPageInfo = id;
+            };
+            CLASS = FirstResponder;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSObject;
+        },
+                {
+            CLASS = GoMenu;
+            LANGUAGE = ObjC;
+            SUPERCLASS = HistoryMenu;
+        },
+                {
+            CLASS = HistoryMenu;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                mItemBeforeHistoryItems = NSMenuItem;
+            };
+            SUPERCLASS = NSMenu;
+        },
+                {
+            ACTIONS =             {
+                aboutPlugins = id;
+                aboutServers = id;
+                aboutWindow = id;
+                clearHistory = id;
+                closeAllWindows = id;
+                closeCurrentTab = id;
+                connectToServer = id;
+                displayPreferencesWindow = id;
+                doSearch = id;
+                downloadsWindow = id;
+                emptyCache = id;
+                exportBookmarks = id;
+                feedbackLink = id;
+                findInPage = id;
+                goBack = id;
+                goForward = id;
+                goHome = id;
+                importBookmarks = id;
+                infoLink = id;
+                keyboardShortcutsLink = id;
+                makeTextBigger = id;
+                makeTextDefaultSize = id;
+                makeTextSmaller = id;
+                manageBookmarks = id;
+                newTab = id;
+                newWindow = id;
+                nextTab = id;
+                openFile = id;
+                openLocation = id;
+                openMenuBookmark = id;
+                pageSetup = id;
+                previousTab = id;
+                printDocument = id;
+                reload = id;
+                reloadAllTabs = id;
+                reloadWithCharset = id;
+                resetBrowser = id;
+                savePage = id;
+                sendURL = id;
+                setFileExtension = id;
+                showCertificates = id;
+                showHistory = id;
+                stop = id;
+                supportLink = id;
+                toggleAutoCharsetDetection = id;
+                toggleBookmarksToolbar = id;
+                toggleOfflineMode = id;
+                viewPageSource = id;
+                zoomAll = id;
+            };
+            CLASS = MainController;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                mAddBookmarkMenuItem = NSMenuItem;
+                mAddBookmarkWithoutPromptMenuItem = NSMenuItem;
+                mAddTabGroupMenuItem = NSMenuItem;
+                mAddTabGroupWithoutPromptMenuItem = NSMenuItem;
+                mApplication = NSApplication;
+                mAutoUpdater = SUUpdater;
+                mBookmarksHelperMenu = NSMenu;
+                mBookmarksMenu = BookmarkMenu;
+                mBookmarksToolbarMenuItem = NSMenuItem;
+                mCloseTabMenuItem = NSMenuItem;
+                mCloseWindowMenuItem = NSMenuItem;
+                mCreateBookmarksFolderMenuItem = NSMenuItem;
+                mCreateBookmarksSeparatorMenuItem = NSMenuItem;
+                mDockMenu = BookmarkMenu;
+                mExportPanelView = NSView;
+                mFilterView = NSView;
+                mServersSubmenu = NSMenu;
+                mShowAllBookmarksMenuItem = NSMenuItem;
+                mTextEncodingsMenu = NSMenu;
+            };
+            SUPERCLASS = NSObject;
+        },
+                {
+            ACTIONS =             {
+                load = id;
+            };
+            CLASS = MyBrowserView;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                progress = id;
+                progressSuper = id;
+                status = id;
+                urlbar = id;
+            };
+            SUPERCLASS = NSView;
+        },
+                {
+            CLASS = NSObject;
+            LANGUAGE = ObjC;
+        },
+                {
+            ACTIONS =             {
+                checkForUpdates = id;
+            };
+            CLASS = SUUpdater;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSObject;
+        },
+                {
+            CLASS = ThrobberHandler;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSObject;
+        },
+                {
+            CLASS = ToolbarController;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                mBrowserView = id;
+                mWindow = id;
+            };
+            SUPERCLASS = NSObject;
         }
-    ); 
-    IBVersion = 1; 
+    );
+    IBVersion = 1;
 }
\ No newline at end of file
diff --git a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/info.nib b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/info.nib
index 65d26b22784..24dae17fc8e 100644
--- a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/info.nib
+++ b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/info.nib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
@@ -14,12 +14,8 @@
 		<string>328 258 307 175 0 0 1024 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
-	<string>446.1</string>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>29</integer>
-	</array>
+	<string>489.0</string>
 	<key>IBSystem Version</key>
-	<string>8R2232</string>
+	<string>9B18</string>
 </dict>
 </plist>
diff --git a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/keyedobjects.nib b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/keyedobjects.nib
index 6a2792a2f60..b2eea4f78b5 100644
Binary files a/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/keyedobjects.nib and b/mozilla/camino/resources/localized/English.lproj/MainMenu.nib/keyedobjects.nib differ