diff --git a/mozilla/editor/base/nsEditorShell.cpp b/mozilla/editor/base/nsEditorShell.cpp
index 1545e9cfc44..9c0d533642e 100644
--- a/mozilla/editor/base/nsEditorShell.cpp
+++ b/mozilla/editor/base/nsEditorShell.cpp
@@ -116,7 +116,7 @@ static NS_DEFINE_IID(kISupportsIID,             NS_ISUPPORTS_IID);
 
 #define APP_DEBUG 0 
 
-#define EDITOR_BUNDLE_URL "chrome://editor/content/editor.properties"
+#define EDITOR_BUNDLE_URL "chrome://editor/locale/editor.properties"
 
 nsresult
 NS_NewEditorShell(nsIEditorShell** aEditorShell)
diff --git a/mozilla/editor/composer/src/nsEditorShell.cpp b/mozilla/editor/composer/src/nsEditorShell.cpp
index 1545e9cfc44..9c0d533642e 100644
--- a/mozilla/editor/composer/src/nsEditorShell.cpp
+++ b/mozilla/editor/composer/src/nsEditorShell.cpp
@@ -116,7 +116,7 @@ static NS_DEFINE_IID(kISupportsIID,             NS_ISUPPORTS_IID);
 
 #define APP_DEBUG 0 
 
-#define EDITOR_BUNDLE_URL "chrome://editor/content/editor.properties"
+#define EDITOR_BUNDLE_URL "chrome://editor/locale/editor.properties"
 
 nsresult
 NS_NewEditorShell(nsIEditorShell** aEditorShell)
diff --git a/mozilla/editor/ui/composer/content/MANIFEST b/mozilla/editor/ui/composer/content/MANIFEST
index 8c0c03e5db2..f81292473e8 100644
--- a/mozilla/editor/ui/composer/content/MANIFEST
+++ b/mozilla/editor/ui/composer/content/MANIFEST
@@ -27,7 +27,6 @@ TextEditorAppShell.xul
 EditorCommands.js
 EditorInitPage.html
 EditorInitPagePlain.html
-editor.properties
 EditorStyles1.css
 EditorContent.css
 editorOverlay.js
@@ -42,4 +41,4 @@ sb-file-panel.js
 sb-file-panel.xul
 sb-FileWidgetFileHandler.js
 viewsource.xul
-viewsource.js
\ No newline at end of file
+viewsource.js
diff --git a/mozilla/editor/ui/composer/content/Makefile.in b/mozilla/editor/ui/composer/content/Makefile.in
index 9c5a0293ca5..e2c59215f8b 100644
--- a/mozilla/editor/ui/composer/content/Makefile.in
+++ b/mozilla/editor/ui/composer/content/Makefile.in
@@ -31,7 +31,6 @@ EXPORT_RESOURCE_CONTENT = \
 		$(srcdir)/TextEditorAppShell.xul \
 		$(srcdir)/EditorInitPage.html \
 		$(srcdir)/EditorInitPagePlain.html \
-		$(srcdir)/editor.properties \
 		$(srcdir)/EditorStyles1.css \
 		$(srcdir)/EditorContent.css \
 		$(srcdir)/contentframe.xul \
diff --git a/mozilla/editor/ui/composer/content/makefile.win b/mozilla/editor/ui/composer/content/makefile.win
index e1bf815f2ae..083e3329a56 100644
--- a/mozilla/editor/ui/composer/content/makefile.win
+++ b/mozilla/editor/ui/composer/content/makefile.win
@@ -25,7 +25,6 @@ install::
 	$(MAKE_INSTALL) EditorCommands.js          $(DIST)\bin\chrome\editor\content\default
 	$(MAKE_INSTALL) EditorInitPage.html        $(DIST)\bin\chrome\editor\content\default
 	$(MAKE_INSTALL) EditorInitPagePlain.html   $(DIST)\bin\chrome\editor\content\default
-	$(MAKE_INSTALL) editor.properties          $(DIST)\bin\chrome\editor\content\default
 	$(MAKE_INSTALL) EditorStyles1.css          $(DIST)\bin\chrome\editor\content\default
 	$(MAKE_INSTALL) EditorContent.css          $(DIST)\bin\chrome\editor\content\default
 	$(MAKE_INSTALL) contentframe.xul           $(DIST)\bin\chrome\editor\content\default
@@ -48,7 +47,6 @@ clobber::
   rm -f $(DIST)\bin\chrome\editor\content\default\EditorCommands.js	
   rm -f $(DIST)\bin\chrome\editor\content\default\EditorInitPage.html 
   rm -f $(DIST)\bin\chrome\editor\content\default\EditorInitPagePlain.html	
-  rm -f $(DIST)\bin\chrome\editor\content\default\editor.properties
   rm -f $(DIST)\bin\chrome\editor\content\default\EditorStyles1.css
   rm -f $(DIST)\bin\chrome\editor\content\default\EditorContent.css
   rm -f $(DIST)\bin\chrome\editor\content\default\contentframe.xul
