From 1ad5acb6a1b9859b484be8ba7170c174f654c6c6 Mon Sep 17 00:00:00 2001
From: "Dominik Schilling (ocean90)" <ocean90@git.wordpress.org>
Date: Wed, 8 Apr 2015 16:58:13 +0000
Subject: [PATCH] Merge strings that describe the same command.

props iseulde.
fixes #31776.

git-svn-id: https://develop.svn.wordpress.org/trunk@32078 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/js/tinymce/plugins/wplink/plugin.js | 2 +-
 src/wp-includes/js/tinymce/wp-mce-help.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-includes/js/tinymce/plugins/wplink/plugin.js b/src/wp-includes/js/tinymce/plugins/wplink/plugin.js
index 48628005c8..f4b2747ac5 100644
--- a/src/wp-includes/js/tinymce/plugins/wplink/plugin.js
+++ b/src/wp-includes/js/tinymce/plugins/wplink/plugin.js
@@ -24,7 +24,7 @@ tinymce.PluginManager.add( 'wplink', function( editor ) {
 
 	editor.addMenuItem( 'link', {
 		icon: 'link',
-		text: 'Insert link',
+		text: 'Insert/edit link',
 		cmd: 'WP_Link',
 		stateSelector: 'a[href]',
 		context: 'insert',
diff --git a/src/wp-includes/js/tinymce/wp-mce-help.php b/src/wp-includes/js/tinymce/wp-mce-help.php
index 9f7e8d3fab..53d649e281 100644
--- a/src/wp-includes/js/tinymce/wp-mce-help.php
+++ b/src/wp-includes/js/tinymce/wp-mce-help.php
@@ -117,7 +117,7 @@ header('Content-Type: text/html; charset=' . get_bloginfo('charset'));
 		<tr><th>n</th><td><?php _e('Check Spelling'); ?></td><th>l</th><td><?php _e('Align Left'); ?></td></tr>
 		<tr><th>j</th><td><?php _e('Justify Text'); ?></td><th>c</th><td><?php _e('Align Center'); ?></td></tr>
 		<tr><th>d</th><td><span style="text-decoration: line-through;"><?php _e('Strikethrough'); ?></span></td><th>r</th><td><?php _e('Align Right'); ?></td></tr>
-		<tr><th>u</th><td><strong>&bull;</strong> <?php _e('List'); ?></td><th>a</th><td><?php _e('Insert link'); ?></td></tr>
+		<tr><th>u</th><td><strong>&bull;</strong> <?php _e('List'); ?></td><th>a</th><td><?php _e('Insert/edit link'); ?></td></tr>
 		<tr><th>o</th><td>1. <?php _e('List'); ?></td><th>s</th><td><?php _e('Remove link'); ?></td></tr>
 		<tr><th>q</th><td><?php _e('Quote'); ?></td><th>m</th><td><?php _e('Insert Image'); ?></td></tr>
 		<tr><th>w</th><td><?php _e('Distraction-free writing mode'); ?></td><th>t</th><td><?php _e('Insert More Tag'); ?></td></tr>