Ticket #20491: 20491-applied.diff

src/wp-admin/js/color-picker.js

@@ -38 +38 @@
                         // Set up HTML structure, hide things
                         el.addClass( 'wp-color-picker' ).hide().wrap( _wrap );
                         self.wrap = el.parent();
-                        self.toggler = $( _before ).insertBefore( el ).css( { backgroundColor: self.initialValue } ).attr( 'title', wpColorPickerL10n.pick ).attr( 'data-current', wpColorPickerL10n.current );
+                        self.toggler = $( _before ).insertBefore( el ).css( { backgroundColor: self.initialValue } ).attr( 'title', wp.i18n.__( 'Select Color' ) ).attr( 'data-current', wp.i18n.__( 'Current Color' ) );
                         self.pickerContainer = $( _after ).insertAfter( el );
                         self.button = $( _button );
 
                         if ( self.options.defaultColor ) {
-                                self.button.addClass( 'wp-picker-default' ).val( wpColorPickerL10n.defaultString );
+                                self.button.addClass( 'wp-picker-default' ).val( wp.i18n.__( 'Default' ) );
                         } else {
-                                self.button.addClass( 'wp-picker-clear' ).val( wpColorPickerL10n.clear );
+                                self.button.addClass( 'wp-picker-clear' ).val( wp.i18n.__( 'Clear' ) );
                         }
 
                         el.wrap( '<span class="wp-picker-input-wrap" />' ).after(self.button);

src/wp-admin/js/comment.js

@@ -46 +46 @@
                 }
 
                 $timestamp.html(
-                        commentL10n.submittedOn + ' <b>' +
-                        commentL10n.dateFormat
+                        wp.i18n.__( 'Submitted on:' ) + ' <b>' +
+                        /* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */
+                        __( '%1$s %2$s, %3$s @ %4$s:%5$s' )
                                 .replace( '%1$s', $( 'option[value="' + mm + '"]', '#mm' ).attr( 'data-text' ) )
                                 .replace( '%2$s', parseInt( jj, 10 ) )
                                 .replace( '%3$s', aa )

src/wp-admin/js/common.js

@@ -1 @@
-/* global setUserSetting, ajaxurl, commonL10n, alert, confirm, pagenow */
+/* global setUserSetting, ajaxurl, alert, confirm, pagenow */
 var showNotice, adminMenu, columns, validateForm, screenMeta;
 ( function( $, window, undefined ) {
         var $document = $( document ),
@@ -89 +89 @@
 // stub for doing better warnings
 showNotice = {
         warn : function() {
-                var msg = commonL10n.warnDelete || '';
+                var msg = wp.i18n.__( "You are about to permanently delete these items.\n  'Cancel' to stop, 'OK' to delete." );
+
                 if ( confirm(msg) ) {
                         return true;
                 }
@@ -404 +405 @@
                 $( '.notice.is-dismissible' ).each( function() {
                         var $el = $( this ),
                                 $button = $( '<button type="button" class="notice-dismiss"><span class="screen-reader-text"></span></button>' ),
-                                btnText = commonL10n.dismiss || '';
+                                btnText = wp.i18n.__( 'Dismiss this notice.' );
 
                         // Ensure plain text
                         $button.find( '.screen-reader-text' ).text( btnText );

src/wp-admin/js/customize-controls.js

@@ -1 @@
-/* global _wpCustomizeHeader, _wpCustomizeBackground, _wpMediaViewsL10n, MediaElementPlayer */
+/* global _wpCustomizeHeader, _wpCustomizeBackground, MediaElementPlayer */
 (function( exports, $ ){
         var Container, focus, api = wp.customize;
 
@@ -2201 +2201 @@
                  * Create a media modal select frame, and store it so the instance can be reused when needed.
                  */
                 initFrame: function() {
-                        var l10n = _wpMediaViewsL10n;
-
                         this.frame = wp.media({
                                 button: {
-                                        text: l10n.select,
+                                        text: wp.i18n.__( 'Select' ),
                                         close: false
                                 },
                                 states: [
@@ -2392 +2390 @@
                  * Create a media modal select frame, and store it so the instance can be reused when needed.
                  */
                 initFrame: function() {
-                        var l10n = _wpMediaViewsL10n;
-
                         this.frame = wp.media({
                                 button: {
-                                        text: l10n.select,
+                                        text: wp.i18n.__( 'Select' ),
                                         close: false
                                 },
                                 states: [
@@ -2648 +2644 @@
                  * @param {event} event
                  */
                 openMedia: function(event) {
-                        var l10n = _wpMediaViewsL10n;
-
                         event.preventDefault();
 
                         this.frame = wp.media({
                                 button: {
-                                        text: l10n.selectAndCrop,
+                                        text: wp.i18n.__( 'Select and Crop' ),
                                         close: false
                                 },
                                 states: [
                                         new wp.media.controller.Library({
-                                                title:     l10n.chooseImage,
+                                                title:     wp.i18n.__( 'Choose Image' ),
                                                 library:   wp.media.query({ type: 'image' }),
                                                 multiple:  false,
                                                 date:      false,
@@ -3046 +3040 @@
                                 response = response.slice( 0, index ) + response.slice( index + signature.length );
 
                                 // Create the iframe and inject the html content.
-                                self.iframe = $( '<iframe />', { 'title': api.l10n.previewIframeTitle } ).appendTo( self.container );
+                                self.iframe = $( '<iframe />', { 'title': wp.i18n.__( 'Site Preview' ) } ).appendTo( self.container );
 
                                 // Bind load event after the iframe has been added to the page;
                                 // otherwise it will fire when injected into the DOM.
@@ -3092 +3086 @@
                                         reject();
                                 }
 
-                                iframe = $( '<iframe />', { 'src': self.previewUrl(), 'title': api.l10n.previewIframeTitle } ).hide();
+                                iframe = $( '<iframe />', { 'src': self.previewUrl(), 'title': wp.i18n.__( 'Site Preview' ) } ).hide();
                                 iframe.appendTo( self.container );
                                 iframe.on( 'load', function() {
                                         self.triedLogin = true;
@@ -3364 +3358 @@
                                 url:     api.settings.url.login
                         });
 
-                        iframe = $( '<iframe />', { 'src': api.settings.url.login, 'title': api.l10n.loginIframeTitle } ).appendTo( this.container );
+                        iframe = $( '<iframe />', { 'src': api.settings.url.login, 'title': wp.i18n.__( 'Session expired' ) } ).appendTo( this.container );
 
                         messenger.targetWindow( iframe[0].contentWindow );
 
@@ -3392 +3386 @@
 
                 cheatin: function() {
                         $( document.body ).empty().addClass( 'cheatin' ).append(
-                                '<h1>' + api.l10n.cheatin + '</h1>' +
-                                '<p>' + api.l10n.notAllowed + '</p>'
+                                '<h1>' + wp.i18n.__( 'Cheatin&#8217; uh?' ) + '</h1>' +
+                                '<p>' + wp.i18n.__( 'Sorry, you are not allowed to customize this site.' ) + '</p>'
                         );
                 },
 
@@ -3608 +3602 @@
 
         $( function() {
                 api.settings = window._wpCustomizeSettings;
-                api.l10n = window._wpCustomizeControlsL10n;
 
                 // Check if we can run the Customizer.
                 if ( ! api.settings ) {
@@ -3921 +3914 @@
 
                         state.bind( 'change', function() {
                                 if ( ! activated() ) {
-                                        saveBtn.val( api.l10n.activate ).prop( 'disabled', false );
-                                        closeBtn.find( '.screen-reader-text' ).text( api.l10n.cancel );
+                                        saveBtn.val( wp.i18n.__( 'Save &amp; Activate' ) ).prop( 'disabled', false );
+                                        closeBtn.find( '.screen-reader-text' ).text( wp.i18n.__( 'Cancel' ) );
 
                                 } else if ( saved() ) {
-                                        saveBtn.val( api.l10n.saved ).prop( 'disabled', true );
-                                        closeBtn.find( '.screen-reader-text' ).text( api.l10n.close );
+                                        saveBtn.val( wp.i18n.__( 'Saved' ) ).prop( 'disabled', true );
+                                        closeBtn.find( '.screen-reader-text' ).text( wp.i18n.__( 'Close' ) );
 
                                 } else {
-                                        saveBtn.val( api.l10n.save ).prop( 'disabled', false );
-                                        closeBtn.find( '.screen-reader-text' ).text( api.l10n.cancel );
+                                        saveBtn.val( wp.i18n.__( 'Save &amp; Publish' ) ).prop( 'disabled', false );
+                                        closeBtn.find( '.screen-reader-text' ).text( wp.i18n.__( 'Cancel' ) );
                                 }
                         });
 
@@ -3988 +3981 @@
                         overlay.toggleClass( 'collapsed', ! paneVisible );
 
                         if ( ! paneVisible ) {
-                                $( '.collapse-sidebar' ).attr({ 'aria-expanded': 'false', 'aria-label': api.l10n.expandSidebar });
+                                $( '.collapse-sidebar' ).attr({ 'aria-expanded': 'false', 'aria-label': wp.i18n.__( 'Expand Sidebar' ) });
                         } else {
-                                $( '.collapse-sidebar' ).attr({ 'aria-expanded': 'true', 'aria-label': api.l10n.collapseSidebar });
+                                $( '.collapse-sidebar' ).attr({ 'aria-expanded': 'true', 'aria-label': wp.i18n.__( 'Expand Sidebar' ) });
                         }
                 });
 
@@ -4080 +4073 @@
                 if ( title.length ) {
                         api( 'blogname', function( setting ) {
                                 var updateTitle = function() {
-                                        title.text( $.trim( setting() ) || api.l10n.untitledBlogName );
+                                        title.text( $.trim( setting() ) || wp.i18n.__( '(Untitled)' ) );
                                 };
                                 setting.bind( updateTitle );
                                 updateTitle();
@@ -4115 +4108 @@
                                 setTimeout( function() {
                                         overlay.removeClass( 'customize-loading' );
                                 }, 1 );
-                                return api.l10n.saveAlert;
+                                return wp.i18n.__( 'The changes you made will be lost if you navigate away from this page.' );
                         }
                 } );
 

src/wp-admin/js/customize-widgets.js

@@ -756 +756 @@
 
                                         if ( isMoveUp ) {
                                                 self.moveUp();
-                                                wp.a11y.speak( l10n.widgetMovedUp );
+                                                wp.a11y.speak( wp.i18n.__( 'Widget moved up' ) );
                                         } else {
                                                 self.moveDown();
-                                                wp.a11y.speak( l10n.widgetMovedDown );
+                                                wp.a11y.speak( wp.i18n.__( 'Widget moved down' ) );
                                         }
 
                                         $( this ).focus(); // re-focus after the container was moved
@@ -833 +833 @@
 
                         // Configure update button
                         $saveBtn = this.container.find( '.widget-control-save' );
-                        $saveBtn.val( l10n.saveBtnLabel );
-                        $saveBtn.attr( 'title', l10n.saveBtnTooltip );
+                        $saveBtn.val( wp.i18n.__( 'Apply' ) );
+                        $saveBtn.attr( 'title', wp.i18n.__( 'Save and preview changes before publishing them.' ) );
                         $saveBtn.removeClass( 'button-primary' ).addClass( 'button-secondary' );
                         $saveBtn.on( 'click', function( e ) {
                                 e.preventDefault();
@@ -946 +946 @@
                         } );
 
                         replaceDeleteWithRemove = function() {
-                                $removeBtn.text( l10n.removeBtnLabel ); // wp_widget_control() outputs the link as "Delete"
-                                $removeBtn.attr( 'title', l10n.removeBtnTooltip );
+                                $removeBtn.text( wp.i18n.__( 'Remove' ) ); // wp_widget_control() outputs the link as "Delete"
+                                $removeBtn.attr( 'title', wp.i18n.__( 'Trash widget by moving it to the inactive widgets sidebar.' ) );
                         };
 
                         if ( this.params.is_new ) {
@@ -1223 +1223 @@
                                         }
                                 } else {
                                         // General error message
-                                        message = l10n.error;
+                                        message = wp.i18n.__( 'An error has occurred. Please reload the page and try again.' );
 
                                         if ( r.data && r.data.message ) {
                                                 message = r.data.message;
@@ -1534 +1534 @@
                                         'class': 'no-widget-areas-rendered-notice'
                                 });
                                 noRenderedAreasNotice.append( $( '<em></em>', {
-                                        text: l10n.noAreasRendered
+                                        text: wp.i18n.__( 'There are no widget areas currently rendered in the preview. Navigate in the preview to a template that makes use of a widget area in order to access its widgets here.' )
                                 } ) );
                                 panelMetaContainer.append( noRenderedAreasNotice );
 
@@ -1888 +1888 @@
 
                                 addNewWidgetBtn.attr({ 'tabindex': '-1', 'aria-hidden': 'true' });
                                 reorderBtn.attr( 'aria-label', l10n.reorderLabelOff );
-                                wp.a11y.speak( l10n.reorderModeOn );
+                                wp.a11y.speak( wp.i18n.__( 'Reorder mode enabled' ) );
                                 // Hide widget titles while reordering: title is already in the reorder controls.
                                 widgetsTitle.attr( 'aria-hidden', 'true' );
                         } else {
                                 addNewWidgetBtn.removeAttr( 'tabindex aria-hidden' );
                                 reorderBtn.attr( 'aria-label', l10n.reorderLabelOn );
-                                wp.a11y.speak( l10n.reorderModeOff );
+                                wp.a11y.speak( wp.i18n.__( 'Reorder mode closed' ) );
                                 widgetsTitle.attr( 'aria-hidden', 'false' );
                         }
                 },

src/wp-admin/js/edit-comments.js

@@ -98 +98 @@
         updateHtmlTitle = function ( diff ) {
                 var newTitle, regExMatch, titleCount, commentFrag;
 
-                titleRegEx = titleRegEx || new RegExp( adminCommentsL10n.docTitleCommentsCount.replace( '%s', '\\([0-9' + thousandsSeparator + ']+\\)' ) + '?' );
+                /* translators: %s: comments count */
+                titleRegEx = titleRegEx || new RegExp( wp.i18n.__( 'Comments (%s)' ).replace( '%s', '\\([0-9' + thousandsSeparator + ']+\\)' ) + '?' );
                 // count funcs operate on a $'d element
                 titleDiv = titleDiv || $( '<div />' );
                 newTitle = adminTitle;
@@ -117 +118 @@
                         updateCount( titleDiv, titleCount );
                         regExMatch = titleRegEx.exec( document.title );
                         if ( regExMatch ) {
-                                newTitle = document.title.replace( regExMatch[0], adminCommentsL10n.docTitleCommentsCount.replace( '%s', titleDiv.text() ) + ' ' );
+                                /* translators: %s: comments count */
+                                newTitle = document.title.replace( regExMatch[0], wp.i18n.__( 'Comments (%s)' ).replace( '%s', titleDiv.text() ) + ' ' );
                         }
                 } else {
                         regExMatch = titleRegEx.exec( newTitle );
                         if ( regExMatch ) {
-                                newTitle = newTitle.replace( regExMatch[0], adminCommentsL10n.docTitleComments );
+                                newTitle = newTitle.replace( regExMatch[0], wp.i18n.__( 'Comments' ) );
                         }
                 }
                 document.title = newTitle;
@@ -218 +220 @@
 
                 if ( c.is('.unapproved') ) {
                         if ( settings.data.id == replyID )
-                                replyButton.text(adminCommentsL10n.replyApprove);
+                                replyButton.text( wp.i18n.__( 'Approve and Reply' ) );
 
                         c.find( '.row-actions span.view' ).addClass( 'hidden' ).end()
                                 .find( 'div.comment_status' ).html( '0' );
 
                 } else {
                         if ( settings.data.id == replyID )
-                                replyButton.text(adminCommentsL10n.reply);
+                                replyButton.text( wp.i18n.__( 'Reply' ) );
 
                         c.find( '.row-actions span.view' ).removeClass( 'hidden' ).end()
                                 .find( 'div.comment_status' ).html( '1' );
@@ -607 +609 @@
         },
 
         toggle : function(el) {
-                if ( 'none' !== $( el ).css( 'display' ) && ( $( '#replyrow' ).parent().is('#com-reply') || window.confirm( adminCommentsL10n.warnQuickEdit ) ) ) {
+                if ( 'none' !== $( el ).css( 'display' ) && ( $( '#replyrow' ).parent().is('#com-reply') || window.confirm( wp.i18n.__( "Are you sure you want to edit this comment?\nThe changes you made will be lost." ) ) ) ) {
                         $( el ).find( 'a.vim-q' ).click();
                 }
         },
@@ -715 +717 @@
                         c.after(editRow);
 
                         if ( c.hasClass('unapproved') ) {
-                                replyButton.text(adminCommentsL10n.replyApprove);
+                                replyButton.text( wp.i18n.__( 'Approve and Reply' ) );
                         } else {
-                                replyButton.text(adminCommentsL10n.reply);
+                                replyButton.text( wp.i18n.__( 'Reply' ) );
                         }
 
                         $('#replyrow').fadeIn(300, function(){ $(this).show(); });
@@ -875 +877 @@
                         return true;
                 }
 
-                return window.confirm( adminCommentsL10n.warnCommentChanges );
+                return window.confirm( __( "Are you sure you want to do this?\nThe comment changes you made will be lost." ) );
         }
 };
 

src/wp-admin/js/inline-edit-post.js

@@ -1 @@
-/* global inlineEditL10n, ajaxurl, typenow */
+/* global ajaxurl, typenow */
 window.wp = window.wp || {};
 
 var inlineEditPost;
@@ -95 +95 @@
                         if ( $(this).prop('checked') ) {
                                 c = false;
                                 var id = $(this).val(), theTitle;
-                                theTitle = $('#inline_'+id+' .post_title').html() || inlineEditL10n.notitle;
-                                te += '<div id="ttle'+id+'"><a id="_'+id+'" class="ntdelbutton" title="'+inlineEditL10n.ntdeltitle+'">X</a>'+theTitle+'</div>';
+                                theTitle = $('#inline_'+id+' .post_title').html() || wp.i18n.__( '(no title)' );
+                                te += '<div id="ttle'+id+'"><a id="_'+id+'" class="ntdelbutton" title="' + wp.i18n.__( 'Remove From Bulk Edit' ) + '">X</a>'+theTitle+'</div>';
                         }
                 });
 
@@ -116 +116 @@
                 if ( 'post' === type ) {
                         // support multi taxonomies?
                         tax = 'post_tag';
-                        $('tr.inline-editor textarea[name="tax_input['+tax+']"]').suggest( ajaxurl + '?action=ajax-tag-search&tax=' + tax, { delay: 500, minchars: 2, multiple: true, multipleSep: inlineEditL10n.comma } );
+                        $('tr.inline-editor textarea[name="tax_input['+tax+']"]').suggest( ajaxurl + '?action=ajax-tag-search&tax=' + tax, { delay: 500, minchars: 2, multiple: true, multipleSep: wp.i18n._x( ',', 'tag delimiter' ).trim() } );
                 }
                 $('html, body').animate( { scrollTop: 0 }, 'fast' );
         },
@@ -184 +184 @@
                         var terms = $(this),
                                 taxname = $(this).attr('id').replace('_' + id, ''),
                                 textarea = $('textarea.tax_input_' + taxname, editRow),
-                                comma = inlineEditL10n.comma;
+                                comma = wp.i18n._x( ',', 'tag delimiter' ).trim();
 
                         terms.find( 'img' ).replaceWith( function() { return this.alt; } );
                         terms = terms.text();
@@ -196 +196 @@
                                 textarea.val(terms);
                         }
 
-                        textarea.suggest( ajaxurl + '?action=ajax-tag-search&tax=' + taxname, { delay: 500, minchars: 2, multiple: true, multipleSep: inlineEditL10n.comma } );
+                        textarea.suggest( ajaxurl + '?action=ajax-tag-search&tax=' + taxname, { delay: 500, minchars: 2, multiple: true, multipleSep: wp.i18n._x( ',', 'tag delimiter' ).trim() } );
                 });
 
                 // handle the post status
@@ -276 +276 @@
                                                 $( inlineEditPost.what + id ).hide().fadeIn( 400, function() {
                                                         // Move focus back to the Quick Edit link. $( this ) is the row being animated.
                                                         $( this ).find( '.editinline' ).focus();
-                                                        wp.a11y.speak( inlineEditL10n.saved );
+                                                        wp.a11y.speak( wp.i18n.__( 'Changes saved.' ) );
                                                 });
                                         } else {
                                                 r = r.replace( /<.[^<>]*?>/g, '' );
@@ -284 +284 @@
                                                 wp.a11y.speak( $errorSpan.text() );
                                         }
                                 } else {
-                                        $errorSpan.html( inlineEditL10n.error ).show();
-                                        wp.a11y.speak( inlineEditL10n.error );
+                                        $errorSpan.html( wp.i18n.__( 'Error while saving the changes.' ) ).show();
+                                        wp.a11y.speak( wp.i18n.__( 'Error while saving the changes.' ), 'polite' );
                                 }
                         },
                 'html');

src/wp-admin/js/inline-edit-tax.js

@@ -1 @@
-/* global inlineEditL10n, ajaxurl */
+/* global ajaxurl */
 window.wp = window.wp || {};
 
 var inlineEditTax;
@@ -123 +123 @@
                                                 row.hide().fadeIn( 400, function() {
                                                         // Move focus back to the Quick Edit link.
                                                         row.find( '.editinline' ).focus();
-                                                        wp.a11y.speak( inlineEditL10n.saved );
+                                                        wp.a11y.speak( wp.i18n.__( 'Changes saved.' ), 'polite' );
                                                 });
 
                                         } else {
@@ -132 +132 @@
                                                 wp.a11y.speak( $errorSpan.text() );
                                         }
                                 } else {
-                                        $errorSpan.html( inlineEditL10n.error ).show();
-                                        wp.a11y.speak( inlineEditL10n.error );
+                                        $errorSpan.html( wp.i18n.__( 'Error while saving the changes.' ) ).show();
+                                        wp.a11y.speak( wp.i18n.__( 'Error while saving the changes.' ), 'polite' );
                                 }
                         }
                 );

src/wp-admin/js/media.js

@@ -1 @@
-/* global ajaxurl, attachMediaBoxL10n, _wpMediaGridSettings, showNotice */
+/* global ajaxurl, _wpMediaGridSettings, showNotice */
 
 var findPosts;
 ( function( $ ){
@@ -61 +61 @@
                                 spinner.removeClass( 'is-active' );
                         }).done( function( x ) {
                                 if ( ! x.success ) {
-                                        $( '#find-posts-response' ).text( attachMediaBoxL10n.error );
+                                        $( '#find-posts-response' ).text( wp.i18n.__( 'Could not load the preview image. Please reload the page and try again.' ) );
                                 }
 
                                 $( '#find-posts-response' ).html( x.data );
                         }).fail( function() {
-                                $( '#find-posts-response' ).text( attachMediaBoxL10n.error );
+                                $( '#find-posts-response' ).text( wp.i18n.__( 'Could not load the preview image. Please reload the page and try again.' ) );
                         });
                 }
         };

src/wp-admin/js/nav-menu.js

@@ -8 +8 @@
  * @subpackage Administration
  */
 
-/* global menus, postboxes, columns, isRtl, navMenuL10n, ajaxurl */
+/* global menus, postboxes, columns, isRtl, ajaxurl */
 
 var wpNavMenu;
 
@@ -577 +577 @@
                                 if ( title ) {
                                         titleEl.text( title ).removeClass( 'no-title' );
                                 } else {
-                                        titleEl.text( navMenuL10n.untitled ).addClass( 'no-title' );
+                                        titleEl.text( wp.i18n._x( '(no label)', 'missing menu item navigation label' ) ).addClass( 'no-title' );
                                 }
                         } );
                 },