diff --git a/mozilla/editor/ui/composer/locale/en-US/MANIFEST b/mozilla/editor/ui/composer/locale/en-US/MANIFEST
index b0f504c4b43..c63ea8dff2e 100644
--- a/mozilla/editor/ui/composer/locale/en-US/MANIFEST
+++ b/mozilla/editor/ui/composer/locale/en-US/MANIFEST
@@ -27,3 +27,4 @@ sidebar-editor-rdf.dtd
 sidebar-editor.dtd
 viewSource.dtd
 editorOverlay.dtd
+editor.properties
diff --git a/mozilla/editor/ui/composer/locale/en-US/Makefile.in b/mozilla/editor/ui/composer/locale/en-US/Makefile.in
index 25833d4d0b2..b69f4cf16ba 100644
--- a/mozilla/editor/ui/composer/locale/en-US/Makefile.in
+++ b/mozilla/editor/ui/composer/locale/en-US/Makefile.in
@@ -31,6 +31,7 @@ EXPORT_RESOURCE_CONTENT = \
 		$(srcdir)/sidebar-editor.dtd \
 		$(srcdir)/viewSource.dtd \
 		$(srcdir)/editorOverlay.dtd \
+		$(srcdir)/editor.properties \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/editor/ui/composer/locale/en-US/editor.properties b/mozilla/editor/ui/composer/locale/en-US/editor.properties
new file mode 100644
index 00000000000..343992c8ea7
--- /dev/null
+++ b/mozilla/editor/ui/composer/locale/en-US/editor.properties
@@ -0,0 +1,52 @@
+#
+# moved from content/
+#
+Yes=Yes
+No=No
+Cancel=Cancel
+Save=Save
+DontSave=Don't Save
+More=More
+Fewer=Fewer
+None=None
+none=none
+OpenHTMLFile=Open HTML File
+SelectImageFile=Select Image File
+SaveDocument=Save Document
+SaveDocumentAs=Save Document As
+LinkImage=Link Image:
+EditMode=Edit Mode
+Preview=Preview
+CorrectSpelling=(correct spelling)
+NoSuggestedWords=(no suggested words)
+NoMisspelledWord=No misspelled word was found.
+CheckSpelling=Check Spelling
+HTMLFiles=HTML Files
+TextFiles=Text Files
+SaveFilePrompt=Save changes to current file?
+SaveFileFailed=Saving file failed!
+DocumentTitle=Document Title
+NeedDocTitle=Document does not have a title.
+AttributesFor=Current attributes for: 
+MissingImageError=Please enter or choose an image<br>of type gif, jpg or png.
+EmptyHREFError=You must enter or choose<br>a location (URL) to create a new link.
+EmptyLinkTextError=You must enter some text for this link.
+ValidateNumber1=The number you entered (
+ValidateNumber2=) is outside of allowed range.<br>Please enter a number between
+ValidateNumber3=and
+MissingAnchorNameError=You must enter a name for this anchor.
+DuplicateAnchorNameError=already exists in this page.<br>Please enter a different name.
+BulletStyle=Bullet Style:
+SolidCircle=Solid circle
+OpenCircle=Open circle
+OpenSquare=Open square
+NumberStyle=Number Style:
+Automatic=Automatic
+Style_1=1,2,3...
+Style_I=I,II,III...
+Style_i=i,ii,iii...
+Style_A=A,B,C...
+Style_a=a,b,c...
+
+
+
diff --git a/mozilla/editor/ui/composer/locale/en-US/makefile.win b/mozilla/editor/ui/composer/locale/en-US/makefile.win
index b414fc9d243..31fd02f1d8b 100644
--- a/mozilla/editor/ui/composer/locale/en-US/makefile.win
+++ b/mozilla/editor/ui/composer/locale/en-US/makefile.win
@@ -25,6 +25,7 @@ install::
 	$(MAKE_INSTALL) sidebar-editor.dtd        $(DIST)\bin\chrome\editor\locale\en-US
 	$(MAKE_INSTALL) viewSource.dtd            $(DIST)\bin\chrome\editor\locale\en-US
 	$(MAKE_INSTALL) editorOverlay.dtd         $(DIST)\bin\chrome\editor\locale\en-US
+	$(MAKE_INSTALL) editor.properties         $(DIST)\bin\chrome\editor\locale\en-US
 
 clobber::
   rm -f $(DIST)\bin\chrome\editor\locale\en-US\EditorAppShell.dtd 
@@ -32,3 +33,4 @@ clobber::
   rm -f $(DIST)\bin\chrome\editor\locale\en-US\sidebar-editor.dtd 
   rm -f $(DIST)\bin\chrome\editor\locale\en-US\viewSource.dtd 
   rm -f $(DIST)\bin\chrome\editor\locale\en-US\editorOverlay.dtd 
+  rm -f $(DIST)\bin\chrome\editor\locale\en-US\editor.properties