From d72d9f21abb13a04653fd6cf939e6fdfe32671b9 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Tue, 14 Apr 2015 18:53:25 +0000
Subject: [PATCH] Update about page for 4.2.

props siobhan, DrewAPicture.
see #31929
Built from https://develop.svn.wordpress.org/trunk@32130


git-svn-id: http://core.svn.wordpress.org/trunk@32109 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/about.php      | 55 +++++++++++++++++++++++++----------------
 wp-includes/version.php |  2 +-
 2 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/wp-admin/about.php b/wp-admin/about.php
index 7dbb2c8107..c36fb29518 100644
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -49,8 +49,8 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 		<div class="dfw-container">
 			<img src="//s.w.org/images/core/4.1/focus.png" class="base-image" />
 		</div>
-		<h3><em><?php echo ( 'Press This modernized' ); ?></em></h3>
-		<p><?php echo ( 'Use Press This to clip text, images and videos from any web page. Then edit and add more directly from Press This before you save or publish it in a post on your site.' ); ?></p>
+		<h3><?php echo ( 'Press This Modernized' ); ?></h3>
+		<p><?php echo ( 'Clip it, edit it, publish it. Get familiar with the new and improved Press This. From the tools menu, add Press This to your browser bookmark bar or your mobile device home screen. Once installed you can share your content with lightning speed. Sharing your favorite videos, images, and content has never been this fast or this easy.' ); ?></p>
 	</div>
 </div>
 
@@ -61,8 +61,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 	<div class="feature-section">
 		<div class="col">
 			<h3><?php echo ( 'Extended Character Support' ); ?></h3>
-			<p><?php echo ( 'WordPress now supports displaying a host of new characters included with Unicode 7.0, extending support for native Chinese, Japanese, and Korean characters, musical and mathematical symbols, hieroglyphs, and of course, emoji.' ); ?></p>
-			<p><?php echo ( 'Whether you’re using special characters or not, you can still get creative and decorate your content with emoji hearts, kittens, ice-cream cones, and musical instruments.' ); ?></p>
+			<p><?php echo ( 'Writing in WordPress, whatever your language, just got better. WordPress 4.2 supports a host of new characters out-of-the-box, including native Chinese, Japanese, and Korean characters, musical and mathematical symbols, and hieroglyphs.' ); ?></p>
+			<p><?php
+				/* translators: 1: heart emoji, 2: kitten emoji, 3, monkey emoji, 4: ice-cream emoji */
+				printf( 'Don’t use special characters? You can still have fun &mdash; emoji are now available in WordPress! Get creative and decorate your content with %1$s, %2$s, %3$s, %4$s, and all the many other emojis.', '&#x1F499', '&#x1F408', '&#x1F412', '&#x1F366' );
+			?></p>
 		</div>
 		<div class="col">
 			<img class="" src="//s.w.org/images/core/4.1/mobile.png" />
@@ -75,7 +78,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 <hr />
 
 <div class="changelog customize">
-	<div class="feature-section col two-col">
+	<div class="feature-section col three-col">
 		<div>
 			<?php
 			echo wp_video_shortcode( array(
@@ -84,11 +87,25 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 				'webm'     => '//s.w.org/images/core/3.9/widgets.webm',
 				'loop'     => true,
 				'autoplay' => true,
-				'width'    => 499
+				'height'   => 218
 			) );
 			?>