@@ -1019 +1019 @@
                         if ( 0 !== $('#menu-to-edit').length || 0 !== $('.menu-location-menus select').length ) {
                                 window.onbeforeunload = function(){
                                         if ( api.menusChanged )
-                                                return navMenuL10n.saveAlert;
+                                                return wp.i18n.__( 'The changes you made will be lost if you navigate away from this page.' );
                                 };
                         } else {
                                 // Make the post boxes read-only, as they can't be used yet
@@ -1159 +1159 @@
 
                 eventOnClickMenuDelete : function() {
                         // Delete warning AYS
-                        if ( window.confirm( navMenuL10n.warnDeleteMenu ) ) {
+                        if ( window.confirm( wp.i18n.__( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ) ) ) {
                                 window.onbeforeunload = null;
                                 return true;
                         }
@@ -1189 +1189 @@
                         $item;
 
                         if( ! $items.length ) {
-                                $('.categorychecklist', panel).html( '<li><p>' + navMenuL10n.noResultsFound + '</p></li>' );
+                                $('.categorychecklist', panel).html( '<li><p>' + wp.i18n.__( 'No results found.' ) + '</p></li>' );
                                 $( '.spinner', panel ).removeClass( 'is-active' );
                                 return;
                         }

src/wp-admin/js/plugin-install.js

@@ -1 @@
-/* global plugininstallL10n, tb_click, tb_remove */
+/* global tb_click, tb_remove */
 
 /**
  * Functionality for the plugin install screens.
@@ -139 +139 @@
         // Open the Plugin details modal.
         $( '.thickbox.open-plugin-details-modal' ).on( 'click', function( e ) {
                 // The `data-title` attribute is used only in the Plugin screens.
-                var title = $( this ).data( 'title' ) ? plugininstallL10n.plugin_information + ' ' + $( this ).data( 'title' ) : plugininstallL10n.plugin_modal_label;
+                var title = $( this ).data( 'title' ) ? wp.i18n.__( 'Plugin:' ) + ' ' + $( this ).data( 'title' ) : wp.i18n.__( 'Plugin details' );
 
                 e.preventDefault();
                 e.stopPropagation();
@@ -152 +152 @@
                 // Set ARIA role and ARIA label.
                 tbWindow.attr({
                         'role': 'dialog',
-                        'aria-label': plugininstallL10n.plugin_modal_label
+                        'aria-label': wp.i18n.__( 'Plugin details' )
                 });
 
                 // Set title attribute on the iframe.

src/wp-admin/js/post.js

@@ -1 @@
-/* global postL10n, ajaxurl, wpAjax, setPostThumbnailL10n, postboxes, pagenow, tinymce, alert, deleteUserSetting */
+/* global ajaxurl, wpAjax, postboxes, pagenow, tinymce, alert, deleteUserSetting */
 /* global theList:true, theExtraList:true, getUserSetting, setUserSetting, commentReply */
 
 var commentsBox, WPSetThumbnailHTML, WPSetThumbnailID, WPRemoveThumbnail, wptitlehint, makeSlugeditClickable, editPermalink;
@@ -46 +46 @@
                                         if ( commentsBox.st > commentsBox.total )
                                                 $('#show-comments').hide();
                                         else
-                                                $('#show-comments').show().children('a').html(postL10n.showcomm);
+                                                $('#show-comments').show().children('a').html( wp.i18n.__( 'Show more comments' ) );
 
                                         return;
                                 } else if ( 1 == r ) {
-                                        $('#show-comments').html(postL10n.endcomm);
+                                        $('#show-comments').html( wp.i18n.__( 'No more comments found.' ) );
                                         return;
                                 }
 
@@ -83 +83 @@
                 action: 'set-post-thumbnail', post_id: $( '#post_ID' ).val(), thumbnail_id: -1, _ajax_nonce: nonce, cookie: encodeURIComponent( document.cookie )
         }, function(str){
                 if ( str == '0' ) {
-                        alert( setPostThumbnailL10n.error );
+                        alert( wp.i18n.__( 'Could not set that as the thumbnail image. Try a different attachment.' ) );
                 } else {
                         WPSetThumbnailHTML(str);
                 }
@@ -379 +379 @@
                         $submitButtons.removeClass( 'disabled' );
                 }
         }).on( 'before-autosave.edit-post', function() {
-                $( '.autosave-message' ).text( postL10n.savingText );
+                $( '.autosave-message' ).text( wp.i18n.__( 'Saving...' ) ); // No ellipsis.
         }).on( 'after-autosave.edit-post', function( event, data ) {
                 $( '.autosave-message' ).text( data.message );
 
@@ -394 +394 @@
                 if ( ( editor && ! editor.isHidden() && editor.isDirty() ) ||
                         ( wp.autosave && wp.autosave.server.postChanged() ) ) {
 
-                        return postL10n.saveAlert;
+                        return wp.i18n.__( 'The changes you made will be lost if you navigate away from this page.' );
                 }
         }).on( 'unload.edit-post', function( event ) {
                 if ( ! releaseLock ) {
@@ -576 +576 @@
                         }
 
                         if ( attemptedDate > currentDate && $('#original_post_status').val() != 'future' ) {
-                                publishOn = postL10n.publishOnFuture;
-                                $('#publish').val( postL10n.schedule );
+                                publishOn = wp.i18n.__( 'Schedule for:' );
+                                $('#publish').val( wp.i18n.__( 'Schedule' ) );
                         } else if ( attemptedDate <= currentDate && $('#original_post_status').val() != 'publish' ) {
-                                publishOn = postL10n.publishOn;
-                                $('#publish').val( postL10n.publish );
+                                publishOn = wp.i18n.__( 'Publish on:' );
+                                $('#publish').val( wp.i18n.__( 'Publish' ) );
                         } else {
-                                publishOn = postL10n.publishOnPast;
-                                $('#publish').val( postL10n.update );
+                                publishOn = wp.i18n.__( 'Published on:' );
+                                $('#publish').val( wp.i18n.__( 'Update' ) );
                         }
                         if ( originalDate.toUTCString() == attemptedDate.toUTCString() ) { //hack
                                 $('#timestamp').html(stamp);
                         } else {
                                 $('#timestamp').html(
                                         '\n' + publishOn + ' <b>' +
-                                        postL10n.dateFormat
+                                        /* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */
+                                        wp.i18n.__( '%1$s %2$s, %3$s @ %4$s:%5$s' )
                                                 .replace( '%1$s', $( 'option[value="' + mm + '"]', '#mm' ).attr( 'data-text' ) )
                                                 .replace( '%2$s', parseInt( jj, 10 ) )
                                                 .replace( '%3$s', aa )
@@ -601 +602 @@
                         }
 
                         if ( $postVisibilitySelect.find('input:radio:checked').val() == 'private' ) {
-                                $('#publish').val( postL10n.update );
+                                $('#publish').val( wp.i18n.__( 'Update' ) );
                                 if ( 0 === optPublish.length ) {
-                                        postStatus.append('<option value="publish">' + postL10n.privatelyPublished + '</option>');
+                                        postStatus.append('<option value="publish">' + wp.i18n.__( 'Privately Published' ) + '</option>');
                                 } else {
-                                        optPublish.html( postL10n.privatelyPublished );
+                                        optPublish.html( wp.i18n.__( 'Privately Published' ) );
                                 }
                                 $('option[value="publish"]', postStatus).prop('selected', true);
                                 $('#misc-publishing-actions .edit-post-status').hide();
@@ -616 +617 @@
                                                 postStatus.val($('#hidden_post_status').val());
                                         }
                                 } else {
-                                        optPublish.html( postL10n.published );
+                                        optPublish.html( wp.i18n.__( 'Published' ) );
                                 }
                                 if ( postStatus.is(':hidden') )
                                         $('#misc-publishing-actions .edit-post-status').show();
@@ -627 +628 @@
                         } else {
                                 $('#save-post').show();
                                 if ( $('option:selected', postStatus).val() == 'pending' ) {
-                                        $('#save-post').show().val( postL10n.savePending );
+                                        $('#save-post').show().val( wp.i18n.__( 'Save as Pending' ) );
                                 } else {
-                                        $('#save-post').show().val( postL10n.saveDraft );
+                                        $('#save-post').show().val( wp.i18n.__( 'Save Draft' ) );
                                 }
                         }
                         return true;
@@ -658 +659 @@
                 });
 
                 $postVisibilitySelect.find('.save-post-visibility').click( function( event ) { // crazyhorse - multiple ok cancels
+                        var visibility;
+
                         $postVisibilitySelect.slideUp('fast');
                         $('#visibility .edit-visibility').show().focus();
                         updateText();
@@ -666 +669 @@
                                 $('#sticky').prop('checked', false);
                         } // WEAPON LOCKED
 
-                        if ( $('#sticky').prop('checked') ) {
-                                sticky = 'Sticky';
-                        } else {
-                                sticky = '';
+                        switch ( $postVisibilitySelect.find( 'input:radio:checked' ).val() ) {
+                                case 'password':
+                                        visibility = wp.i18n.__( 'Password Protected' );
+                                        break;
+                                case 'private':
+                                        visibility = wp.i18n.__( 'Private' );
+                                        break;
+                                default:
+                                        visibility = $( '#sticky' ).prop( 'checked' ) ? wp.i18n.__( 'Public, Sticky' ) : wp.i18n.__( 'Public' );
+                                        break;
                         }
 
-                        $('#post-visibility-display').html(     postL10n[ $postVisibilitySelect.find('input:radio:checked').val() + sticky ]    );
+                        $('#post-visibility-display').html(     visibility );
                         event.preventDefault();
                 });
 
@@ -768 +777 @@
                 $el = $( '#editable-post-name' );
                 revert_e = $el.html();
 
-                buttons.html( '<button type="button" class="save button button-small">' + postL10n.ok + '</button> <button type="button" class="cancel button-link">' + postL10n.cancel + '</button>' );
+                buttons.html( '<button type="button" class="save button button-small">' + wp.i18n.__( 'OK' ) + '</button> <button type="button" class="cancel button-link">' + wp.i18n.__( 'Cancel' ) + '</button>' );
                 buttons.children( '.save' ).click( function() {
                         var new_slug = $el.children( 'input' ).val();
 
@@ -795 +804 @@
                                 permalink.html(permalinkOrig);
                                 real_slug.val(new_slug);
                                 $( '.edit-slug' ).focus();
-                                wp.a11y.speak( postL10n.permalinkSaved );
+                                wp.a11y.speak( wp.i18n.__( 'Permalink saved' ), 'polite' );
                         });
                 });
 

src/wp-admin/js/postbox.js

@@ -202 +202 @@
                                         t.removeClass('empty-container');
                                 }
                                 else {
-                                        t.addClass('empty-container');
-                                        t.attr('data-emptyString', postBoxL10n.postBoxEmptyString);
+                                        t.addClass( 'empty-container' );
+                                        t.attr( 'data-emptyString', wp.i18n.__( 'Drag boxes here' ) );
                                 }
                         });
 

src/wp-admin/js/press-this.js

@@ -42 +42 @@
                  *************************************************************** */
 
                 /**
-                 * Emulates our PHP __() gettext function, powered by the strings exported in pressThisL10n.
-                 *
-                 * @param key string Key of the string to be translated, as found in pressThisL10n.
-                 * @returns string Original or translated string, or empty string if no key.
-                 */
-                function __( key ) {
-                        if ( key && window.pressThisL10n ) {
-                                return window.pressThisL10n[key] || key;
-                        }
-
-                        return key || '';
-                }
-
-                /**
                  * Strips HTML tags
                  *
                  * @param string string Text to have the HTML tags striped out of.
@@ -301 +287 @@
                                         }
                                 }
                         }).fail( function() {
-                                renderError( __( 'serverError' ) );
+                                renderError( wp.i18n.__( 'Connection lost or the server is busy. Please try again later.' ) );
                         });
                 }
 
@@ -451 +437 @@
                         var $element = $mediaThumbWrap.clone().addClass( 'is-image' );
 
                         $element.attr( 'data-wp-src', src ).css( 'background-image', 'url(' + displaySrc + ')' )
-                                .find( 'span' ).text( __( 'suggestedImgAlt' ).replace( '%d', i + 1 ) );
+                                /* translators: %d: nth image found in a post */
+                                .find( 'span' ).text( wp.i18n.__( 'Suggested image #%d' ).replace( '%d', i + 1 ) );
 
                         $mediaList.append( $element );
                 }
@@ -490 +477 @@
                                                 cssClass += ' is-video';
                                         }
 
