WordPress.org

Make WordPress Core

Changeset 48352


Ignore:
Timestamp:
07/06/2020 09:50:23 PM (3 months ago)
Author:
whyisjake
Message:

Administration: Move more table strings to sentence casing.

WordPress as a project has moved largely to sentence casing for UI elements in the admin. This commit moves several string$

  • Move to trash
  • Mark as spam
  • Permanently delete comment
  • Approve comment
  • In response to
  • Bulk actions
  • Not spam
  • Sumitted on
  • Delete permanently
  • Add media
  • Upload files
  • Upload images
  • Add media
  • Bulk select
  • Restore from trash
  • Search media
  • Attachment details
  • Create gallery
  • Edit gallery
  • Cancel gallery
  • Add to gallery
  • Image details
  • Replace image
  • Cancel edit
  • Edit image
  • Choose image
  • Select and crop
  • Skip cropping
  • Crop image
  • Audio details
  • Replace audio
  • Add audio source
  • Video details
  • Replace video
  • Add video source
  • Select poster image
  • Add subtitles
  • Create audio playlist
  • Edit audio playlist.
  • Cancel audio playlist
  • Create video playlist
  • Edit video playlist
  • Add to video playlist
  • Filter media

Fixes #40244.
Props afercia, bhargavbhandari90, rcutmore, webzunft, manojlovic, jeremyfelt, desrosj, lschuyler, SergeyBiryukov, whyisjake.

Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/package-lock.json

    r48269 r48352  
    64466446            "dev": true
    64476447        },
     6448        "chardet": {
     6449            "version": "0.4.2",
     6450            "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
     6451            "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
     6452            "dev": true
     6453        },
    64486454        "check-node-version": {
    64496455            "version": "4.0.1",
     
    67346740        },
    67356741        "cli-width": {
    6736             "version": "2.2.0",
    6737             "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
    6738             "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
     6742            "version": "2.2.1",
     6743            "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
     6744            "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
    67396745            "dev": true
    67406746        },
     
    1004810054            }
    1004910055        },
     10056        "external-editor": {
     10057            "version": "2.2.0",
     10058            "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
     10059            "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
     10060            "dev": true,
     10061            "requires": {
     10062                "chardet": "^0.4.0",
     10063                "iconv-lite": "^0.4.17",
     10064                "tmp": "^0.0.33"
     10065            }
     10066        },
    1005010067        "extglob": {
    1005110068            "version": "2.0.4",
     
    1239512412        },
    1239612413        "grunt-patch-wordpress": {
    12397             "version": "2.0.0",
    12398             "resolved": "https://registry.npmjs.org/grunt-patch-wordpress/-/grunt-patch-wordpress-2.0.0.tgz",
    12399             "integrity": "sha512-9iCcgsZjBY6XPT25yFkln+7o/roy3zwF+RfrTZaTNVGXR1eEVWIPfjF0DJKMTvaqVIPXQyUq2uJ7/D65rAxiuA==",
     12414            "version": "https://github.com/WordPress/grunt-patch-wordpress/archive/trunk.tar.gz",
     12415            "integrity": "sha512-j3YOSfin2//8K4LYxCJJnIYDrA7KMOTwGihl0FS/+sqZX4+9xW6QPL1tl3b1RO4nfF9pzYwzngYb84VioLTTsA==",
    1240012416            "dev": true,
    1240112417            "requires": {
     
    1240412420                "request": "^2.83.0",
    1240512421                "xmlrpc": "^1.3.1"
    12406             },
    12407             "dependencies": {
    12408                 "ansi-styles": {
    12409                     "version": "3.2.1",
    12410                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
    12411                     "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
    12412                     "dev": true,
    12413                     "requires": {
    12414                         "color-convert": "^1.9.0"
    12415                     }
    12416                 },
    12417                 "chalk": {
    12418                     "version": "2.4.2",
    12419                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
    12420                     "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
    12421                     "dev": true,
    12422                     "requires": {
    12423                         "ansi-styles": "^3.2.1",
    12424                         "escape-string-regexp": "^1.0.5",
    12425                         "supports-color": "^5.3.0"
    12426                     }
    12427                 },
    12428                 "chardet": {
    12429                     "version": "0.4.2",
    12430                     "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
    12431                     "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
    12432                     "dev": true
    12433                 },
    12434                 "external-editor": {
    12435                     "version": "2.2.0",
    12436                     "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
    12437                     "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
    12438                     "dev": true,
    12439                     "requires": {
    12440                         "chardet": "^0.4.0",
    12441                         "iconv-lite": "^0.4.17",
    12442                         "tmp": "^0.0.33"
    12443                     }
    12444                 },
    12445                 "inquirer": {
    12446                     "version": "5.2.0",
    12447                     "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz",
    12448                     "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==",
    12449                     "dev": true,
    12450                     "requires": {
    12451                         "ansi-escapes": "^3.0.0",
    12452                         "chalk": "^2.0.0",
    12453                         "cli-cursor": "^2.1.0",
    12454                         "cli-width": "^2.0.0",
    12455                         "external-editor": "^2.1.0",
    12456                         "figures": "^2.0.0",
    12457                         "lodash": "^4.3.0",
    12458                         "mute-stream": "0.0.7",
    12459                         "run-async": "^2.2.0",
    12460                         "rxjs": "^5.5.2",
    12461                         "string-width": "^2.1.0",
    12462                         "strip-ansi": "^4.0.0",
    12463                         "through": "^2.3.6"
    12464                     }
    12465                 },
    12466                 "rxjs": {
    12467                     "version": "5.5.12",
    12468                     "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz",
    12469                     "integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==",
    12470                     "dev": true,
    12471                     "requires": {
    12472                         "symbol-observable": "1.0.1"
    12473                     }
    12474                 },
    12475                 "supports-color": {
    12476                     "version": "5.5.0",
    12477                     "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
    12478                     "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
    12479                     "dev": true,
    12480                     "requires": {
    12481                         "has-flag": "^3.0.0"
    12482                     }
    12483                 },
    12484                 "symbol-observable": {
    12485                     "version": "1.0.1",
    12486                     "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
    12487                     "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
    12488                     "dev": true
    12489                 }
    1249012422            }
    1249112423        },
     
    1345913391            }
    1346013392        },
     13393        "inquirer": {
     13394            "version": "5.2.0",
     13395            "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz",
     13396            "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==",
     13397            "dev": true,
     13398            "requires": {
     13399                "ansi-escapes": "^3.0.0",
     13400                "chalk": "^2.0.0",
     13401                "cli-cursor": "^2.1.0",
     13402                "cli-width": "^2.0.0",
     13403                "external-editor": "^2.1.0",
     13404                "figures": "^2.0.0",
     13405                "lodash": "^4.3.0",
     13406                "mute-stream": "0.0.7",
     13407                "run-async": "^2.2.0",
     13408                "rxjs": "^5.5.2",
     13409                "string-width": "^2.1.0",
     13410                "strip-ansi": "^4.0.0",
     13411                "through": "^2.3.6"
     13412            },
     13413            "dependencies": {
     13414                "ansi-styles": {
     13415                    "version": "3.2.1",
     13416                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
     13417                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
     13418                    "dev": true,
     13419                    "requires": {
     13420                        "color-convert": "^1.9.0"
     13421                    }
     13422                },
     13423                "chalk": {
     13424                    "version": "2.4.2",
     13425                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
     13426                    "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
     13427                    "dev": true,
     13428                    "requires": {
     13429                        "ansi-styles": "^3.2.1",
     13430                        "escape-string-regexp": "^1.0.5",
     13431                        "supports-color": "^5.3.0"
     13432                    }
     13433                },
     13434                "supports-color": {
     13435                    "version": "5.5.0",
     13436                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
     13437                    "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
     13438                    "dev": true,
     13439                    "requires": {
     13440                        "has-flag": "^3.0.0"
     13441                    }
     13442                }
     13443            }
     13444        },
    1346113445        "install-changed": {
    1346213446            "version": "1.1.0",
     
    1389913883            "dev": true,
    1390013884            "optional": true
    13901         },
    13902         "is-promise": {
    13903             "version": "2.1.0",
    13904             "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
    13905             "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
    13906             "dev": true
    1390713885        },
    1390813886        "is-regex": {
     
    2184121819        },
    2184221820        "run-async": {
    21843             "version": "2.3.0",
    21844             "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
    21845             "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
    21846             "dev": true,
    21847             "requires": {
    21848                 "is-promise": "^2.1.0"
    21849             }
     21821            "version": "2.4.1",
     21822            "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
     21823            "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
     21824            "dev": true
    2185021825        },
    2185121826        "run-parallel": {
     
    2187421849            "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=",
    2187521850            "dev": true
     21851        },
     21852        "rxjs": {
     21853            "version": "5.5.12",
     21854            "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz",
     21855            "integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==",
     21856            "dev": true,
     21857            "requires": {
     21858                "symbol-observable": "1.0.1"
     21859            },
     21860            "dependencies": {
     21861                "symbol-observable": {
     21862                    "version": "1.0.1",
     21863                    "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
     21864                    "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
     21865                    "dev": true
     21866                }
     21867            }
    2187621868        },
    2187721869        "safe-buffer": {
  • trunk/package.json

    r48269 r48352  
    5353        "grunt-jsvalidate": "~0.2.2",
    5454        "grunt-legacy-util": "^1.1.1",
    55         "grunt-patch-wordpress": "~2.0.0",
     55        "grunt-patch-wordpress": "https://github.com/WordPress/grunt-patch-wordpress/archive/trunk.tar.gz",
    5656        "grunt-postcss": "~0.9.0",
    5757        "grunt-replace-lts": "~1.1.0",
  • trunk/src/wp-admin/comment.php

    r48154 r48352  
    126126            case 'spam':
    127127                $caution_msg = __( 'You are about to mark the following comment as spam:' );
    128                 $button      = _x( 'Mark as Spam', 'comment' );
     128                $button      = _x( 'Mark as spam', 'comment' );
    129129                break;
    130130            case 'trash':
    131131                $caution_msg = __( 'You are about to move the following comment to the Trash:' );
    132                 $button      = __( 'Move to Trash' );
     132                $button      = __( 'Move to trash' );
    133133                break;
    134134            case 'delete':
    135135                $caution_msg = __( 'You are about to delete the following comment:' );
    136                 $button      = __( 'Permanently Delete Comment' );
     136                $button      = __( 'Permanently delete comment' );
    137137                break;
    138138            default:
    139139                $caution_msg = __( 'You are about to approve the following comment:' );
    140                 $button      = __( 'Approve Comment' );
     140                $button      = __( 'Approve comment' );
    141141                break;
    142142        }
     
    180180<?php } ?>
    181181<tr>
    182     <th scope="row"><?php /* translators: Column name or table row header. */ _e( 'In Response To' ); ?></th>
     182    <th scope="row"><?php /* translators: Column name or table row header. */ _e( 'In response to' ); ?></th>
    183183    <td>
    184184        <?php
  • trunk/src/wp-admin/edit-comments.php

    r47785 r48352  
    173173        'title'   => __( 'Overview' ),
    174174        'content' =>
    175                 '<p>' . __( 'You can manage comments made on your site similar to the way you manage posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions.' ) . '</p>',
     175                '<p>' . __( 'You can manage comments made on your site similar to the way you manage posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the bulk actions.' ) . '</p>',
    176176    )
    177177);
     
    184184                    '<p>' . __( 'In the <strong>Author</strong> column, in addition to the author&#8217;s name, email address, and blog URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.' ) . '</p>' .
    185185                    '<p>' . __( 'In the <strong>Comment</strong> column, hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment.' ) . '</p>' .
    186                     '<p>' . __( 'In the <strong>In Response To</strong> column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If there are pending comments, a red notification circle with the number of pending comments is displayed. Clicking the notification circle will filter the comments screen to show only pending comments on that post.' ) . '</p>' .
    187                     '<p>' . __( 'In the <strong>Submitted On</strong> column, the date and time the comment was left on your site appears. Clicking on the date/time link will take you to that comment on your live site.' ) . '</p>' .
     186                    '<p>' . __( 'In the <strong>In response to</strong> column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If there are pending comments, a red notification circle with the number of pending comments is displayed. Clicking the notification circle will filter the comments screen to show only pending comments on that post.' ) . '</p>' .
     187                    '<p>' . __( 'In the <strong>Submitted on</strong> column, the date and time the comment was left on your site appears. Clicking on the date/time link will take you to that comment on your live site.' ) . '</p>' .
    188188                    '<p>' . __( 'Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link to the side to learn more.' ) . '</p>',
    189189    )
  • trunk/src/wp-admin/edit-form-comment.php

    r47785 r48352  
    203203<div id="major-publishing-actions">
    204204<div id="delete-action">
    205 <?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url( 'comment.php?action=' . ( ! EMPTY_TRASH_DAYS ? 'deletecomment' : 'trashcomment' ) . "&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode( wp_get_referer() ), 'delete-comment_' . $comment->comment_ID ) . "'>" . ( ! EMPTY_TRASH_DAYS ? __( 'Delete Permanently' ) : __( 'Move to Trash' ) ) . "</a>\n"; ?>
     205<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url( 'comment.php?action=' . ( ! EMPTY_TRASH_DAYS ? 'deletecomment' : 'trashcomment' ) . "&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode( wp_get_referer() ), 'delete-comment_' . $comment->comment_ID ) . "'>" . ( ! EMPTY_TRASH_DAYS ? __( 'Delete Permanently' ) : __( 'Move to trash' ) ) . "</a>\n"; ?>
    206206</div>
    207207<div id="publishing-action">
  • trunk/src/wp-admin/edit.php

    r48312 r48352  
    265265        array(
    266266            'id'      => 'bulk-actions',
    267             'title'   => __( 'Bulk Actions' ),
    268             'content' =>
    269                     '<p>' . __( 'You can also edit or move multiple posts to the Trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply.' ) . '</p>' .
     267            'title'   => __( 'Bulk actions' ),
     268            'content' =>
     269                    '<p>' . __( 'You can also edit or move multiple posts to the Trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk actions menu and click Apply.' ) . '</p>' .
    270270                            '<p>' . __( 'When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears.' ) . '</p>',
    271271        )
     
    293293            'content' =>
    294294                    '<p>' . __( 'Managing pages is very similar to managing posts, and the screens can be customized in the same way.' ) . '</p>' .
    295                     '<p>' . __( 'You can also perform the same types of actions, including narrowing the list by using the filters, acting on a page using the action links that appear when you hover over a row, or using the Bulk Actions menu to edit the metadata for multiple pages at once.' ) . '</p>',
     295                    '<p>' . __( 'You can also perform the same types of actions, including narrowing the list by using the filters, acting on a page using the action links that appear when you hover over a row, or using the Bulk actions menu to edit the metadata for multiple pages at once.' ) . '</p>',
    296296        )
    297297    );
  • trunk/src/wp-admin/includes/class-wp-comments-list-table.php

    r47808 r48352  
    352352        }
    353353        if ( in_array( $comment_status, array( 'all', 'moderated', 'approved', 'trash' ), true ) ) {
    354             $actions['spam'] = _x( 'Mark as Spam', 'comment' );
     354            $actions['spam'] = _x( 'Mark as spam', 'comment' );
    355355        }
    356356
     
    358358            $actions['untrash'] = __( 'Restore' );
    359359        } elseif ( 'spam' === $comment_status ) {
    360             $actions['unspam'] = _x( 'Not Spam', 'comment' );
     360            $actions['unspam'] = _x( 'Not spam', 'comment' );
    361361        }
    362362
    363363        if ( in_array( $comment_status, array( 'trash', 'spam' ), true ) || ! EMPTY_TRASH_DAYS ) {
    364             $actions['delete'] = __( 'Delete Permanently' );
     364            $actions['delete'] = __( 'Delete permanently' );
    365365        } else {
    366             $actions['trash'] = __( 'Move to Trash' );
     366            $actions['trash'] = __( 'Move to trash' );
    367367        }
    368368
     
    468468        if ( ! $post_id ) {
    469469            /* translators: Column name or table row header. */
    470             $columns['response'] = __( 'In Response To' );
    471         }
    472 
    473         $columns['date'] = _x( 'Submitted On', 'column name' );
     470            $columns['response'] = __( 'In response to' );
     471        }
     472
     473        $columns['date'] = _x( 'Submitted on', 'column name' );
    474474
    475475        return $columns;
  • trunk/src/wp-admin/includes/class-wp-list-table.php

    r48165 r48352  
    446446
    447447            /**
    448              * Filters the list table Bulk Actions drop-down.
     448             * Filters the list table bulk actions drop-down.
    449449             *
    450450             * The dynamic portion of the hook name, `$this->screen->id`, refers
     
    470470        echo '<label for="bulk-action-selector-' . esc_attr( $which ) . '" class="screen-reader-text">' . __( 'Select bulk action' ) . '</label>';
    471471        echo '<select name="action' . $two . '" id="bulk-action-selector-' . esc_attr( $which ) . "\">\n";
    472         echo '<option value="-1">' . __( 'Bulk Actions' ) . "</option>\n";
     472        echo '<option value="-1">' . __( 'Bulk actions' ) . "</option>\n";
    473473
    474474        foreach ( $this->_actions as $name => $title ) {
  • trunk/src/wp-admin/includes/class-wp-media-list-table.php

    r48240 r48352  
    150150            if ( $this->is_trash ) {
    151151                $actions['untrash'] = __( 'Restore' );
    152                 $actions['delete']  = __( 'Delete Permanently' );
     152                $actions['delete']  = __( 'Delete permanently' );
    153153            } else {
    154                 $actions['trash'] = __( 'Move to Trash' );
     154                $actions['trash'] = __( 'Move to trash' );
    155155            }
    156156        } else {
    157             $actions['delete'] = __( 'Delete Permanently' );
     157            $actions['delete'] = __( 'Delete permanently' );
    158158        }
    159159
  • trunk/src/wp-admin/includes/class-wp-posts-list-table.php

    r48240 r48352  
    416416        if ( current_user_can( $post_type_obj->cap->delete_posts ) ) {
    417417            if ( $this->is_trash || ! EMPTY_TRASH_DAYS ) {
    418                 $actions['delete'] = __( 'Delete Permanently' );
     418                $actions['delete'] = __( 'Delete permanently' );
    419419            } else {
    420                 $actions['trash'] = __( 'Move to Trash' );
     420                $actions['trash'] = __( 'Move to trash' );
    421421            }
    422422        }
  • trunk/src/wp-admin/includes/meta-boxes.php

    r48292 r48352  
    333333        if ( current_user_can( 'delete_post', $post_id ) ) {
    334334            if ( ! EMPTY_TRASH_DAYS ) {
    335                 $delete_text = __( 'Delete Permanently' );
     335                $delete_text = __( 'Delete permanently' );
    336336            } else {
    337                 $delete_text = __( 'Move to Trash' );
     337                $delete_text = __( 'Move to trash' );
    338338            }
    339339            ?>
     
    439439    if ( current_user_can( 'delete_post', $post->ID ) ) {
    440440        if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
    441             echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Move to Trash' ) . '</a>';
     441            echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Move to trash' ) . '</a>';
    442442        } else {
    443443            $delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
    444             echo "<a class='submitdelete deletion'$delete_ays href='" . get_delete_post_link( $post->ID, null, true ) . "'>" . __( 'Delete Permanently' ) . '</a>';
     444            echo "<a class='submitdelete deletion'$delete_ays href='" . get_delete_post_link( $post->ID, null, true ) . "'>" . __( 'Delete permanently' ) . '</a>';
    445445        }
    446446    }
     
    11161116<div id="taxonomy-linkcategory" class="categorydiv">
    11171117    <ul id="category-tabs" class="category-tabs">
    1118         <li class="tabs"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
     1118        <li class="tabs"><a href="#categories-all"><?php _e( 'All categories' ); ?></a></li>
    11191119        <li class="hide-if-no-js"><a href="#categories-pop"><?php _ex( 'Most Used', 'categories' ); ?></a></li>
    11201120    </ul>
  • trunk/src/wp-admin/users.php

    r48115 r48352  
    5454
    5555if ( is_multisite() ) {
    56     $help .= '<li>' . __( '<strong>Remove</strong> allows you to remove a user from your site. It does not delete their content. You can also remove multiple users at once by using Bulk Actions.' ) . '</li>';
     56    $help .= '<li>' . __( '<strong>Remove</strong> allows you to remove a user from your site. It does not delete their content. You can also remove multiple users at once by using bulk actions.' ) . '</li>';
    5757} else {
    58     $help .= '<li>' . __( '<strong>Delete</strong> brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their content. You can also delete multiple users at once by using Bulk Actions.' ) . '</li>';
     58    $help .= '<li>' . __( '<strong>Delete</strong> brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their content. You can also delete multiple users at once by using bulk actions.' ) . '</li>';
    5959}
    6060
  • trunk/src/wp-includes/media-template.php

    r48232 r48352  
    519519                    <?php if ( MEDIA_TRASH ) : ?>
    520520                        <# if ( 'trash' === data.status ) { #>
    521                             <button type="button" class="button-link untrash-attachment"><?php _e( 'Restore from Trash' ); ?></button>
     521                            <button type="button" class="button-link untrash-attachment"><?php _e( 'Restore from trash' ); ?></button>
    522522                        <# } else { #>
    523                             <button type="button" class="button-link trash-attachment"><?php _e( 'Move to Trash' ); ?></button>
     523                            <button type="button" class="button-link trash-attachment"><?php _e( 'Move to trash' ); ?></button>
    524524                        <# } #>
    525525                    <?php else : ?>
    526                         <button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' ); ?></button>
     526                        <button type="button" class="button-link delete-attachment"><?php _e( 'Delete permanently' ); ?></button>
    527527                    <?php endif; ?>
    528528                <# } #>
     
    640640                    <?php if ( MEDIA_TRASH ) : ?>
    641641                    <# if ( 'trash' === data.status ) { #>
    642                         <button type="button" class="button-link untrash-attachment"><?php _e( 'Restore from Trash' ); ?></button>
     642                        <button type="button" class="button-link untrash-attachment"><?php _e( 'Restore from trash' ); ?></button>
    643643                    <# } else { #>
    644                         <button type="button" class="button-link trash-attachment"><?php _e( 'Move to Trash' ); ?></button>
     644                        <button type="button" class="button-link trash-attachment"><?php _e( 'Move to trash' ); ?></button>
    645645                    <# } #>
    646646                    <?php else : ?>
    647                         <button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' ); ?></button>
     647                        <button type="button" class="button-link delete-attachment"><?php _e( 'Delete permanently' ); ?></button>
    648648                    <?php endif; ?>
    649649                <# } #>
  • trunk/src/wp-includes/media.php

    r48343 r48352  
    41574157        'mediaFrameDefaultTitle'      => __( 'Media' ),
    41584158        'url'                         => __( 'URL' ),
    4159         'addMedia'                    => __( 'Add Media' ),
     4159        'addMedia'                    => __( 'Add media' ),
    41604160        'search'                      => __( 'Search' ),
    41614161        'select'                      => __( 'Select' ),
     
    41744174
    41754175        // Upload.
    4176         'uploadFilesTitle'            => __( 'Upload Files' ),
    4177         'uploadImagesTitle'           => __( 'Upload Images' ),
     4176        'uploadFilesTitle'            => __( 'Upload files' ),
     4177        'uploadImagesTitle'           => __( 'Upload images' ),
    41784178
    41794179        // Library.
    41804180        'mediaLibraryTitle'           => __( 'Media Library' ),
    4181         'insertMediaTitle'            => __( 'Add Media' ),
     4181        'insertMediaTitle'            => __( 'Add media' ),
    41824182        'createNewGallery'            => __( 'Create a new gallery' ),
    41834183        'createNewPlaylist'           => __( 'Create a new playlist' ),
     
    41954195        'warnBulkDelete'              => __( "You are about to permanently delete these items from your site.\nThis action cannot be undone.\n 'Cancel' to stop, 'OK' to delete." ),
    41964196        'warnBulkTrash'               => __( "You are about to trash these items.\n  'Cancel' to stop, 'OK' to delete." ),
    4197         'bulkSelect'                  => __( 'Bulk Select' ),
    4198         'trashSelected'               => __( 'Move to Trash' ),
    4199         'restoreSelected'             => __( 'Restore from Trash' ),
    4200         'deletePermanently'           => __( 'Delete Permanently' ),
     4197        'bulkSelect'                  => __( 'Bulk select' ),
     4198        'trashSelected'               => __( 'Move to trash' ),
     4199        'restoreSelected'             => __( 'Restore from trash' ),
     4200        'deletePermanently'           => __( 'Delete permanently' ),
    42014201        'apply'                       => __( 'Apply' ),
    42024202        'filterByDate'                => __( 'Filter by date' ),
    42034203        'filterByType'                => __( 'Filter by type' ),
    42044204        'searchLabel'                 => __( 'Search' ),
    4205         'searchMediaLabel'            => __( 'Search Media' ),          // Backward compatibility pre-5.3.
     4205        'searchMediaLabel'            => __( 'Search media' ),          // Backward compatibility pre-5.3.
    42064206        'searchMediaPlaceholder'      => __( 'Search media items...' ), // Placeholder (no ellipsis), backward compatibility pre-5.3.
    42074207        'mediaFound'                  => __( 'Number of media items found: %d' ),
     
    42114211
    42124212        // Library Details.
    4213         'attachmentDetails'           => __( 'Attachment Details' ),
     4213        'attachmentDetails'           => __( 'Attachment details' ),
    42144214
    42154215        // From URL.
     
    42214221
    42224222        // Gallery.
    4223         'createGalleryTitle'          => __( 'Create Gallery' ),
    4224         'editGalleryTitle'            => __( 'Edit Gallery' ),
    4225         'cancelGalleryTitle'          => __( '&#8592; Cancel Gallery' ),
     4223        'createGalleryTitle'          => __( 'Create gallery' ),
     4224        'editGalleryTitle'            => __( 'Edit gallery' ),
     4225        'cancelGalleryTitle'          => __( '&#8592; Cancel gallery' ),
    42264226        'insertGallery'               => __( 'Insert gallery' ),
    42274227        'updateGallery'               => __( 'Update gallery' ),
    42284228        'addToGallery'                => __( 'Add to gallery' ),
    4229         'addToGalleryTitle'           => __( 'Add to Gallery' ),
     4229        'addToGalleryTitle'           => __( 'Add to gallery' ),
    42304230        'reverseOrder'                => __( 'Reverse order' ),
    42314231
    42324232        // Edit Image.
    4233         'imageDetailsTitle'           => __( 'Image Details' ),
    4234         'imageReplaceTitle'           => __( 'Replace Image' ),
    4235         'imageDetailsCancel'          => __( 'Cancel Edit' ),
    4236         'editImage'                   => __( 'Edit Image' ),
     4233        'imageDetailsTitle'           => __( 'Image details' ),
     4234        'imageReplaceTitle'           => __( 'Replace image' ),
     4235        'imageDetailsCancel'          => __( 'Cancel edit' ),
     4236        'editImage'                   => __( 'Edit image' ),
    42374237
    42384238        // Crop Image.
    4239         'chooseImage'                 => __( 'Choose Image' ),
    4240         'selectAndCrop'               => __( 'Select and Crop' ),
    4241         'skipCropping'                => __( 'Skip Cropping' ),
    4242         'cropImage'                   => __( 'Crop Image' ),
     4239        'chooseImage'                 => __( 'Choose image' ),
     4240        'selectAndCrop'               => __( 'Select and crop' ),
     4241        'skipCropping'                => __( 'Skip cropping' ),
     4242        'cropImage'                   => __( 'Crop image' ),
    42434243        'cropYourImage'               => __( 'Crop your image' ),
    42444244        'cropping'                    => __( 'Cropping&hellip;' ),
     
    42484248
    42494249        // Edit Audio.
    4250         'audioDetailsTitle'           => __( 'Audio Details' ),
    4251         'audioReplaceTitle'           => __( 'Replace Audio' ),
    4252         'audioAddSourceTitle'         => __( 'Add Audio Source' ),
    4253         'audioDetailsCancel'          => __( 'Cancel Edit' ),
     4250        'audioDetailsTitle'           => __( 'Audio details' ),
     4251        'audioReplaceTitle'           => __( 'Replace audio' ),
     4252        'audioAddSourceTitle'         => __( 'Add audio source' ),
     4253        'audioDetailsCancel'          => __( 'Cancel edit' ),
    42544254
    42554255        // Edit Video.
    4256         'videoDetailsTitle'           => __( 'Video Details' ),
    4257         'videoReplaceTitle'           => __( 'Replace Video' ),
    4258         'videoAddSourceTitle'         => __( 'Add Video Source' ),
    4259         'videoDetailsCancel'          => __( 'Cancel Edit' ),
    4260         'videoSelectPosterImageTitle' => __( 'Select Poster Image' ),
    4261         'videoAddTrackTitle'          => __( 'Add Subtitles' ),
     4256        'videoDetailsTitle'           => __( 'Video details' ),
     4257        'videoReplaceTitle'           => __( 'Replace video' ),
     4258        'videoAddSourceTitle'         => __( 'Add video source' ),
     4259        'videoDetailsCancel'          => __( 'Cancel edit' ),
     4260        'videoSelectPosterImageTitle' => __( 'Select poster image' ),
     4261        'videoAddTrackTitle'          => __( 'Add subtitles' ),
    42624262
    42634263        // Playlist.
    42644264        'playlistDragInfo'            => __( 'Drag and drop to reorder tracks.' ),
    4265         'createPlaylistTitle'         => __( 'Create Audio Playlist' ),
    4266         'editPlaylistTitle'           => __( 'Edit Audio Playlist' ),
    4267         'cancelPlaylistTitle'         => __( '&#8592; Cancel Audio Playlist' ),
     4265        'createPlaylistTitle'         => __( 'Create audio playlist' ),
     4266        'editPlaylistTitle'           => __( 'Edit audio playlist' ),
     4267        'cancelPlaylistTitle'         => __( '&#8592; Cancel audio playlist' ),
    42684268        'insertPlaylist'              => __( 'Insert audio playlist' ),
    42694269        'updatePlaylist'              => __( 'Update audio playlist' ),
     
    42734273        // Video Playlist.
    42744274        'videoPlaylistDragInfo'       => __( 'Drag and drop to reorder videos.' ),
    4275         'createVideoPlaylistTitle'    => __( 'Create Video Playlist' ),
    4276         'editVideoPlaylistTitle'      => __( 'Edit Video Playlist' ),
    4277         'cancelVideoPlaylistTitle'    => __( '&#8592; Cancel Video Playlist' ),
     4275        'createVideoPlaylistTitle'    => __( 'Create video playlist' ),
     4276        'editVideoPlaylistTitle'      => __( 'Edit video playlist' ),
     4277        'cancelVideoPlaylistTitle'    => __( '&#8592; Cancel video playlist' ),
    42784278        'insertVideoPlaylist'         => __( 'Insert video playlist' ),
    42794279        'updateVideoPlaylist'         => __( 'Update video playlist' ),
    42804280        'addToVideoPlaylist'          => __( 'Add to video playlist' ),
    4281         'addToVideoPlaylistTitle'     => __( 'Add to Video Playlist' ),
     4281        'addToVideoPlaylistTitle'     => __( 'Add to video Playlist' ),
    42824282
    42834283        // Headings.
    4284         'filterAttachments'           => __( 'Filter Media' ),
     4284        'filterAttachments'           => __( 'Filter media' ),
    42854285        'attachmentsList'             => __( 'Media list' ),
    42864286    );
Note: See TracChangeset for help on using the changeset viewer.