--- a/language/english/core.json	Mon Feb 16 16:04:54 2009 -0500
+++ b/language/english/core.json	Mon Feb 16 16:17:25 2009 -0500
@@ -349,17 +349,21 @@
       msg_discard_confirm: 'Do you really want to discard your changes?',
       msg_confirm_ajax: 'Do you really want to do this?\nYour changes to this page have not been saved. If you continue, your changes will be lost.',
       msg_unload: 'If you do, any changes that you have made to this page will be lost.',
-      msg_revert_confirm_title: 'Do you really want to revert your changes?',
-      msg_revert_confirm_body: 'If you choose to continue, all of the changes you have made to this page will be lost, and the editor will be set with the latest published (not draft) copy of the page.',
-      msg_cancel_confirm_title: 'Do you want to cancel your changes?',
-      msg_cancel_confirm_body: 'Are you sure you want to discard the changes you made? If you continue, your changes cannot be recovered.',
+      msg_revert_confirm_title: 'Revert changes?',
+      msg_revert_confirm_body: 'All of the changes you have made to this page will be lost, and the text will be replaced with the latest published (not draft) version of the page.',
+      msg_cancel_confirm_title: 'Close without saving?',
+      msg_cancel_confirm_body: 'You haven\'t saved your changes to the page. Closing the editor will discard your changes.',
       msg_diff: 'Below is a summarization of the differences between the current revision of the page (left), and your version (right).',
       msg_diff_empty: 'There are no differences between the text in the editor and the current revision of the page.',
       msg_editing_old_revision: 'You are editing an old revision of this page. If you click Save, newer revisions of this page will be undone.',
       msg_have_draft_title: 'A draft copy of this page is available.',
       msg_have_draft_body: '%author% saved a draft version of this page on %time%. You can <a href="#use_draft" onclick="ajaxEditorUseDraft(); return false;">use the draft copy</a>, or edit the current published version (below). If you edit the published version, the draft copy will remain available, but will not reflect your changes. It is recommended that you edit the draft version instead of editing the published version. You can also <a href="#delete_draft" onclick="ajaxEditorDeleteDraft(); return false;">discard the draft revision</a>.',
-      btn_graphical: 'graphical editor',
-      btn_wikitext: 'wikitext editor',
+      msg_convert_confirm_title: 'Convert this page?',
+      msg_convert_confirm_body: 'This will change the format of the page. This may cause some loss of formatting information.',
+      msg_convert_draft_load_title: 'Format changed',
+      msg_convert_draft_load_body: 'The revision that was just loaded is in a different format than the current setting. The editor has been switched to match the format.',
+      btn_graphical: 'Convert to HTML',
+      btn_wikitext: 'Convert to wikitext',
       lbl_edit_summary: 'Brief summary of your changes:',
       lbl_edit_summary_explain: 'Please summarize and briefly explain what you changed on the page.',
       lbl_minor_edit: 'Mark revision as trivial:',
@@ -374,6 +378,9 @@
       btn_closeviewer: 'Close viewer',
       msg_draft_saving: 'Saving...',
       msg_draft_saved: 'Saved at %time%',
+      btn_revert_confirm: 'Revert changes',
+      btn_cancel_confirm: 'Close editor',
+      btn_cancel_cancel: 'Keep editing',
       preview_blurb: '<b>Reminder:</b> This is only a preview - your changes to this page have not yet been saved.',
       msg_save_success_title: 'Changes saved',
       msg_save_success_body: 'Your changes to this page have been saved. Redirecting...',