-                                        $element.attr( 'data-wp-src', src ).find( 'span' ).text( __( 'suggestedEmbedAlt' ).replace( '%d', i + 1 ) );
+                                        /* translators: %d: nth embed found in a post */
+                                        $element.attr( 'data-wp-src', src ).find( 'span' ).text( wp.i18n.__( 'Suggested embed #%d' ).replace( '%d', i + 1 ) );
 
                                         if ( displaySrc ) {
                                                 $element.css( 'background-image', 'url(' + displaySrc + ')' );
@@ -854 +842 @@
 
                         $window.on( 'beforeunload.press-this', function() {
                                 if ( saveAlert || ( editor && editor.isDirty() ) ) {
-                                        return __( 'saveAlert' );
+                                        return wp.i18n.__( 'The changes you made will be lost if you navigate away from this page.' );
                                 }
                         } ).on( 'resize.press-this', function() {
                                 if ( ! editor || editor.isHidden() ) {

src/wp-admin/js/set-post-thumbnail.js

@@ -1 @@
-/* global setPostThumbnailL10n, ajaxurl, post_id, alert */
+/* global ajaxurl, post_id, alert */
 /* exported WPSetAsThumbnail */
 
 function WPSetAsThumbnail( id, nonce ) {
         var $link = jQuery('a#wp-post-thumbnail-' + id);
 
-        $link.text( setPostThumbnailL10n.saving );
+        $link.text( wp.i18n.__( 'Saving...' ) ); // No ellipsis.
         jQuery.post(ajaxurl, {
                 action: 'set-post-thumbnail', post_id: post_id, thumbnail_id: id, _ajax_nonce: nonce, cookie: encodeURIComponent( document.cookie )
         }, function(str){
                 var win = window.dialogArguments || opener || parent || top;
-                $link.text( setPostThumbnailL10n.setThumbnail );
+                $link.text( wp.i18n.__( 'Use as featured image' ) );
                 if ( str == '0' ) {
-                        alert( setPostThumbnailL10n.error );
+                        alert( wp.i18n.__( 'Could not set that as the thumbnail image. Try a different attachment.' ) );
                 } else {
                         jQuery('a.wp-post-thumbnail').show();
-                        $link.text( setPostThumbnailL10n.done );
+                        $link.text( wp.i18n.__( 'Done' ) );
                         $link.fadeOut( 2000 );
                         win.WPSetThumbnailID(id);
                         win.WPSetThumbnailHTML(str);

src/wp-admin/js/tags-box.js

@@ -21 +21 @@
 
         tagBox = {
                 clean : function(tags) {
-                        var comma = window.tagsBoxL10n.tagDelimiter;
+                        var comma = wp.i18n._x( ',', 'tag delimiter' );
                         if ( ',' !== comma )
                                 tags = tags.replace(new RegExp(comma, 'g'), ',');
                         tags = tags.replace(/\s*,\s*/g, ',').replace(/,+/g, ',').replace(/[,\s]+$/, '').replace(/^[,\s]+/, '');
@@ -35 +35 @@
                                 num = id.split('-check-num-')[1],
                                 taxbox = $(el).closest('.tagsdiv'),
                                 thetags = taxbox.find('.the-tags'),
-                                comma = window.tagsBoxL10n.tagDelimiter,
+                                comma = wp.i18n._x( ',', 'tag delimiter' ),
                                 current_tags = thetags.val().split( comma ),
                                 new_tags = [];
 
@@ -65 +65 @@
 
                         disabled = thetags.prop('disabled');
 
-                        current_tags = thetags.val().split( window.tagsBoxL10n.tagDelimiter );
+                        current_tags = thetags.val().split( wp.i18n._x( ',', 'tag delimiter' ) );
                         tagchecklist.empty();
 
                         $.each( current_tags, function( key, val ) {
@@ -107 +107 @@
                         var tagsval, newtags, text,
                                 tags = $( '.the-tags', el ),
                                 newtag = $( 'input.newtag', el ),
-                                comma = window.tagsBoxL10n.tagDelimiter;
+                                comma = wp.i18n._x( ',', 'tag delimiter' );
 
                         a = a || false;
 
@@ -177 +177 @@
                                 var tax = $(this).closest('div.tagsdiv').attr('id');
                                 $(this).suggest(
                                         ajaxurl + '?action=ajax-tag-search&tax=' + tax,
-                                        { delay: 500, minchars: 2, multiple: true, multipleSep: window.tagsBoxL10n.tagDelimiter }
+                                        { delay: 500, minchars: 2, multiple: true, multipleSep: wp.i18n._x( ',', 'tag delimiter' ) }
                                 );
                         });
 

src/wp-admin/js/tags.js

@@ -16 +16 @@
                                         $('select#parent option[value="' + data.match(/tag_ID=(\d+)/)[1] + '"]').remove();
                                         $('a.tag-link-' + data.match(/tag_ID=(\d+)/)[1]).remove();
                                 } else if ( '-1' == r ) {
-                                        $('#ajax-response').empty().append('<div class="error"><p>' + tagsl10n.noPerm + '</p></div>');
+                                        $('#ajax-response').empty().append('<div class="error"><p>' + wp.i18n.__( 'Sorry, you are not allowed to do that.' ) + '</p></div>');
                                         tr.children().css('backgroundColor', '');
                                 } else {
-                                        $('#ajax-response').empty().append('<div class="error"><p>' + tagsl10n.broken + '</p></div>');
+                                        $('#ajax-response').empty().append('<div class="error"><p>' + wp.i18n.__( 'An unidentified error has occurred.' ) + '</p></div>');
                                         tr.children().css('backgroundColor', '');
                                 }
                         });

src/wp-admin/js/theme.js

@@ -4 +4 @@
 ( function($) {
 
 // Set up our namespace...
-var themes, l10n;
-themes = wp.themes = wp.themes || {};
+var themes = wp.themes = wp.themes || {};
 
 // Store the theme data and settings for organized and quick access
-// themes.data.settings, themes.data.themes, themes.data.l10n
+// themes.data.settings, themes.data.themes
 themes.data = _wpThemeSettings;
-l10n = themes.data.l10n;
 
 // Shortcut for isInstall check
 themes.isInstall = !! themes.data.settings.isInstall;
@@ -104 +102 @@
                 // Render and append after screen title
                 view.render();
                 this.searchContainer
-                        .append( $.parseHTML( '<label class="screen-reader-text" for="wp-filter-search-input">' + l10n.search + '</label>' ) )
+                        .append( $.parseHTML( '<label class="screen-reader-text" for="wp-filter-search-input">' + wp.i18n.__( 'Search Themes' ) + '</label>' ) )
                         .append( view.el );
         },
 
@@ -916 +914 @@
         collapse: function( event ) {
                 var $button = $( event.currentTarget );
                 if ( 'true' === $button.attr( 'aria-expanded' ) ) {
-                        $button.attr({ 'aria-expanded': 'false', 'aria-label': l10n.expandSidebar });
+                        $button.attr({ 'aria-expanded': 'false', 'aria-label': wp.i18n.__( 'Expand Sidebar' ) });
                 } else {
-                        $button.attr({ 'aria-expanded': 'true', 'aria-label': l10n.collapseSidebar });
+                        $button.attr({ 'aria-expanded': 'true', 'aria-label': wp.i18n.__( 'Collapse Sidebar' ) });
                 }
 
                 this.$el.toggleClass( 'collapsed' ).toggleClass( 'expanded' );
@@ -1155 +1153 @@
 
                 // 'Add new theme' element shown at the end of the grid
                 if ( ! themes.isInstall && themes.data.settings.canInstall ) {
-                        this.$el.append( '<div class="theme add-new-theme"><a href="' + themes.data.settings.installURI + '"><div class="theme-screenshot"><span></span></div><h2 class="theme-name">' + l10n.addNew + '</h2></a></div>' );
+                        this.$el.append( '<div class="theme add-new-theme"><a href="' + themes.data.settings.installURI + '"><div class="theme-screenshot"><span></span></div><h2 class="theme-name">' + wp.i18n.__( 'Add New Theme' ) + '</h2></a></div>' );
                 }
 
                 this.parent.page++;
@@ -1211 +1209 @@
                                 $modal.find( '.notice-warning' )
                                         .removeClass( 'notice-large' )
                                         .addClass( 'updating-message' )
-                                        .find( 'p' ).text( wp.updates.l10n.updating );
+                                        .find( 'p' ).text( wp.i18n.__( 'Updating...' ) );
                         } else if ( $card.find( '.notice-error' ).length ) {
                                 $modal.find( '.notice-warning' ).remove();
                         }
@@ -1287 +1285 @@
         // Dispatch audible search results feedback message
         announceSearchResults: function( count ) {
                 if ( 0 === count ) {
-                        wp.a11y.speak( l10n.noThemesFound );
+                        wp.a11y.speak( __( 'No themes found. Try a different search.' ), 'polite' );
                 } else {
-                        wp.a11y.speak( l10n.themesFound.replace( '%d', count ) );
+                        wp.a11y.speak( wp.i18n._n( '%d Theme found', '%d Themes found', count ).replace( '%d', count ), 'polite' );
                 }
         }
 });
@@ -1303 +1301 @@
         searching: false,
 
         attributes: {
-                placeholder: l10n.searchPlaceholder,
+                placeholder: __( 'Search themes...' ), // No ellipsis.
                 type: 'search',
                 'aria-describedby': 'live-search-desc'
         },
@@ -1584 +1582 @@
                 this.listenTo( this.collection, 'query:fail', function() {
                         $( 'body' ).removeClass( 'loading-content' );
                         $( '.theme-browser' ).find( 'div.error' ).remove();
-                        $( '.theme-browser' ).find( 'div.themes' ).before( '<div class="error"><p>' + l10n.error + '</p></div>' );
+                        $( '.theme-browser' ).find( 'div.themes' ).before( '<div class="error"><p>' + wp.i18n.__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ) + '</p></div>' );
                 });
 
                 if ( this.view ) {

src/wp-admin/js/updates.js

@@ -14 +14 @@
  * @param {object}  wp                                  WP object.
  * @param {object}  settings                            WP Updates settings.
  * @param {string}  settings.ajax_nonce                 AJAX nonce.
- * @param {object}  settings.l10n                       Translation strings.
+ * @param {bool}    settings.isNetworkAdmin             Whether we're in the network admin or not.
  * @param {object=} settings.plugins                    Base names of plugins in their different states.
  * @param {Array}   settings.plugins.all                Base names of all plugins.
  * @param {Array}   settings.plugins.active             Base names of active plugins.
@@ -50 +50 @@
         wp.updates.ajaxNonce = settings.ajax_nonce;
 
         /**
-         * Localized strings.
+         * Whether we're in the network admin or not.
          *
-         * @since 4.2.0
+         * @since 4.7.0
          *
-         * @type {object}
+         * @type {bool}
          */
-        wp.updates.l10n = settings.l10n;
+        wp.updates.isNetworkAdmin = settings.isNetworkAdmin;
 
         /**
          * Current search term.
@@ -351 +351 @@
                 if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
                         $updateRow = $( 'tr[data-plugin="' + args.plugin + '"]' );
                         $message   = $updateRow.find( '.update-message' ).removeClass( 'notice-error' ).addClass( 'updating-message notice-warning' ).find( 'p' );
-                        message    = wp.updates.l10n.updatingLabel.replace( '%s', $updateRow.find( '.plugin-title strong' ).text() );
+                        /* translators: %s: Plugin name and version */
+                        message    = wp.i18n.__( 'Updating %s...' ).replace( '%s', $updateRow.find( '.plugin-title strong' ).text() );
                 } else if ( 'plugin-install' === pagenow || 'plugin-install-network' === pagenow ) {
                         $card    = $( '.plugin-card-' + args.slug );
                         $message = $card.find( '.update-now' ).addClass( 'updating-message' );
-                        message  = wp.updates.l10n.updatingLabel.replace( '%s', $message.data( 'name' ) );
+                        /* translators: %s: Plugin name and version */
+                        message  = wp.i18n.__( 'Updating %s...' ).replace( '%s', $message.data( 'name' ) );
 
                         // Remove previous error messages, if any.
                         $card.removeClass( 'plugin-card-update-failed' ).find( '.notice.notice-error' ).remove();
                 }
 
-                if ( $message.html() !== wp.updates.l10n.updating ) {
+                if ( $message.html() !== wp.i18n.__( 'Updating...' ) ) {
                         $message.data( 'originaltext', $message.html() );
                 }
 
                 $message
                         .attr( 'aria-label', message )
-                        .text( wp.updates.l10n.updating );
+                        .text( wp.i18n.__( 'Updating...' ) );
 
                 $document.trigger( 'wp-plugin-updating', args );
 
@@ -409 +411 @@
                 }
 
                 $updateMessage
-                        .attr( 'aria-label', wp.updates.l10n.updatedLabel.replace( '%s', response.pluginName ) )
-                        .text( wp.updates.l10n.updated );
+                        /* translators: %s: Plugin name and version */
+                        .attr( 'aria-label', wp.i18n.__( '%s updated!' ).replace( '%s', response.pluginName ) )
+                        .text( wp.i18n.__( 'Updated!' ) );
 
-                wp.a11y.speak( wp.updates.l10n.updatedMsg, 'polite' );
+                /* translators: JavaScript accessible string */
+                wp.a11y.speak( wp.i18n.__( 'Update completed successfully.' ), 'polite' );
 
                 wp.updates.decrementCount( 'plugin' );
 
@@ -444 +448 @@
                         return;
                 }
 
-                errorMessage = wp.updates.l10n.updateFailed.replace( '%s', response.errorMessage );
+                /* translators: %s: Error string for a failed update */
+                errorMessage = wp.i18n.__( 'Update Failed: %s' ).replace( '%s', response.errorMessage );
 
                 if ( 'plugins' === pagenow || 'plugins-network' === pagenow ) {
                         if ( response.plugin ) {
@@ -456 +461 @@
 
                         if ( response.pluginName ) {
                                 $message.find( 'p' )
-                                        .attr( 'aria-label', wp.updates.l10n.updateFailedLabel.replace( '%s', response.pluginName ) );
+                                        /* translators: %s: Plugin name and version */
+                                        .attr( 'aria-label', wp.i18n.__( '%s update failed' ).replace( '%s', response.pluginName ) );
                         } else {
                                 $message.find( 'p' ).removeAttr( 'aria-label' );
                         }
@@ -469 +475 @@
                                 } ) );
 
                         $card.find( '.update-now' )
-                                .text( wp.updates.l10n.updateFailedShort ).removeClass( 'updating-message' );
+                                .text( wp.i18n.__( 'Update Failed!' ) ).removeClass( 'updating-message' );
 
                         if ( response.pluginName ) {
                                 $card.find( '.update-now' )
-                                        .attr( 'aria-label', wp.updates.l10n.updateFailedLabel.replace( '%s', response.pluginName ) );
+                                        /* translators: %s: Plugin name and version */
+                                        .attr( 'aria-label', wp.i18n.__( '%s update failed' ).replace( '%s', response.pluginName ) );
                         } else {
                                 $card.find( '.update-now' ).removeAttr( 'aria-label' );
                         }
@@ -488 +495 @@
 
                                         $card.find( '.update-now' )
                                                 .attr( 'aria-label', false )
-                                                .text( wp.updates.l10n.updateNow );
+                                                .text( wp.i18n.__( 'Update Now' ) );
                                 }, 200 );
                         } );
                 }
@@ -523 +530 @@
                         $message = $( '[data-slug="' + args.slug + '"]' );
                 }
 
-                if ( $message.html() !== wp.updates.l10n.installing ) {
+                if ( $message.html() !== wp.i18n.__( 'Installing...' ) ) {
                         $message.data( 'originaltext', $message.html() );
                 }
 
                 $message
                         .addClass( 'updating-message' )
-                        .attr( 'aria-label', wp.updates.l10n.pluginInstallingLabel.replace( '%s', $message.data( 'name' ) ) )
-                        .text( wp.updates.l10n.installing );
+                        /* translators: %s: Plugin name and version */
+                        .attr( 'aria-label', wp.i18n._x( 'Installing %s...', 'plugin' ).replace( '%s', $message.data( 'name' ) ) )
+                        .text( wp.i18n.__( 'Installing...' ) );
 
-                wp.a11y.speak( wp.updates.l10n.installingMsg, 'polite' );
+                wp.a11y.speak( wp.i18n.__( 'Installing... please wait.' ), 'polite' );
 
                 // Remove previous error messages, if any.
                 $card.removeClass( 'plugin-card-install-failed' ).find( '.notice.notice-error' ).remove();
@@ -554 +562 @@
          * @param {string} response.activateUrl URL to activate the just installed plugin.
          */
         wp.updates.installPluginSuccess = function( response ) {
-                var $message = $( '.plugin-card-' + response.slug ).find( '.install-now' );
+                var $message            = $( '.plugin-card-' + response.slug ).find( '.install-now' ),
+                    activatePlugin      = wp.i18n.__( 'Activate' ),
+                    /* translators: %s: Plugin name */
+                    activatePluginLabel = wp.i18n._x( 'Activate %s', 'plugin' );
 
                 $message
                         .removeClass( 'updating-message' )
                         .addClass( 'updated-message installed button-disabled' )
-                        .attr( 'aria-label', wp.updates.l10n.pluginInstalledLabel.replace( '%s', response.pluginName ) )
-                        .text( wp.updates.l10n.installed );
+                        /* translators: %s: Plugin name and version */
+                        .attr( 'aria-label', wp.i18n._x( '%s installed!', 'plugin' ).replace( '%s', response.pluginName ) )
+                        .text( wp.i18n.__( 'Installed!' ) );
 
-                wp.a11y.speak( wp.updates.l10n.installedMsg, 'polite' );
+                wp.a11y.speak( wp.i18n.__( 'Installation completed successfully.' ), 'polite' );
 
                 $document.trigger( 'wp-plugin-install-success', response );
 
                 if ( response.activateUrl ) {
                         setTimeout( function() {
+                                if ( wp.updates.isNetworkAdmin ) {
+                                        activatePlugin = wp.i18n.__( 'Network Activate' );
+                                        /* translators: %s: Plugin name */
+                                        activatePluginLabel = wp.i18n._x( 'Network Activate %s', 'plugin' );
+                                }
 
                                 // Transform the 'Install' button into an 'Activate' button.
                                 $message.removeClass( 'install-now installed button-disabled updated-message' ).addClass( 'activate-now button-primary' )
                                         .attr( 'href', response.activateUrl )
-                                        .attr( 'aria-label', wp.updates.l10n.activatePluginLabel.replace( '%s', response.pluginName ) )
-                                        .text( wp.updates.l10n.activatePlugin );
+                                        .attr( 'aria-label', activatePluginLabel.replace( '%s', response.pluginName ) )
+                                        .text( activatePlugin );
                         }, 1000 );
                 }
         };
@@ -603 +620 @@
                         return;
                 }
 
-                errorMessage = wp.updates.l10n.installFailed.replace( '%s', response.errorMessage );
+                /* translators: %s: Error string for a failed installation */
+                errorMessage = wp.i18n.__( 'Installation failed: %s' ).replace( '%s', response.errorMessage );
 
                 $card
                         .addClass( 'plugin-card-update-failed' )
@@ -621 +639 @@
 
                 $button
                         .removeClass( 'updating-message' ).addClass( 'button-disabled' )
-                        .attr( 'aria-label', wp.updates.l10n.pluginInstallFailedLabel.replace( '%s', $button.data( 'name' ) ) )
-                        .text( wp.updates.l10n.installFailedShort );
+                        /* translators: %s: Plugin name and version */
+                        .attr( 'aria-label', wp.i18n._x( '%s installation failed', 'plugin' ).replace( '%s', $button.data( 'name' ) ) )
+                        .text( wp.i18n.__( 'Install Failed!' ) );
 
                 wp.a11y.speak( errorMessage, 'assertive' );
 
@@ -644 +663 @@
                 wp.updates.addAdminNotice( {
                         id:        'install-success',
                         className: 'notice-success is-dismissible',
-                        message:   wp.updates.l10n.importerInstalledMsg.replace( '%s', response.activateUrl + '&from=import' )
+                        /* translators: %s: Activation URL */
+                        message:   wp.i18n.__( 'Importer installed successfully. <a href="%s">Run importer</a>' ).replace( '%s', response.activateUrl + '&from=import' )
                 } );
 
                 $( '[data-slug="' + response.slug + '"]' )
@@ -652 +672 @@
                         .addClass( 'activate-now' )
                         .attr({
                                 'href': response.activateUrl + '&from=import',
-                                'aria-label': wp.updates.l10n.activateImporterLabel.replace( '%s', response.pluginName )
+                                /* translators: %s: Importer name */
+                                'aria-label': wp.i18n.__( 'Run %s' ).replace( '%s', response.pluginName )
                         })
-                        .text( wp.updates.l10n.activateImporter );
+                        .text( wp.i18n.__( 'Run Importer' ) );
 
-                wp.a11y.speak( wp.updates.l10n.installedMsg, 'polite' );
+                wp.a11y.speak( wp.i18n.__( 'Installation completed successfully.' ), 'polite' );
 
                 $document.trigger( 'wp-importer-install-success', response );
         };
@@ -674 +695 @@
          * @param {string}  response.errorMessage The error that occurred.
          */
         wp.updates.installImporterError = function( response ) {
-                var errorMessage = wp.updates.l10n.installFailed.replace( '%s', response.errorMessage ),
+                /* translators: %s: Error string for a failed installation */
+                var errorMessage = wp.i18n.__( 'Installation failed: %s' ).replace( '%s', response.errorMessage ),
                         $installLink = $( '[data-slug="' + response.slug + '"]' ),
                         pluginName = $installLink.data( 'name' );
 
@@ -694 +716 @@
 
                 $installLink
                         .removeClass( 'updating-message' )
-                        .text( wp.updates.l10n.installNow )
-                        .attr( 'aria-label', wp.updates.l10n.installNowLabel.replace( '%s', pluginName ) );
+                        .text( wp.i18n.__( 'Install Now' ) )
+                        /* translators: %s: Plugin name */
+                        .attr( 'aria-label', wp.i18n.__( 'Install %s now' ).replace( '%s', pluginName ) );
 
                 wp.a11y.speak( errorMessage, 'assertive' );
 
@@ -723 +746 @@
                         error: wp.updates.deletePluginError
                 }, args );
 
-                if ( $link.html() !== wp.updates.l10n.deleting ) {
+                if ( $link.html() !== wp.i18n.__( 'Deleting...' ) ) {
                         $link
                                 .data( 'originaltext', $link.html() )
-                                .text( wp.updates.l10n.deleting );
+                                .text( wp.i18n.__( 'Deleting...' ) );
                 }
 
-                wp.a11y.speak( wp.updates.l10n.deleting, 'polite' );
+                wp.a11y.speak( wp.i18n.__( 'Deleting...' ), 'polite' );
 
                 $document.trigger( 'wp-plugin-deleting', args );
 
@@ -816 +839 @@
                                 $views.find( '.all' ).remove();
 
                                 if ( ! $form.find( 'tr.no-items' ).length ) {
-                                        $form.find( '#the-list' ).append( '<tr class="no-items"><td class="colspanchange" colspan="' + columnCount + '">' + wp.updates.l10n.noPlugins + '</td></tr>' );
+                                        $form.find( '#the-list' ).append( '<tr class="no-items"><td class="colspanchange" colspan="' + columnCount + '">' + wp.i18n.__( 'You do not appear to have any plugins available at this time.' ) + '</td></tr>' );
                                 }
                         }
                 } );
 
-                wp.a11y.speak( wp.updates.l10n.deleted, 'polite' );
+                wp.a11y.speak( wp.i18n.__( 'Deleted!' ), 'polite' );
 
                 $document.trigger( 'wp-plugin-delete-success', response );
         };
@@ -916 +939 @@
                         $notice = $notice.addClass( 'updating-message' ).find( 'p' );
                 }
 
-                if ( $notice.html() !== wp.updates.l10n.updating ) {
+                if ( $notice.html() !== wp.i18n.__( 'Updating...' ) ) {
                         $notice.data( 'originaltext', $notice.html() );
                 }
 
-                wp.a11y.speak( wp.updates.l10n.updatingMsg, 'polite' );
-                $notice.text( wp.updates.l10n.updating );
+                /* translators: JavaScript accessible string */
+                wp.a11y.speak( __( 'Updating... please wait.' ), 'polite' ); // No ellipsis.
+                $notice.text( wp.i18n.__( 'Updating...' ) ); // No ellipsis.
 
                 $document.trigger( 'wp-theme-updating', args );
 
@@ -945 +969 @@
                         $theme         = $( '[data-slug="' + response.slug + '"]' ),
                         updatedMessage = {
                                 className: 'updated-message notice-success notice-alt',
-                                message:   wp.updates.l10n.updated
+                                message:   wp.i18n.__( 'Updated!' )
                         },
                         $notice, newText;
 
@@ -967 +991 @@
                 }
 
                 wp.updates.addAdminNotice( _.extend( { selector: $notice }, updatedMessage ) );
-                wp.a11y.speak( wp.updates.l10n.updatedMsg, 'polite' );
+                /* translators: JavaScript accessible string */
+                wp.a11y.speak( wp.i18n.__( 'Update completed successfully.' ), 'polite' );
 
                 wp.updates.decrementCount( 'theme' );
 
