diff -ruN ../prefbar-6.4.0-fx+sm.org/chrome/prefbar/content/buttonCommands.js ./chrome/prefbar/content/buttonCommands.js
--- ../prefbar-6.4.0-fx+sm.org/chrome/prefbar/content/buttonCommands.js	2014-01-19 03:47:57.000000000 +0900
+++ ./chrome/prefbar/content/buttonCommands.js	2014-06-13 13:10:29.000000000 +0900
@@ -258,6 +258,42 @@
   }
 }
 
+//
+// "Kill Silverlight" button
+//
+
+function prefbarKillSilverlight() {
+  var frames = prefbarGetFrames(window._content.window);
+  for (var frameindex = 0; frameindex < frames.length; frameindex++) {
+    var page = frames[frameindex].document;
+
+    // "Twice-Cooked Method" and <embed>
+
+    var embeds = page.getElementsByTagName("embed");
+
+    for(var i = embeds.length - 1; i >= 0; i--) {
+      var current = embeds[i];
+
+      if(current.type =="application/x-silverlight") {
+        if(current.parentNode.nodeName.toLowerCase() == "object")
+          current = current.parentNode;
+        prefbarRemoveElement(page, current);
+      }
+    }
+
+    // "Satay Method" and <object>
+
+    var objects = page.getElementsByTagName("object");
+
+    for(var i = objects.length - 1; i >= 0; i--) {
+      var current = objects[i];
+
+      if(current.type =="application/x-silverlight")
+        prefbarRemoveElement(page, current);
+    }
+  }
+}
+
 function prefbarGetFrames(owindow) {
   var winarray = new Array();
   winarray.push(owindow);
@@ -515,10 +551,11 @@
 //Java(TM) Plug-in                  <-- Linux
 //IcedTea NPR Web Browser Plugin    <-- Linux (http://icedtea.classpath.org/)
 //Java Embedding Plugin 0.9.7.2     <-- Mac OS X
+//Java アプレットプラグイン         <-- Mac OS X (Snow) Leopard/(Mt.) Lion
 //InnoTek OS/2 Kit for Java Plug-in <-- OS/2
 //Java(TM) Platform SE 6 U16        <-- Windows
 //Java Deployment Toolkit 6.0.160.1 <-- Don't match for this!
-var prefbarRegExJava = /(^| )(java|icedtea).*(platform|plug-?in)/i;
+var prefbarRegExJava = /(^Java |(^| )(java|icedtea).*(platform|plug-?in))/i;
 function prefbarSetJava(aValue) {
   // Set both (Pref and Plugin disabled status), if possible
   goPrefBar.SetPref("security.enable_java", aValue);
diff -ruN ../prefbar-6.4.0-fx+sm.org/chrome/prefbar/content/prefbar.json ./chrome/prefbar/content/prefbar.json
--- ../prefbar-6.4.0-fx+sm.org/chrome/prefbar/content/prefbar.json	2014-01-19 03:53:50.000000000 +0900
+++ ./chrome/prefbar/content/prefbar.json	2014-06-13 13:13:12.000000000 +0900
@@ -1,15 +1,50 @@
 {
   "prefbar:menu:enabled":{
     "items":["prefbar:button:colors",
-      "prefbar:button:images",
+      "prefbar:button:imagebehavior",
+      "prefbar:button:accessibility_blockautorefresh",
+      "prefbar:button:dom_storage",
+      "prefbar:button:dom_indexedDB",
+      "prefbar:button:gfx_downloadable_fonts",
+      "prefbar:button:geo",
+      "prefbar:button:media_autoplay",
+      "prefbar:button:animation",
+      "prefbar:button:cookies",
+      "prefbar:button:java",
       "prefbar:button:javascript",
       "prefbar:button:Flash",
+      "prefbar:button:Silverlight",
+      "prefbar:button:PDF",
+      "prefbar:button:WMP",
+      "prefbar:button:QuickTime",
+      "prefbar:button:Flip4MacWMV",
+      "prefbar:button:SharePointBrowser",
+      "prefbar:button:media_wave",
+      "prefbar:button:media_ogg",
+      "prefbar:button:media_webm",
+      "prefbar:button:webgl",
+      "prefbar:button:svg_smil",
+      "prefbar:button:pdfjs",
       "prefbar:button:separator10",
       "prefbar:button:clearallcache",
       "prefbar:button:separator11",
       "prefbar:button:savepage",
       "prefbar:button:separator8",
+      "prefbar:button:proxymenu",
+      "prefbar:button:referrer",
+      "prefbar:button:prefetch-next",
+      "prefbar:button:favicons",
+      "prefbar:button:siteicons",
+      "prefbar:button:urlbar_richresults",
+      "prefbar:button:search_suggest",
+      "prefbar:button:prefbarlanglist",
+      "prefbar:button:fonts",
+      "prefbar:button:font_default_ja",
+      "prefbar:button:font_name_serif_ja",
+      "prefbar:button:font_name_sans-serif_ja",
+      "prefbar:button:font_name_monospace_ja",
       "prefbar:button:useragent",
+      "prefbar:button:resizelist",
       "prefbar:button:spacer0",
       "prefbar:button:separator6",
       "prefbar:button:help",
@@ -25,12 +60,86 @@
     "topref":"value",
     "frompref":"value"
   },
-  "prefbar:button:images":{
-    "label":"Images",
+  "prefbar:button:imagebehavior": {
+    "items": [
+      [
+        "No Images",
+        "2"
+      ],
+      [
+        "Site Images",
+        "3"
+      ],
+      [
+        "All Images",
+        "1"
+      ]
+    ],
+    "type": "menulist",
+    "label": "Image Behavior",
+    "prefstring": "permissions.default.image"
+  },
+  "prefbar:button:accessibility_blockautorefresh": {
+    "type": "check",
+    "label": "Auto Refresh",
+    "prefstring": "accessibility.blockautorefresh",
+    "topref": "!value",
+    "frompref": "!value"
+  },
+  "prefbar:button:dom_storage": {
+    "label": "Storage",
+    "type": "check",
+    "prefstring": "dom.storage.enabled",
+    "topref": "value",
+    "frompref": "value"
+  },
+  "prefbar:button:dom_indexedDB": {
+    "label": "Indexed DB",
+    "type": "check",
+    "prefstring": "dom.indexedDB.enabled",
+    "topref": "value",
+    "frompref": "value"
+  },
+  "prefbar:button:gfx_downloadable_fonts": {
+    "label": "Downloadable fonts",
+    "type": "check",
+    "prefstring": "gfx.downloadable_fonts.enabled",
+    "topref": "value",
+    "frompref": "value"
+  },
+  "prefbar:button:geo": {
+    "label": "Geolocation",
+    "type": "check",
+    "prefstring": "geo.enabled",
+    "topref": "value",
+    "frompref": "value"
+  },
+  "prefbar:button:media_autoplay": {
+    "label": "Autoplay",
+    "type": "check",
+    "prefstring": "media.autoplay.enabled",
+    "topref": "value",
+    "frompref": "value"
+  },
+  "prefbar:button:animation":{
+    "label":"Animation",
     "type":"check",
-    "prefstring":"permissions.default.image",
-    "topref":"value ? 1 : 2",
-    "frompref":"value == 1"
+    "prefstring":"image.animation_mode",
+    "topref":"value ? 'normal' : 'none'",
+    "frompref":"value=='normal'"
+  },
+  "prefbar:button:cookies":{
+    "label":"Cookies",
+    "type":"check",
+    "prefstring":"network.cookie.cookieBehavior",
+    "topref":"Number(!value)+1",
+    "frompref":"value != 2"
+  },
+  "prefbar:button:java":{
+    "label":"Java",
+    "type":"extcheck",
+    "setfunction": "prefbarRegExJava = /(^Java |(^| )(java|icedtea).*(platform|plug-?in))/i;\nprefbarSetJava(value);",
+    "getfunction": "prefbarRegExJava = /(^Java |(^| )(java|icedtea).*(platform|plug-?in))/i;\nvalue = prefbarGetJava();"
   },
   "prefbar:button:javascript":{
     "label":"JavaScript",
@@ -45,6 +154,84 @@
     "setfunction":"prefbarSetFlash(value);",
     "getfunction":"value = prefbarGetFlash();"
   },
+  "prefbar:button:Silverlight":{
+    "label":"Silverlight",
+    "type":"extcheck",
+    "setfunction": "var prefbarRegExSilverlight = /^Silverlight Plug-In/i;\nfunction prefbarSetSilverlight(aValue) {\n  goPrefBar.SetPluginEnabled(prefbarRegExSilverlight, aValue, \"Silverlight\");\n}\nprefbarSetSilverlight(value);\n",
+    "getfunction": "var prefbarRegExSilverlight = /^Silverlight Plug-In/i;\nfunction prefbarGetSilverlight() {\n  return goPrefBar.GetPluginEnabled(prefbarRegExSilverlight);\n}\nvalue = prefbarGetSilverlight();\n"
+  },
+  "prefbar:button:PDF":{
+    "label":"PDF",
+    "type":"extcheck",
+    "setfunction": "var prefbarRegExPDF = /^Adobe Acrobat NPAPI Plug-in/i;\nfunction prefbarSetPDF(aValue) {\n  goPrefBar.SetPluginEnabled(prefbarRegExPDF, aValue, \"PDF\");\n}\nprefbarSetPDF(value);",
+    "getfunction": "var prefbarRegExPDF = /^Adobe Acrobat NPAPI Plug-in/i;\nfunction prefbarGetPDF() {\n  return goPrefBar.GetPluginEnabled(prefbarRegExPDF);\n}\nvalue = prefbarGetPDF();"
+  },
+  "prefbar:button:WMP":{
+    "label":"WMP",
+    "type":"extcheck",
+    "setfunction": "var prefbarRegExWMP = /^Windows Media Player Plug-in/i;\nfunction prefbarSetWMP(aValue) {\n  goPrefBar.SetPluginEnabled(prefbarRegExWMP, aValue, \"WMP\");\n}\nprefbarSetWMP(value);\n",
+    "getfunction": "var prefbarRegExWMP = /^Windows Media Player Plug-in/i;\nfunction prefbarGetWMP() {\n  return goPrefBar.GetPluginEnabled(prefbarRegExWMP);\n}\nvalue = prefbarGetWMP();"
+  },
+  "prefbar:button:QuickTime":{
+    "label":"QuickTime",
+    "type":"extcheck",
+    "setfunction": "var prefbarRegExQuickTime = /^QuickTime Plug-in/i;\nfunction prefbarSetQuickTime(aValue) {\n  goPrefBar.SetPluginEnabled(prefbarRegExQuickTime, aValue, \"QuickTime\");\n}\nprefbarSetQuickTime(value);",
+    "getfunction": "var prefbarRegExQuickTime = /^QuickTime Plug-in/i;\nfunction prefbarGetQuickTime() {\n  return goPrefBar.GetPluginEnabled(prefbarRegExQuickTime);\n}\nvalue = prefbarGetQuickTime();"
+  },
+  "prefbar:button:Flip4MacWMV":{
+    "label":"Flip4Mac",
+    "type":"extcheck",
+    "setfunction": "var prefbarRegExFlip4MacWMV = /^Flip4Mac Windows Media Plugin/i;\nfunction prefbarSetFlip4MacWMV(aValue) {\n  goPrefBar.SetPluginEnabled(prefbarRegExFlip4MacWMV, aValue, \"Flip4MacWMV\");\n}\nprefbarSetFlip4MacWMV(value);\n",
+    "getfunction": "var prefbarRegExFlip4MacWMV = /^Flip4Mac Windows Media Plugin/i;\nfunction prefbarGetFlip4MacWMV() {\n  return goPrefBar.GetPluginEnabled(prefbarRegExFlip4MacWMV);\n}\nvalue = prefbarGetFlip4MacWMV();"
+  },
+  "prefbar:button:SharePointBrowser":{
+    "label":"SharePoint Browser",
+    "type":"extcheck",
+    "setfunction": "var prefbarRegExSharePointBrowser = /^SharePoint Browser Plug-in/i;\nfunction prefbarSetSharePointBrowser(aValue) {\n  goPrefBar.SetPluginEnabled(prefbarRegExSharePointBrowser, aValue, \"SharePointBrowser\");\n}\nprefbarSetSharePointBrowser(value);\n",
+    "getfunction": "var prefbarRegExSharePointBrowser = /^SharePoint Browser Plug-in/i;\nfunction prefbarGetSharePointBrowser() {\n  return goPrefBar.GetPluginEnabled(prefbarRegExSharePointBrowser);\n}\nvalue = prefbarGetSharePointBrowser();"
+  },
+  "prefbar:button:media_wave": {
+    "label": "Wave",
+    "type": "check",
+    "prefstring": "media.wave.enabled",
+    "topref": "value",
+    "frompref": "value"
+  },
+  "prefbar:button:media_ogg": {
+    "label": "Ogg",
+    "type": "check",
+    "prefstring": "media.ogg.enabled",
+    "topref": "value",
+    "frompref": "value"
+  },
+  "prefbar:button:media_webm": {
+    "label": "WebM",
+    "type": "check",
+    "prefstring": "media.webm.enabled",
+    "topref": "value",
+    "frompref": "value"
+  },
+  "prefbar:button:webgl": {
+    "label": "WebGL",
+    "type": "check",
+    "prefstring": "webgl.disabled",
+    "topref": "!value",
+    "frompref": "!value"
+  },
+  "prefbar:button:svg_smil": {
+    "label": "SVG.SMIL",
+    "type": "check",
+    "prefstring": "svg.smil.enabled",
+    "topref": "value",
+    "frompref": "value"
+  },
+  "prefbar:button:pdfjs": {
+    "type": "check",
+    "label": "PDF.js Viewer",
+    "prefstring": "pdfjs.disabled",
+    "topref": "!value",
+    "frompref": "!value"
+  },
   "prefbar:button:separator10":{
     "type":"separator"
   },
@@ -64,6 +251,312 @@
   "prefbar:button:separator8":{
     "type":"separator"
   },
+  "prefbar:button:proxymenu":{
+    "items":[["No Proxies",
+        "0"
+      ],
+      ["Manual Proxy",
+        "1"
+      ],
+      ["Automatic Proxy",
+        "2"
+      ]
+    ],
+    "label":"Proxy Menulist",
+    "type":"menulist",
+    "prefstring":"network.proxy.type"
+  },
+  "prefbar:button:referrer":{
+    "label":"Send Referrer",
+    "type":"check",
+    "prefstring":"network.http.sendRefererHeader",
+    "topref":"2*Number(value)",
+    "frompref":"Boolean(value)"
+  },
+  "prefbar:button:prefetch-next": {
+    "type": "check",
+    "label": "prefetch",
+    "prefstring": "network.prefetch-next",
+    "topref": "value",
+    "frompref": "value"
+  },
+  "prefbar:button:favicons": {
+    "type": "check",
+    "label": "favicon",
+    "prefstring": "browser.chrome.favicons",
+    "topref": "value",
+    "frompref": "value"
+  },
+  "prefbar:button:siteicons": {
+    "type": "check",
+    "label": "siteicon",
+    "prefstring": "browser.chrome.site_icons",
+    "topref": "value",
+    "frompref": "value"
+  },
+  "prefbar:button:urlbar_richresults": {
+    "type": "check",
+    "label": "rich result",
+    "prefstring": "browser.urlbar.maxRichResults",
+    "topref": "12*Number(value)",
+    "frompref": "Boolean(value)"
+  },
+  "prefbar:button:search_suggest": {
+    "type": "check",
+    "label": "suggest search",
+    "prefstring": "browser.search.suggest.enabled",
+    "topref": "value",
+    "frompref": "value"
+  },
+  "prefbar:button:prefbarlanglist":{
+    "items":[
+      ["Default",  "!RESET!"],
+      ["English",  "en-us,en"],
+      ["French",   "fr-fr,fr,en-us,en"],
+      ["German",   "de-de,de,en-us,en"],
+      ["Japanese", "ja,en-us,en"],
+      ["Spanish",  "es-es,es,en-us,en"]
+    ],
+    "label":"Language",
+    "type":"menulist",
+    "prefstring":"intl.accept_languages",
+    "dontupdatelistitems":true
+  },
+  "prefbar:button:fonts":{
+    "label":"Fonts",
+    "type":"check",
+    "prefstring":"browser.display.use_document_fonts",
+    "topref":"Number(value)",
+    "frompref":"Boolean(value)"
+  },
+  "prefbar:button:font_default_ja": {
+    "type": "menulist",
+    "label": "書体",
+    "prefstring": "font.default.ja",
+    "items": [
+      [
+        "明朝体",
+        "serif"
+      ],
+      [
+        "ゴシック体",
+        "sans-serif"
+      ]
+    ]
+  },
+  "prefbar:button:font_name_serif_ja": {
+    "type": "menulist",
+    "label": "明朝体フォント名",
+    "prefstring": "font.name.serif.ja",
+    "items": [
+      [
+        "ヒラギノ明朝",
+        "Hiragino Mincho ProN"
+      ],
+      [
+        "小塚明朝 Pr6N",
+        "Kozuka Mincho Pr6N"
+      ],
+      [
+        "ＭＳ Ｐ明朝",
+        "MS PMincho"
+      ],
+      [
+        "ＭＳ 明朝",
+        "MS Mincho"
+      ],
+      [
+        "メイリオ",
+        "Meiryo"
+      ],
+      [
+        "IPAPMincho",
+        "IPAPMincho"
+      ],
+      [
+        "IPAMincho",
+        "IPAMincho"
+      ],
+      [
+        "IPAMonaPMincho",
+        "IPAMonaPMincho"
+      ],
+      [
+        "IPAMonaMincho",
+        "IPAMonaMincho"
+      ]
+    ]
+  },
+  "prefbar:button:font_name_sans-serif_ja": {
+    "type": "menulist",
+    "label": "ゴシック体フォント名",
+    "prefstring": "font.name.sans-serif.ja",
+    "items": [
+      [
+        "ヒラギノ角ゴ",
+	"Hiragino Kaku Gothic ProN"
+      ],
+      [
+        "小塚ゴシック Pr6N",
+        "Kozuka Gothic Pr6N"
+      ],
+      [
+        "ＭＳ Ｐゴシック",
+        "MS PGothic"
+      ],
+      [
+        "ＭＳ ゴシック",
+        "MS Gothic"
+      ],
+      [
+        "メイリオ",
+        "Meiryo"
+      ],
+      [
+        "IPAPGothic",
+        "IPAPGothic"
+      ],
+      [
+        "IPAGothic",
+        "IPAGothic"
+      ],
+      [
+        "IPAMonaPGothic",
+        "IPAMonaPGothic"
+      ],
+      [
+        "IPAMonaGothic",
+        "IPAMonaGothic"
+      ]
+    ]
+  },
+  "prefbar:button:font_name_monospace_ja": {
+    "type": "menulist",
+    "label": "等幅フォント名",
+    "prefstring": "font.name.monospace.ja",
+    "items": [
+      [
+        "Osaka-Mono",
+        "Osaka-Mono"
+      ],
+      [
+        "Andale Mono",
+        "Andale Mono"
+      ],
+      [
+        "Courier",
+        "Courier"
+      ],
+      [
+        "Courier New",
+        "Courier New"
+      ],
+      [
+        "Monaco",
+        "Monaco"
+      ],
+      [
+        "ヒラギノ明朝",
+        "Hiragino Mincho ProN"
+      ],
+      [
+        "ヒラギノ角ゴ",
+        "Hiragino Kaku Gothic ProN"
+      ],
+      [
+        "小塚明朝 Pr6N",
+        "Kozuka Mincho Pr6N"
+      ],
+      [
+        "小塚ゴシック Pr6N",
+        "Kozuka Gothic Pr6N"
+      ],
+      [
+        "ＭＳ 明朝",
+        "MS Mincho"
+      ],
+      [
+        "ＭＳ ゴシック",
+        "MS Gothic"
+      ],
+      [
+        "メイリオ",
+        "Meiryo"
+      ],
+      [
+        "IPAMincho",
+        "IPAMincho"
+      ],
+      [
+        "IPAGothic",
+        "IPAGothic"
+      ],
+      [
+        "IPAMonaMincho",
+        "IPAMonaMincho"
+      ],
+      [
+        "IPAMonaGothic",
+        "IPAMonaGothic"
+      ],
+      [
+        "STSong",
+        "STSong"
+      ],
+      [
+        "STHeiti",
+        "STHeiti"
+      ],
+      [
+        "Kai",
+        "Kai"
+      ],
+      [
+        "Hei",
+        "Hei"
+      ],
+      [
+        "LiSong Pro",
+        "LiSong Pro"
+      ],
+      [
+        "LiHei Pro",
+        "LiHei Pro"
+      ],
+      [
+        "Apple LiSung",
+        "Apple LiSung"
+      ],
+      [
+        "Apple LiGothic",
+        "Apple LiGothic"
+      ],
+      [
+        "PCMyungjo",
+        "PCMyungjo"
+      ],
+      [
+        "GungSeo",
+        "GungSeo"
+      ],
+      [
+        "AppleMyungjo",
+        "AppleMyungjo"
+      ],
+      [
+        "AppleGothic",
+        "AppleGothic"
+      ],
+      [
+        "Source Sans Pro",
+        "Source Sans Pro"
+      ],
+      [
+        "Source Code Pro",
+        "Source Code Pro"
+      ]
+    ]
+  },
   "prefbar:button:useragent":{
     "items":[["Real UA",
         "!RESET!"
@@ -93,6 +586,35 @@
     "setfunction":"prefbarSetUseragent(value);",
     "getfunction":"value = prefbarGetUseragent(items);"
   },
+  "prefbar:button:resizelist":{
+    "items":[["640x480",
+        "640x480"
+      ],
+      ["800x600",
+        "800x600"
+      ],
+      ["1024x768",
+        "1024x768"
+      ],
+      ["1280x1024",
+        "1280x1024"
+      ],
+      ["640x960",
+        "640x960"
+      ],
+      ["800x960",
+        "800x960"
+      ],
+      ["1024x960",
+        "1024x960"
+      ]
+    ],
+    "label":"Resize",
+    "type":"extlist",
+    "dontupdatelistitems":true,
+    "setfunction":"prefbarSetResolution(value);",
+    "getfunction":"value = prefbarGetResolution(items);"
+  },
   "prefbar:button:spacer0":{
     "type":"spacer"
   },
@@ -123,35 +645,30 @@
       "prefbar:button:reload",
       "prefbar:button:stop",
       "prefbar:button:separator0",
+      "prefbar:button:images",
       "prefbar:button:home",
       "prefbar:button:separator13",
       "prefbar:button:prefbartabjavascript",
       "prefbar:button:prefbartabimages",
       "prefbar:button:prefbartabplugins",
       "prefbar:button:separator1",
-      "prefbar:button:fonts",
       "prefbar:button:systemcolors",
-      "prefbar:button:animation",
-      "prefbar:button:java",
       "prefbar:button:popups",
       "prefbar:button:proxycheck",
-      "prefbar:button:proxymenu",
-      "prefbar:button:cookies",
       "prefbar:button:cookieask",
       "prefbar:button:pipelining",
       "prefbar:button:cacheenabled",
-      "prefbar:button:referrer",
       "prefbar:button:separator2",
       "prefbar:button:clearhist",
       "prefbar:button:clearurlbar",
       "prefbar:button:clearcookies",
       "prefbar:button:clearall",
       "prefbar:button:separator5",
-      "prefbar:button:resizelist",
       "prefbar:button:separator9",
       "prefbar:button:newtab",
       "prefbar:button:prefbarrestoretab",
       "prefbar:button:killflash",
+      "prefbar:button:killsilverlight",
       "prefbar:button:separator12",
       "prefbar:button:fontdown",
       "prefbar:button:fontup",
@@ -161,8 +678,7 @@
       "prefbar:button:mozillazine",
       "prefbar:button:separator7",
       "prefbar:button:hidetoolbar",
-      "prefbar:button:proxylist",
-      "prefbar:button:prefbarlanglist"
+      "prefbar:button:proxylist"
     ]
   },
   "prefbar:button:back":{
@@ -191,6 +707,13 @@
   "prefbar:button:separator0":{
     "type":"separator"
   },
+  "prefbar:button:images":{
+    "label":"Images",
+    "type":"check",
+    "prefstring":"permissions.default.image",
+    "topref":"value ? 1 : 2",
+    "frompref":"value == 1"
+  },
   "prefbar:button:home":{
     "label":"Home",
     "type":"button",
@@ -223,13 +746,6 @@
   "prefbar:button:separator1":{
     "type":"separator"
   },
-  "prefbar:button:fonts":{
-    "label":"Fonts",
-    "type":"check",
-    "prefstring":"browser.display.use_document_fonts",
-    "topref":"Number(value)",
-    "frompref":"Boolean(value)"
-  },
   "prefbar:button:systemcolors":{
     "label":"System Colors",
     "type":"check",
@@ -237,19 +753,6 @@
     "topref":"value",
     "frompref":"value"
   },
-  "prefbar:button:animation":{
-    "label":"Animation",
-    "type":"check",
-    "prefstring":"image.animation_mode",
-    "topref":"value ? 'normal' : 'none'",
-    "frompref":"value=='normal'"
-  },
-  "prefbar:button:java":{
-    "label":"Java",
-    "type":"extcheck",
-    "setfunction":"prefbarSetJava(value);",
-    "getfunction":"value = prefbarGetJava();"
-  },
   "prefbar:button:popups":{
     "label":"Popups",
     "type":"check",
@@ -263,28 +766,6 @@
     "setfunction":"prefbarSetProxyEnabled(value);",
     "getfunction":"value = prefbarGetProxyEnabled();"
   },
-  "prefbar:button:proxymenu":{
-    "items":[["No Proxies",
-        "0"
-      ],
-      ["Manual Proxy",
-        "1"
-      ],
-      ["Automatic Proxy",
-        "2"
-      ]
-    ],
-    "label":"Proxy Menulist",
-    "type":"menulist",
-    "prefstring":"network.proxy.type"
-  },
-  "prefbar:button:cookies":{
-    "label":"Cookies",
-    "type":"check",
-    "prefstring":"network.cookie.cookieBehavior",
-    "topref":"2*Number(!value)",
-    "frompref":"value != 2"
-  },
   "prefbar:button:cookieask":{
     "label":"Cookie Warning",
     "type":"check",
@@ -304,13 +785,6 @@
     "setfunction":"prefbarSetCacheEnabled(value);",
     "getfunction":"value = prefbarGetCacheEnabled();"
   },
-  "prefbar:button:referrer":{
-    "label":"Send Referrer",
-    "type":"check",
-    "prefstring":"network.http.sendRefererHeader",
-    "topref":"2*Number(value)",
-    "frompref":"Boolean(value)"
-  },
   "prefbar:button:separator2":{
     "type":"separator"
   },
@@ -337,23 +811,6 @@
   "prefbar:button:separator5":{
     "type":"separator"
   },
-  "prefbar:button:resizelist":{
-    "items":[["640x480",
-        "640x480"
-      ],
-      ["800x600",
-        "800x600"
-      ],
-      ["1024x768",
-        "1024x768"
-      ]
-    ],
-    "label":"Resize",
-    "type":"extlist",
-    "dontupdatelistitems":true,
-    "setfunction":"prefbarSetResolution(value);",
-    "getfunction":"value = prefbarGetResolution(items);"
-  },
   "prefbar:button:separator9":{
     "type":"separator"
   },
@@ -372,6 +829,11 @@
     "type":"button",
     "onclick":"prefbarKillFlash()"
   },
+  "prefbar:button:killsilverlight":{
+    "label":"Kill Silverlight",
+    "type":"button",
+    "onclick":"prefbarKillSilverlight()"
+  },
   "prefbar:button:separator12":{
     "type":"separator"
   },
@@ -428,20 +890,6 @@
     "setfunction":"prefbarSetProxy(value);",
     "getfunction":"value=prefbarGetProxy();"
   },
-  "prefbar:button:prefbarlanglist":{
-    "items":[
-      ["Default",  "!RESET!"],
-      ["English",  "en-us,en"],
-      ["French",   "fr-fr,fr,en-us,en"],
-      ["German",   "de-de,de,en-us,en"],
-      ["Japanese", "ja,en-us,en"],
-      ["Spanish",  "es-es,es,en-us,en"]
-    ],
-    "label":"Language",
-    "type":"menulist",
-    "prefstring":"intl.accept_languages",
-    "dontupdatelistitems":true
-  },
   "prefbar:info":{
     "formatversion":3
   }
diff -ruN ../prefbar-6.4.0-fx+sm.org/chrome/prefbar/locale/ja/buttons.properties ./chrome/prefbar/locale/ja/buttons.properties
--- ../prefbar-6.4.0-fx+sm.org/chrome/prefbar/locale/ja/buttons.properties	2012-02-13 19:17:01.000000000 +0900
+++ ./chrome/prefbar/locale/ja/buttons.properties	2014-06-13 13:10:29.000000000 +0900
@@ -2,8 +2,8 @@
 images.label=画像
 clearallcache.label=キャッシュを消去
 savepage.label=ページを保存
-useragent.label=ユーザーエージェント
-useragent.optionlabel1=現在使用中のブラウザ
+useragent.label=ブラウザの通知
+useragent.optionlabel1=既定のブラウザ
 help.label=PrefBar ヘルプ
 whatsnew.label=最新情報
 customize.label=カスタマイズ
@@ -15,7 +15,7 @@
 prefbartabjavascript.label=Javascript (タブ)
 prefbartabimages.label=画像 (タブ)
 prefbartabplugins.label=プラグイン (タブ)
-fonts.label=フォント
+fonts.label=指定書体
 systemcolors.label=システムカラー
 animation.label=アニメーション
 java.label=Java
@@ -27,6 +27,19 @@
 proxymenu.optionlabel2=手動設定
 proxymenu.optionlabel3=自動検出
 
+imagebehavior.label=画像設定
+imagebehavior.optionlabel1=画像なし
+imagebehavior.optionlabel2=サイト内画像
+imagebehavior.optionlabel3=全ての画像
+
+accessibility_blockautorefresh.label=自動再読込
+dom_storage.label=ストレージ
+dom_indexedDB.label=インデックスDB
+gfx_downloadable_fonts.label=外部フォント
+geo.label=位置情報
+media_autoplay.label=自動再生
+prefetch-next.label=先読み
+
 cookies.label=Cookie
 cookieask.label=Cookie を警告
 pipelining.label=パイプライン接続
@@ -40,18 +53,19 @@
 newtab.label=新しいタブ
 prefbarrestoretab.label=タブの復元
 killflash.label=Flash の除去
+killsilverlight.label=Silverlight の除去
 fontdown.label=フォント -
 fontup.label=フォント +
 prefbarhomepagelink.label=PrefBar ホームページ
 hidetoolbar.label=ツールバーを隠す
 
 proxylist.label=プロキシを選択
-proxylist.optionlabel1=なし
+proxylist.optionlabel1=プロキシなし
 proxylist.optionlabel2=プロキシ1
 proxylist.optionlabel3=プロキシ2
 
 prefbarlanglist.label=言語識別子
-prefbarlanglist.optionlabel1=デフォルト
+prefbarlanglist.optionlabel1=既定言語
 prefbarlanglist.optionlabel2=英語
 prefbarlanglist.optionlabel3=フランス語
 prefbarlanglist.optionlabel4=ドイツ語
@@ -160,7 +174,7 @@
 localeswitch._label=Locale Switch
 localeswitch.label=Locale の切り替え
 localeswitch._optionlabel1=Default
-localeswitch.optionlabel1=デフォルト
+localeswitch.optionlabel1=既定Locale
 localeswitch._optionlabel2=Automatic
 localeswitch.optionlabel2=自動切り替え
 localeswitch._optionlabel3=English (en-US)
