bugzilla 103192 r=morse sr=hewitt reducing h and v space taken up in cookies prefpanels

extensions/cookie/resources/content/pref-cookies.xul

@@ -88,12 +88,7 @@
   </script>
 
   <hbox class="box-smallheader" id="cookieHeader" title="&lHeader;"/>
-
-  <groupbox>
-    <caption label="&cookiePolicy.label;"/>
-
     <description>&cookieDetails;</description>
-
     <radiogroup id="networkCookieBehaviour"
                 prefstring="network.cookie.cookieBehavior">
       <radio value="2" label="&disableCookies.label;"
@@ -110,9 +105,7 @@
       <radio value="0" label="&accAllCookiesRadio.label;"
              accesskey="&accAllCookiesRadio.accesskey;" oncommand="setDisables();"/>
     </radiogroup>
-
     <separator/>
-
     <vbox align="start">
       <checkbox id="networkWarnAboutCookies" label="&warnAboutCookies.label;" accesskey="&warnAboutCookies.accesskey;"
                 prefstring="network.cookie.warnAboutCookies"/>
@@ -130,21 +123,17 @@
             <textbox id="lifetimeDays" pref="true" size="4"
                      preftype="int" prefstring="network.cookie.lifetime.days"/>
             <description>&days.label;</description>
-          </hbox>
-        </radiogroup>
+            </hbox>
+         </radiogroup>
       </hbox>
-
-    </vbox>
-
-    <separator/>
-
-    <hbox pack="end">
-      <button label="&viewCookies.label;" accesskey="&viewCookies.accesskey;" oncommand="viewCookies();"
-              id="viewCookieButton"
-              prefstring="pref.advanced.cookies.disable_button.view_cookies"/>
-      <button label="&viewTutorial.label;" accesskey="&viewTutorial.accesskey;" oncommand="viewTutorial();"
-              id="moreInformation"
-              prefstring="pref.advanced.cookies.disable_button.more_info"/>
-    </hbox>
-  </groupbox>
+   </vbox>
+   <separator/>
+   <hbox pack="end">
+     <button label="&viewCookies.label;" accesskey="&viewCookies.accesskey;" oncommand="viewCookies();"
+		     id="viewCookieButton"
+		     prefstring="pref.advanced.cookies.disable_button.view_cookies"/>
+     <button label="&viewTutorial.label;" accesskey="&viewTutorial.accesskey;" oncommand="viewTutorial();"
+             id="moreInformation"
+             prefstring="pref.advanced.cookies.disable_button.more_info"/>
+   </hbox>
 </page>

extensions/cookie/resources/locale/en-US/pref-cookies.dtd

@@ -19,16 +19,16 @@
 <!ENTITY warnAboutCookies.label         "Warn me before storing a cookie">
 <!ENTITY warnAboutCookies.accesskey     "w">
 
-<!ENTITY cookieDetails                  "Cookies are small pieces of information that some web sites ask to store on your computer. If you enable cookies, your browser will accept a web site's cookies automatically when you visit the site. Such cookies are sent back to the web site on future visits.">
+<!ENTITY cookieDetails                  "Cookies are small pieces of information that some web sites ask to store on (and later retrieve from) your computer.">
 
 <!ENTITY viewCookies.label              "View Stored Cookies">
 <!ENTITY viewCookies.accesskey          "S">
-<!ENTITY viewP3P.label                   "View Privacy Levels">
+<!ENTITY viewP3P.label                   "View">
 <!ENTITY viewP3P.accesskey               "V">
 <!ENTITY viewTutorial.label              "More Information">
 <!ENTITY viewTutorial.accesskey          "M">
 
-<!ENTITY  limitLifetime.label            "Limit maximum lifetime of cookies to">
+<!ENTITY  limitLifetime.label            "Limit maximum lifetime of cookies to:">
 <!ENTITY  limitLifetime.accesskey        "l">
 <!ENTITY  current.label                  "current session">
 <!ENTITY  current.accesskey              "c">