Ticket #26769: 26769.4.patch

src/wp-admin/about.php

@@ -93 +93 @@
                                 /** This action is documented in wp-admin/user-edit.php */
                                 do_action( 'admin_color_scheme_picker' );
                                 ?>
-                        <p><?php printf( __( 'To change your color scheme later, just <a href="%1$s">visit your profile</a>.' ), get_edit_profile_url() ); ?></p>
+                        <p><?php printf( __( 'To change your color scheme later, just <a href="%1$s">update your profile</a>.' ), get_edit_profile_url() ); ?></p>
                 </div>
         </div>
 </div>

src/wp-admin/menu.php

@@ -192 +192 @@
         else
                 $submenu['users.php'][10] = array(_x('Add New', 'user'), 'promote_users', 'user-new.php');
 
-        $submenu['users.php'][15] = array(__('Your Profile'), 'read', 'profile.php');
+        $submenu['users.php'][15] = array(__('Profile'), 'read', 'profile.php');
 } else {
         $_wp_real_parent_file['users.php'] = 'profile.php';
-        $submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php');
+        $submenu['profile.php'][5] = array(__('Profile'), 'read', 'profile.php');
         if ( current_user_can('create_users') )
                 $submenu['profile.php'][10] = array(__('Add New User'), 'create_users', 'user-new.php');
         else

src/wp-admin/user-edit.php

@@ -125 +125 @@
 
 if ( IS_PROFILE_PAGE ) {
         /**
-         * Fires before the page loads on the 'Your Profile' editing screen.
+         * Fires before the page loads on the 'Profile' editing screen.
          *
          * The action only fires if the current user is editing their own profile.
          *
@@ -293 +293 @@
 <?php
         if ( IS_PROFILE_PAGE ) {
                 /**
-                 * Fires after the 'Personal Options' settings table on the 'Your Profile' editing screen.
+                 * Fires after the 'Personal Options' settings table on the 'Profile' editing screen.
                  *
                  * The action only fires if the current user is editing their own profile.
                  *
@@ -479 +479 @@
 <?php
         if ( IS_PROFILE_PAGE ) {
                 /**
-                 * Fires after the 'About Yourself' settings table on the 'Your Profile' editing screen.
+                 * Fires after the 'About Yourself' settings table on the 'Profile' editing screen.
                  *
                  * The action only fires if the current user is editing their own profile.
                  *

src/wp-includes/js/tinymce/wp-mce-help.php

@@ -47 +47 @@
                 -webkit-transition: none;
                 transition: none;
         }
-        
+
         #tabs-wrap #tabs > a {
                 float: left;
                 font-size: 14px;
@@ -167 +167 @@
         <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>
+        <p><?php _e('If you do not like the way the rich editor works, you may turn it off from Profile submenu, under Users in the admin menu.'); ?></p>
 </div>
 
 <div id="content2" class="hidden">