sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge two similar strings. 

props pavelevap.
fixes #29751.

git-svn-id: https://develop.svn.wordpress.org/trunk@29768 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2014-09-26 19:29:59 +00:00
parent c993055800
commit a86e98ba96
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/script-loader.php
View File

@ -358,7 +358,7 @@ function wp_default_scripts( &$scripts ) {
'update' => __('Update'), 'update' => __('Update'),
'save' => __('Add Link'), 'save' => __('Add Link'),
'noTitle' => __('(no title)'), 'noTitle' => __('(no title)'),
'noMatchesFound' => __('No matches found.') 'noMatchesFound' => __('No results found.')
) ); ) );
$scripts->add( 'wpdialogs', "/wp-includes/js/wpdialog$suffix.js", array( 'jquery-ui-dialog' ), false, 1 ); $scripts->add( 'wpdialogs', "/wp-includes/js/wpdialog$suffix.js", array( 'jquery-ui-dialog' ), false, 1 );
@ -534,7 +534,7 @@ function wp_default_scripts( &$scripts ) {
// Navigation Menus // Navigation Menus
$scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-lists', 'postbox' ) ); $scripts->add( 'nav-menu', "/wp-admin/js/nav-menu$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable', 'wp-lists', 'postbox' ) );
did_action( 'init' ) && $scripts->localize( 'nav-menu', 'navMenuL10n', array( did_action( 'init' ) && $scripts->localize( 'nav-menu', 'navMenuL10n', array(
'noResultsFound' => _x('No results found.', 'search results'), 'noResultsFound' => _x( 'No results found.' ),
'warnDeleteMenu' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ), 'warnDeleteMenu' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ),
'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ), 'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
'untitled' => _x( '(no label)', 'missing menu item navigation label' ) 'untitled' => _x( '(no label)', 'missing menu item navigation label' )