Bug 1684948 - Move debugging preferences from debugQA into SeaMonkey - cache part. r=frg

suite/components/pref/content/pref-cache.xul

@@ -33,6 +33,12 @@
       <preference id="browser.cache.disk.parent_directory"
                   name="browser.cache.disk.parent_directory"
                   type="file"/>
+      <preference id="browser.cache.disk.enable"
+                  name="browser.cache.disk.enable"
+                  type="bool"/>
+      <preference id="browser.cache.memory.enable"
+                  name="browser.cache.memory.enable"
+                  type="bool"/>
     </preferences>
 
     <groupbox>
@@ -118,5 +124,19 @@
       </vbox>
     </groupbox>
 
+    <groupbox id="debugCache">
+      <caption label="&debugCache.label;"/>
+      <hbox align="center">
+        <checkbox id="browserEnableDiskCache"
+                  label="&debugEnableDiskCache.label;"
+                  accesskey="&debugEnableDiskCache.accesskey;"
+                  preference="browser.cache.disk.enable"/>
+        <checkbox id="browserEnableCache"
+                  label="&debugEnableMemCache.label;"
+                  accesskey="&debugEnableMemCache.accesskey;"
+                  preference="browser.cache.memory.enable"/>
+      </hbox>
+    </groupbox>
+
   </prefpane>
 </overlay>

suite/extensions/debugQA/content/pref-debug2.xul

@@ -12,10 +12,6 @@
     <preferences id="debugqa_preferences2">
       <preference id="nglayout.debug.disable_xul_cache"
                   name="nglayout.debug.disable_xul_cache" type="bool"/>
-      <preference id="browser.cache.disk.enable"
-                  name="browser.cache.disk.enable" type="bool"/>
-      <preference id="browser.cache.memory.enable"
-                  name="browser.cache.memory.enable" type="bool"/>
     </preferences>
 
     <!-- nothing on this page has accesskeys because this is a temporary debug
@@ -26,10 +22,6 @@
       <vbox align="start">
         <checkbox id="nglayoutDebugDisableXULCache" label="&debugDisableXULCache.label;"
                   preference="nglayout.debug.disable_xul_cache"/>
-        <checkbox id="browserEnableDiskCache" label="&debugEnableDiskCache.label;"
-                  preference="browser.cache.disk.enable"/>
-        <checkbox id="browserEnableCache" label="&debugEnableMemCache.label;"
-                  preference="browser.cache.memory.enable"/>
       </vbox>
     </groupbox>
   </prefpane>

suite/extensions/debugQA/locales/en-US/pref-debug2.dtd

@@ -12,5 +12,3 @@
 <!-- Cache -->
 <!ENTITY debugCache.label             "Cache">
 <!ENTITY debugDisableXULCache.label   "Disable XUL Cache">
-<!ENTITY debugEnableMemCache.label    "Enable Mem Cache">
-<!ENTITY debugEnableDiskCache.label   "Enable Disk Cache">

suite/locales/en-US/chrome/common/pref/pref-cache.dtd

@@ -29,3 +29,9 @@
 <!ENTITY prefetchTitle.label             "Link Prefetching">
 <!ENTITY enablePrefetch.label            "Prefetch web pages when idle, so that links in web pages designed for prefetching can load more quickly">
 <!ENTITY enablePrefetch.accesskey        "P">
+
+<!ENTITY debugCache.label                "Debugging">
+<!ENTITY debugEnableMemCache.label       "Enable Memory Cache">
+<!ENTITY debugEnableMemCache.accesskey   "E">
+<!ENTITY debugEnableDiskCache.label      "Enable Disk Cache">
+<!ENTITY debugEnableDiskCache.accesskey  "D">