Fix for 47703 - UI: Composer Prefs Panel - r=walk84@usa.net

editor/ui/composer/content/pref-composer.xul

@@ -48,6 +48,41 @@
 
   <box class="box-smallheader" title="&lHeader;"/>
 
+  <!-- Recent files menu -->
+	<titledbox orient="vertical">
+    <title value="&recentFiles.title;"/>
+    <box align="horizontal" valign="middle">
+      <text value="&documentsInMenu;"/>
+      <textfield 
+        id="recentFiles"
+        name="recent string" 
+        type="text" 
+        size="3" 
+        value="10" 
+        pref="true" 
+        preftype="int" 
+        prefstring="editor.history.url_maximum"
+        prefattribute="value"
+      />
+    </box>
+	</titledbox>
+
+<!-- HTML formatting on output -->
+	<titledbox orient="vertical">
+    <title value="&savingFiles.title;"/>
+    <box align="horizontal" valign="middle">
+      <checkbox 
+        value      = "&preserveExistingFormatting;"
+        id         = "preserveFormatting" 
+        tooltip    = "aTooltip" tooltiptext="&preserveExistingFormatting.tooltip;"
+        pref       = "true" 
+        preftype   = "bool" 
+        prefstring = "editor.prettyprint"
+        prefattribute="checked"
+      />
+    </box>
+	</titledbox>
+	
   <titledbox orient="vertical" autostretch="never">
     <title value="&tableEditing.label;"/>
       <checkbox 
@@ -81,25 +116,6 @@
     </box>
   </titledbox>
 
-  <!-- Recent files menu -->
-	<titledbox orient="vertical">
-    <title value="&recentFiles.title;"/>
-    <box align="horizontal" valign="middle">
-      <text value="&documentsInMenu;"/>
-      <textfield 
-        id="recentFiles"
-        name="recent string" 
-        type="text" 
-        size="3" 
-        value="10" 
-        pref="true" 
-        preftype="int" 
-        prefstring="editor.history.url_maximum"
-        prefattribute="value"
-      />
-    </box>
-	</titledbox>
-
 <!-- Take out Auto-Save; not supported at this time
   -->
 	<titledbox orient="vertical">
@@ -129,22 +145,6 @@
     </box>
 	</titledbox>
 
-<!-- HTML formatting on output -->
-	<titledbox orient="vertical">
-    <title value="&savingFiles.title;"/>
-    <box align="horizontal" valign="middle">
-      <checkbox 
-        value      = "&preserveExistingFormatting;"
-        id         = "preserveFormatting" 
-        tooltip    = "aTooltip" tooltiptext="&preserveExistingFormatting.tooltip;"
-        pref       = "true" 
-        preftype   = "bool" 
-        prefstring = "editor.prettyprint"
-        prefattribute="checked"
-      />
-    </box>
-	</titledbox>
-
 <!-- External Editors are not supported at this time
 		<titledbox orient="vertical">
 					<title value="&exterLegend.label;"/> 

editor/ui/composer/locale/en-US/pref-composer.dtd

@@ -9,19 +9,19 @@
 
 <!ENTITY  tableEditing.label                    "Table Editing">
 
-<!ENTITY  maintainTableStructure.label          "Always maintain table layout">
+<!ENTITY  maintainTableStructure.label          "Maintain table layout when inserting or deleting cells">
 <!ENTITY  maintainTableStructure.tooltip        "Prevents cell borders from collapsing when you delete one or more cells">
 <!ENTITY  maintainStructure.accesskey           "m">
 <!-- LOCALIZATION NOTE (pressingTheDeleteKey.label): Don't translate "Delete" -->
 <!ENTITY  pressingTheDeleteKey.label            "Delete key:">
 <!ENTITY  pressingTheDeleteKey.tooltip          "Assign an action to the Delete key for table editing purposes">
-<!ENTITY  deleteCell.label                      "Erases the cell's content and border">
-<!ENTITY  deleteCell.accesskey                  "s">
-<!ENTITY  deleteContent.label                   "Erases the cell's content only">
+<!ENTITY  deleteCell.label                      "Removes the entire cell">
+<!ENTITY  deleteCell.accesskey                  "r">
+<!ENTITY  deleteContent.label                   "Removes the cells' contents">
 <!ENTITY  deleteContent.accesskey               "c">
 
 <!ENTITY  savingFiles.title           "When Saving Files">
-<!ENTITY  preserveExistingFormatting  "Retain HTML framework">
+<!ENTITY  preserveExistingFormatting  "Maintain source formatting">
 <!ENTITY  preserveExistingFormatting.tooltip    "Preserves line breaks and page's original structure ">
 
 <!ENTITY  saving                    "Saving">
@@ -34,4 +34,4 @@
 <!ENTITY  chooseButton.label        "Choose">
 
 <!ENTITY  recentFiles.title         "Recent Pages Menu">
-<!ENTITY  documentsInMenu           "Max number of pages listed:">
+<!ENTITY  documentsInMenu           "Maximum number of pages listed:">