-			<h4><?php echo ( 'Switch themes in the Customizer' ); ?></h4>
-			<p><?php echo ( 'Browse and live preview your installed themes in the Customizer. Make sure everything looks just how you want it with your content before the new theme makes its debut on your site.' ); ?></p>
+			<h4><?php echo ( 'Switch Themes in the Customizer' ); ?></h4>
+			<p><?php echo ( 'Browse and preview your installed themes from the Customizer. Make sure the theme looks just right with <em>your</em> content, before it debuts on your site. ' ); ?></p>
+		</div>
+		<div>
+			<?php
+			echo wp_video_shortcode( array(
+				'mp4'      => '//s.w.org/images/core/3.9/widgets.mp4',
+				'ogv'      => '//s.w.org/images/core/3.9/widgets.ogv',
+				'webm'     => '//s.w.org/images/core/3.9/widgets.webm',
+				'loop'     => true,
+				'autoplay' => true,
+				'height'   => 218
+			) );
+			?>
+			<h4><?php echo ( 'Even More Embeds' ); ?></h4>
+			<p><?php echo ( 'Paste links from Tumblr and Kickstarter and watch them magically appear right in the editor. With every release, your publishing and editing experience gets closer together.' ); ?></p>
 		</div>
 		<div class="last-feature">
 			<?php
@@ -98,11 +115,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 				'webm'     => '//s.w.org/images/core/3.9/widgets.webm',
 				'loop'     => true,
 				'autoplay' => true,
-				'width'    => 499
+				'height'   => 218
 			) );
 			?>
-			<h4><?php echo ( 'Streamlined plugin updates' ); ?></h4>
-			<p><?php echo ( 'Plugin updates are smooth and simple. No more boring loading screen &mdash; just click <em>Update Now</em> on any number of plugins and wait for the success messages. Easy!' ); ?></p>
+			<h4><?php echo ( 'Streamlined Plugin Updates' ); ?></h4>
+			<p><?php echo ( 'Goodbye boring loading screen, hello smooth and simple plugin updates. Just click <em>Update Now</em> and watch the magic happen.' ); ?></p>
 		</div>
 	</div>
 </div>
@@ -112,24 +129,20 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 <div class="changelog under-the-hood">
 	<h3><?php _e( 'Under the Hood' ); ?></h3>
 
-	<div class="feature-section col three-col">
-		<div>
-			<h4><?php echo ( 'Tumblr & Kickstarter oEmbed support' ); ?></h4>
-			<p><?php echo ( 'Give your favorite Tumblr posts and Kickstarter campaigns a boost by embedding them in a post or page.' ); ?></p>
-
-			<h4><?php echo ( 'JavaScript accessibility' ); ?></h4>
-			<p><?php echo ( 'New <code>wp.a11y.speak</code> functionality lets your JavaScript talk to screen readers with ARIA live notifications.' ); ?></p>
-		</div>
+	<div class="feature-section col two-col">
 		<div>
 			<h4><?php echo ( 'utf8mb4 Support' ); ?></h4>
-			<p><?php echo ( 'If your system supports it, we&#8217;ve changed from utf8 to utf8mb4 character encoding in the database, which adds support for a whole range of new 4-byte characters.' ); ?></p>
+			<p><?php echo ( 'Database character encoding has changed from utf8 to utf8mb4, which adds support for a whole range of new 4-byte characters.' ); ?></p>
 
 			<h4><?php echo ( 'Complex Query Ordering' ); ?></h4>
 			<p><?php echo ( '<code>WP_Query</code>, <code>WP_Comment_Query</code>, and <code>WP_User_Query</code> now support complex ordering with named meta query clauses.' ); ?></p>
 		</div>
 		<div class="last-feature">
 			<h4><?php echo ( 'Taxonomy Roadmap' ); ?></h4>
-			<p><?php echo ( 'Terms previously shared across multiple taxonomies will be &#8220;split&#8221; when one of them is updated, creating a new row in the database for each.' ); ?></p>
+			<p><?php echo ( 'Terms previously shared across multiple taxonomies will be split when one of them is updated. A new row is created in the database for each.' ); ?></p>
+
+			<h4><?php echo ( 'JavaScript Accessibility' ); ?></h4>
+			<p><?php echo ( 'Your JavaScript can now talk to screen readers with <code>wp.a11y.speak()</code>.' ); ?></p>
 		</div>
 
 	<hr />
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 02265f3de0..875d8dad0f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta4-32129';
+$wp_version = '4.2-beta4-32130';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.