Index: /CKEditor/branches/prototype/_source/lang/en.js
===================================================================
--- /CKEditor/branches/prototype/_source/lang/en.js	(revision 2854)
+++ /CKEditor/branches/prototype/_source/lang/en.js	(revision 2855)
@@ -165,4 +165,5 @@
 	anchor :
 	{
+		toolbar		: 'Anchor',
 		title		: 'Anchor Properties',
 		name		: 'Anchor Name',
@@ -238,5 +239,12 @@
 		title		: 'Form Properties',
 		action		: 'Action',
-		method		: 'Method'
+		method		: 'Method',
+		encoding	: 'Encoding',
+		target		: 'Target',
+		targetNotSet	: '<not set>',
+		targetNew	: 'New Window (_blank)',
+		targetTop	: 'Topmost Window (_top)',
+		targetSelf	: 'Same Window (_self)',
+		targetParent	: 'Parent Window (_parent)',
 	},
 
Index: /CKEditor/branches/prototype/_source/plugins/forms/dialogs/form.js
===================================================================
--- /CKEditor/branches/prototype/_source/plugins/forms/dialogs/form.js	(revision 2854)
+++ /CKEditor/branches/prototype/_source/plugins/forms/dialogs/form.js	(revision 2855)
@@ -42,4 +42,7 @@
 		readAttribute.apply( this, [ 'info', 'action', 'txtAction' ] );
 		readAttribute.apply( this, [ 'info', 'method', 'cmbMethod' ] );
+		readAttribute.apply( this, [ 'info', 'encoding', 'cmbEncoding' ] );
+		readAttribute.apply( this, [ 'info', 'target', 'cmbTarget' ] );
+		readAttribute.apply( this, [ 'info', 'id', 'txtId' ] );
 
 		return false;
@@ -58,5 +61,5 @@
 		resizable : CKEDITOR.DIALOG_RESIZE_NONE,
 		minWidth : 400,
-		minHeight : 230,
+		minHeight : 270,
 		onOk : function( data )
 		{
@@ -136,19 +139,85 @@
 					},
 					{
-						id : 'cmbMethod',
-						type : 'select',
-						label : editor.lang.form.method,
-						'default' : 'GET',
-						accessKey : 'M',
-						items :
+						type : 'hbox',
+						widths : [ '45%', '55%' ],
+						children :
 						[
-							[ 'GET', 'get' ],
-							[ 'POST', 'post' ]
-						],
-						validate: function()
-						{
-							addChange( 'method', this );
-							return true;
-						}
+							{
+								id : 'txtId',
+								type : 'text',
+								label : editor.lang.common.id,
+								'default' : '',
+								accessKey : 'I',
+								validate: function()
+								{
+									addChange( 'id', this );
+									return true;
+								}
+							},
+							{
+								id : 'cmbEncoding',
+								type : 'select',
+								label : editor.lang.form.encoding,
+								style : 'width:100%',
+								accessKey : 'E',
+								'default' : 'text/plain',
+								items :
+								[
+									[ 'text/plain' ],
+									[ 'multipart/form-data' ],
+									[ 'application/x-www-form-urlencoded' ]
+								],
+								validate: function()
+								{
+									addChange( 'encoding', this );
+									return true;
+								}
+							}
+						]
+					},
+					{
+						type : 'hbox',
+						widths : [ '45%', '55%' ],
+						children :
+						[
+							{
+								id : 'cmbTarget',
+								type : 'select',
+								label : editor.lang.form.target,
+								style : 'width:100%',
+								accessKey : 'M',
+								'default' : '',
+								items :
+								[
+									[ editor.lang.form.targetNotSet, '' ],
+									[ editor.lang.form.targetNew, '_blank' ],
+									[ editor.lang.form.targetTop, '_top' ],
+									[ editor.lang.form.targetSelf, '_self' ],
+									[ editor.lang.form.targetParent, '_parent' ]
+								],
+								validate: function()
+								{
+									addChange( 'target', this );
+									return true;
+								}
+							},
+							{
+								id : 'cmbMethod',
+								type : 'select',
+								label : editor.lang.form.method,
+								accessKey : 'M',
+								'default' : 'GET',
+								items :
+								[
+									[ 'GET', 'get' ],
+									[ 'POST', 'post' ]
+								],
+								validate: function()
+								{
+									addChange( 'method', this );
+									return true;
+								}
+							}
+						]
 					}
 				]