Bug 391407 - Move File Handling dialog into localizable location. r=gavin.sharp, a=blocking1.9

toolkit/mozapps/handling/content/dialog.xul

@@ -39,8 +39,7 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
-<!-- TODO this needs to move to locale/ once we are certain of the strings -->
-<!DOCTYPE dialog SYSTEM "chrome://mozapps/content/handling/handling.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://mozapps/locale/handling/handling.dtd">
 
 <dialog id="handling"
         ondialogaccept="return dialog.onAccept();"
@@ -53,7 +52,7 @@
 
   <stringbundleset id="strings">
     <stringbundle id="base-strings"
-                  src="chrome://mozapps/content/handling/handling.properties"/>
+                  src="chrome://mozapps/locale/handling/handling.properties"/>
   </stringbundleset>
 
   <hbox>

toolkit/mozapps/handling/src/nsContentDispatchChooser.js

@@ -46,9 +46,7 @@ const Ci = Components.interfaces;
 const Cr = Components.results;
 
 const CONTENT_HANDLING_URL = "chrome://mozapps/content/handling/dialog.xul";
-// TODO this needs to move to locale, but l10n folks want to wait until we
-//      finalize these for sure before doing so
-const STRINGBUNDLE_URL = "chrome://mozapps/content/handling/handling.properties";
+const STRINGBUNDLE_URL = "chrome://mozapps/locale/handling/handling.properties";
 
 ////////////////////////////////////////////////////////////////////////////////
 //// nsContentDispatchChooser class

toolkit/mozapps/jar.mn

@@ -27,7 +27,5 @@ toolkit.jar:
   content/mozapps/plugins/missingPluginBinding.css              (plugins/content/missingPluginBinding.css)
   content/mozapps/handling/handler.css                          (handling/content/handler.css)
   content/mozapps/handling/handler.xml                          (handling/content/handler.xml)
-  content/mozapps/handling/handling.properties                  (handling/content/handling.properties)
-  content/mozapps/handling/handling.dtd                         (handling/content/handling.dtd)
   content/mozapps/handling/dialog.xul                           (handling/content/dialog.xul)
   content/mozapps/handling/dialog.js                            (handling/content/dialog.js)