@@ -992 +1017 @@
          */
         wp.updates.updateThemeError = function( response ) {
                 var $theme       = $( '[data-slug="' + response.slug + '"]' ),
-                        errorMessage = wp.updates.l10n.updateFailed.replace( '%s', response.errorMessage ),
+                    /* translators: %s: Error string for a failed update */
+                        errorMessage = wp.i18n.__( 'Update Failed: %s' ).replace( '%s', response.errorMessage ),
                         $notice;
 
                 if ( ! wp.updates.isValidResponse( response, 'update' ) ) {
@@ -1044 +1070 @@
 
                 $message.addClass( 'updating-message' );
                 $message.parents( '.theme' ).addClass( 'focus' );
-                if ( $message.html() !== wp.updates.l10n.installing ) {
+                if ( $message.html() !== wp.i18n.__( 'Installing...' ) ) {
                         $message.data( 'originaltext', $message.html() );
                 }
 
                 $message
-                        .text( wp.updates.l10n.installing )
-                        .attr( 'aria-label', wp.updates.l10n.themeInstallingLabel.replace( '%s', $message.data( 'name' ) ) );
-                wp.a11y.speak( wp.updates.l10n.installingMsg, 'polite' );
+                        .text( wp.i18n__( 'Installing...' ) )
+                        /* translators: %s: Theme name and version */
+                        .attr( 'aria-label', wp.i18n._x( 'Installing %s...', 'theme' ).replace( '%s', $message.data( 'name' ) ) );
+                wp.a11y.speak( wp.i18n.__( 'Installing... please wait.' ), 'polite' );
 
                 // Remove previous error messages, if any.
                 $( '.install-theme-info, [data-slug="' + args.slug + '"]' ).removeClass( 'theme-install-failed' ).find( '.notice.notice-error' ).remove();
@@ -1073 +1100 @@
          * @param {string} response.activateUrl  URL to activate the just installed theme.
          */
         wp.updates.installThemeSuccess = function( response ) {
-                var $card = $( '.wp-full-overlay-header, [data-slug=' + response.slug + ']' ),
-                        $message;
+                var $card              = $( '.wp-full-overlay-header, [data-slug=' + response.slug + ']' ),
+                    activateTheme      = wp.i18n.__( 'Activate' ),
+                    activateThemeLabel = wp.i18n._x( 'Activate %s', 'theme' ),
+                    $message;
 
                 $document.trigger( 'wp-theme-install-success', response );
 
                 $message = $card.find( '.button-primary' )
                         .removeClass( 'updating-message' )
                         .addClass( 'updated-message disabled' )
-                        .attr( 'aria-label', wp.updates.l10n.themeInstalledLabel.replace( '%s', response.themeName ) )
-                        .text( wp.updates.l10n.installed );
+                        /* translators: %s: Theme name and version */
+                        .attr( 'aria-label', wp.i18n._x( '%s installed!', 'theme' ).replace( '%s', response.themeName ) )
+                        .text( wp.i18n.__( 'Installed!' ) );
 
-                wp.a11y.speak( wp.updates.l10n.installedMsg, 'polite' );
+                wp.a11y.speak( wp.i18n.__( 'Installation completed successfully.' ), 'polite' );
 
                 setTimeout( function() {
 
                         if ( response.activateUrl ) {
+                                if ( wp.updates.isNetworkAdmin ) {
+                                        activateTheme = wp.i18n.__( 'Network Enable' );
+                                        /* translators: %s: Theme name */
+                                        activateThemeLabel = wp.i18n._x( 'Network Activate %s', 'theme' );
+                                }
 
                                 // Transform the 'Install' button into an 'Activate' button.
                                 $message
                                         .attr( 'href', response.activateUrl )
                                         .removeClass( 'theme-install updated-message disabled' )
                                         .addClass( 'activate' )
-                                        .attr( 'aria-label', wp.updates.l10n.activateThemeLabel.replace( '%s', response.themeName ) )
-                                        .text( wp.updates.l10n.activateTheme );
+                                        .attr( 'aria-label', activateThemeLabel.replace( '%s', response.themeName ) )
+                                        .text( activateTheme );
                         }
 
                         if ( response.customizeUrl ) {
@@ -1106 +1141 @@
                                         return $( '<a>' )
                                                 .attr( 'href', response.customizeUrl )
                                                 .addClass( 'button button-secondary load-customize' )
-                                                .text( wp.updates.l10n.livePreview );
+                                                .text( wp.i18n.__( 'Live Preview' ) );
                                 } );
                         }
                 }, 1000 );
@@ -1125 +1160 @@
          */
         wp.updates.installThemeError = function( response ) {
                 var $card, $button,
-                        errorMessage = wp.updates.l10n.installFailed.replace( '%s', response.errorMessage ),
+                    /* translators: %s: Error string for a failed installation */
+                        errorMessage = wp.i18n.__( 'Installation failed: %s' ).replace( '%s', response.errorMessage ),
                         $message     = wp.updates.adminNotice( {
                                 className: 'update-message notice-error notice-alt',
                                 message:   errorMessage
@@ -1149 +1185 @@
 
                 $button
                         .removeClass( 'updating-message' )
-                        .attr( 'aria-label', wp.updates.l10n.themeInstallFailedLabel.replace( '%s', $button.data( 'name' ) ) )
-                        .text( wp.updates.l10n.installFailedShort );
+                        /* translators: %s: Theme name and version */
+                        .attr( 'aria-label', wp.i18n._x( '%s installation failed', 'theme' ).replace( '%s', $button.data( 'name' ) ) )
+                        .text( wp.i18n.__( 'Install Failed!' ) );
 
                 wp.a11y.speak( errorMessage, 'assertive' );
 
@@ -1183 +1220 @@
                         error: wp.updates.deleteThemeError
                 }, args );
 
-                if ( $button && $button.html() !== wp.updates.l10n.deleting ) {
+                if ( $button && $button.html() !== wp.i18n.__( 'Deleting...' ) ) {
                         $button
                                 .data( 'originaltext', $button.html() )
-                                .text( wp.updates.l10n.deleting );
+                                .text( wp.i18n.__( 'Deleting...' ) );
                 }
 
-                wp.a11y.speak( wp.updates.l10n.deleting, 'polite' );
+                wp.a11y.speak( wp.i18n.__( 'Deleting...' ), 'polite' );
 
                 // Remove previous error messages, if any.
                 $( '.theme-info .update-message' ).remove();
@@ -1253 +1290 @@
                         } );
                 }
 
-                wp.a11y.speak( wp.updates.l10n.deleted, 'polite' );
+                wp.a11y.speak( wp.i18n.__( 'Deleted!' ), 'polite' );
 
                 $document.trigger( 'wp-theme-delete-success', response );
         };
@@ -1274 +1311 @@
                         $button      = $( '.theme-actions .delete-theme' ),
                         updateRow    = wp.template( 'item-update-row' ),
                         $updateRow   = $themeRow.siblings( '#' + response.slug + '-update' ),
-                        errorMessage = wp.updates.l10n.deleteFailed.replace( '%s', response.errorMessage ),
+                        /* translators: %s: Error string for a failed deletion */
+                        errorMessage = wp.i18n.__( 'Deletion failed: %s' ).replace( '%s', response.errorMessage ),
                         $message     = wp.updates.adminNotice( {
                                 className: 'update-message notice-error notice-alt',
                                 message:   errorMessage
@@ -1566 +1604 @@
          *                                                'update' or 'install'.
          */
         wp.updates.isValidResponse = function( response, action ) {
-                var error = wp.updates.l10n.unknownError,
+                var error = wp.i18n.__( 'An unknown error occurred' ),
                     errorMessage;
 
                 // Make sure the response is a valid data object and not a Promise object.
@@ -1575 +1613 @@
                 }
 
                 if ( _.isString( response ) && '-1' === response ) {
-                        error = wp.updates.l10n.nonceError;
+                        error = wp.i18n.__( 'An error has occurred. Please reload the page and try again.' );
                 } else if ( _.isString( response ) ) {
                         error = response;
                 } else if ( 'undefined' !== typeof response.readyState && 0 === response.readyState ) {
-                        error = wp.updates.l10n.connectionError;
+                        error = wp.i18n.__( 'Connection lost or the server is busy. Please try again later.' );
                 } else if ( _.isString( response.responseText ) && '' !== response.responseText ) {
                         error = response.responseText;
                 } else if ( _.isString( response.statusText ) ) {
@@ -1588 +1626 @@
 
                 switch ( action ) {
                         case 'update':
-                                errorMessage = wp.updates.l10n.updateFailed;
+                                /* translators: %s: Error string for a failed update */
+                                errorMessage = wp.i18n.__( 'Update Failed: %s' );
                                 break;
 
                         case 'install':
-                                errorMessage = wp.updates.l10n.installFailed;
+                                /* translators: %s: Error string for a failed installation */
+                                errorMessage = wp.i18n.__( 'Installation failed: %s' );
                                 break;
 
                         case 'delete':
-                                errorMessage = wp.updates.l10n.deleteFailed;
+                                /* translators: %s: Error string for a failed deletion */
+                                errorMessage = wp.i18n.__( 'Deletion failed: %s' );
                                 break;
                 }
 
@@ -1620 +1661 @@
                         .removeClass( 'updating-message' )
                         .removeAttr( 'aria-label' )
                         .prop( 'disabled', true )
-                        .text( wp.updates.l10n.updateFailedShort );
+                        .text( wp.i18n.__( 'Update Failed!' ) );
 
                 $( '.updating-message:not(.button):not(.thickbox)' )
                         .removeClass( 'updating-message notice-warning' )
@@ -1644 +1685 @@
          */
         wp.updates.beforeunload = function() {
                 if ( wp.updates.ajaxLocked ) {
-                        return wp.updates.l10n.beforeunload;
+                        return wp.i18n.__( 'Updates may not complete if you navigate away from this page.' );
                 }
         };
 
@@ -1749 +1790 @@
 
                                 if ( 'plugin-install' === pagenow || 'plugin-install-network' === pagenow ) {
                                         if ( 'update-plugin' === job.action ) {
-                                                $message.attr( 'aria-label', wp.updates.l10n.updateNowLabel.replace( '%s', $message.data( 'name' ) ) );
+                                                /* translators: %s: Plugin name and version */
+                                                $message.attr( 'aria-label', wp.i18n.__( 'Update %s now' ).replace( '%s', $message.data( 'name' ) ) );
                                         } else if ( 'install-plugin' === job.action ) {
-                                                $message.attr( 'aria-label', wp.updates.l10n.installNowLabel.replace( '%s', $message.data( 'name' ) ) );
+                                                /* translators: %s: Plugin name */
+                                                $message.attr( 'aria-label', wp.i18n.__( 'Install %s now' ).replace( '%s', $message.data( 'name' ) ) );
                                         }
                                 }
                         }
 
-                        wp.a11y.speak( wp.updates.l10n.updateCancel, 'polite' );
+                        /* translators: JavaScript accessible string */
+                        wp.a11y.speak( wp.i18n.__( 'Update canceled.' ), 'polite' );
                 } );
 
                 /**
@@ -1832 +1876 @@
 
                                         $message
                                                 .removeClass( 'updating-message' )
-                                                .text( wp.updates.l10n.installNow );
+                                                .text( wp.i18n.__( 'Install Now' ) );
 
-                                        wp.a11y.speak( wp.updates.l10n.updateCancel, 'polite' );
+                                        /* translators: JavaScript accessible string */
+                                        wp.a11y.speak( wp.i18n.__( 'Update canceled.' ), 'polite' );
                                 } );
                         }
 
@@ -1867 +1912 @@
 
                                         $button
                                                 .removeClass( 'updating-message' )
-                                                .text( wp.updates.l10n.installNow )
-                                                .attr( 'aria-label', wp.updates.l10n.installNowLabel.replace( '%s', pluginName ) );
+                                                .text( wp.i18n.__( 'Install Now' ) )
+                                                /* translators: %s: Plugin name */
+                                                .attr( 'aria-label', wp.i18n.__( 'Install %s now' ).replace( '%s', pluginName ) );
 
-                                        wp.a11y.speak( wp.updates.l10n.updateCancel, 'polite' );
+                                        /* translators: JavaScript accessible string */
+                                        wp.a11y.speak( wp.i18n.__( 'Update canceled.' ), 'polite' );
                                 } );
                         }
 
@@ -1893 +1940 @@
 
                         event.preventDefault();
 
-                        if ( ! window.confirm( wp.updates.l10n.aysDeleteUninstall.replace( '%s', $pluginRow.find( '.plugin-title strong' ).text() ) ) ) {
+                        /* translators: %s: Plugin name */
+                        if ( ! window.confirm( wp.i18n.__( 'Are you sure you want to delete %s and its data?' ).replace( '%s', $pluginRow.find( '.plugin-title strong' ).text() ) ) ) {
                                 return;
                         }
 
@@ -1944 +1992 @@
 
                         event.preventDefault();
 
-                        if ( ! window.confirm( wp.updates.l10n.aysDelete.replace( '%s', $themeRow.find( '.theme-title strong' ).text() ) ) ) {
+                        /* translators: %s: Theme name */
+                        if ( ! window.confirm( wp.i18n.__( 'Are you sure you want to delete %s?' ).replace( '%s', $themeRow.find( '.theme-title strong' ).text() ) ) ) {
                                 return;
                         }
 
@@ -1970 +2019 @@
                                 success       = 0,
                                 error         = 0,
                                 errorMessages = [],
-                                type, action;
+                                type, action, bulkDeleteMsg;
 
                         // Determine which type of item we're dealing with.
                         switch ( pagenow ) {
@@ -1995 +2044 @@
                                 return wp.updates.addAdminNotice( {
                                         id:        'no-items-selected',
                                         className: 'notice-error is-dismissible',
-                                        message:   wp.updates.l10n.noItemsSelected
+                                        message:   wp.i18n.__( 'Please select at least one item to perform this action on.' )
                                 } );
                         }
 
@@ -2006 +2055 @@
                                         break;
 
                                 case 'delete-selected':
-                                        if ( ! window.confirm( 'plugin' === type ? wp.updates.l10n.aysBulkDelete : wp.updates.l10n.aysBulkDeleteThemes ) ) {
+                                        bulkDeleteMsg = wp.i18n.__( 'Caution: These themes may be active on other sites in the network. Are you sure you want to proceed?' );
+
+                                        if ( 'plugin' === type ) {
+                                                bulkDeleteMsg = wp.i18n.__( 'Are you sure you want to delete the selected plugins and their data?' );
+                                        }
+
+                                        if ( ! window.confirm( bulkDeleteMsg ) ) {
                                                 event.preventDefault();
                                                 return;
                                         }
@@ -2143 +2198 @@
                                         .append( $( '<a />', {
                                                 'class': 'current',
                                                 'href': searchLocation,
-                                                'text': wp.updates.l10n.searchResultsLabel
+                                                'text': wp.i18n.__( 'Search Results' )
                                         } ) );
 
                                 $( '.wp-filter .filter-links .current' )
@@ -2166 +2221 @@
                                 delete wp.updates.searchRequest;
 
                                 if ( 0 === response.count ) {
-                                        wp.a11y.speak( wp.updates.l10n.noPluginsFound );
+                                        wp.a11y.speak( wp.i18n.__( 'No plugins found. Try a different search.' ) );
                                 } else {
-                                        wp.a11y.speak( wp.updates.l10n.pluginsFound.replace( '%d', response.count ) );
+                                        wp.a11y.speak( wp.i18n._n( '%d plugin found', '%d plugins found', response.count ) );
                                 }
                         } );
                 }, 500 ) );
@@ -2215 +2270 @@
                         wp.updates.searchRequest = wp.ajax.post( 'search-plugins', data ).done( function( response ) {
 
                                 // Can we just ditch this whole subtitle business?
-                                var $subTitle    = $( '<span />' ).addClass( 'subtitle' ).html( wp.updates.l10n.searchResults.replace( '%s', _.escape( data.s ) ) ),
+                                /* translators: %s: Search string */
+                                var $subTitle    = $( '<span />' ).addClass( 'subtitle' ).html( wp.i18n.__( 'Search results for &#8220;%s&#8221;' ).replace( '%s', _.escape( data.s ) ) ),
                                         $oldSubTitle = $( '.wrap .subtitle' );
 
                                 if ( ! data.s.length ) {
@@ -2231 +2287 @@
                                 delete wp.updates.searchRequest;
 
                                 if ( 0 === response.count ) {
-                                        wp.a11y.speak( wp.updates.l10n.noPluginsFound );
+                                        wp.a11y.speak( wp.i18n.__( 'No plugins found. Try a different search.' ) );
                                 } else {
-                                        wp.a11y.speak( wp.updates.l10n.pluginsFound.replace( '%d', response.count ) );
+                                        wp.a11y.speak( wp.i18n._n( '%d plugin found', '%d plugins found', response.count ) );
                                 }
                         } );
                 }, 500 ) );

src/wp-admin/js/user-profile.js

@@ -1 @@
-/* global ajaxurl, pwsL10n, userProfileL10n */
+/* global ajaxurl */
 (function($) {
         var updateLock = false,
 
@@ -50 +50 @@
                 }
 
                 // Once zxcvbn loads, passwords strength is known.
-                $( '#pw-weak-text-label' ).html( userProfileL10n.warnWeak );
+                $( '#pw-weak-text-label' ).html( wp.i18n.__( 'Confirm use of weak password' ) );
         }
 
         function bindPass1() {
@@ -100 +100 @@
                 $toggleButton
                         .data( 'toggle', 0 )
                         .attr({
-                                'aria-label': userProfileL10n.ariaHide
+                                'aria-label': wp.i18n.esc_attr__( 'Hide password' )
                         })
                         .find( '.text' )
-                                .text( userProfileL10n.hide )
+                                .text( wp.i18n.__( 'Hide' ) )
                         .end()
                         .find( '.dashicons' )
                                 .removeClass( 'dashicons-visibility' )
@@ -130 +130 @@
                                 $toggleButton
                                         .data( 'toggle', 1 )
                                         .attr({
-                                                'aria-label': userProfileL10n.ariaShow
+                                                'aria-label': wp.i18n.esc_attr__( 'Show password' )
                                         })
                                         .find( '.text' )
-                                                .text( userProfileL10n.show )
+                                                .text( wp.i18n.__( 'Show' ) )
                                         .end()
                                         .find( '.dashicons' )
                                                 .removeClass('dashicons-hidden')
@@ -290 +290 @@
 
                 switch ( strength ) {
                         case -1:
-                                $( '#pass-strength-result' ).addClass( 'bad' ).html( pwsL10n.unknown );
+                                $( '#pass-strength-result' ).addClass( 'bad' ).html( wp.i18n._x( 'Password strength unknown', 'password strength' ) );
                                 break;
                         case 2:
-                                $('#pass-strength-result').addClass('bad').html( pwsL10n.bad );
+                                $('#pass-strength-result').addClass('bad').html( wp.i18n._x( 'Weak', 'password strength' ) );
                                 break;
                         case 3:
-                                $('#pass-strength-result').addClass('good').html( pwsL10n.good );
+                                $('#pass-strength-result').addClass('good').html( wp.i18n._x( 'Medium', 'password strength' ) );
                                 break;
                         case 4:
-                                $('#pass-strength-result').addClass('strong').html( pwsL10n.strong );
+                                $('#pass-strength-result').addClass('strong').html( wp.i18n._x( 'Strong', 'password strength' ) );
                                 break;
                         case 5:
-                                $('#pass-strength-result').addClass('short').html( pwsL10n.mismatch );
+                                $('#pass-strength-result').addClass('short').html( wp.i18n._x( 'Mismatch', 'password mismatch' ) );
                                 break;
                         default:
-                                $('#pass-strength-result').addClass('short').html( pwsL10n['short'] );
+                                $('#pass-strength-result').addClass('short').html( wp.i18n._x( 'Very weak', 'password strength' ) );
                 }
         }
 
@@ -448 +448 @@
         /* Warn the user if password was generated but not saved */
         $( window ).on( 'beforeunload', function () {
                 if ( true === updateLock ) {
-                        return userProfileL10n.warn;
+                        return wp.i18n.__( 'Your new password has not been saved.' );
                 }
         } );
 

src/wp-admin/js/word-count.js

@@ -37 +37 @@
          * @param {RegExp} settings.shortcodesRegExp                  Optional. Regular expression to find shortcodes.
          * @param {Object} settings.l10n                              Optional. Localization object containing specific
          *                                                            configuration for the current localization.
-         * @param {String} settings.l10n.type                         Optional. Method of finding words to count.
          * @param {Array}  settings.l10n.shortcodes                   Optional. Array of shortcodes that should be removed
          *                                                            from the text.
          *
@@ -136 +135 @@
                  * \u2028 = line separator
                  * \u2029 = paragraph separator
                  */
-                characters_including_spacesRegExp: /[^\f\n\r\t\v\u00AD\u2028\u2029]/g,
-                l10n: window.wordCountL10n || {}
+                characters_including_spacesRegExp: /[^\f\n\r\t\v\u00AD\u2028\u2029]/g
         };
 
         /**
@@ -157 +155 @@
                 var count = 0;
 
                 // Use default type if none was provided.
-                type = type || this.settings.l10n.type;
+
+                /*
+                 * translators: If your word count is based on single characters (e.g. East Asian characters),
+                 * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'.
+                 * Do not translate into your own language.
+                 */
+                type = type || wp.i18n._x( 'words', 'Word count type. Do not translate!' );
 
                 // Sanitize type to one of three possibilities: 'words', 'characters_excluding_spaces' or 'characters_including_spaces'.
                 if ( type !== 'characters_excluding_spaces' && type !== 'characters_including_spaces' ) {

src/wp-admin/theme-install.php

@@ -42 +42 @@
                 'installURI'    => current_user_can( 'install_themes' ) ? self_admin_url( 'theme-install.php' ) : null,
                 'adminUrl'      => parse_url( self_admin_url(), PHP_URL_PATH )
         ),
-        'l10n' => array(
-                'addNew' => __( 'Add New Theme' ),
-                'search' => __( 'Search Themes' ),
-                'searchPlaceholder' => __( 'Search themes...' ), // placeholder (no ellipsis)
-                'upload' => __( 'Upload Theme' ),
-                'back'   => __( 'Back' ),
-                'error'  => __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ),
-                'themesFound'   => __( 'Number of Themes found: %d' ),
-                'noThemesFound' => __( 'No themes found. Try a different search.' ),
-                'collapseSidebar'    => __( 'Collapse Sidebar' ),
-                'expandSidebar'      => __( 'Expand Sidebar' ),
-        ),
         'installedThemes' => array_keys( $installed_themes ),
 ) );
 

