Merge branch 't/16954' into major

ckeditor · Apr 6, 2017 · 2e060a0 · 2e060a0
2 parents 3ee6035 + 6970e6a
commit 2e060a0
Show file tree

Hide file tree

Showing 25 changed files with 794 additions and 852 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -38,6 +38,10 @@ Fixed Issues:
 * [#16845](https://dev.ckeditor.com/ticket/16845): [IE] Fixed: Cursor jumps to the top of the scrolled editor after focusing it when [Copy Formatting](http://ckeditor.com/addon/copyformatting) plugin is enabled.
 * [#16927](https://dev.ckeditor.com/ticket/16927): Fixed: CKEditor throws an error if a bundle containing [Color Button](http://ckeditor.com/addon/colorbutton) plugin is run in ES5 strict mode. Thanks to [Igor Rubinovich](https://github.com/IgorRubinovich)!
 
+Other Changes:
+
+* [#16954](http://dev.ckeditor.com/ticket/16954): Remove paste dialog.
+
 ## CKEditor 4.6.2
 
 New Features:

diff --git a/dev/langtool/meta/ckeditor.plugin-clipboard/meta.txt b/dev/langtool/meta/ckeditor.plugin-clipboard/meta.txt
@@ -2,11 +2,8 @@
 # For licensing, see LICENSE.md or http://ckeditor.com/license
 
 copy = Toolbar button tooltip for the Copy feature.
-copyError = Error message displayed when the browser security settings are blocking the copying operation.
+copyError = A notification message shown when browser is blocking copying, and user should use the keyboard instead. %1 sequence is replaced with a keystroke that, when pressed, will perform the action.
 cut = Toolbar button tooltip for the Cut feature.
-cutError = Error message displayed when the browser security settings are blocking the cutting operation.
+cutError = A notification message shown when browser is blocking cutting, and user should use the keyboard instead. %1 sequence is replaced with a keystroke that, when pressed, will perform the action.
 paste = Toolbar button tooltip for the Paste feature.
-pasteArea = WAI-ARIA label for the paste area.
-pasteMsg = A help message urging the user to paste the text into the dialog window by using the keyboard.
-securityMsg = Error message displayed when the browser security settings are blocking the pasting operation.
-title = Label for the Paste dialog window.
+pasteMsg = A notification message shown when browser is blocking pasting, and user should use the keyboard instead. %1 sequence is replaced with a keystroke that, when pressed, will perform the action.
diff --git a/dev/langtool/meta/ckeditor.plugin-pastetext/meta.txt b/dev/langtool/meta/ckeditor.plugin-pastetext/meta.txt
@@ -2,4 +2,4 @@
 # For licensing, see LICENSE.md or http://ckeditor.com/license
 
 button = Toolbar button tooltip for the Paste as Plain Text feature.
-title = Label for the Paste as Plain Text dialog window.
+pasteMsg = A notification message shown when browser is blocking pasting, and user should use the keyboard instead. %1 sequence is replaced with a keystroke that, when pressed, will perform the action.
diff --git a/plugins/clipboard/dialogs/paste.js b/plugins/clipboard/dialogs/paste.js
diff --git a/plugins/clipboard/lang/en.js b/plugins/clipboard/lang/en.js
@@ -8,8 +8,5 @@ CKEDITOR.plugins.setLang( 'clipboard', 'en', {
 	cut: 'Cut',
 	cutError: 'Your browser security settings don\'t permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).',
 	paste: 'Paste',
-	pasteArea: 'Paste Area',
-	pasteMsg: 'Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK',
-	securityMsg: 'Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.',
-	title: 'Paste'
+	pasteMsg: 'Your browser doesn\'t allow you to paste this way. Press %1 to paste.'
 } );