Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-29 07:37:44 +02:00
Code Issues Projects Releases Wiki Activity

TinyMCE, shortcuts help popup: do not use translatable strings for the keys.

Browse Source 
See #31441.
Built from https://develop.svn.wordpress.org/trunk@33170


git-svn-id: http://core.svn.wordpress.org/trunk@33142 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-07-11 22:37:24 +00:00
parent 5a59c292e3
commit 0241081bae
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/js/tinymce/plugins/wordpress/plugin.js
View File

@ -270,8 +270,8 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
html = html + html = html +
'<p>' + __( 'When starting a new paragraph with one of these patterns followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ) + '</p>' + '<p>' + __( 'When starting a new paragraph with one of these patterns followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ) + '</p>' +
'<table>' + '<table>' +
tr({ '* or -': 'Bullet list' }) + tr({ '*</kbd>&nbsp;<kbd>-': 'Bullet list' }) +
tr({ '1. or 1)': 'Numbered list' }) + tr({ '1.</kbd>&nbsp;<kbd>1)': 'Numbered list' }) +
tr({ '>': 'Blockquote' }) + tr({ '>': 'Blockquote' }) +
tr({ '##': 'Heading 2' }) + tr({ '##': 'Heading 2' }) +
tr({ '###': 'Heading 3' }) + tr({ '###': 'Heading 3' }) +

2
wp-includes/js/tinymce/plugins/wordpress/plugin.min.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-beta2-33169'; $wp_version = '4.3-beta2-33170';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.