Bug #224318 --> minor UI polish for the new filter junk status command. Change the wording and location.

r=stefan
sr=bienvenu
a=chofmann

mailnews/base/search/resources/content/FilterEditor.xul

@@ -134,6 +134,21 @@ Contributor(s):
             </listcell>
           </listitem>
 
+          <listitem allowevents="true">
+            <listcell>
+              <checkbox id="setJunkScore" label="&setJunkScore.label;"/>
+            </listcell>
+            <listcell> 
+              <menulist id="actionValueJunkScore" flex="1">
+                <menupopup>
+                  <!-- see MailNewsTypes2.idl -->
+                  <menuitem value="100" label="&junk.label;"/>
+                  <menuitem value="0" label="&notJunk.label;"/>
+                </menupopup>
+              </menulist>
+            </listcell>
+          </listitem>
+
           <listitem allowevents="true">
             <listcell>
               <checkbox id="markRead" label="&markRead.label;"/>
@@ -158,21 +173,6 @@ Contributor(s):
             </listcell>
           </listitem>
 
-          <listitem allowevents="true">
-            <listcell>
-              <checkbox id="setJunkScore" label="&setJunkScore.label;"/>
-            </listcell>
-            <listcell> 
-              <menulist id="actionValueJunkScore" flex="1">
-                <menupopup>
-                  <!-- see MailNewsTypes2.idl -->
-                  <menuitem value="100" label="&junk.label;"/>
-                  <menuitem value="0" label="&notJunk.label;"/>
-                </menupopup>
-              </menulist>
-            </listcell>
-          </listitem>
-
           <listitem allowevents="true">
             <listcell>
               <checkbox id="kill" enablefornews="true" label="&killThread.label;"/>

mailnews/base/search/resources/locale/en-US/FilterEditor.dtd

@@ -24,12 +24,12 @@
 <!ENTITY killThread.label "Ignore thread">
 <!ENTITY watchThread.label "Watch thread">
 <!ENTITY deleteFromServer.label "Delete from POP server">
-<!ENTITY setJunkScore.label "Set Junk Status">
+<!ENTITY setJunkScore.label "Set Junk Status to:">
 <!ENTITY filterName.label "Filter name:">
 <!ENTITY filterName.accesskey "i">
 
 <!ENTITY junk.label "Junk">
-<!ENTITY notJunk.label "NotJunk">
+<!ENTITY notJunk.label "Not Junk">
 
 <!ENTITY lowestPriorityCmd.label "Lowest">
 <!ENTITY lowPriorityCmd.label "Low">