<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[21415] trunk/wp-includes/js/tinymce: TinyMCE: revert Firefox shortcuts to match all other browsers (Alt+Shift+letter), fix the labels for the shortcuts, update description in wp-mce-help, fixes #21197</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21415">21415</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2012-08-03 18:12:45 +0000 (Fri, 03 Aug 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>TinyMCE: revert Firefox shortcuts to match all other browsers (Alt+Shift+letter), fix the labels for the shortcuts, update description in wp-mce-help, fixes <a href="http://core.trac.wordpress.org/ticket/21197">#21197</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjstinymcelangswplangsenjs">trunk/wp-includes/js/tinymce/langs/wp-langs-en.js</a></li>
<li><a href="#trunkwpincludesjstinymcelangswplangsphp">trunk/wp-includes/js/tinymce/langs/wp-langs.php</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswordpresseditor_plugin_srcjs">trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js</a></li>
<li><a href="#trunkwpincludesjstinymcewpmcehelpphp">trunk/wp-includes/js/tinymce/wp-mce-help.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjstinymcelangswplangsenjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/langs/wp-langs-en.js (21414 => 21415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/langs/wp-langs-en.js 2012-08-03 17:51:42 UTC (rev 21414)
+++ trunk/wp-includes/js/tinymce/langs/wp-langs-en.js 2012-08-03 18:12:45 UTC (rev 21415)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> unload_msg:"The changes you made will be lost if you navigate away from this page."
</span><span class="cx"> },
</span><span class="cx"> fullscreen:{
</span><del>-desc:"Toggle fullscreen mode (Alt + G)"
</del><ins>+desc:"Toggle fullscreen mode (Alt + Shift + G)"
</ins><span class="cx"> },
</span><span class="cx"> media:{
</span><span class="cx"> desc:"Insert / edit embedded media",
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> desc:"Visual control characters on/off."
</span><span class="cx"> },
</span><span class="cx"> spellchecker:{
</span><del>-desc:"Toggle spellchecker (Alt + N)",
</del><ins>+desc:"Toggle spellchecker (Alt + Shift + N)",
</ins><span class="cx"> menu:"Spellchecker settings",
</span><span class="cx"> ignore_word:"Ignore word",
</span><span class="cx"> ignore_words:"Ignore all",
</span><span class="lines">@@ -243,20 +243,20 @@
</span><span class="cx"> bold_desc:"Bold (Ctrl + B)",
</span><span class="cx"> italic_desc:"Italic (Ctrl + I)",
</span><span class="cx"> underline_desc:"Underline",
</span><del>-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)",
</del><ins>+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)",
</ins><span class="cx"> outdent_desc:"Outdent",
</span><span class="cx"> indent_desc:"Indent",
</span><span class="cx"> undo_desc:"Undo (Ctrl + Z)",
</span><span class="cx"> redo_desc:"Redo (Ctrl + Y)",
</span><del>-link_desc:"Insert/edit link (Alt + A)",
-unlink_desc:"Unlink (Alt + S)",
-image_desc:"Insert/edit image (Alt + M)",
</del><ins>+link_desc:"Insert/edit link (Alt + Shift + A)",
+unlink_desc:"Unlink (Alt + Shift + S)",
+image_desc:"Insert/edit image (Alt + Shift + M)",
</ins><span class="cx"> cleanup_desc:"Cleanup messy code",
</span><span class="cx"> code_desc:"Edit HTML Source",
</span><span class="cx"> sub_desc:"Subscript",
</span><span class="lines">@@ -274,11 +274,11 @@
</span><span class="cx"> image_props_desc:"Image properties",
</span><span class="cx"> newdocument_desc:"New document",
</span><span class="cx"> help_desc:"Help",
</span><del>-blockquote_desc:"Blockquote (Alt + Q)",
</del><ins>+blockquote_desc:"Blockquote (Alt + Shift + Q)",
</ins><span class="cx"> clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.",
</span><span class="cx"> path:"Path",
</span><span class="cx"> newdocument:"Are you sure you want to clear all contents?",
</span><del>-toolbar_focus:"Jump to tool buttons - Alt + Q, Jump to editor - Alt-Z, Jump to element path - Alt-X",
</del><ins>+toolbar_focus:"Jump to tool buttons - Alt + Shift + Q, Jump to editor - Alt-Z, Jump to element path - Alt-X",
</ins><span class="cx"> more_colors:"More colors",
</span><span class="cx"> shortcuts_desc:"Accessibility Help",
</span><span class="cx"> help_shortcut:" Press ALT F10 for toolbar. Press ALT 0 for help.",
</span><span class="lines">@@ -452,10 +452,10 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> tinyMCE.addI18n("en.wordpress",{
</span><del>-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)",
</del><ins>+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)",
</ins><span class="cx"> wp_more_alt:"More...",
</span><span class="cx"> wp_page_alt:"Next page...",
</span><span class="cx"> add_media:"Add Media",
</span><span class="lines">@@ -464,7 +464,7 @@
</span><span class="cx"> add_audio:"Add Audio",
</span><span class="cx"> editgallery:"Edit Gallery",
</span><span class="cx"> delgallery:"Delete Gallery",
</span><del>-wp_fullscreen_desc:"Distraction Free Writing mode (Alt + W)"
</del><ins>+wp_fullscreen_desc:"Distraction Free Writing mode (Alt + Shift + W)"
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> tinyMCE.addI18n("en.wpeditimage",{
</span></span></pre></div>
<a id="trunkwpincludesjstinymcelangswplangsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/langs/wp-langs.php (21414 => 21415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/langs/wp-langs.php 2012-08-03 17:51:42 UTC (rev 21414)
+++ trunk/wp-includes/js/tinymce/langs/wp-langs.php 2012-08-03 18:12:45 UTC (rev 21415)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> ),
</span><span class="cx">
</span><span class="cx"> 'fullscreen' => array(
</span><del>- 'desc' => __('Toggle fullscreen mode (Alt + G)')
</del><ins>+ 'desc' => __('Toggle fullscreen mode (Alt + Shift + G)')
</ins><span class="cx"> ),
</span><span class="cx">
</span><span class="cx"> 'media' => array(
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> ),
</span><span class="cx">
</span><span class="cx"> 'spellchecker' => array(
</span><del>- 'desc' => __('Toggle spellchecker (Alt + N)'),
</del><ins>+ 'desc' => __('Toggle spellchecker (Alt + Shift + N)'),
</ins><span class="cx"> 'menu' => __('Spellchecker settings'),
</span><span class="cx"> 'ignore_word' => __('Ignore word'),
</span><span class="cx"> 'ignore_words' => __('Ignore all'),
</span><span class="lines">@@ -289,20 +289,20 @@
</span><span class="cx"> 'bold_desc' => __('Bold (Ctrl + B)'),
</span><span class="cx"> 'italic_desc' => __('Italic (Ctrl + I)'),
</span><span class="cx"> 'underline_desc' => __('Underline'),
</span><del>- '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)'),
</del><ins>+ '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)'),
</ins><span class="cx"> 'outdent_desc' => __('Outdent'),
</span><span class="cx"> 'indent_desc' => __('Indent'),
</span><span class="cx"> 'undo_desc' => __('Undo (Ctrl + Z)'),
</span><span class="cx"> 'redo_desc' => __('Redo (Ctrl + Y)'),
</span><del>- 'link_desc' => __('Insert/edit link (Alt + A)'),
- 'unlink_desc' => __('Unlink (Alt + S)'),
- 'image_desc' => __('Insert/edit image (Alt + M)'),
</del><ins>+ 'link_desc' => __('Insert/edit link (Alt + Shift + A)'),
+ 'unlink_desc' => __('Unlink (Alt + Shift + S)'),
+ 'image_desc' => __('Insert/edit image (Alt + Shift + M)'),
</ins><span class="cx"> 'cleanup_desc' => __('Cleanup messy code'),
</span><span class="cx"> 'code_desc' => __('Edit HTML Source'),
</span><span class="cx"> 'sub_desc' => __('Subscript'),
</span><span class="lines">@@ -320,7 +320,7 @@
</span><span class="cx"> 'image_props_desc' => __('Image properties'),
</span><span class="cx"> 'newdocument_desc' => __('New document'),
</span><span class="cx"> 'help_desc' => __('Help'),
</span><del>- 'blockquote_desc' => __('Blockquote (Alt + Q)'),
</del><ins>+ 'blockquote_desc' => __('Blockquote (Alt + Shift + Q)'),
</ins><span class="cx"> 'clipboard_msg' => __('Copy/Cut/Paste is not available in Mozilla and Firefox.'),
</span><span class="cx"> 'path' => __('Path'),
</span><span class="cx"> 'newdocument' => __('Are you sure you want to clear all contents?'),
</span><span class="lines">@@ -498,10 +498,10 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $wordpress = array(
</span><del>- '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)'),
</del><ins>+ '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)'),
</ins><span class="cx"> 'wp_more_alt' => __('More...'),
</span><span class="cx"> 'wp_page_alt' => __('Next page...'),
</span><span class="cx"> 'add_media' => __('Add Media'),
</span><span class="lines">@@ -510,7 +510,7 @@
</span><span class="cx"> 'add_audio' => __('Add Audio'),
</span><span class="cx"> 'editgallery' => __('Edit Gallery'),
</span><span class="cx"> 'delgallery' => __('Delete Gallery'),
</span><del>- 'wp_fullscreen_desc' => __('Distraction Free Writing mode (Alt + W)')
</del><ins>+ 'wp_fullscreen_desc' => __('Distraction Free Writing mode (Alt + Shift + W)')
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $wpeditimage = array(
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswordpresseditor_plugin_srcjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js (21414 => 21415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js 2012-08-03 17:51:42 UTC (rev 21414)
+++ trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js 2012-08-03 18:12:45 UTC (rev 21415)
</span><span class="lines">@@ -251,8 +251,8 @@
</span><span class="cx"> // Add custom shortcuts
</span><span class="cx"> mod_key = 'alt+shift';
</span><span class="cx">
</span><del>- if ( tinymce.isGecko )
- mod_key = 'ctrl+alt';
</del><ins>+ // if ( tinymce.isGecko ) // disable for mow, too many shortcuts conflicts
+ // mod_key = 'ctrl+alt';
</ins><span class="cx">
</span><span class="cx"> ed.addShortcut(mod_key + '+c', 'justifycenter_desc', 'JustifyCenter');
</span><span class="cx"> ed.addShortcut(mod_key + '+r', 'justifyright_desc', 'JustifyRight');
</span></span></pre></div>
<a id="trunkwpincludesjstinymcewpmcehelpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/wp-mce-help.php (21414 => 21415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/wp-mce-help.php 2012-08-03 17:51:42 UTC (rev 21414)
+++ trunk/wp-includes/js/tinymce/wp-mce-help.php 2012-08-03 18:12:45 UTC (rev 21415)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
</span><span class="cx"> <head>
</span><span class="cx"> <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
</span><del>-<title><?php _e('Rich Editor Help') ?></title>
</del><ins>+<title><?php _e('Rich Editor Help'); ?></title>
</ins><span class="cx"> <script type="text/javascript" src="tiny_mce_popup.js?ver=342"></script>
</span><span class="cx"> <?php
</span><span class="cx"> wp_admin_css( 'wp-admin', true );
</span><span class="lines">@@ -159,70 +159,70 @@
</span><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <ul id="tabs">
</span><del>- <li><a id="tab1" href="javascript:flipTab(1)" title="<?php esc_attr_e('Basics of Rich Editing') ?>" accesskey="1" class="current"><?php _e('Basics') ?></a></li>
- <li><a id="tab2" href="javascript:flipTab(2)" title="<?php esc_attr_e('Advanced use of the Rich Editor') ?>" accesskey="2"><?php _e('Advanced') ?></a></li>
- <li><a id="tab3" href="javascript:flipTab(3)" title="<?php esc_attr_e('Hotkeys') ?>" accesskey="3"><?php _e('Hotkeys') ?></a></li>
- <li><a id="tab4" href="javascript:flipTab(4)" title="<?php esc_attr_e('About the software') ?>" accesskey="4"><?php _e('About') ?></a></li>
</del><ins>+ <li><a id="tab1" href="javascript:flipTab(1)" title="<?php esc_attr_e('Basics of Rich Editing'); ?>" accesskey="1" class="current"><?php _e('Basics'); ?></a></li>
+ <li><a id="tab2" href="javascript:flipTab(2)" title="<?php esc_attr_e('Advanced use of the Rich Editor'); ?>" accesskey="2"><?php _e('Advanced'); ?></a></li>
+ <li><a id="tab3" href="javascript:flipTab(3)" title="<?php esc_attr_e('Hotkeys'); ?>" accesskey="3"><?php _e('Hotkeys'); ?></a></li>
+ <li><a id="tab4" href="javascript:flipTab(4)" title="<?php esc_attr_e('About the software'); ?>" accesskey="4"><?php _e('About'); ?></a></li>
</ins><span class="cx"> </ul>
</span><span class="cx">
</span><span class="cx"> <div id="flipper" class="wrap">
</span><span class="cx">
</span><span class="cx"> <div id="content1">
</span><del>- <h2><?php _e('Rich Editing Basics') ?></h2>
- <p><?php _e('<em>Rich editing</em>, 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.') ?></p>
- <p><?php _e('WordPress includes a rich HTML editor that works well in all major web browsers used today. However editing HTML is not the same as typing text. Each web page has two major components: the structure, which is the actual HTML code and is produced by the editor as you type, and the display, that is applied to it by the currently selected WordPress theme and is defined in style.css. WordPress is producing valid XHTML 1.0 which means that inserting multiple line breaks (BR tags) after a paragraph would not produce white space on the web page. The BR tags will be removed as invalid by the internal HTML correcting functions.') ?></p>
- <p><?php _e('While using the editor, most basic keyboard shortcuts work like in any other text editor. For example: Shift+Enter inserts line break, Ctrl+C = copy, Ctrl+X = cut, Ctrl+Z = undo, Ctrl+Y = redo, Ctrl+A = select all, etc. (on Mac use the Command key instead of Ctrl). See the Hotkeys tab for all available keyboard shortcuts.') ?></p>
- <p><?php _e('If you do not like the way the rich editor works, you may turn it off from Your Profile submenu, under Users in the admin menu.') ?></p>
</del><ins>+ <h2><?php _e('Rich Editing Basics'); ?></h2>
+ <p><?php _e('<em>Rich editing</em>, 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.'); ?></p>
+ <p><?php _e('WordPress includes a rich HTML editor that works well in all major web browsers used today. However editing HTML is not the same as typing text. Each web page has two major components: the structure, which is the actual HTML code and is produced by the editor as you type, and the display, that is applied to it by the currently selected WordPress theme and is defined in style.css. WordPress is producing valid XHTML 1.0 which means that inserting multiple line breaks (BR tags) after a paragraph would not produce white space on the web page. The BR tags will be removed as invalid by the internal HTML correcting functions.'); ?></p>
+ <p><?php _e('While using the editor, most basic keyboard shortcuts work like in any other text editor. For example: Shift+Enter inserts line break, Ctrl+C = copy, Ctrl+X = cut, Ctrl+Z = undo, Ctrl+Y = redo, Ctrl+A = select all, etc. (on Mac use the Command key instead of Ctrl). See the Hotkeys tab for all available keyboard shortcuts.'); ?></p>
+ <p><?php _e('If you do not like the way the rich editor works, you may turn it off from Your Profile submenu, under Users in the admin menu.'); ?></p>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="content2" class="hidden">
</span><del>- <h2><?php _e('Advanced Rich Editing') ?></h2>
- <h3><?php _e('Images and Attachments') ?></h3>
- <p><?php _e('There is a button in the editor toolbar for inserting images that are already hosted somewhere on the internet. If you have a URL for an image, click this button and enter the URL in the box which appears.') ?></p>
- <p><?php _e('If you need to upload an image or another media file from your computer, you can use the Media Library button above the editor. The media library will attempt to create a thumbnail-sized copy from each uploaded image. To insert your image into the post, first click on the thumbnail to reveal a menu of options. When you have selected the options you like, click "Insert into Post" and your image or file will appear in the post you are editing.') ?></p>
- <h3><?php _e('HTML in the Rich Editor') ?></h3>
- <p><?php _e('Any HTML entered directly into the rich editor will show up as text when the post is viewed. What you see is what you get. When you want to include HTML elements that cannot be generated with the toolbar buttons, you must enter it by hand in the Text editor. Examples are tables and &lt;code&gt;. To do this, click the Text tab and edit the code, then switch back to Visual mode. If the code is valid and understood by the editor, you should see it rendered immediately.') ?></p>
- <h3><?php _e('Pasting in the Rich Editor') ?></h3>
- <p><?php _e('When pasting content from another web page the results can be inconsistent and depend on your browser and on the web page you are pasting from. The editor tries to correct any invalid HTML code that was pasted, but for best results try using the Text tab or one of the paste buttons that are on the second row. Alternatively try pasting paragraph by paragraph. In most browsers to select one paragraph at a time, triple-click on it.') ?></p>
- <p><?php _e('Pasting content from another application, like Word or Excel, is best done with the Paste from Word button on the second row, or in Text mode.') ?></p>
</del><ins>+ <h2><?php _e('Advanced Rich Editing'); ?></h2>
+ <h3><?php _e('Images and Attachments'); ?></h3>
+ <p><?php _e('There is a button in the editor toolbar for inserting images that are already hosted somewhere on the internet. If you have a URL for an image, click this button and enter the URL in the box which appears.'); ?></p>
+ <p><?php _e('If you need to upload an image or another media file from your computer, you can use the Media Library button above the editor. The media library will attempt to create a thumbnail-sized copy from each uploaded image. To insert your image into the post, first click on the thumbnail to reveal a menu of options. When you have selected the options you like, click "Insert into Post" and your image or file will appear in the post you are editing.'); ?></p>
+ <h3><?php _e('HTML in the Rich Editor'); ?></h3>
+ <p><?php _e('Any HTML entered directly into the rich editor will show up as text when the post is viewed. What you see is what you get. When you want to include HTML elements that cannot be generated with the toolbar buttons, you must enter it by hand in the Text editor. Examples are tables and &lt;code&gt;. To do this, click the Text tab and edit the code, then switch back to Visual mode. If the code is valid and understood by the editor, you should see it rendered immediately.'); ?></p>
+ <h3><?php _e('Pasting in the Rich Editor'); ?></h3>
+ <p><?php _e('When pasting content from another web page the results can be inconsistent and depend on your browser and on the web page you are pasting from. The editor tries to correct any invalid HTML code that was pasted, but for best results try using the Text tab or one of the paste buttons that are on the second row. Alternatively try pasting paragraph by paragraph. In most browsers to select one paragraph at a time, triple-click on it.'); ?></p>
+ <p><?php _e('Pasting content from another application, like Word or Excel, is best done with the Paste from Word button on the second row, or in Text mode.'); ?></p>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="content3" class="hidden">
</span><del>- <h2><?php _e('Writing at Full Speed') ?></h2>
- <p><?php _e('Rather than reaching for your mouse to click on the toolbar, use these access keys. Windows and Linux use Ctrl + letter. Macintosh uses Command + letter.') ?></p>
</del><ins>+ <h2><?php _e('Writing at Full Speed'); ?></h2>
+ <p><?php _e('Rather than reaching for your mouse to click on the toolbar, use these access keys. Windows and Linux use Ctrl + letter. Macintosh uses Command + letter.'); ?></p>
</ins><span class="cx">
</span><span class="cx"> <table class="keys">
</span><del>- <tr class="top"><th class="key center"><?php _e('Letter') ?></th><th class="left"><?php _e('Action') ?></th><th class="key center"><?php _e('Letter') ?></th><th class="left"><?php _e('Action') ?></th></tr>
- <tr><th>c</th><td><?php _e('Copy') ?></td><th>v</th><td><?php _e('Paste') ?></td></tr>
- <tr><th>a</th><td><?php _e('Select all') ?></td><th>x</th><td><?php _e('Cut') ?></td></tr>
- <tr><th>z</th><td><?php _e('Undo') ?></td><th>y</th><td><?php _e('Redo') ?></td></tr>
</del><ins>+ <tr class="top"><th class="key center"><?php _e('Letter'); ?></th><th class="left"><?php _e('Action'); ?></th><th class="key center"><?php _e('Letter'); ?></th><th class="left"><?php _e('Action'); ?></th></tr>
+ <tr><th>c</th><td><?php _e('Copy'); ?></td><th>v</th><td><?php _e('Paste'); ?></td></tr>
+ <tr><th>a</th><td><?php _e('Select all'); ?></td><th>x</th><td><?php _e('Cut'); ?></td></tr>
+ <tr><th>z</th><td><?php _e('Undo'); ?></td><th>y</th><td><?php _e('Redo'); ?></td></tr>
</ins><span class="cx">
</span><del>- <tr><th>b</th><td><?php _e('Bold') ?></td><th>i</th><td><?php _e('Italic') ?></td></tr>
- <tr><th>u</th><td><?php _e('Underline') ?></td><th>1</th><td><?php _e('Heading 1') ?></td></tr>
- <tr><th>2</th><td><?php _e('Heading 2') ?></td><th>3</th><td><?php _e('Heading 3') ?></td></tr>
- <tr><th>4</th><td><?php _e('Heading 4') ?></td><th>5</th><td><?php _e('Heading 5') ?></td></tr>
- <tr><th>6</th><td><?php _e('Heading 6') ?></td><th>9</th><td><?php _e('Address') ?></td></tr>
</del><ins>+ <tr><th>b</th><td><?php _e('Bold'); ?></td><th>i</th><td><?php _e('Italic'); ?></td></tr>
+ <tr><th>u</th><td><?php _e('Underline'); ?></td><th>1</th><td><?php _e('Heading 1'); ?></td></tr>
+ <tr><th>2</th><td><?php _e('Heading 2'); ?></td><th>3</th><td><?php _e('Heading 3'); ?></td></tr>
+ <tr><th>4</th><td><?php _e('Heading 4'); ?></td><th>5</th><td><?php _e('Heading 5'); ?></td></tr>
+ <tr><th>6</th><td><?php _e('Heading 6'); ?></td><th>9</th><td><?php _e('Address'); ?></td></tr>
</ins><span class="cx"> </table>
</span><span class="cx">
</span><del>- <p><?php _e('The following shortcuts use different access keys: Alt + Shift + letter in Chrome, Safari, Internet Explorer and Opera, and Ctrl + Alt + letter (Command + Option + letter on Macintosh) in Firefox.') ?></p>
</del><ins>+ <p><?php _e('The following shortcuts use different access keys: Alt + Shift + letter.'); ?></p>
</ins><span class="cx"> <table class="keys">
</span><del>- <tr class="top"><th class="key center"><?php _e('Letter') ?></th><th class="left"><?php _e('Action') ?></th><th class="key center"><?php _e('Letter') ?></th><th class="left"><?php _e('Action') ?></th></tr>
- <tr><th>n</th><td><?php _e('Check Spelling') ?></td><th>l</th><td><?php _e('Align Left') ?></td></tr>
- <tr><th>j</th><td><?php _e('Justify Text') ?></td><th>c</th><td><?php _e('Align Center') ?></td></tr>
- <tr><th>d</th><td><span style="text-decoration: line-through;"><?php _e('Strikethrough') ?></span></td><th>r</th><td><?php _e('Align Right') ?></td></tr>
- <tr><th>u</th><td><strong>&bull;</strong> <?php _e('List') ?></td><th>a</th><td><?php _e('Insert link') ?></td></tr>
- <tr><th>o</th><td>1. <?php _e('List') ?></td><th>s</th><td><?php _e('Remove link') ?></td></tr>
- <tr><th>q</th><td><?php _e('Quote') ?></td><th>m</th><td><?php _e('Insert Image') ?></td></tr>
- <tr><th>g</th><td><?php _e('Full Screen') ?></td><th>t</th><td><?php _e('Insert More Tag') ?></td></tr>
- <tr><th>p</th><td><?php _e('Insert Page Break tag') ?></td><th>h</th><td><?php _e('Help') ?></td></tr>
- <tr><th>w</th><td colspan="3"><?php _e('Distraction Free Writing mode') ?></td></tr>
</del><ins>+ <tr class="top"><th class="key center"><?php _e('Letter'); ?></th><th class="left"><?php _e('Action'); ?></th><th class="key center"><?php _e('Letter'); ?></th><th class="left"><?php _e('Action'); ?></th></tr>
+ <tr><th>n</th><td><?php _e('Check Spelling'); ?></td><th>l</th><td><?php _e('Align Left'); ?></td></tr>
+ <tr><th>j</th><td><?php _e('Justify Text'); ?></td><th>c</th><td><?php _e('Align Center'); ?></td></tr>
+ <tr><th>d</th><td><span style="text-decoration: line-through;"><?php _e('Strikethrough'); ?></span></td><th>r</th><td><?php _e('Align Right'); ?></td></tr>
+ <tr><th>u</th><td><strong>&bull;</strong> <?php _e('List'); ?></td><th>a</th><td><?php _e('Insert link'); ?></td></tr>
+ <tr><th>o</th><td>1. <?php _e('List'); ?></td><th>s</th><td><?php _e('Remove link'); ?></td></tr>
+ <tr><th>q</th><td><?php _e('Quote'); ?></td><th>m</th><td><?php _e('Insert Image'); ?></td></tr>
+ <tr><th>g</th><td><?php _e('Full Screen'); ?></td><th>t</th><td><?php _e('Insert More Tag'); ?></td></tr>
+ <tr><th>p</th><td><?php _e('Insert Page Break tag'); ?></td><th>h</th><td><?php _e('Help'); ?></td></tr>
+ <tr><th>w</th><td colspan="3"><?php _e('Distraction Free Writing mode'); ?></td></tr>
</ins><span class="cx"> </table>
</span><span class="cx">
</span><span class="cx"> <p style="padding: 15px 10px 10px;"><?php _e('Editor width in Distraction Free Writing mode:'); ?></p>
</span><span class="cx"> <table class="keys">
</span><del>- <tr><th><span class="win">Alt +</span><span class="mac">Ctrl +</span></th><td><?php _e('Wider') ?></td>
- <th><span class="win">Alt -</span><span class="mac">Ctrl -</span></th><td><?php _e('Narrower') ?></td></tr>
- <tr><th><span class="win">Alt 0</span><span class="mac">Ctrl 0</span></th><td><?php _e('Default width') ?></td><th></th><td></td></tr>
</del><ins>+ <tr><th><span class="win">Alt +</span><span class="mac">Ctrl +</span></th><td><?php _e('Wider'); ?></td>
+ <th><span class="win">Alt -</span><span class="mac">Ctrl -</span></th><td><?php _e('Narrower'); ?></td></tr>
+ <tr><th><span class="win">Alt 0</span><span class="mac">Ctrl 0</span></th><td><?php _e('Default width'); ?></td><th></th><td></td></tr>
</ins><span class="cx"> </table>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -230,12 +230,12 @@
</span><span class="cx"> <h2><?php _e('About TinyMCE'); ?></h2>
</span><span class="cx">
</span><span class="cx"> <p><?php _e('Version:'); ?> <span id="version"></span> (<span id="date"></span>)</p>
</span><del>- <p><?php printf(__('TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor released as Open Source under %sLGPL</a> by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '<a href="'.home_url('/wp-includes/js/tinymce/license.txt').'" target="_blank" title="'.esc_attr__('GNU Library General Public License').'">') ?></p>
- <p><?php _e('Copyright &copy; 2003-2011, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.') ?></p>
- <p><?php _e('For more information about this software visit the <a href="http://tinymce.com" target="_blank">TinyMCE website</a>.') ?></p>
</del><ins>+ <p><?php printf(__('TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor released as Open Source under %sLGPL</a> by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '<a href="'.home_url('/wp-includes/js/tinymce/license.txt').'" target="_blank" title="'.esc_attr__('GNU Library General Public License').'">'); ?></p>
+ <p><?php _e('Copyright &copy; 2003-2011, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.'); ?></p>
+ <p><?php _e('For more information about this software visit the <a href="http://tinymce.com" target="_blank">TinyMCE website</a>.'); ?></p>
</ins><span class="cx">
</span><span class="cx"> <div id="buttoncontainer">
</span><del>- <a href="http://www.moxiecode.com" target="_blank"><img src="themes/advanced/img/gotmoxie.png" alt="<?php esc_attr_e('Got Moxie?') ?>" style="border: 0" /></a>
</del><ins>+ <a href="http://www.moxiecode.com" target="_blank"><img src="themes/advanced/img/gotmoxie.png" alt="<?php esc_attr_e('Got Moxie?'); ?>" style="border: 0" /></a>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>