More work on I18N features in Composer

include/allxpstr.h

@@ -6527,7 +6527,7 @@ ResDef(XP_EDT_CHARSET_EDIT_SUGGESTED, (XP_MSG_BASE + 855),
 ResDef(XP_EDT_CHARSET_CONVERT_PAGE, (XP_MSG_BASE + 856),
 "This may alter some of the characters in your page.\nYou cannot undo this action.")
 ResDef(XP_EDT_CHARSET_SET_METATAG, (XP_MSG_BASE + 857),
-"This only changes the Content-Type tag saved with the page.\nIt will not convert any characters in your page.")
+"This only changes the Content-Type information saved with the page.\nIt will not convert any characters in your page.")
 
 
 ResDef(MK_ADDR_DELETE_ALL, XP_MSG_BASE+860, "Delete From All Lists")  /* new entry in address book context menus - delete all from list */
@@ -6911,11 +6911,6 @@ ResDef (MK_CACHE_USES_RELATIVE_PATH, XP_MSG_BASE + 1015,
 ResDef (MK_CACHE_FROM_NETSITE_SERVER, XP_MSG_BASE + 1016,
     "From Netsite Server:")
 
-ResDef (XP_EDT_I18N_HAS_CHARSET, XP_MSG_BASE + 1017,
-  "Changing the character encoding may alter some\n\
-of the characters in your document.\n\
-This change cannot be undone.")
-
 ResDef (XP_EDT_BREAKING_LINKS, XP_MSG_BASE + 1018,
   "The following links could become invalid because\n\
 they refer to files on your local hard disk(s).\n\n\

include/allxpstr.rc

@@ -6527,7 +6527,7 @@ ResDef(XP_EDT_CHARSET_EDIT_SUGGESTED, (XP_MSG_BASE + 855),
 ResDef(XP_EDT_CHARSET_CONVERT_PAGE, (XP_MSG_BASE + 856),
 "This may alter some of the characters in your page.\nYou cannot undo this action.")
 ResDef(XP_EDT_CHARSET_SET_METATAG, (XP_MSG_BASE + 857),
-"This only changes the Content-Type tag saved with the page.\nIt will not convert any characters in your page.")
+"This only changes the Content-Type information saved with the page.\nIt will not convert any characters in your page.")
 
 
 ResDef(MK_ADDR_DELETE_ALL, XP_MSG_BASE+860, "Delete From All Lists")  /* new entry in address book context menus - delete all from list */
@@ -6911,11 +6911,6 @@ ResDef (MK_CACHE_USES_RELATIVE_PATH, XP_MSG_BASE + 1015,
 ResDef (MK_CACHE_FROM_NETSITE_SERVER, XP_MSG_BASE + 1016,
     "From Netsite Server:")
 
-ResDef (XP_EDT_I18N_HAS_CHARSET, XP_MSG_BASE + 1017,
-  "Changing the character encoding may alter some\n\
-of the characters in your document.\n\
-This change cannot be undone.")
-
 ResDef (XP_EDT_BREAKING_LINKS, XP_MSG_BASE + 1018,
   "The following links could become invalid because\n\
 they refer to files on your local hard disk(s).\n\n\

include/edttypes.h

@@ -673,7 +673,7 @@ typedef void (*EDT_ImageEncoderCallbackFn)(EDT_ImageEncoderStatus status, void*
 /* Outcomes which can be returned by FE_EncodingDialog(): */
 typedef enum { 
     ED_ENCODE_CANCEL,            /* User canceled - close the page */
-    ED_ENDCODE_CHANGE_CHARSET,   /* Convert current document's charset */
+    ED_ENCODE_CHANGE_CHARSET,   /* Convert current document's charset */
     ED_ENCODE_CHANGE_METATAG     /* Just write charset to meta tag */
                                  /*  (doesn't change content) */
 } ED_CharsetEncode;

include/fe_proto.h

@@ -1000,7 +1000,7 @@ PUBLIC void FE_EditFormattingUpdate( MWContext *pContext );
 /*
  * Dialog to confirm change of document encoding.
  */
-PUBLIC ED_CharsetEncode FE_EncodingDialog(MWContext* pContext); 
+PUBLIC ED_CharsetEncode FE_EncodingDialog(MWContext* pMWContext, char *pCharSet);
 
 /* 
  * Brings up a modal image load dialog and returns.  Calls