From e0989568d2e8cbc21716669dab41411593f81728 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Tue, 8 Apr 2014 01:18:15 +0000
Subject: [PATCH] TinyMCE help: Break up strings changed in [28027] for ease of
 changing later.

Restores a not inaccurate paragraph to reduce churn.

see #27100.


git-svn-id: https://develop.svn.wordpress.org/trunk@28028 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/js/tinymce/wp-mce-help.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/wp-includes/js/tinymce/wp-mce-help.php b/src/wp-includes/js/tinymce/wp-mce-help.php
index d449008998..c9a070195f 100644
--- a/src/wp-includes/js/tinymce/wp-mce-help.php
+++ b/src/wp-includes/js/tinymce/wp-mce-help.php
@@ -150,7 +150,10 @@ if ( win && win.tinymce && win.tinymce.isMac ) {
 <div id="content1">
 	<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 HTML 5.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('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.' );
+		echo ' ' . __( '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.' );
+		echo ' ' . __( 'WordPress is producing valid HTML 5 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>
 </div>
@@ -158,10 +161,12 @@ if ( win && win.tinymce && win.tinymce.isMac ) {
 <div id="content2" class="hidden">
 	<h2><?php _e('Advanced Rich Editing'); ?></h2>
 	<h3><?php _e('Images and Attachments'); ?></h3>
-	<p><?php _e('The Add Media button above the editor toolbar can be used for inserting images that are already hosted somewhere on the internet. If you have a URL for an image, click this button, select Insert from URL, 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 same Add Media button and select Insert Media: Upload Files or drag the files you wish to upload from the desktop and drop them into the browser window. 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>
+	<p><?php _e( 'If you want to upload an image or another media file from your computer, you can use the Add Media button above the editor. Select Upload Files or drag the files you wish to upload from the desktop and drop them into the browser window.' );
+		echo ' ' . __( '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>
+	<p><?php _e( 'The Add Media button can also be used for inserting images that are already hosted somewhere on the internet. If you have a URL for an image, click this button, select Insert from URL, and enter the URL in the box which appears.' ); ?></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 code that cannot be generated with the toolbar buttons, you must enter it by hand in the Text editor. Examples are tables and &lt;div&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>
+	<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 the "Paste as text" button 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 automatically handled. If you want it to appear as plain text instead, you can use "Paste as text" button on the second row, or paste directly in Text mode.'); ?></p>