Ticket #17414: 17414.001.diff

wp-includes/class-http.php

@@ -192 +192 @@
         }
 
         /**
-         * Tests which transports are capabable of supporting the request.
+         * Tests which transports are capable of supporting the request.
          * 
          * @since 3.2.0
          * @access private
@@ -247 +247 @@
                 if ( !$class )
                         return new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) );
 
-                // Transport claims to support request, Instantate it and give it a whirl.
+                // Transport claims to support request, instantiate it and give it a whirl.
                 if ( empty( $transports[$class] ) )
                         $transports[$class] = new $class;
 

wp-includes/l10n.php

@@ -186 +186 @@
  * @param string $domain Optional. Domain to retrieve the translated text
  * @return string Translated context string without pipe
  */
-function _x( $single, $context, $domain = 'default' ) {
-        return translate_with_gettext_context( $single, $context, $domain );
+function _x( $text, $context, $domain = 'default' ) {
+        return translate_with_gettext_context( $text, $context, $domain );
 }
 
 /**
@@ -201 +201 @@
  * @param string $domain Optional. Domain to retrieve the translated text
  * @return string Translated context string without pipe
  */
-function _ex( $single, $context, $domain = 'default' ) {
-        echo _x( $single, $context, $domain );
+function _ex( $text, $context, $domain = 'default' ) {
+        echo _x( $text, $context, $domain );
 }
 
 function esc_attr_x( $single, $context, $domain = 'default' ) {
@@ -270 +270 @@
  *  $usable_text = sprintf( translate_nooped_plural( $message, $count ), $count );
  *
  * @since 2.5
- * @param string $single Single form to be i18ned
+ * @param string $singular Single form to be i18ned
  * @param string $plural Plural form to be i18ned
- * @return array array($single, $plural)
+ * @return array array($singular, $plural)
  */
 function _n_noop( $singular, $plural ) {
         return array( 0 => $singular, 1 => $plural, 'singular' => $singular, 'plural' => $plural, 'context' => null );

wp-includes/formatting.php

@@ -1227 +1227 @@
  *
  * @since 2.0.0
  *
- * @param array|string $value The array or string to be striped.
+ * @param array|string $value The array or string to be stripped.
  * @return array|string Stripped array (or string in the callback).
  */
 function stripslashes_deep($value) {
@@ -2758 +2758 @@
  * This function by default only applies to <a> tags, however this can be
  * modified by the 3rd param.
  *
- * <b>NOTE:</b> Any current target attributed will be striped and replaced.
+ * <b>NOTE:</b> Any current target attributed will be stripped and replaced.
  *
  * @since 2.7.0
  *

wp-admin/plugins.php

@@ -59 +59 @@
                                 update_option('recently_activated', $recent);
                         }
                         if ( isset($_GET['from']) && 'import' == $_GET['from'] ) {
-                                wp_redirect( self_admin_url("import.php?import=" . str_replace('-importer', '', dirname($plugin))) ); // overrides the ?error=true one above and redirects to the Imports page, striping the -importer suffix
+                                wp_redirect( self_admin_url("import.php?import=" . str_replace('-importer', '', dirname($plugin))) ); // overrides the ?error=true one above and redirects to the Imports page, stripping the -importer suffix
                         } else {
                                 wp_redirect( self_admin_url("plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s") ); // overrides the ?error=true one above
                         }