Merge branch 't/11068' into major

ckeditor · Nov 4, 2013 · 812c3c4 · 812c3c4
2 parents 7b210e8 + abccedf
commit 812c3c4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/plugins/image2/dialogs/image2.js b/plugins/image2/dialogs/image2.js
@@ -360,7 +360,7 @@ CKEDITOR.dialog.add( 'image2', function( editor ) {
 		contents: [
 			{
 				id: 'info',
-				label: editor.lang.image2.infoTab,
+				label: lang.infoTab,
 				elements: [
 					{
 						type: 'vbox',
@@ -506,20 +506,20 @@ CKEDITOR.dialog.add( 'image2', function( editor ) {
 				id: 'Upload',
 				hidden: true,
 				filebrowser: 'uploadButton',
-				label: editor.lang.image2.uploadTab,
+				label: lang.uploadTab,
 				elements: [
 					{
 						type: 'file',
 						id: 'upload',
-						label: editor.lang.image2.btnUpload,
+						label: lang.btnUpload,
 						style: 'height:40px',
 						size: 38
 					},
 					{
 						type: 'fileButton',
 						id: 'uploadButton',
 						filebrowser: 'info:src',
-						label: editor.lang.image2.btnUpload,
+						label: lang.btnUpload,
 						'for': [ 'Upload', 'upload' ]
 					}
 				]

diff --git a/plugins/image2/lang/en.js b/plugins/image2/lang/en.js
@@ -3,15 +3,15 @@ Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.plugins.setLang( 'image2', 'en', {
-	alt: 'Alternative Text',						// Inherit from image plugin.
-	btnUpload: 'Send it to the Server',				// Inherit from image plugin.
-	captioned: 'Captioned image', 					// NEW property.
-	infoTab: 'Image Info',							// Inherit from image plugin.
-	lockRatio: 'Lock Ratio',						// Inherit from image plugin.
-	menu: 'Image Properties',						// Inherit from image plugin.
-	resetSize: 'Reset Size', 						// Inherit from image plugin.
-	resizer: 'Click and drag to resize',			// NEW property.
-	title: 'Image Properties',						// Inherit from image plugin.
-	uploadTab: 'Upload',							// NEW property (but same as lang.image.upload).
-	urlMissing: 'Image source URL is missing.' 		// Inherit from image plugin.
+	alt: 'Alternative Text',
+	btnUpload: 'Send it to the Server',
+	captioned: 'Captioned image',
+	infoTab: 'Image Info',
+	lockRatio: 'Lock Ratio',
+	menu: 'Image Properties',
+	resetSize: 'Reset Size',
+	resizer: 'Click and drag to resize',
+	title: 'Image Properties',
+	uploadTab: 'Upload',
+	urlMissing: 'Image source URL is missing.'
 } );