src/wp-includes/class-wp-customize-widgets.php

@@ -722 +722 @@
                         'registeredWidgets'    => $wp_registered_widgets,
                         'availableWidgets'     => $available_widgets, // @todo Merge this with registered_widgets
                         'l10n' => array(
-                                'saveBtnLabel'     => __( 'Apply' ),
-                                'saveBtnTooltip'   => __( 'Save and preview changes before publishing them.' ),
-                                'removeBtnLabel'   => __( 'Remove' ),
-                                'removeBtnTooltip' => __( 'Trash widget by moving it to the inactive widgets sidebar.' ),
-                                'error'            => __( 'An error has occurred. Please reload the page and try again.' ),
-                                'widgetMovedUp'    => __( 'Widget moved up' ),
-                                'widgetMovedDown'  => __( 'Widget moved down' ),
-                                'noAreasRendered'  => __( 'There are no widget areas currently rendered in the preview. Navigate in the preview to a template that makes use of a widget area in order to access its widgets here.' ),
-                                'reorderModeOn'    => __( 'Reorder mode enabled' ),
-                                'reorderModeOff'   => __( 'Reorder mode closed' ),
                                 'reorderLabelOn'   => esc_attr__( 'Reorder widgets' ),
                                 'reorderLabelOff'  => esc_attr__( 'Close reorder mode' ),
                         ),

src/wp-includes/js/media-audiovideo.js

