diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js
index bd46424df..d7c4727cc 100644
--- a/modules/admin/tpl/js/admin.js
+++ b/modules/admin/tpl/js/admin.js
@@ -160,6 +160,7 @@ $.fn.xeModalWindow = function(){
 			var $this = $(this), $modal, $btnClose, disabled, before_event, duration;
 			
 			$modal = $( $this.attr('href') );
+			alert($this.attr('href'));
 			if(!$modal.parent('body').length) {
 				$btnClose = $('<button type="button" class="x_close">&times;</button>');
 				$btnClose.click(function(){ $modal.data('anchor').trigger('close.mw') });
@@ -966,14 +967,14 @@ $('.filebox')
 				}else{
 					var $displayInput = $('<input type="text" id="lang_' + id + '" class="displayInput" style="width:179px">').data('lang-id', id);
 				}
-				var $remover = $('<button type="button" class="x_add-on remover" title="Remove Multilingual Text"><i class="x_icon-remove"></i> Remove Multilingual Text</button>').data('lang-target', id);
-				var $setter = $('<a href="#g11n" class="x_add-on modalAnchor" title="Set Multilungual Text"><i class="x_icon-globe"></i> Set Multilingual Text</a>').data('lang-target', id);
+				var $remover = $('<button type="button" class="x_add-on remover" title="' + xe.cmd_remove_multilingual_text + '"><i class="x_icon-remove"></i>' + xe.cmd_remove_multilingual_text + '</button>').data('lang-target', id);
+				var $setter = $('<a href="#g11n" class="x_add-on modalAnchor" title="' + xe.cmd_set_multilingual_text + '"><i class="x_icon-globe"></i>' + xe.cmd_set_multilingual_text + '</a>').data('lang-target', id);
 
 				$this.parent().addClass('g11n').addClass('x_input-append');
 				$this.after($displayInput, $remover, $setter);
 				$this.parent().find('.vLang').remove();
 				$this.hide();
-				$setter.xeModalWindow();
+				$setter.attr('href', '#g11n').xeModalWindow();
 
 				// text change
 				var $hiddenInput = $this;
diff --git a/modules/module/lang/lang.xml b/modules/module/lang/lang.xml
index e08b52981..a8f66d1dd 100644
--- a/modules/module/lang/lang.xml
+++ b/modules/module/lang/lang.xml
@@ -1083,4 +1083,12 @@ Le module [Administration des Modules] montera tous les modules installés et vo
 		<value xml:lang="ko"><![CDATA[다국어를 입력해 주세요.]]></value>
 		<value xml:lang="en"><![CDATA[Please enter value for multilingual.]]></value>
 	</item>
+	<item name="cmd_set_multilingual_text">
+		<value xml:lang="ko"><![CDATA[다국어 텍스트 설정]]></value>
+		<value xml:lang="en"><![CDATA[Set multilingual text]]></value>
+	</item>
+	<item name="cmd_remove_multilingual_text">
+		<value xml:lang="ko"><![CDATA[다국어 텍스트 해제]]></value>
+		<value xml:lang="en"><![CDATA[Remove multilingual text]]></value>
+	</item>
 </lang>
diff --git a/modules/module/tpl/multilingual_v17.html b/modules/module/tpl/multilingual_v17.html
index 8e4e7d96d..5d70bb68b 100644
--- a/modules/module/tpl/multilingual_v17.html
+++ b/modules/module/tpl/multilingual_v17.html
@@ -21,7 +21,7 @@
 						<div class="x_clearfix">
 							<button type="reset" class="x_btn cancel">{$lang->cmd_cancel}</button>
 							<span class="x_pull-right">
-								<button type="submit" class="x_btn x_btn-primary save-useit">{$lang->cmd_save_and_use_it}</button>
+								<button type="submit" class="x_btn x_btn-primary save-useit">{$lang->use_after_save}</button>
 							<span>
 						</div>
 					</fieldset>
@@ -45,4 +45,6 @@
 <script>
 	xe.msg_confirm_save_and_use_multilingual = '{$lang->msg_confirm_save_and_use_multilingual}';
 	xe.msg_empty_multilingual = '{$lang->msg_empty_multilingual}';
+	xe.cmd_set_multilingual_text = '{$lang->cmd_set_multilingual_text}';
+	xe.cmd_remove_multilingual_text = '{$lang->cmd_remove_multilingual_text}';
 </script>
diff --git a/modules/module/tpl/multilingual_v17_list.html b/modules/module/tpl/multilingual_v17_list.html
index 64db4de96..7a3e6170b 100644
--- a/modules/module/tpl/multilingual_v17_list.html
+++ b/modules/module/tpl/multilingual_v17_list.html
@@ -17,7 +17,7 @@
 				</span>
 				<span class="x_pull-right">
 					<button type="button" class="x_btn useit x_btn-primary">{$lang->use}</button>
-					<button type="submit" class="x_btn save x_btn-primary">{$lang->cmd_save_and_use_it}</button>
+					<button type="submit" class="x_btn save x_btn-primary">{$lang->use_after_save}</button>
 				</span>
 			</div>
 		</fieldset>
diff --git a/modules/widget/tpl/widget_generate_code.include.html b/modules/widget/tpl/widget_generate_code.include.html
index 2c0976821..10f79e88a 100644
--- a/modules/widget/tpl/widget_generate_code.include.html
+++ b/modules/widget/tpl/widget_generate_code.include.html
@@ -44,16 +44,10 @@
 		<div class="x_controls">
 			<div cond="$var->type == 'text'">
 				<input type="text" name="{$id}" class="lang_code" />
-				<script>
-					xe.registerApp(new xe.MultiLangManager('{$id}'));
-				</script>
 			</div>
 			<input cond="$var->type == 'color'" type="text" name="{$id}" value="" id="{$id}" class="color-indicator" style="width:178px" />
 			<div cond="$var->type == 'textarea'">
 				<textarea cond="$var->type == 'textarea'" name="{$id}" id="{$id}" class="lang_code" rows="8" cols="42"></textarea>
-				<script>
-					xe.registerApp(new xe.MultiLangManager('{$id}'));
-				</script>
 			</div>
 			<select cond="$var->type == 'select'" name="{$id}" id="{$id}" style="width:220px">
 				<option loop="$var->options => $key, $val" value="{$key}">{$val}</option>