diff --git a/wp-includes/js/tinymce/langs/wp-langs-en.js b/wp-includes/js/tinymce/langs/wp-langs-en.js index 5efd014348..ccd24bcbb7 100644 --- a/wp-includes/js/tinymce/langs/wp-langs-en.js +++ b/wp-includes/js/tinymce/langs/wp-langs-en.js @@ -170,7 +170,7 @@ autosave:{ unload_msg:"The changes you made will be lost if you navigate away from this page." }, fullscreen:{ -desc:"Toggle fullscreen mode (Alt + G)" +desc:"Toggle fullscreen mode (Alt + Shift + G)" }, media:{ desc:"Insert / edit embedded media", @@ -186,7 +186,7 @@ visualchars:{ desc:"Visual control characters on/off." }, spellchecker:{ -desc:"Toggle spellchecker (Alt + N)", +desc:"Toggle spellchecker (Alt + Shift + N)", menu:"Spellchecker settings", ignore_word:"Ignore word", ignore_words:"Ignore all", @@ -243,20 +243,20 @@ dd:"Definition description", bold_desc:"Bold (Ctrl + B)", italic_desc:"Italic (Ctrl + I)", underline_desc:"Underline", -striketrough_desc:"Strikethrough (Alt + D)", -justifyleft_desc:"Align Left (Alt + L)", -justifycenter_desc:"Align Center (Alt + C)", -justifyright_desc:"Align Right (Alt + R)", -justifyfull_desc:"Align Full (Alt + J)", -bullist_desc:"Unordered list (Alt + U)", -numlist_desc:"Ordered list (Alt + O)", +striketrough_desc:"Strikethrough (Alt + Shift + D)", +justifyleft_desc:"Align Left (Alt + Shift + L)", +justifycenter_desc:"Align Center (Alt + Shift + C)", +justifyright_desc:"Align Right (Alt + Shift + R)", +justifyfull_desc:"Align Full (Alt + Shift + J)", +bullist_desc:"Unordered list (Alt + Shift + U)", +numlist_desc:"Ordered list (Alt + Shift + O)", outdent_desc:"Outdent", indent_desc:"Indent", undo_desc:"Undo (Ctrl + Z)", redo_desc:"Redo (Ctrl + Y)", -link_desc:"Insert/edit link (Alt + A)", -unlink_desc:"Unlink (Alt + S)", -image_desc:"Insert/edit image (Alt + M)", +link_desc:"Insert/edit link (Alt + Shift + A)", +unlink_desc:"Unlink (Alt + Shift + S)", +image_desc:"Insert/edit image (Alt + Shift + M)", cleanup_desc:"Cleanup messy code", code_desc:"Edit HTML Source", sub_desc:"Subscript", @@ -274,11 +274,11 @@ paste_desc:"Paste", image_props_desc:"Image properties", newdocument_desc:"New document", help_desc:"Help", -blockquote_desc:"Blockquote (Alt + Q)", +blockquote_desc:"Blockquote (Alt + Shift + Q)", clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.", path:"Path", newdocument:"Are you sure you want to clear all contents?", -toolbar_focus:"Jump to tool buttons - Alt + Q, Jump to editor - Alt-Z, Jump to element path - Alt-X", +toolbar_focus:"Jump to tool buttons - Alt + Shift + Q, Jump to editor - Alt-Z, Jump to element path - Alt-X", more_colors:"More colors", shortcuts_desc:"Accessibility Help", help_shortcut:" Press ALT F10 for toolbar. Press ALT 0 for help.", @@ -452,10 +452,10 @@ source:"Source" }); tinyMCE.addI18n("en.wordpress",{ -wp_adv_desc:"Show/Hide Kitchen Sink (Alt + Z)", -wp_more_desc:"Insert More Tag (Alt + T)", -wp_page_desc:"Insert Page break (Alt + P)", -wp_help_desc:"Help (Alt + H)", +wp_adv_desc:"Show/Hide Kitchen Sink (Alt + Shift + Z)", +wp_more_desc:"Insert More Tag (Alt + Shift + T)", +wp_page_desc:"Insert Page break (Alt + Shift + P)", +wp_help_desc:"Help (Alt + Shift + H)", wp_more_alt:"More...", wp_page_alt:"Next page...", add_media:"Add Media", @@ -464,7 +464,7 @@ add_video:"Add Video", add_audio:"Add Audio", editgallery:"Edit Gallery", delgallery:"Delete Gallery", -wp_fullscreen_desc:"Distraction Free Writing mode (Alt + W)" +wp_fullscreen_desc:"Distraction Free Writing mode (Alt + Shift + W)" }); tinyMCE.addI18n("en.wpeditimage",{ diff --git a/wp-includes/js/tinymce/langs/wp-langs.php b/wp-includes/js/tinymce/langs/wp-langs.php index fa416303c1..1f702ddc7b 100644 --- a/wp-includes/js/tinymce/langs/wp-langs.php +++ b/wp-includes/js/tinymce/langs/wp-langs.php @@ -207,7 +207,7 @@ function wp_mce_translation() { ), 'fullscreen' => array( - 'desc' => __('Toggle fullscreen mode (Alt + G)') + 'desc' => __('Toggle fullscreen mode (Alt + Shift + G)') ), 'media' => array( @@ -228,7 +228,7 @@ function wp_mce_translation() { ), 'spellchecker' => array( - 'desc' => __('Toggle spellchecker (Alt + N)'), + 'desc' => __('Toggle spellchecker (Alt + Shift + N)'), 'menu' => __('Spellchecker settings'), 'ignore_word' => __('Ignore word'), 'ignore_words' => __('Ignore all'), @@ -289,20 +289,20 @@ function wp_mce_translation() { 'bold_desc' => __('Bold (Ctrl + B)'), 'italic_desc' => __('Italic (Ctrl + I)'), 'underline_desc' => __('Underline'), - 'striketrough_desc' => __('Strikethrough (Alt + D)'), - 'justifyleft_desc' => __('Align Left (Alt + L)'), - 'justifycenter_desc' => __('Align Center (Alt + C)'), - 'justifyright_desc' => __('Align Right (Alt + R)'), - 'justifyfull_desc' => __('Align Full (Alt + J)'), - 'bullist_desc' => __('Unordered list (Alt + U)'), - 'numlist_desc' => __('Ordered list (Alt + O)'), + 'striketrough_desc' => __('Strikethrough (Alt + Shift + D)'), + 'justifyleft_desc' => __('Align Left (Alt + Shift + L)'), + 'justifycenter_desc' => __('Align Center (Alt + Shift + C)'), + 'justifyright_desc' => __('Align Right (Alt + Shift + R)'), + 'justifyfull_desc' => __('Align Full (Alt + Shift + J)'), + 'bullist_desc' => __('Unordered list (Alt + Shift + U)'), + 'numlist_desc' => __('Ordered list (Alt + Shift + O)'), 'outdent_desc' => __('Outdent'), 'indent_desc' => __('Indent'), 'undo_desc' => __('Undo (Ctrl + Z)'), 'redo_desc' => __('Redo (Ctrl + Y)'), - 'link_desc' => __('Insert/edit link (Alt + A)'), - 'unlink_desc' => __('Unlink (Alt + S)'), - 'image_desc' => __('Insert/edit image (Alt + M)'), + 'link_desc' => __('Insert/edit link (Alt + Shift + A)'), + 'unlink_desc' => __('Unlink (Alt + Shift + S)'), + 'image_desc' => __('Insert/edit image (Alt + Shift + M)'), 'cleanup_desc' => __('Cleanup messy code'), 'code_desc' => __('Edit HTML Source'), 'sub_desc' => __('Subscript'), @@ -320,7 +320,7 @@ function wp_mce_translation() { 'image_props_desc' => __('Image properties'), 'newdocument_desc' => __('New document'), 'help_desc' => __('Help'), - 'blockquote_desc' => __('Blockquote (Alt + Q)'), + 'blockquote_desc' => __('Blockquote (Alt + Shift + Q)'), 'clipboard_msg' => __('Copy/Cut/Paste is not available in Mozilla and Firefox.'), 'path' => __('Path'), 'newdocument' => __('Are you sure you want to clear all contents?'), @@ -498,10 +498,10 @@ function wp_mce_translation() { ); $wordpress = array( - 'wp_adv_desc' => __('Show/Hide Kitchen Sink (Alt + Z)'), - 'wp_more_desc' => __('Insert More Tag (Alt + T)'), - 'wp_page_desc' => __('Insert Page break (Alt + P)'), - 'wp_help_desc' => __('Help (Alt + H)'), + 'wp_adv_desc' => __('Show/Hide Kitchen Sink (Alt + Shift + Z)'), + 'wp_more_desc' => __('Insert More Tag (Alt + Shift + T)'), + 'wp_page_desc' => __('Insert Page break (Alt + Shift + P)'), + 'wp_help_desc' => __('Help (Alt + Shift + H)'), 'wp_more_alt' => __('More...'), 'wp_page_alt' => __('Next page...'), 'add_media' => __('Add Media'), @@ -510,7 +510,7 @@ function wp_mce_translation() { 'add_audio' => __('Add Audio'), 'editgallery' => __('Edit Gallery'), 'delgallery' => __('Delete Gallery'), - 'wp_fullscreen_desc' => __('Distraction Free Writing mode (Alt + W)') + 'wp_fullscreen_desc' => __('Distraction Free Writing mode (Alt + Shift + W)') ); $wpeditimage = array( diff --git a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js index 0e7a93731e..54052c7473 100644 --- a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js +++ b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js @@ -251,8 +251,8 @@ // Add custom shortcuts mod_key = 'alt+shift'; - if ( tinymce.isGecko ) - mod_key = 'ctrl+alt'; + // if ( tinymce.isGecko ) // disable for mow, too many shortcuts conflicts + // mod_key = 'ctrl+alt'; ed.addShortcut(mod_key + '+c', 'justifycenter_desc', 'JustifyCenter'); ed.addShortcut(mod_key + '+r', 'justifyright_desc', 'JustifyRight'); diff --git a/wp-includes/js/tinymce/wp-mce-help.php b/wp-includes/js/tinymce/wp-mce-help.php index 3e04a97c10..ae1301be4f 100644 --- a/wp-includes/js/tinymce/wp-mce-help.php +++ b/wp-includes/js/tinymce/wp-mce-help.php @@ -13,7 +13,7 @@ header('Content-Type: text/html; charset=' . get_bloginfo('charset')); > -<?php _e('Rich Editor Help') ?> +<?php _e('Rich Editor Help'); ?>
-

-

Rich editing, also called WYSIWYG for What You See Is What You Get, means your text is formatted as you type. The rich editor creates HTML code behind the scenes while you concentrate on writing. Font styles, links and images all appear approximately as they will on the internet.') ?>

-

-

-

+

+

Rich editing, also called WYSIWYG for What You See Is What You Get, means your text is formatted as you type. The rich editor creates HTML code behind the scenes while you concentrate on writing. Font styles, links and images all appear approximately as they will on the internet.'); ?>

+

+

+

@@ -230,12 +230,12 @@ if ( tinymce.isMac )

()

-

by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '') ?>

-

Moxiecode Systems AB, All rights reserved.') ?>

-

TinyMCE website.') ?>

+

by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), ''); ?>

+

Moxiecode Systems AB, All rights reserved.'); ?>

+

TinyMCE website.'); ?>

- <?php esc_attr_e('Got Moxie?') ?> + <?php esc_attr_e('Got Moxie?'); ?>