@@ -1 +1 @@
 (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 var media = wp.media,
-        baseSettings = window._wpmejsSettings || {},
-        l10n = window._wpMediaViewsL10n || {};
+        baseSettings = window._wpmejsSettings || {};
 
 /**
  * @mixin
@@ -79 +78 @@
  */
 wp.media.playlist = new wp.media.collection({
         tag: 'playlist',
-        editTitle : l10n.editPlaylistTitle,
+        editTitle : wp.i18n.__( 'Edit Audio Playlist' ),
         defaults : {
                 id: wp.media.view.settings.post.id,
                 style: 'light',
@@ -226 +225 @@
  * @augments Backbone.Model
  */
 var State = wp.media.controller.State,
-        l10n = wp.media.view.l10n,
         AudioDetails;
 
 AudioDetails = State.extend({
         defaults: {
                 id: 'audio-details',
                 toolbar: 'audio-details',
-                title: l10n.audioDetailsTitle,
+                title: wp.i18n.__( 'Cancel Edit' ),
                 content: 'audio-details',
                 menu: 'audio-details',
                 router: false,
@@ -259 +257 @@
  * @augments Backbone.Model
  */
 var State = wp.media.controller.State,
-        l10n = wp.media.view.l10n,
         VideoDetails;
 
 VideoDetails = State.extend({
         defaults: {
                 id: 'video-details',
                 toolbar: 'video-details',
-                title: l10n.videoDetailsTitle,
+                title: wp.i18n.__( 'Video Details' ),
                 content: 'video-details',
                 menu: 'video-details',
                 router: false,
@@ -389 +386 @@
                 content: 'audio-details',
                 toolbar: 'audio-details',
                 type:    'link',
-                title:    l10n.audioDetailsTitle,
+                title:    wp.i18n.__( 'Audio Details' ),
                 priority: 120
         },
 
         initialize: function( options ) {
                 options.DetailsView = wp.media.view.AudioDetails;
-                options.cancelText = l10n.audioDetailsCancel;
-                options.addText = l10n.audioAddSourceTitle;
+                options.cancelText = wp.i18n.__( 'Cancel Edit' );
+                options.addText = wp.i18n.__( 'Add Audio Source' );
 
                 MediaDetails.prototype.initialize.call( this, options );
         },
@@ -417 +414 @@
                         new MediaLibrary( {
                                 type: 'audio',
                                 id: 'replace-audio',
-                                title: l10n.audioReplaceTitle,
+                                title: wp.i18n.__( 'Replace Audio' ),
                                 toolbar: 'replace-audio',
                                 media: this.media,
                                 menu: 'audio-details'
@@ -426 +423 @@
                         new MediaLibrary( {
                                 type: 'audio',
                                 id: 'add-audio-source',
-                                title: l10n.audioAddSourceTitle,
+                                title: wp.i18n.__( 'Add Audio Source' ),
                                 toolbar: 'add-audio-source',
                                 media: this.media,
                                 menu: false
@@ -542 +539 @@
         },
 
         renderDetailsToolbar: function() {
-                this.setPrimaryButton( l10n.update, function( controller, state ) {
+                this.setPrimaryButton( wp.i18n.__( 'Update' ), function( controller, state ) {
                         controller.close();
                         state.trigger( 'update', controller.media.toJSON() );
                 } );
         },
 
         renderReplaceToolbar: function() {
-                this.setPrimaryButton( l10n.replace, function( controller, state ) {
+                this.setPrimaryButton( wp.i18n.__( 'Replace' ), function( controller, state ) {
                         var attachment = state.get( 'selection' ).single();
                         controller.media.changeAttachment( attachment );
                         state.trigger( 'replace', controller.media.toJSON() );
@@ -594 +591 @@
                 content: 'video-details',
                 toolbar: 'video-details',
                 type:    'link',
-                title:    l10n.videoDetailsTitle,
+                title:    wp.i18n.__( 'Video Details' ),
                 priority: 120
         },
 
         initialize: function( options ) {
                 options.DetailsView = wp.media.view.VideoDetails;
-                options.cancelText = l10n.videoDetailsCancel;
-                options.addText = l10n.videoAddSourceTitle;
+                options.cancelText = wp.i18n.__( 'Cancel Edit' );
+                options.addText = wp.i18n.__( 'Add Video Source' );
 
                 MediaDetails.prototype.initialize.call( this, options );
         },
@@ -624 +621 @@
                         new MediaLibrary( {
                                 type: 'video',
                                 id: 'replace-video',
-                                title: l10n.videoReplaceTitle,
+                                title: wp.i18n.__( 'Replace Video' ),
                                 toolbar: 'replace-video',
                                 media: this.media,
                                 menu: 'video-details'
@@ -633 +630 @@
                         new MediaLibrary( {
                                 type: 'video',
                                 id: 'add-video-source',
-                                title: l10n.videoAddSourceTitle,
+                                title: wp.i18n.__( 'Add Video Source' ),
                                 toolbar: 'add-video-source',
                                 media: this.media,
                                 menu: false
@@ -642 +639 @@
                         new MediaLibrary( {
                                 type: 'image',
                                 id: 'select-poster-image',
-                                title: l10n.videoSelectPosterImageTitle,
+                                title: wp.i18n.__( 'Select Poster Image' ),
                                 toolbar: 'select-poster-image',
                                 media: this.media,
                                 menu: 'video-details'
@@ -651 +648 @@
                         new MediaLibrary( {
                                 type: 'text',
                                 id: 'add-track',
-                                title: l10n.videoAddTrackTitle,
+                                title: wp.i18n.__( 'Add Subtitles' ),
                                 toolbar: 'add-track',
                                 media: this.media,
                                 menu: 'video-details'
@@ -660 +657 @@
         },
 
         renderSelectPosterImageToolbar: function() {
-                this.setPrimaryButton( l10n.videoSelectPosterImageTitle, function( controller, state ) {
+                this.setPrimaryButton( wp.i18n.__( 'Select Poster Image' ), function( controller, state ) {
                         var urls = [], attachment = state.get( 'selection' ).single();
 
                         controller.media.set( 'poster', attachment.get( 'url' ) );
@@ -682 +679 @@
         },
 
         renderAddTrackToolbar: function() {
-                this.setPrimaryButton( l10n.videoAddTrackTitle, function( controller, state ) {
+                this.setPrimaryButton( wp.i18n.__( 'Add Subtitles' ), function( controller, state ) {
                         var attachment = state.get( 'selection' ).single(),
                                 content = controller.media.get( 'content' );
 

src/wp-includes/js/media-editor.js

@@ -663 +663 @@
                                 _wpnonce:     settings.post.nonce
                         }).done( function( html ) {
                                 if ( html == '0' ) {
-                                        window.alert( window.setPostThumbnailL10n.error );
+                                        window.alert( wp.i18n.__( 'Could not set that as the thumbnail image. Try a different attachment.' ) );
                                         return;
                                 }
                                 $( '.inside', '#postimagediv' ).html( html );

src/wp-includes/js/media-grid.js

@@ -8 +8 @@
  * @augments wp.media.controller.State
  * @augments Backbone.Model
  */
-var l10n = wp.media.view.l10n,
-        EditAttachmentMetadata;
-
-EditAttachmentMetadata = wp.media.controller.State.extend({
+var EditAttachmentMetadata = wp.media.controller.State.extend({
         defaults: {
                 id:      'edit-attachment',
                 // Title string passed to the frame's title region view.
-                title:   l10n.attachmentDetails,
+                title:   wp.i18n.__( 'Attachment Details' ),
                 // Region mode defaults.
                 content: 'edit-metadata',
                 menu:    false,
@@ -190 +187 @@
  * @augments Backbone.View
  */
 var Button = wp.media.view.Button,
-        l10n = wp.media.view.l10n,
         DeleteSelected;
 
 DeleteSelected = Button.extend({
@@ -204 +200 @@
 
         filterChange: function( model ) {
                 if ( 'trash' === model.get( 'status' ) ) {
-                        this.model.set( 'text', l10n.untrashSelected );
+                        this.model.set( 'text', wp.i18n.__( 'Untrash Selected' ) );
                 } else if ( wp.media.view.settings.mediaTrash ) {
-                        this.model.set( 'text', l10n.trashSelected );
+                        this.model.set( 'text', wp.i18n.__( 'Trash Selected' ) );
                 } else {
-                        this.model.set( 'text', l10n.deleteSelected );
+                        this.model.set( 'text', wp.i18n.__( 'Delete Selected' ) );
                 }
         },
 
@@ -241 +237 @@
  * @augments Backbone.View
  */
 var Button = wp.media.view.Button,
-        l10n = wp.media.view.l10n,
         SelectModeToggle;
 
 SelectModeToggle = Button.extend({
@@ -283 +278 @@
                 if ( this.controller.isModeActive( 'select' ) ) {
                         this.model.set( {
                                 size: 'large',
-                                text: l10n.cancelSelection
+                                text: wp.i18n.__( 'Cancel Selection' )
                         } );
                         children.not( '.spinner, .media-button' ).hide();
                         this.$el.show();
@@ -291 +286 @@
                 } else {
                         this.model.set( {
                                 size: '',
-                                text: l10n.bulkSelect
+                                text: wp.i18n.__( 'Bulk Select' )
                         } );
                         this.controller.content.get().$el.removeClass( 'fixed' );
                         toolbar.$el.css( 'width', '' );

src/wp-includes/js/media-views.js

@@ -136 +136 @@
  * @param {string}                     attributes.collectionType         The collection type. (e.g. 'playlist').
  */
 var Library = wp.media.controller.Library,
-        l10n = wp.media.view.l10n,
         $ = jQuery,
         CollectionEdit;
 
@@ -249 +248 @@
 
                 // Add the 'Reverse order' button to the toolbar.
                 attachmentsBrowserView.toolbar.set( 'reverse', {
-                        text:     l10n.reverseOrder,
+                        text:     wp.i18n.__( 'Reverse order' ),
                         priority: 80,
 
                         click: function() {
@@ -271 +270 @@
  * @augments wp.media.controller.State
  * @augments Backbone.Model
  */
-var l10n = wp.media.view.l10n,
-        Cropper;
-
-Cropper = wp.media.controller.State.extend({
+var Cropper = wp.media.controller.State.extend({
         defaults: {
                 id:          'cropper',
-                title:       l10n.cropImage,
+                title:       wp.i18n.__( 'Crop Image' ),
                 // Region mode defaults.
                 toolbar:     'crop',
                 content:     'crop',
@@ -323 +319 @@
                         items: {
                                 insert: {
                                         style:    'primary',
-                                        text:     l10n.cropImage,
+                                        text:     wp.i18n.__( 'Crop Image' ),
                                         priority: 80,
                                         requires: { library: false, selection: false },
 
@@ -334 +330 @@
                                                 selection = controller.state().get('selection').first();
                                                 selection.set({cropDetails: controller.state().imgSelect.getSelection()});
 
-                                                this.$el.text(l10n.cropping);
+                                                this.$el.text( wp.i18n.__( 'Cropping…' ) );
                                                 this.$el.attr('disabled', true);
 
                                                 controller.state().doCrop( selection ).done( function( croppedImage ) {
@@ -352 +348 @@
                         _.extend( toolbarOptions.items, {
                                 skip: {
                                         style:      'secondary',
-                                        text:       l10n.skipCropping,
+                                        text:       wp.i18n.__( 'Skip Cropping' ),
                                         priority:   70,
                                         requires:   { library: false, selection: false },
                                         click:      function() {
@@ -445 +441 @@
  * @param {string}                    [attributes.menu=false]         Initial mode for the menu region.
  * @param {string}                    [attributes.url]                Unused. @todo Consider removal.
  */
-var l10n = wp.media.view.l10n,
-        EditImage;
-
-EditImage = wp.media.controller.State.extend({
+var EditImage = wp.media.controller.State.extend({
         defaults: {
                 id:      'edit-image',
-                title:   l10n.editImage,
+                title:   wp.i18n.__( 'Edit Image' ),
                 menu:    false,
                 toolbar: 'edit-image',
                 content: 'edit-image',
@@ -485 +478 @@
                         items: {
                                 back: {
                                         style: 'primary',
-                                        text:     l10n.back,
+                                        text:     wp.i18n.__( 'Back' ),
                                         priority: 20,
                                         click:    function() {
                                                 if ( previous ) {
@@ -524 +517 @@
  * @param {string} [attributes.url]                   The embed URL.
  * @param {object} [attributes.metadata={}]           Properties of the embed, which will override attributes.url if set.
  */
-var l10n = wp.media.view.l10n,
-        $ = Backbone.$,
+var $ = Backbone.$,
         Embed;
 
 Embed = wp.media.controller.State.extend({
         defaults: {
                 id:       'embed',
-                title:    l10n.insertFromUrlTitle,
+                title:    wp.i18n.__( 'Insert from URL' ),
                 content:  'embed',
                 menu:     'default',
                 toolbar:  'main-embed',
@@ -794 +786 @@
  */
 var Selection = wp.media.model.Selection,
         Library = wp.media.controller.Library,
-        l10n = wp.media.view.l10n,
         GalleryAdd;
 
 GalleryAdd = Library.extend({
         defaults: _.defaults({
                 id:            'gallery-library',
-                title:         l10n.addToGalleryTitle,
+                title:         wp.i18n.__( 'Add to Gallery' ),
                 multiple:      'add',
                 filterable:    'uploaded',
                 menu:          'gallery',
@@ -885 +876 @@
  *                                                                        If none supplied, defaults to wp.media.view.Attachment.EditLibrary.
  */
 var Library = wp.media.controller.Library,
-        l10n = wp.media.view.l10n,
         GalleryEdit;
 
 GalleryEdit = Library.extend({
         defaults: {
                 id:               'gallery-edit',
-                title:            l10n.editGalleryTitle,
+                title:            wp.i18n.__( 'Edit Gallery' ),
                 multiple:         false,
                 searchable:       false,
                 sortable:         true,
@@ -981 +971 @@
                 });
 
                 browser.toolbar.set( 'reverse', {
-                        text:     l10n.reverseOrder,
+                        text:     wp.i18n.__( 'Reverse order' ),
                         priority: 80,
 
                         click: function() {
@@ -1020 +1010 @@
  */
 var State = wp.media.controller.State,
         Library = wp.media.controller.Library,
-        l10n = wp.media.view.l10n,
         ImageDetails;
 
 ImageDetails = State.extend({
         defaults: _.defaults({
                 id:       'image-details',
-                title:    l10n.imageDetailsTitle,
+                title:    wp.i18n.__( 'Image Details' ),
                 content:  'image-details',
                 menu:     false,
                 router:   false,
@@ -1090 +1079 @@
  * @param {boolean}                         [attributes.contentUserSetting=true] Whether the content region's mode should be set and persisted per user.
  * @param {boolean}                         [attributes.syncSelection=true]      Whether the Attachments selection should be persisted from the last state.
  */
-var l10n = wp.media.view.l10n,
-        getUserSetting = window.getUserSetting,
+var getUserSetting = window.getUserSetting,
         setUserSetting = window.setUserSetting,
         Library;
 
 Library = wp.media.controller.State.extend({
         defaults: {
                 id:                 'library',
-                title:              l10n.mediaLibraryTitle,
+                title:              wp.i18n.__( 'Media Library' ),
                 multiple:           false,
                 content:            'upload',
                 menu:               'default',
@@ -1610 +1598 @@
  * @param {boolean}                    [attributes.syncSelection=true]      Whether the Attachments selection should be persisted from the last state.
  */
 var Library = wp.media.controller.Library,
-        l10n = wp.media.view.l10n,
         ReplaceImage;
 
 ReplaceImage = Library.extend({
         defaults: _.defaults({
                 id:            'replace-image',
-                title:         l10n.replaceImageTitle,
+                title:         wp.i18n.__( 'Replace Image' ),
                 multiple:      false,
                 filterable:    'uploaded',
                 toolbar:       'replace',
@@ -2509 +2496 @@
                 });
 
                 filters.all = {
-                        text:  l10n.allMediaItems,
+                        text:  wp.i18n.__( 'All media items' ),
                         props: {
                                 status:  null,
                                 type:    null,
@@ -2535 +2522 @@
                 }
 
                 filters.unattached = {
-                        text:  l10n.unattached,
+                        text:  wp.i18n.__( 'Unattached' ),
                         props: {
                                 status:     null,
                                 uploadedTo: 0,
@@ -2550 +2537 @@
                         this.controller.isModeActive( 'grid' ) ) {
 
                         filters.trash = {
-                                text:  l10n.trash,
+                                text:  wp.i18n._x( 'Trash', 'noun' ),
                                 props: {
                                         uploadedTo: null,
                                         status:     'trash',
@@ -2578 +2565 @@
  * @augments wp.Backbone.View
  * @augments Backbone.View
  */
-var l10n = wp.media.view.l10n,
-        DateFilter;
-
-DateFilter = wp.media.view.AttachmentFilters.extend({
+var DateFilter = wp.media.view.AttachmentFilters.extend({
         id: 'media-attachment-date-filters',
 
         createFilters: function() {
@@ -2596 +2580 @@
                         };
                 });
                 filters.all = {
-                        text:  l10n.allDates,
+                        text:  wp.i18n.__( 'All dates' ),
                         props: {
                                 monthnum: false,
                                 year:  false
@@ -2634 +2618 @@
 
                 this.filters = {
                         all: {
-                                text:  text || l10n.allMediaItems,
+                                text:  text || wp.i18n.__( 'All media items' ),
                                 props: {
                                         uploadedTo: null,
                                         orderby: 'date',
@@ -2654 +2638 @@
                         },
 
                         unattached: {
-                                text:  l10n.unattached,
+                                text:  wp.i18n.__( 'Unattached' ),
                                 props: {
                                         uploadedTo: 0,
                                         orderby: 'menuOrder',
@@ -3225 +3209 @@
  * @augments Backbone.View
  */
 var Attachment = wp.media.view.Attachment,
-        l10n = wp.media.view.l10n,
         Details;
 
 Details = Attachment.extend({
@@ -3280 +3263 @@
         deleteAttachment: function( event ) {
                 event.preventDefault();
 
-                if ( window.confirm( l10n.warnDelete ) ) {
+                if ( window.confirm( wp.i18n.__( "You are about to permanently delete this item.\n  'Cancel' to stop, 'OK' to delete." ) ) ) {
                         this.model.destroy();
                         // Keep focus inside media modal
                         // after image is deleted
@@ -3751 +3734 @@
  */
 var View = wp.media.View,
         mediaTrash = wp.media.view.settings.mediaTrash,
-        l10n = wp.media.view.l10n,
         $ = jQuery,
         AttachmentsBrowser;
 
@@ -3829 +3811 @@
                         // "Filters" will return a <select>, need to render
                         // screen reader text before
                         this.toolbar.set( 'filtersLabel', new wp.media.view.Label({
-                                value: l10n.filterByType,
+                                value: wp.i18n.__( 'Filter by type' ),
                                 attributes: {
                                         'for':  'media-attachment-filters'
                                 },
@@ -3869 +3851 @@
 
                         // DateFilter is a <select>, screen reader text needs to be rendered before
                         this.toolbar.set( 'dateFilterLabel', new wp.media.view.Label({
-                                value: l10n.filterByDate,
+                                value: wp.i18n.__( 'Filter by date' ),
                                 attributes: {
                                         'for': 'media-attachment-date-filters'
                                 },
@@ -3883 +3865 @@
 
                         // BulkSelection is a <div> with subviews, including screen reader text
                         this.toolbar.set( 'selectModeToggleButton', new wp.media.view.SelectModeToggleButton({
-                                text: l10n.bulkSelect,
+                                text: wp.i18n.__( 'Bulk Select' ),
                                 controller: this.controller,
                                 priority: -70
                         }).render() );
@@ -3892 +3874 @@
                                 filters: Filters,
                                 style: 'primary',
                                 disabled: true,
-                                text: mediaTrash ? l10n.trashSelected : l10n.deleteSelected,
+                                text: mediaTrash ? wp.i18n.__( 'Trash Selected' ) : wp.i18n.__( 'Delete Selected' ),
                                 controller: this.controller,
                                 priority: -60,
                                 click: function() {
@@ -3904 +3886 @@
                                                 return;
                                         }
 
-                                        if ( ! mediaTrash && ! window.confirm( l10n.warnBulkDelete ) ) {
+                                        if ( ! mediaTrash && ! window.confirm( wp.i18n.__( "You are about to permanently delete these items.\n  'Cancel' to stop, 'OK' to delete." ) ) ) {
                                                 return;
                                         }
 
                                         if ( mediaTrash &&
                                                 'trash' !== selection.at( 0 ).get( 'status' ) &&
-                                                ! window.confirm( l10n.warnBulkTrash ) ) {
+                                                ! window.confirm( wp.i18n.__( "You are about to trash these items.\n  'Cancel' to stop, 'OK' to delete." ) ) ) {
 
                                                 return;
                                         }
@@ -3952 +3934 @@
                                         filters: Filters,
                                         style: 'primary',
                                         disabled: true,
-                                        text: l10n.deleteSelected,
+                                        text: wp.i18n.__( 'Delete Selected' ),
                                         controller: this.controller,
                                         priority: -55,
                                         click: function() {
                                                 var removed = [], selection = this.controller.state().get( 'selection' );
 
-                                                if ( ! selection.length || ! window.confirm( l10n.warnBulkDelete ) ) {
+                                                if ( ! selection.length || ! window.confirm( wp.i18n.__( "You are about to permanently delete these items.\n  'Cancel' to stop, 'OK' to delete." ) ) ) {
                                                         return;
                                                 }
 
@@ -3980 +3962 @@
                 } else if ( this.options.date ) {
                         // DateFilter is a <select>, screen reader text needs to be rendered before
                         this.toolbar.set( 'dateFilterLabel', new wp.media.view.Label({
-                                value: l10n.filterByDate,
+                                value: wp.i18n.__( 'Filter by date' ),
                                 attributes: {
                                         'for': 'media-attachment-date-filters'
                                 },
@@ -3996 +3978 @@
                 if ( this.options.search ) {
                         // Search is an input, screen reader text needs to be rendered before
                         this.toolbar.set( 'searchLabel', new wp.media.view.Label({
-                                value: l10n.searchMediaLabel,
+                                value: wp.i18n.__( 'Search Media' ),
                                 attributes: {
                                         'for': 'media-search-input'
                                 },
@@ -4011 +3993 @@
 
                 if ( this.options.dragInfo ) {
                         this.toolbar.set( 'dragInfo', new View({
-                                el: $( '<div class="instructions">' + l10n.dragInfo + '</div>' )[0],
+                                el: $( '<div class="instructions">' + wp.i18n.__( 'Drag and drop to reorder media files.' ) + '</div>' )[0],
                                 priority: -40
                         }) );
                 }
 
                 if ( this.options.suggestedWidth && this.options.suggestedHeight ) {
                         this.toolbar.set( 'suggestedDimensions', new View({
-                                el: $( '<div class="instructions">' + l10n.suggestedDimensions + ' ' + this.options.suggestedWidth + ' &times; ' + this.options.suggestedHeight + '</div>' )[0],
+                                el: $( '<div class="instructions">' + wp.i18n.__( 'Suggested image dimensions:' ) + ' ' + this.options.suggestedWidth + ' &times; ' + this.options.suggestedHeight + '</div>' )[0],
                                 priority: -40
                         }) );
                 }
@@ -4054 +4036 @@
                 this.uploader = new wp.media.view.UploaderInline({
                         controller: this.controller,
                         status:     false,
-                        message:    this.controller.isModeActive( 'grid' ) ? '' : l10n.noItemsFound,
+                        message:    this.controller.isModeActive( 'grid' ) ? '' : wp.i18n.__( 'No items found.' ),
                         canClose:   this.controller.isModeActive( 'grid' )
                 });
 
@@ -4098 +4080 @@
                         });
 
                         this.attachmentsNoResults.$el.addClass( 'hidden no-media' );
-                        this.attachmentsNoResults.$el.html( l10n.noMedia );
+                        this.attachmentsNoResults.$el.html( wp.i18n.__( 'No media files found.' ) );
 
                         this.views.add( this.attachmentsNoResults );
                 }
@@ -4351 +4333 @@
  */
 var View = wp.media.View,
         UploaderStatus = wp.media.view.UploaderStatus,
-        l10n = wp.media.view.l10n,
         $ = jQuery,
         Cropper;
 
@@ -4375 +4356 @@
         },
         prepare: function() {
                 return {
-                        title: l10n.cropYourImage,
+                        title: wp.i18n.__( 'Crop your image' ),
                         url: this.options.attachment.get('url')
                 };
         },
@@ -4394 +4375 @@
 
                 this.views.add( '.upload-errors', new wp.media.view.UploaderStatusError({
                         filename: UploaderStatus.prototype.filename(filename),
-                        message: window._wpMediaViewsL10n.cropError
+                        message: wp.i18n.__( 'There has been an error cropping your image.' )
                 }), { at: 0 });
         }
 });
@@ -4951 +4932 @@
  * @mixes wp.media.controller.StateMachine
  */
 var Select = wp.media.view.MediaFrame.Select,
-        l10n = wp.media.view.l10n,
         ImageDetails;
 
 ImageDetails = Select.extend({
@@ -4962 +4942 @@
                 content: 'image-details',
                 toolbar: 'image-details',
                 type:    'link',
-                title:    l10n.imageDetailsTitle,
+                title:    wp.i18n.__( 'Image Details' ),
                 priority: 120
         },
 
@@ -4993 +4973 @@
                                 library: wp.media.query( { type: 'image' } ),
                                 image: this.image,
                                 multiple:  false,
-                                title:     l10n.imageReplaceTitle,
+                                title:     wp.i18n.__( 'Replace Image' ),
                                 toolbar: 'replace',
                                 priority:  80,
                                 displaySettings: true
@@ -5037 +5017 @@
                         items: {
                                 select: {
                                         style:    'primary',
-                                        text:     l10n.update,
+                                        text:     wp.i18n.__( 'Update' ),
                                         priority: 80,
 
                                         click: function() {
@@ -5068 +5048 @@
                         controller: this,
                         items: {
                                 back: {
-                                        text:     l10n.back,
+                                        text:     wp.i18n.__( 'Back' ),
                                         priority: 20,
                                         click:    function() {
                                                 if ( previous ) {
@@ -5081 +5061 @@
 
                                 replace: {
                                         style:    'primary',
-                                        text:     l10n.replace,
+                                        text:     wp.i18n.__( 'Replace' ),
                                         priority: 80,
 
                                         click: function() {
@@ -5167 +5147 @@
                         // Main states.
                         new Library({
                                 id:         'insert',
-                                title:      l10n.insertMediaTitle,
+                                title:      wp.i18n.__( 'Insert Media' ),
                                 priority:   20,
                                 toolbar:    'main-insert',
                                 filterable: 'all',
@@ -5188 +5168 @@
 
                         new Library({
                                 id:         'gallery',
-                                title:      l10n.createGalleryTitle,
+                                title:      wp.i18n.__( 'Create Gallery' ),
                                 priority:   40,
                                 toolbar:    'main-gallery',
                                 filterable: 'uploaded',
@@ -5216 +5196 @@
 
                         new Library({
                                 id:         'playlist',
-                                title:      l10n.createPlaylistTitle,
+                                title:      wp.i18n.__( 'Create Audio Playlist' ),
                                 priority:   60,
                                 toolbar:    'main-playlist',
                                 filterable: 'uploaded',
@@ -5232 +5212 @@
                         new wp.media.controller.CollectionEdit({
                                 type: 'audio',
                                 collectionType: 'playlist',
-                                title:          l10n.editPlaylistTitle,
+                                title:          wp.i18n.__( 'Edit Audio Playlist' ),
                                 SettingsView:   wp.media.view.Settings.Playlist,
                                 library:        options.selection,
                                 editing:        options.editing,
                                 menu:           'playlist',
-                                dragInfoText:   l10n.playlistDragInfo,
+                                dragInfoText:   wp.i18n.__( 'Drag and drop to reorder tracks.' ),
                                 dragInfo:       false
                         }),
 
                         new wp.media.controller.CollectionAdd({
                                 type: 'audio',
                                 collectionType: 'playlist',
-                                title: l10n.addToPlaylistTitle
+                                title: wp.i18n.__( 'Add to Audio Playlist' )
                         }),
 
                         new Library({
                                 id:         'video-playlist',
-                                title:      l10n.createVideoPlaylistTitle,
+                                title:      wp.i18n.__( 'Create Video Playlist' ),
                                 priority:   60,
                                 toolbar:    'main-video-playlist',
                                 filterable: 'uploaded',
@@ -5264 +5244 @@
                         new wp.media.controller.CollectionEdit({
                                 type: 'video',
                                 collectionType: 'playlist',
-                                title:          l10n.editVideoPlaylistTitle,
+                                title:          wp.i18n.__( 'Create Video Playlist' ),
                                 SettingsView:   wp.media.view.Settings.Playlist,
                                 library:        options.selection,
                                 editing:        options.editing,
                                 menu:           'video-playlist',
-                                dragInfoText:   l10n.videoPlaylistDragInfo,
+                                dragInfoText:   wp.i18n.__( 'Drag and drop to reorder videos.' ),
                                 dragInfo:       false
                         }),
 
                         new wp.media.controller.CollectionAdd({
                                 type: 'video',
                                 collectionType: 'playlist',
-                                title: l10n.addToVideoPlaylistTitle
+                                title: wp.i18n.__( 'Add to Video Playlist' )
                         })
                 ]);
 
@@ -5393 +5373 @@
 
                 view.set({
                         cancel: {
-                                text:     l10n.cancelGalleryTitle,
+                                text:     wp.i18n.__( '&#8592; Cancel Gallery' ),
                                 priority: 20,
                                 click:    function() {
                                         if ( previous ) {
@@ -5421 +5401 @@
 
                 view.set({
                         cancel: {
-                                text:     l10n.cancelPlaylistTitle,
+                                text:     wp.i18n.__( '&#8592; Cancel Audio Playlist' ),
                                 priority: 20,
                                 click:    function() {
                                         if ( previous ) {
@@ -5445 +5425 @@
 
                 view.set({
                         cancel: {
-                                text:     l10n.cancelVideoPlaylistTitle,
+                                text:     wp.i18n.__( '&#8592; Cancel Video Playlist' ),
                                 priority: 20,
                                 click:    function() {
                                         if ( previous ) {
@@ -5495 +5475 @@
                 }).render();
 
                 view.toolbar.set( 'backToLibrary', {
-                        text:     l10n.returnToLibrary,
+                        text:     wp.i18n.__( '&#8592; Return to library' ),
                         priority: -100,
 
                         click: function() {
@@ -5579 +5559 @@
 
                 view.set( 'gallery', {
                         style:    'primary',
-                        text:     l10n.createNewGallery,
+                        text:     wp.i18n.__( 'Create a new gallery' ),
                         priority: 60,
                         requires: { selection: true },
 
@@ -5609 +5589 @@
 
                 view.set( 'playlist', {
                         style:    'primary',
-                        text:     l10n.createNewPlaylist,
+                        text:     wp.i18n.__( 'Create a new playlist' ),
                         priority: 100,
                         requires: { selection: true },
 
@@ -5639 +5619 @@
 
                 view.set( 'video-playlist', {
                         style:    'primary',
-                        text:     l10n.createNewVideoPlaylist,
+                        text:     wp.i18n.__( 'Create a new video playlist' ),
                         priority: 100,
                         requires: { selection: true },
 
@@ -5682 +5662 @@
                         items: {
                                 insert: {
                                         style:    'primary',
-                                        text:     editing ? l10n.updateGallery : l10n.insertGallery,
+                                        text:     editing ? wp.i18n.__( 'Update gallery' ) : wp.i18n.__( 'Insert gallery' ),
                                         priority: 80,
                                         requires: { library: true },
 
@@ -5711 +5691 @@
                         items: {
                                 insert: {
                                         style:    'primary',
-                                        text:     l10n.addToGallery,
+                                        text:     wp.i18n.__( 'Add to gallery' ),
                                         priority: 80,
                                         requires: { selection: true },
 
@@ -5739 +5719 @@
                         items: {
                                 insert: {
                                         style:    'primary',
-                                        text:     editing ? l10n.updatePlaylist : l10n.insertPlaylist,
+                                        text:     editing ? wp.i18n.__( 'Update audio playlist' ) : wp.i18n.__( 'Insert audio playlist' ),
                                         priority: 80,
                                         requires: { library: true },
 
@@ -5768 +5748 @@
                         items: {
                                 insert: {
                                         style:    'primary',
-                                        text:     l10n.addToPlaylist,
+                                        text:     wp.i18n.__( 'Add to audio playlist' ),
                                         priority: 80,
                                         requires: { selection: true },
 
@@ -5796 +5776 @@
                         items: {
                                 insert: {
                                         style:    'primary',
-                                        text:     editing ? l10n.updateVideoPlaylist : l10n.insertVideoPlaylist,
+                                        text:     editing ? wp.i18n.__( 'Update video playlist' ) : wp.i18n.__( 'Insert video playlist' ),
                                         priority: 140,
                                         requires: { library: true },
 
@@ -5825 +5805 @@
                         items: {
                                 insert: {
                                         style:    'primary',
-                                        text:     l10n.addToVideoPlaylist,
+                                        text:     wp.i18n.__( 'Add to video playlist' ),
                                         priority: 140,
                                         requires: { selection: true },
 
@@ -5862 +5842 @@
  */
 
 var MediaFrame = wp.media.view.MediaFrame,
-        l10n = wp.media.view.l10n,
         Select;
 
 Select = MediaFrame.extend({
@@ -5949 +5928 @@
         browseRouter: function( routerView ) {
                 routerView.set({
                         upload: {
-                                text:     l10n.uploadFilesTitle,
+                                text:     wp.i18n.__( 'Upload Files' ),
                                 priority: 20
                         },
                         browse: {
-                                text:     l10n.mediaLibraryTitle,
+                                text:     wp.i18n.__( 'Media Library' ),
                                 priority: 40
                         }
                 });
@@ -7061 +7040 @@
 
         attributes: {
                 type:        'search',
-                placeholder: l10n.search
+                placeholder: wp.i18n.__( 'Search' )
         },
 
         events: {
@@ -7099 +7078 @@
  * @augments wp.Backbone.View
  * @augments Backbone.View
  */
-var l10n = wp.media.view.l10n,
-        Selection;
+var Selection;
 
 Selection = wp.media.View.extend({
         tagName:   'div',
@@ -7151 +7129 @@
                 this.$el.toggleClass( 'one', 1 === collection.length );
                 this.$el.toggleClass( 'editing', editing );
 
-                this.$('.count').text( l10n.selected.replace('%d', collection.length) );
+                this.$('.count').text( wp.i18n._n( '%d selected', '%d selected', collection.length ) );
         },
 
         edit: function( event ) {
@@ -7780 +7758 @@
  * @augments Backbone.View
  */
 var Toolbar = wp.media.view.Toolbar,
-        l10n = wp.media.view.l10n,
         Select;
 
 Select = Toolbar.extend({
@@ -7794 +7771 @@
                         state: false,
                         reset: true,
                         close: true,
-                        text:  l10n.select,
+                        text:  wp.i18n.__( 'Select' ),
 
                         // Does the button rely on the selection?
                         requires: {
@@ -7852 +7829 @@
  * @augments Backbone.View
  */
 var View = wp.media.View,
-        l10n = wp.media.view.l10n,
         $ = jQuery,
         EditorUploader;
 
@@ -7992 +7968 @@
                         this.workflow = wp.media.editor.open( window.wpActiveEditor, {
                                 frame:    'post',
                                 state:    'insert',
-                                title:    l10n.addMedia,
+                                title:    wp.i18n.__( 'Add Media' ),
                                 multiple: true
                         });
 

src/wp-includes/js/media/audiovideo.manifest.js

@@ -1 +1 @@
 var media = wp.media,
-        baseSettings = window._wpmejsSettings || {},
-        l10n = window._wpMediaViewsL10n || {};
+        baseSettings = window._wpmejsSettings || {};
 
 /**
  * @mixin
@@ -78 +77 @@
  */
 wp.media.playlist = new wp.media.collection({
         tag: 'playlist',
-        editTitle : l10n.editPlaylistTitle,
+        editTitle : wp.i18n.__( 'Edit Audio Playlist' ),
         defaults : {
                 id: wp.media.view.settings.post.id,
                 style: 'light',

src/wp-includes/js/media/views/attachments/browser.js

@@ -20 +20 @@
  */
 var View = wp.media.View,
         mediaTrash = wp.media.view.settings.mediaTrash,
-        l10n = wp.media.view.l10n,
         $ = jQuery,
         AttachmentsBrowser;
 
@@ -98 +97 @@
                         // "Filters" will return a <select>, need to render
                         // screen reader text before
                         this.toolbar.set( 'filtersLabel', new wp.media.view.Label({
-                                value: l10n.filterByType,
+                                value: wp.i18n.__( 'Filter by type' ),
                                 attributes: {
                                         'for':  'media-attachment-filters'
                                 },
@@ -138 +137 @@
 
                         // DateFilter is a <select>, screen reader text needs to be rendered before
                         this.toolbar.set( 'dateFilterLabel', new wp.media.view.Label({
-                                value: l10n.filterByDate,
+                                value: wp.i18n.__( 'Filter by date' ),
                                 attributes: {
                                         'for': 'media-attachment-date-filters'
                                 },
@@ -152 +151 @@
 
                         // BulkSelection is a <div> with subviews, including screen reader text
                         this.toolbar.set( 'selectModeToggleButton', new wp.media.view.SelectModeToggleButton({
-                                text: l10n.bulkSelect,
+                                text: wp.i18n.__( 'Bulk Select' ),
                                 controller: this.controller,
                                 priority: -70
                         }).render() );
@@ -161 +160 @@
                                 filters: Filters,
                                 style: 'primary',
                                 disabled: true,
-                                text: mediaTrash ? l10n.trashSelected : l10n.deleteSelected,
+                                text: mediaTrash ? wp.i18n.__( 'Trash Selected' ) : wp.i18n.__( 'Delete Selected' ),
                                 controller: this.controller,
                                 priority: -60,
                                 click: function() {
@@ -173 +172 @@
                                                 return;
                                         }
 
-                                        if ( ! mediaTrash && ! window.confirm( l10n.warnBulkDelete ) ) {
+                                        if ( ! mediaTrash && ! window.confirm( wp.i18n.__( "You are about to permanently delete these items.\n  'Cancel' to stop, 'OK' to delete." ) ) ) {
                                                 return;
                                         }
 
                                         if ( mediaTrash &&
                                                 'trash' !== selection.at( 0 ).get( 'status' ) &&
-                                                ! window.confirm( l10n.warnBulkTrash ) ) {
+                                                ! window.confirm( wp.i18n.__( "You are about to trash these items.\n  'Cancel' to stop, 'OK' to delete." ) ) ) {
 
                                                 return;
                                         }
@@ -221 +220 @@
                                         filters: Filters,
                                         style: 'primary',
                                         disabled: true,
-                                        text: l10n.deleteSelected,
+                                        text: wp.i18n.__( 'Delete Selected' ),
                                         controller: this.controller,
                                         priority: -55,
                                         click: function() {
                                                 var removed = [], selection = this.controller.state().get( 'selection' );
 
-                                                if ( ! selection.length || ! window.confirm( l10n.warnBulkDelete ) ) {
+                                                if ( ! selection.length || ! window.confirm( wp.i18n.__( "You are about to permanently delete these items.\n  'Cancel' to stop, 'OK' to delete." ) ) ) {
                                                         return;
                                                 }
 
@@ -249 +248 @@
                 } else if ( this.options.date ) {
                         // DateFilter is a <select>, screen reader text needs to be rendered before
                         this.toolbar.set( 'dateFilterLabel', new wp.media.view.Label({
-                                value: l10n.filterByDate,
+                                value: wp.i18n.__( 'Filter by date' ),
                                 attributes: {
                                         'for': 'media-attachment-date-filters'
                                 },
@@ -265 +264 @@
                 if ( this.options.search ) {
                         // Search is an input, screen reader text needs to be rendered before
                         this.toolbar.set( 'searchLabel', new wp.media.view.Label({
-                                value: l10n.searchMediaLabel,
+                                value: wp.i18n.__( 'Search Media' ),
                                 attributes: {
                                         'for': 'media-search-input'
                                 },
@@ -280 +279 @@
 
                 if ( this.options.dragInfo ) {
                         this.toolbar.set( 'dragInfo', new View({
-                                el: $( '<div class="instructions">' + l10n.dragInfo + '</div>' )[0],
+                                el: $( '<div class="instructions">' + wp.i18n.__( 'Drag and drop to reorder media files.' ) + '</div>' )[0],
                                 priority: -40
                         }) );
                 }
 
                 if ( this.options.suggestedWidth && this.options.suggestedHeight ) {
                         this.toolbar.set( 'suggestedDimensions', new View({
-                                el: $( '<div class="instructions">' + l10n.suggestedDimensions + ' ' + this.options.suggestedWidth + ' &times; ' + this.options.suggestedHeight + '</div>' )[0],
+                                el: $( '<div class="instructions">' + wp.i18n.__( 'Suggested image dimensions:' ) + ' ' + this.options.suggestedWidth + ' &times; ' + this.options.suggestedHeight + '</div>' )[0],
                                 priority: -40
                         }) );
                 }
@@ -323 +322 @@
                 this.uploader = new wp.media.view.UploaderInline({
                         controller: this.controller,
                         status:     false,
-                        message:    this.controller.isModeActive( 'grid' ) ? '' : l10n.noItemsFound,
+                        message:    this.controller.isModeActive( 'grid' ) ? '' : wp.i18n.__( 'No items found.' ),
                         canClose:   this.controller.isModeActive( 'grid' )
                 });
 
@@ -367 +366 @@
                         });
 
                         this.attachmentsNoResults.$el.addClass( 'hidden no-media' );
-                        this.attachmentsNoResults.$el.html( l10n.noMedia );
+                        this.attachmentsNoResults.$el.html( wp.i18n.__( 'No media files found.' ) );
 
                         this.views.add( this.attachmentsNoResults );
                 }

src/wp-includes/js/media/views/button/select-mode-toggle.js

@@ -8 +8 @@
  * @augments Backbone.View
  */
 var Button = wp.media.view.Button,
-        l10n = wp.media.view.l10n,
         SelectModeToggle;
 
 SelectModeToggle = Button.extend({
@@ -50 +49 @@
                 if ( this.controller.isModeActive( 'select' ) ) {
                         this.model.set( {
                                 size: 'large',
-                                text: l10n.cancelSelection
+                                text: wp.i18n.__( 'Cancel Selection' )
                         } );
                         children.not( '.spinner, .media-button' ).hide();
                         this.$el.show();
@@ -58 +57 @@
                 } else {
                         this.model.set( {
                                 size: '',
-                                text: l10n.bulkSelect
+                                text: wp.i18n.__( 'Bulk Select' )
                         } );
                         this.controller.content.get().$el.removeClass( 'fixed' );
                         toolbar.$el.css( 'width', '' );

src/wp-includes/js/media/views/cropper.js

@@ -14 +14 @@
  */
 var View = wp.media.View,
         UploaderStatus = wp.media.view.UploaderStatus,
-        l10n = wp.media.view.l10n,
         $ = jQuery,
         Cropper;
 
@@ -38 +37 @@
         },
         prepare: function() {
                 return {
-                        title: l10n.cropYourImage,
+                        title: wp.i18n.__( 'Crop your image' ),
                         url: this.options.attachment.get('url')
                 };
         },
@@ -57 +56 @@
 
                 this.views.add( '.upload-errors', new wp.media.view.UploaderStatusError({
                         filename: UploaderStatus.prototype.filename(filename),
-                        message: window._wpMediaViewsL10n.cropError
+                        message: wp.i18n.__( 'There has been an error cropping your image.' )
                 }), { at: 0 });
         }
 });

src/wp-includes/js/media/views/frame/post.js

@@ -53 +53 @@
                         // Main states.
                         new Library({
                                 id:         'insert',
-                                title:      l10n.insertMediaTitle,
+                                title:      wp.i18n.__( 'Insert Media' ),
                                 priority:   20,
                                 toolbar:    'main-insert',
                                 filterable: 'all',
@@ -74 +74 @@
 
                         new Library({
                                 id:         'gallery',
-                                title:      l10n.createGalleryTitle,
+                                title:      wp.i18n.__( 'Create Gallery' ),
                                 priority:   40,
                                 toolbar:    'main-gallery',
                                 filterable: 'uploaded',
@@ -102 +102 @@
 
                         new Library({
                                 id:         'playlist',
-                                title:      l10n.createPlaylistTitle,
+                                title:      wp.i18n.__( 'Create Audio Playlist' ),
                                 priority:   60,
                                 toolbar:    'main-playlist',
                                 filterable: 'uploaded',
@@ -118 +118 @@
                         new wp.media.controller.CollectionEdit({
                                 type: 'audio',
                                 collectionType: 'playlist',
-                                title:          l10n.editPlaylistTitle,
+                                title:          wp.i18n.__( 'Edit Audio Playlist' ),
                                 SettingsView:   wp.media.view.Settings.Playlist,
                                 library:        options.selection,
                                 editing:        options.editing,
                                 menu:           'playlist',
-                                dragInfoText:   l10n.playlistDragInfo,
+                                dragInfoText:   wp.i18n.__( 'Drag and drop to reorder tracks.' ),
                                 dragInfo:       false
                         }),
 
                         new wp.media.controller.CollectionAdd({
                                 type: 'audio',
                                 collectionType: 'playlist',
-                                title: l10n.addToPlaylistTitle
+                                title: wp.i18n.__( 'Add to Audio Playlist' )
                         }),
 
                         new Library({
                                 id:         'video-playlist',
-                                title:      l10n.createVideoPlaylistTitle,
+                                title:      wp.i18n.__( 'Create Video Playlist' ),
                                 priority:   60,
                                 toolbar:    'main-video-playlist',
                                 filterable: 'uploaded',
@@ -150 +150 @@
                         new wp.media.controller.CollectionEdit({
                                 type: 'video',
                                 collectionType: 'playlist',
-                                title:          l10n.editVideoPlaylistTitle,
+                                title:          wp.i18n.__( 'Edit Video Playlist' ),
                                 SettingsView:   wp.media.view.Settings.Playlist,
                                 library:        options.selection,
                                 editing:        options.editing,
                                 menu:           'video-playlist',
-                                dragInfoText:   l10n.videoPlaylistDragInfo,
+                                dragInfoText:   wp.i18n.__( 'Drag and drop to reorder videos.' ),
                                 dragInfo:       false
                         }),
 
                         new wp.media.controller.CollectionAdd({
                                 type: 'video',
                                 collectionType: 'playlist',
-                                title: l10n.addToVideoPlaylistTitle
+                                title: wp.i18n.__( 'Add to Video Playlist' )
                         })
                 ]);
 
@@ -279 +279 @@
 
                 view.set({
                         cancel: {
-                                text:     l10n.cancelGalleryTitle,
+                                text:     wp.i18n.__( '← Cancel Gallery' ),
                                 priority: 20,
                                 click:    function() {
                                         if ( previous ) {
@@ -307 +307 @@
 
                 view.set({
                         cancel: {
-                                text:     l10n.cancelPlaylistTitle,
+                                text:     wp.i18n.__( '← Cancel Audio Playlist' ),
                                 priority: 20,
                                 click:    function() {
                                         if ( previous ) {
@@ -331 +331 @@
 
                 view.set({
                         cancel: {
-                                text:     l10n.cancelVideoPlaylistTitle,
+                                text:     wp.i18n.__( '← Cancel Video Playlist' ),
                                 priority: 20,
                                 click:    function() {
                                         if ( previous ) {
@@ -381 +381 @@
                 }).render();
 
                 view.toolbar.set( 'backToLibrary', {
-                        text:     l10n.returnToLibrary,
+                        text:     wp.i18n.__( '← Return to library' ),
                         priority: -100,
 
                         click: function() {
@@ -465 +465 @@
 
                 view.set( 'gallery', {
                         style:    'primary',
-                        text:     l10n.createNewGallery,
+                        text:     wp.i18n.__( 'Create a new gallery' ),
                         priority: 60,
                         requires: { selection: true },
 
@@ -495 +495 @@
 
                 view.set( 'playlist', {
                         style:    'primary',
-                        text:     l10n.createNewPlaylist,
+                        text:     wp.i18n.__( 'Create a new playlist' ),
                         priority: 100,
                         requires: { selection: true },
 
@@ -525 +525 @@
 
                 view.set( 'video-playlist', {
                         style:    'primary',
-                        text:     l10n.createNewVideoPlaylist,
+                        text:     wp.i18n.__( 'Create a new video playlist' ),
                         priority: 100,
                         requires: { selection: true },
 
@@ -568 +568 @@
                         items: {
                                 insert: {
                                         style:    'primary',
-                                        text:     editing ? l10n.updateGallery : l10n.insertGallery,
+                                        text:     editing ? wp.i18n.__( 'Update gallery' ) : wp.i18n.__( 'Insert gallery' ),
                                         priority: 80,
                                         requires: { library: true },
 
@@ -597 +597 @@
                         items: {
                                 insert: {
                                         style:    'primary',
-                                        text:     l10n.addToGallery,
+                                        text:     wp.i18n.__( 'Add to gallery' ),
                                         priority: 80,
                                         requires: { selection: true },
 
@@ -625 +625 @@
                         items: {
                                 insert: {
                                         style:    'primary',
-                                        text:     editing ? l10n.updatePlaylist : l10n.insertPlaylist,
+                                        text:     editing ? wp.i18n.__( 'Update audio playlist' ) : wp.i18n.__( 'Insert audio playlist' ),
                                         priority: 80,
                                         requires: { library: true },
 
@@ -654 +654 @@
                         items: {
                                 insert: {
                                         style:    'primary',
-                                        text:     l10n.addToPlaylist,
+                                        text:     wp.i18n.__( 'Add to audio playlist' ),
                                         priority: 80,
                                         requires: { selection: true },
 
@@ -682 +682 @@
                         items: {
                                 insert: {
                                         style:    'primary',
-                                        text:     editing ? l10n.updateVideoPlaylist : l10n.insertVideoPlaylist,
+                                        text:     editing ? wp.i18n.__( 'Update video playlist' ) : wp.i18n.__( 'Insert video playlist' ),
                                         priority: 140,
                                         requires: { library: true },
 
@@ -711 +711 @@
                         items: {
                                 insert: {
                                         style:    'primary',
-                                        text:     l10n.addToVideoPlaylist,
+                                        text:     wp.i18n.__( 'Add to video playlist' ),
                                         priority: 140,
                                         requires: { selection: true },
 

src/wp-includes/js/plupload/handlers.js

@@ -1 @@
-/* global plupload, pluploadL10n, ajaxurl, post_id, wpUploaderInit, deleteUserSetting, setUserSetting, getUserSetting, shortform */
+/* global plupload, ajaxurl, post_id, wpUploaderInit, deleteUserSetting, setUserSetting, getUserSetting, shortform */
 var topWin = window.dialogArguments || opener || parent || top, uploader, uploader_init;
 
 // progress and success handlers for media multi uploads
@@ -48 +48 @@
         if ( max > hundredmb && file.size > hundredmb ) {
                 setTimeout( function() {
                         if ( file.status < 3 && file.loaded === 0 ) { // not uploading
-                                wpFileError( file, pluploadL10n.big_upload_failed.replace( '%1$s', '<a class="uploader-html" href="#">' ).replace( '%2$s', '</a>' ) );
+                                wpFileError( file, wp.i18n.__( 'Please try uploading this file with the %1$sbrowser uploader%2$s.' ).replace( '%1$s', '<a class="uploader-html" href="#">' ).replace( '%2$s', '</a>' ) );
                                 up.stop(); // stops the whole queue
                                 up.removeFile( file );
                                 up.start(); // restart the queue
@@ -88 +88 @@
                 item.html(serverData);
                 return;
         } else {
-                jQuery('.percent', item).html( pluploadL10n.crunching );
+                jQuery('.percent', item).html( wp.i18n.__( 'Crunching&hellip;' ) );
         }
 
         prepareMediaItem(fileObj, serverData);
@@ -213 +213 @@
                 return;
 
         item.html('<div class="error-div">' +
-                                '<a class="dismiss" href="#">' + pluploadL10n.dismiss + '</a>' +
-                                '<strong>' + pluploadL10n.error_uploading.replace('%s', jQuery.trim(filename)) + '</strong> ' +
+                                '<a class="dismiss" href="#">' + wp.i18n.__( 'Dismiss' ) + '</a>' +
+                                /* translators: s: file name */
+                                '<strong>' + wp.i18n.__( '&#8220;%s&#8221; has failed to upload.' ).replace('%s', jQuery.trim(filename)) + '</strong> ' +
                                 message +
                                 '</div>').data('last-err', id);
 }
@@ -249 +250 @@
 
         jQuery('.filename:empty', item).remove();
         jQuery('.filename .title', item).css('font-weight','bold');
-        jQuery('.filename', item).append('<span class="trashnotice"> ' + pluploadL10n.deleted + ' </span>').siblings('a.toggle').hide();
+        jQuery('.filename', item).append('<span class="trashnotice"> ' + wp.i18n.__( 'moved to the trash.' ) + ' </span>').siblings('a.toggle').hide();
         jQuery('.filename', item).append( jQuery('a.undo', item).removeClass('hidden') );
         jQuery('.menu_order_input', item).hide();
 
@@ -282 +283 @@
 
         switch (errorCode) {
                 case plupload.FAILED:
-                        wpFileError(fileObj, pluploadL10n.upload_failed);
+                        wpFileError( fileObj, wp.i18n.__( 'Upload failed.' ) );
                         break;
                 case plupload.FILE_EXTENSION_ERROR:
-                        wpFileExtensionError( uploader, fileObj, pluploadL10n.invalid_filetype );
+                        wpFileExtensionError( uploader, fileObj, wp.i18n.__( 'This file type is not allowed. Please try another.' ) );
                         break;
                 case plupload.FILE_SIZE_ERROR:
-                        uploadSizeError(uploader, fileObj);
+                        uploadSizeError( uploader, fileObj );
                         break;
                 case plupload.IMAGE_FORMAT_ERROR:
-                        wpFileError(fileObj, pluploadL10n.not_an_image);
+                        wpFileError( fileObj, wp.i18n.__( 'This file is not an image. Please try another.' ) );
                         break;
                 case plupload.IMAGE_MEMORY_ERROR:
-                        wpFileError(fileObj, pluploadL10n.image_memory_exceeded);
+                        wpFileError( fileObj, wp.i18n.__( 'Memory exceeded. Please try another smaller file.' ) );
                         break;
                 case plupload.IMAGE_DIMENSIONS_ERROR:
-                        wpFileError(fileObj, pluploadL10n.image_dimensions_exceeded);
+                        wpFileError( fileObj, wp.i18n.__( 'This is larger than the maximum size. Please try another.' ) );
                         break;
                 case plupload.GENERIC_ERROR:
-                        wpQueueError(pluploadL10n.upload_failed);
+                        wpQueueError( wp.i18n.__( 'Upload failed.' ) );
                         break;
                 case plupload.IO_ERROR:
                         max = parseInt( uploader.settings.filters.max_file_size, 10 );
 
                         if ( max > hundredmb && fileObj.size > hundredmb )
-                                wpFileError( fileObj, pluploadL10n.big_upload_failed.replace('%1$s', '<a class="uploader-html" href="#">').replace('%2$s', '</a>') );
+                                wpFileError( fileObj, wp.i18n.__( 'Please try uploading this file with the %1$sbrowser uploader%2$s.' ).replace( '%1$s', '<a class="uploader-html" href="#">' ).replace( '%2$s', '</a>' ) );
                         else
-                                wpQueueError(pluploadL10n.io_error);
+                                wpQueueError( wp.i18n.__( 'IO error.' ) );
                         break;
                 case plupload.HTTP_ERROR:
-                        wpQueueError(pluploadL10n.http_error);
+                        wpQueueError( wp.i18n.__( 'HTTP error.' ) );
                         break;
                 case plupload.INIT_ERROR:
                         jQuery('.media-upload-form').addClass('html-uploader');
                         break;
                 case plupload.SECURITY_ERROR:
-                        wpQueueError(pluploadL10n.security_error);
+                        wpQueueError( wp.i18n.__( 'Security error.' ) );
                         break;
 /*              case plupload.UPLOAD_ERROR.UPLOAD_STOPPED:
                 case plupload.UPLOAD_ERROR.FILE_CANCELLED:
                         jQuery('#media-item-' + fileObj.id).remove();
                         break;*/
                 default:
-                        wpFileError(fileObj, pluploadL10n.default_error);
+                        wpFileError( fileObj, wp.i18n.__( 'An error occurred in the upload. Please try again later.' ) );
         }
 }
 
 function uploadSizeError( up, file, over100mb ) {
         var message;
 
-        if ( over100mb )
-                message = pluploadL10n.big_upload_queued.replace('%s', file.name) + ' ' + pluploadL10n.big_upload_failed.replace('%1$s', '<a class="uploader-html" href="#">').replace('%2$s', '</a>');
-        else
-                message = pluploadL10n.file_exceeds_size_limit.replace('%s', file.name);
+        if ( over100mb ) {
+                /* translators: s: file name */
+                message = wp.i18n.__( '%s exceeds the maximum upload size for the multi-file uploader when used in your browser.' ).replace( '%s', file.name ) + ' ' + wp.i18n.__( 'Please try uploading this file with the %1$sbrowser uploader%2$s.' ).replace( '%1$s', '<a class="uploader-html" href="#">' ).replace( '%2$s', '</a>' );
+        } else {
+                /* translators: s: file name */
+                message = wp.i18n.__( '%s exceeds the maximum upload size for this site.' ).replace( '%s', file.name );
+        }
 
         jQuery('#media-items').append('<div id="media-item-' + file.id + '" class="media-item error"><p>' + message + '</p></div>');
         up.removeFile(file);

src/wp-includes/js/plupload/wp-plupload.js

@@ -1 @@
-/* global pluploadL10n, plupload, _wpPluploadSettings */
+/* global plupload, _wpPluploadSettings */
 
 window.wp = window.wp || {};
 
@@ -120 +120 @@
                         }
 
                         Uploader.errors.unshift({
-                                message: message || pluploadL10n.default_error,
+                                message: message || wp.i18n.__( 'An error occurred in the upload. Please try again later.' ),
                                 data:    data,
                                 file:    file
                         });
@@ -264 +264 @@
                         try {
                                 response = JSON.parse( response.response );
                         } catch ( e ) {
-                                return error( pluploadL10n.default_error, e, file );
+                                return error( wp.i18n.__( 'An error occurred in the upload. Please try again later.' ), e, file );
                         }
 
                         if ( ! _.isObject( response ) || _.isUndefined( response.success ) )
-                                return error( pluploadL10n.default_error, null, file );
+                                return error( wp.i18n.__( 'An error occurred in the upload. Please try again later.' ), null, file );
                         else if ( ! response.success )
                                 return error( response.data && response.data.message, response.data, file );
 
@@ -296 +296 @@
                  * @param {Object}            error    Contains code, message and sometimes file and other details.
                  */
                 this.uploader.bind( 'Error', function( up, pluploadError ) {
-                        var message = pluploadL10n.default_error,
+                        var message = wp.i18n.__( 'An error occurred in the upload. Please try again later.' ),
                                 key;
 
                         // Check for plupload errors.
@@ -325 +325 @@
 
         // Map Plupload error codes to user friendly error messages.
         Uploader.errorMap = {
-                'FAILED':                 pluploadL10n.upload_failed,
-                'FILE_EXTENSION_ERROR':   pluploadL10n.invalid_filetype,
-                'IMAGE_FORMAT_ERROR':     pluploadL10n.not_an_image,
-                'IMAGE_MEMORY_ERROR':     pluploadL10n.image_memory_exceeded,
-                'IMAGE_DIMENSIONS_ERROR': pluploadL10n.image_dimensions_exceeded,
-                'GENERIC_ERROR':          pluploadL10n.upload_failed,
-                'IO_ERROR':               pluploadL10n.io_error,
-                'HTTP_ERROR':             pluploadL10n.http_error,
-                'SECURITY_ERROR':         pluploadL10n.security_error,
+                'FAILED':                 wp.i18n.__( 'Upload failed.' ),
+                'FILE_EXTENSION_ERROR':   wp.i18n.__( 'This file type is not allowed. Please try another.' ),
+                'IMAGE_FORMAT_ERROR':     wp.i18n.__( 'This file is not an image. Please try another.' ),
+                'IMAGE_MEMORY_ERROR':     wp.i18n.__( 'Memory exceeded. Please try another smaller file.' ),
+                'IMAGE_DIMENSIONS_ERROR': wp.i18n.__( 'This is larger than the maximum size. Please try another.' ),
+                'GENERIC_ERROR':          wp.i18n.__( 'Upload failed.' ),
+                'IO_ERROR':               wp.i18n.__( 'IO error.' ),
+                'HTTP_ERROR':             wp.i18n.__( 'HTTP error.' ),
+                'SECURITY_ERROR':         wp.i18n.__( 'Security error.' ),
 
                 'FILE_SIZE_ERROR': function( file ) {
-                        return pluploadL10n.file_exceeds_size_limit.replace('%s', file.name);
+                        /* translators: s: file name */
+                        return wp.i18n.__( '%s exceeds the maximum upload size for this site.' ).replace('%s', file.name);
                 }
         };
 

src/wp-includes/js/quicktags.js

@@ -1 @@
-/* global adminpage, wpActiveEditor, quicktagsL10n, wpLink, prompt */
+/* global adminpage, wpActiveEditor, wpLink, prompt */
 /*
  * Quicktags
  *
@@ -223 +223 @@
 
                 if ( tb.addEventListener ) {
                         tb.addEventListener( 'click', onclick, false );
-                        
+
                         if ( wrap ) {
                                 wrap.addEventListener( 'click', setActiveEditor, false );
                         }
@@ -582 +582 @@
 
         // the close tags button
         qt.CloseButton = function() {
-                qt.Button.call( this, 'close', quicktagsL10n.closeTags, '', quicktagsL10n.closeAllOpenTags );
+                qt.Button.call( this, 'close', wp.i18n.__( 'close tags' ), '', wp.i18n.__( 'Close all open tags' ) );
         };
 
         qt.CloseButton.prototype = new qt.Button();
@@ -614 +614 @@
         // the link button
         qt.LinkButton = function() {
                 var attr = {
-                        ariaLabel: quicktagsL10n.link
+                        ariaLabel: wp.i18n.__( 'Insert link' )
                 };
 
                 qt.TagButton.call( this, 'link', 'link', '', '</a>', '', '', '', attr );
@@ -633 +633 @@
                 }
 
                 if ( t.isOpen(ed) === false ) {
-                        URL = prompt( quicktagsL10n.enterURL, defaultValue );
+                        URL = prompt( wp.i18n.__( 'Enter the URL' ), defaultValue );
                         if ( URL ) {
                                 t.tagStart = '<a href="' + URL + '">';
                                 qt.TagButton.prototype.callback.call(t, e, c, ed);
@@ -646 +646 @@
         // the img button
         qt.ImgButton = function() {
                 var attr = {
-                        ariaLabel: quicktagsL10n.image
+                        ariaLabel: wp.i18n.__( 'Insert image' )
                 };
 
                 qt.TagButton.call( this, 'img', 'img', '', '', '', '', '', attr );
@@ -656 +656 @@
                 if ( ! defaultValue ) {
                         defaultValue = 'http://';
                 }
-                var src = prompt(quicktagsL10n.enterImageURL, defaultValue), alt;
+                var src = prompt( wp.i18n.__( 'Enter the URL of the image' ), defaultValue ), alt;
                 if ( src ) {
-                        alt = prompt(quicktagsL10n.enterImageDescription, '');
+                        alt = prompt( wp.i18n.__( 'Enter a description of the image' ), '' );
                         this.tagStart = '<img src="' + src + '" alt="' + alt + '" />';
                         qt.TagButton.prototype.callback.call(this, e, c, ed);
                 }
         };
 
         qt.DFWButton = function() {
-                qt.Button.call( this, 'dfw', '', 'f', quicktagsL10n.dfw );
+                qt.Button.call( this, 'dfw', '', 'f', wp.i18n.__( 'Distraction-free writing mode' ) );
         };
         qt.DFWButton.prototype = new qt.Button();
         qt.DFWButton.prototype.callback = function() {
@@ -679 +679 @@
         };
 
         qt.TextDirectionButton = function() {
-                qt.Button.call( this, 'textdirection', quicktagsL10n.textdirection, '', quicktagsL10n.toggleTextdirection );
+                qt.Button.call( this, 'textdirection', wp.i18n.__( 'text direction' ), '', wp.i18n.__( 'Toggle Editor Text Direction' ) );
         };
         qt.TextDirectionButton.prototype = new qt.Button();
         qt.TextDirectionButton.prototype.callback = function(e, c) {
@@ -695 +695 @@
         };
 
         // ensure backward compatibility
-        edButtons[10]  = new qt.TagButton( 'strong', 'b', '<strong>', '</strong>', '', '', '', { ariaLabel: quicktagsL10n.strong, ariaLabelClose: quicktagsL10n.strongClose } );
-        edButtons[20]  = new qt.TagButton( 'em', 'i', '<em>', '</em>', '', '', '', { ariaLabel: quicktagsL10n.em, ariaLabelClose: quicktagsL10n.emClose } );
+        edButtons[10]  = new qt.TagButton( 'strong', 'b', '<strong>', '</strong>', '', '', '', { ariaLabel: wp.i18n.__( 'Bold' ), ariaLabelClose: wp.i18n.__( 'Close bold tag' ) } );
+        edButtons[20]  = new qt.TagButton( 'em', 'i', '<em>', '</em>', '', '', '', { ariaLabel: wp.i18n.__( 'Italic' ), ariaLabelClose: wp.i18n.__( 'Close italic tag' ) } );
         edButtons[30]  = new qt.LinkButton(); // special case
-        edButtons[40]  = new qt.TagButton( 'block', 'b-quote', '\n\n<blockquote>', '</blockquote>\n\n', '', '', '', { ariaLabel: quicktagsL10n.blockquote, ariaLabelClose: quicktagsL10n.blockquoteClose } );
-        edButtons[50]  = new qt.TagButton( 'del', 'del', '<del datetime="' + _datetime + '">', '</del>', '', '', '', { ariaLabel: quicktagsL10n.del, ariaLabelClose: quicktagsL10n.delClose } );
-        edButtons[60]  = new qt.TagButton( 'ins', 'ins', '<ins datetime="' + _datetime + '">', '</ins>', '', '', '', { ariaLabel: quicktagsL10n.ins, ariaLabelClose: quicktagsL10n.insClose } );
+        edButtons[40]  = new qt.TagButton( 'block', 'b-quote', '\n\n<blockquote>', '</blockquote>\n\n', '', '', '', { ariaLabel: wp.i18n.__( 'Blockquote' ), ariaLabelClose: wp.i18n.__( 'Close blockquote tag' ) } );
+        edButtons[50]  = new qt.TagButton( 'del', 'del', '<del datetime="' + _datetime + '">', '</del>', '', '', '', { ariaLabel: wp.i18n.__( 'Deleted text (strikethrough)' ), ariaLabelClose: wp.i18n.__( 'Close deleted text tag' ) } );
+        edButtons[60]  = new qt.TagButton( 'ins', 'ins', '<ins datetime="' + _datetime + '">', '</ins>', '', '', '', { ariaLabel: wp.i18n.__( 'Inserted text' ), ariaLabelClose: wp.i18n.__( 'Close inserted text tag' ) } );
         edButtons[70]  = new qt.ImgButton(); // special case
-        edButtons[80]  = new qt.TagButton( 'ul', 'ul', '<ul>\n', '</ul>\n\n', '', '', '', { ariaLabel: quicktagsL10n.ul, ariaLabelClose: quicktagsL10n.ulClose } );
-        edButtons[90]  = new qt.TagButton( 'ol', 'ol', '<ol>\n', '</ol>\n\n', '', '', '', { ariaLabel: quicktagsL10n.ol, ariaLabelClose: quicktagsL10n.olClose } );
-        edButtons[100] = new qt.TagButton( 'li', 'li', '\t<li>', '</li>\n', '', '', '', { ariaLabel: quicktagsL10n.li, ariaLabelClose: quicktagsL10n.liClose } );
-        edButtons[110] = new qt.TagButton( 'code', 'code', '<code>', '</code>', '', '', '', { ariaLabel: quicktagsL10n.code, ariaLabelClose: quicktagsL10n.codeClose } );
-        edButtons[120] = new qt.TagButton( 'more', 'more', '<!--more-->\n\n', '', '', '', '', { ariaLabel: quicktagsL10n.more } );
+        edButtons[80]  = new qt.TagButton( 'ul', 'ul', '<ul>\n', '</ul>\n\n', '', '', '', { ariaLabel: wp.i18n.__( 'Bulleted list' ), ariaLabelClose: wp.i18n.__( 'Close bulleted list tag' ) } );
+        edButtons[90]  = new qt.TagButton( 'ol', 'ol', '<ol>\n', '</ol>\n\n', '', '', '', { ariaLabel: wp.i18n.__( 'Numbered list' ), ariaLabelClose: wp.i18n.__( 'Close numbered list tag' ) } );
+        edButtons[100] = new qt.TagButton( 'li', 'li', '\t<li>', '</li>\n', '', '', '', { ariaLabel: wp.i18n.__( 'List item' ), ariaLabelClose: wp.i18n.__( 'Close list item tag' ) } );
+        edButtons[110] = new qt.TagButton( 'code', 'code', '<code>', '</code>', '', '', '', { ariaLabel: wp.i18n.__( 'Code' ), ariaLabelClose: wp.i18n.__( 'Close code tag' ) } );
+        edButtons[120] = new qt.TagButton( 'more', 'more', '<!--more-->\n\n', '', '', '', '', { ariaLabel: wp.i18n.__( 'Insert Read More tag' ) } );
         edButtons[140] = new qt.CloseButton();
 
 })();

src/wp-includes/js/swfupload/handlers.js

@@ -45 +45 @@
         jQuery('.percent', item).html( Math.ceil(bytesDone / bytesTotal * 100) + '%' );
 
         if ( bytesDone == bytesTotal )
-                jQuery('.bar', item).html('<strong class="crunching">' + swfuploadL10n.crunching + '</strong>');
+                jQuery('.bar', item).html('<strong class="crunching">' + wp.i18n.__( 'Crunching&hellip;' ) + '</strong>');
 }
 
 function prepareMediaItem(fileObj, serverData) {
@@ -154 +154 @@
         var filename = jQuery('.filename', item).text();
 
         item.html('<div class="error-div">'
-                                + '<a class="dismiss" href="#">' + swfuploadL10n.dismiss + '</a>'
-                                + '<strong>' + swfuploadL10n.error_uploading.replace('%s', filename) + '</strong><br />'
+                                + '<a class="dismiss" href="#">' + wp.i18n.__( 'Dismiss' ) + '</a>'
+                                /* translators: s: file name */
+                                + '<strong>' + wp.i18n.__( '&#8220;%s&#8221; has failed to upload.' ).replace( '%s', filename ) + '</strong><br />'
                                 + html
                                 + '</div>');
         item.find('a.dismiss').click(function(){jQuery(this).parents('.media-item').slideUp(200, function(){jQuery(this).remove();})});
@@ -187 +188 @@
 
         jQuery('.filename:empty', item).remove();
         jQuery('.filename .title', item).css('font-weight','bold');
-        jQuery('.filename', item).append('<span class="trashnotice"> ' + swfuploadL10n.deleted + ' </span>').siblings('a.toggle').hide();
+        jQuery('.filename', item).append('<span class="trashnotice"> ' + wp.i18n.__( 'moved to the trash.' ) + ' </span>').siblings('a.toggle').hide();
         jQuery('.filename', item).append( jQuery('a.undo', item).removeClass('hidden') );
         jQuery('.menu_order_input', item).hide();
 
@@ -257 +258 @@
         var filename = jQuery('.filename', item).text();
 
         item.html('<div class="error-div">'
-                                + '<a class="dismiss" href="#">' + swfuploadL10n.dismiss + '</a>'
-                                + '<strong>' + swfuploadL10n.error_uploading.replace('%s', filename) + '</strong><br />'
+                                + '<a class="dismiss" href="#">' + wp.i18n.__( 'Dismiss' ) + '</a>'
+                                /* translators: s: file name */
+                                + '<strong>' + wp.i18n.__( '&#8220;%s&#8221; has failed to upload.' ).replace( '%s', filename ) + '</strong><br />'
                                 + message
                                 + '</div>');
         item.find('a.dismiss').click(function(){jQuery(this).parents('.media-item').slideUp(200, function(){jQuery(this).remove();})});
@@ -267 +269 @@
 function fileQueueError(fileObj, error_code, message)  {
         // Handle this error separately because we don't want to create a FileProgress element for it.
         if ( error_code == SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED ) {
-                wpQueueError(swfuploadL10n.queue_limit_exceeded);
+                wpQueueError( wp.i18n.__( 'You have attempted to queue too many files.' ) );
         }
         else if ( error_code == SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT ) {
                 fileQueued(fileObj);
-                wpFileError(fileObj, swfuploadL10n.file_exceeds_size_limit);
+                /* translators: s: file name */
+                wpFileError( fileObj, wp.i18n.__( '%s exceeds the maximum upload size for this site.' ) );
         }
         else if ( error_code == SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE ) {
                 fileQueued(fileObj);
-                wpFileError(fileObj, swfuploadL10n.zero_byte_file);
+                wpFileError( fileObj, wp.i18n.__( 'This file is empty. Please try another.' ) );
         }
         else if ( error_code == SWFUpload.QUEUE_ERROR.INVALID_FILETYPE ) {
                 fileQueued(fileObj);
-                wpFileError(fileObj, swfuploadL10n.invalid_filetype);
+                wpFileError( fileObj, wp.i18n.__( 'This file type is not allowed. Please try another.' ) );
         }
         else {
-                wpQueueError(swfuploadL10n.default_error);
+                wpQueueError( wp.i18n.__( 'An error occurred in the upload. Please try again later.' ) );
         }
 }
 
@@ -324 +327 @@
 
         switch (errorCode) {
                 case SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL:
-                        wpFileError(fileObj, swfuploadL10n.missing_upload_url);
+                        wpFileError( fileObj, wp.i18n.__( 'There was a configuration error. Please contact the server administrator.' ) );
                         break;
                 case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:
-                        wpFileError(fileObj, swfuploadL10n.upload_limit_exceeded);
+                        wpFileError( fileObj, wp.i18n.__( 'You may only upload 1 file.' ) );
                         break;
                 case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:
-                        wpQueueError(swfuploadL10n.http_error);
+                        wpQueueError( wp.i18n.__( 'HTTP error.' ) );
                         break;
                 case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:
-                        wpQueueError(swfuploadL10n.upload_failed);
+                        wpQueueError( wp.i18n.__( 'Upload failed.' ) );
                         break;
                 case SWFUpload.UPLOAD_ERROR.IO_ERROR:
-                        wpQueueError(swfuploadL10n.io_error);
+                        wpQueueError( wp.i18n.__( 'IO error.' ) );
                         break;
                 case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:
-                        wpQueueError(swfuploadL10n.security_error);
+                        wpQueueError( wp.i18n.__( 'Security error.' ) );
                         break;
                 case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:
                 case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:
                         jQuery('#media-item-' + fileObj.id).remove();
                         break;
                 default:
-                        wpFileError(fileObj, swfuploadL10n.default_error);
+                        wpFileError( fileObj, wp.i18n.__( 'An error occurred in the upload. Please try again later.' ) );
         }
 }
 

src/wp-includes/js/thickbox/thickbox.js

@@ -48 +48 @@
                         jQuery("body","html").css({height: "100%", width: "100%"});
                         jQuery("html").css("overflow","hidden");
                         if (document.getElementById("TB_HideSelect") === null) {//iframe to hide select elements in ie6
-                                jQuery("body").append("<iframe id='TB_HideSelect'>"+thickboxL10n.noiframes+"</iframe><div id='TB_overlay'></div><div id='TB_window' class='thickbox-loading'></div>");
+                                jQuery("body").append("<iframe id='TB_HideSelect'>" + wp.i18n.__( 'This feature requires inline frames. You have iframes disabled or your browser does not support them.' ) + "</iframe><div id='TB_overlay'></div><div id='TB_window' class='thickbox-loading'></div>");
                                 jQuery("#TB_overlay").click(tb_remove);
                         }
                 }else{//all others
@@ -97 +97 @@
                                                         if (TB_FoundURL) {
                                                                 TB_NextCaption = TB_TempArray[TB_Counter].title;
                                                                 TB_NextURL = TB_TempArray[TB_Counter].href;
-                                                                TB_NextHTML = "<span id='TB_next'>&nbsp;&nbsp;<a href='#'>"+thickboxL10n.next+"</a></span>";
+                                                                TB_NextHTML = "<span id='TB_next'>&nbsp;&nbsp;<a href='#'>"+wp.i18n.__( 'Next &gt;' )+"</a></span>";
                                                         } else {
                                                                 TB_PrevCaption = TB_TempArray[TB_Counter].title;
                                                                 TB_PrevURL = TB_TempArray[TB_Counter].href;
-                                                                TB_PrevHTML = "<span id='TB_prev'>&nbsp;&nbsp;<a href='#'>"+thickboxL10n.prev+"</a></span>";
+                                                                TB_PrevHTML = "<span id='TB_prev'>&nbsp;&nbsp;<a href='#'>" + wp.i18n.__( '&lt; Prev' ) + "</a></span>";
                                                         }
                                                 } else {
                                                         TB_FoundURL = true;
-                                                        TB_imageCount = thickboxL10n.image + ' ' + (TB_Counter + 1) + ' ' + thickboxL10n.of + ' ' + (TB_TempArray.length);
+                                                        /* translators: 1: image number, 2: total number of images */
+                                                        TB_imageCount = wp.i18n.__( 'Image %1$d of %2$d' ).replace( '%1$d', ( TB_Counter + 1 ) ).replace( '%2$d', TB_TempArray.length );
                                                 }
                                 }
                         }
@@ -139 +140 @@
 
                         TB_WIDTH = imageWidth + 30;
                         TB_HEIGHT = imageHeight + 60;
-                        jQuery("#TB_window").append("<a href='' id='TB_ImageOff'><span class='screen-reader-text'>"+thickboxL10n.close+"</span><img id='TB_Image' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><button type='button' id='TB_closeWindowButton'><span class='screen-reader-text'>"+thickboxL10n.close+"</span><span class='tb-close-icon'></span></button></div>");
+                        jQuery("#TB_window").append("<a href='' id='TB_ImageOff'><span class='screen-reader-text'>" + wp.i18n.__( 'Close' ) + "</span><img id='TB_Image' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><button type='button' id='TB_closeWindowButton'><span class='screen-reader-text'>" + wp.i18n.__( 'Close' ) + "</span><span class='tb-close-icon'></span></button></div>");
 
                         jQuery("#TB_closeWindowButton").click(tb_remove);
 
@@ -204 +205 @@
                                         urlNoQuery = url.split('TB_');
                                         jQuery("#TB_iframeContent").remove();
                                         if(params['modal'] != "true"){//iframe no modal
-                                                jQuery("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><button type='button' id='TB_closeWindowButton'><span class='screen-reader-text'>"+thickboxL10n.close+"</span><span class='tb-close-icon'></span></button></div></div><iframe frameborder='0' hspace='0' allowtransparency='true' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;' >"+thickboxL10n.noiframes+"</iframe>");
+                                                jQuery("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><button type='button' id='TB_closeWindowButton'><span class='screen-reader-text'>" + wp.i18n.__( 'Close' ) + "</span><span class='tb-close-icon'></span></button></div></div><iframe frameborder='0' hspace='0' allowtransparency='true' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;' >" + wp.i18n.__( 'This feature requires inline frames. You have iframes disabled or your browser does not support them.' ) + "</iframe>");
                                         }else{//iframe modal
                                         jQuery("#TB_overlay").unbind();
-                                                jQuery("#TB_window").append("<iframe frameborder='0' hspace='0' allowtransparency='true' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;'>"+thickboxL10n.noiframes+"</iframe>");
+                                                jQuery("#TB_window").append("<iframe frameborder='0' hspace='0' allowtransparency='true' src='"+urlNoQuery[0]+"' id='TB_iframeContent' name='TB_iframeContent"+Math.round(Math.random()*1000)+"' onload='tb_showIframe()' style='width:"+(ajaxContentW + 29)+"px;height:"+(ajaxContentH + 17)+"px;'>" + wp.i18n.__( 'This feature requires inline frames. You have iframes disabled or your browser does not support them.' ) + "</iframe>");
                                         }
                         }else{// not an iframe, ajax
                                         if(jQuery("#TB_window").css("visibility") != "visible"){
                                                 if(params['modal'] != "true"){//ajax no modal
-                                                jQuery("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><button type='button' id='TB_closeWindowButton'><span class='screen-reader-text'>"+thickboxL10n.close+"</span><span class='tb-close-icon'></span></button></div></div><div id='TB_ajaxContent' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px'></div>");
+                                                jQuery("#TB_window").append("<div id='TB_title'><div id='TB_ajaxWindowTitle'>"+caption+"</div><div id='TB_closeAjaxWindow'><button type='button' id='TB_closeWindowButton'><span class='screen-reader-text'>" + wp.i18n.__( 'Close' ) + "</span><span class='tb-close-icon'></span></button></div></div><div id='TB_ajaxContent' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px'></div>");
                                                 }else{//ajax modal
                                                 jQuery("#TB_overlay").unbind();
                                                 jQuery("#TB_window").append("<div id='TB_ajaxContent' class='TB_modal' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px;'></div>");

src/wp-includes/js/tinymce/plugins/wplink/plugin.js

@@ -271 +271 @@
                         editor.nodeChanged();
 
                         // Audible confirmation message when a link has been inserted in the Editor.
-                        if ( typeof window.wpLinkL10n !== 'undefined' && ! hasLinkError ) {
-                                speak( window.wpLinkL10n.linkInserted );
+                        if ( ! hasLinkError ) {
+                                speak( wp.i18n.__( 'Link inserted.' ) );