b=255151/262304, landing changes that got half-merged to trunk from aviary; smoketest fix; r=vladimir,a=ben

browser/components/bookmarks/content/bookmarks.js

@@ -698,6 +698,18 @@ var BookmarksCommand = {
   },
 
   importBookmarks: function ()
+  {
+      // XXX: ifdef it to be non-modal (non-"sheet") on mac (see bug 259039)
+      var features = "modal,centerscreen,chrome,resizable=no";
+      window.fromFile = false;
+      window.openDialog("chrome://browser/content/migration/migration.xul", "migration", features, "bookmarks");
+      if(window.fromFile)
+      {
+        this.importBookmarksFromFile();
+      }
+  },
+
+  importBookmarksFromFile: function ()
   {
     ///transaction...
     try {

browser/locales/en-US/chrome/browser/migration/migration.dtd

@@ -3,6 +3,7 @@
 
 <!ENTITY importFrom.label               "Import Options, Bookmarks, History, Passwords and other data from:">
 <!ENTITY importFromUnix.label           "Import Preferences, Bookmarks, History, Passwords and other data from:">
+<!ENTITY importFromBookmarks.label      "Import Bookmarks from:">
 
 <!ENTITY importFromIE.label             "Microsoft Internet Explorer">
 <!ENTITY importFromIE.accesskey         "M">
@@ -30,6 +31,8 @@
 <!ENTITY importFromEpiphany.accesskey   "E">
 <!ENTITY importFromGaleon.label         "Galeon">
 <!ENTITY importFromGaleon.accesskey     "G">
+<!ENTITY importFromFile.label           "From File">
+<!ENTITY importFromFile.accesskey       "F">
 
 <!ENTITY importSource.title             "Import Settings and Data From">
 <!ENTITY importItems.title              "Items to Import">