diff --git a/.gitignore b/.gitignore
index 1ab6c7b20..f6d44c481 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,5 @@ composer.phar
 *.sublime-workspace
 *.sublime-project
 .codeintel
+error_log
 
diff --git a/addons/captcha/captcha.addon.php b/addons/captcha/captcha.addon.php
index 128aa917d..9c12f9b01 100644
--- a/addons/captcha/captcha.addon.php
+++ b/addons/captcha/captcha.addon.php
@@ -62,7 +62,7 @@ if(!class_exists('AddonCaptcha', false))
 					{
 						Context::loadLang(_XE_PATH_ . 'addons/captcha/lang');
 						$_SESSION['XE_VALIDATOR_ERROR'] = -1;
-						$_SESSION['XE_VALIDATOR_MESSAGE'] = Context::getLang('captcha_denied');
+						$_SESSION['XE_VALIDATOR_MESSAGE'] = lang('captcha_denied');
 						$_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] = 'error';
 						$_SESSION['XE_VALIDATOR_RETURN_URL'] = Context::get('error_return_url');
 						$ModuleHandler->_setInputValueToSession();
@@ -113,7 +113,7 @@ if(!class_exists('AddonCaptcha', false))
 			// Generate keywords
 			$this->createKeyword();
 
-			$target = Context::getLang('target_captcha');
+			$target = lang('target_captcha');
 			header("Content-Type: text/xml; charset=UTF-8");
 			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
 			header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
@@ -121,11 +121,11 @@ if(!class_exists('AddonCaptcha', false))
 			header("Cache-Control: post-check=0, pre-check=0", false);
 			header("Pragma: no-cache");
 			printf("<response>\r\n <error>0</error>\r\n <message>success</message>\r\n <about_captcha><![CDATA[%s]]></about_captcha>\r\n <captcha_reload><![CDATA[%s]]></captcha_reload>\r\n <captcha_play><![CDATA[%s]]></captcha_play>\r\n <cmd_input><![CDATA[%s]]></cmd_input>\r\n <cmd_cancel><![CDATA[%s]]></cmd_cancel>\r\n </response>"
-					, Context::getLang('about_captcha')
-					, Context::getLang('captcha_reload')
-					, Context::getLang('captcha_play')
-					, Context::getLang('cmd_input')
-					, Context::getLang('cmd_cancel')
+					, lang('about_captcha')
+					, lang('captcha_reload')
+					, lang('captcha_play')
+					, lang('cmd_input')
+					, lang('cmd_cancel')
 			);
 			Context::close();
 			exit();
diff --git a/addons/captcha_member/captcha_member.addon.php b/addons/captcha_member/captcha_member.addon.php
index 3d5471a13..feeded237 100644
--- a/addons/captcha_member/captcha_member.addon.php
+++ b/addons/captcha_member/captcha_member.addon.php
@@ -73,7 +73,7 @@ if(!class_exists('AddonMemberCaptcha', false))
 					{
 						Context::loadLang(_XE_PATH_ . 'addons/captcha_member/lang');
 						$_SESSION['XE_VALIDATOR_ERROR'] = -1;
-						$_SESSION['XE_VALIDATOR_MESSAGE'] = Context::getLang('captcha_denied');
+						$_SESSION['XE_VALIDATOR_MESSAGE'] = lang('captcha_denied');
 						$_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] = 'error';
 						$_SESSION['XE_VALIDATOR_RETURN_URL'] = Context::get('error_return_url');
 						$ModuleHandler->_setInputValueToSession();
@@ -124,7 +124,7 @@ if(!class_exists('AddonMemberCaptcha', false))
 			// Generate keywords
 			$this->createKeyword();
 
-			$target = Context::getLang('target_captcha');
+			$target = lang('target_captcha');
 			header("Content-Type: text/xml; charset=UTF-8");
 			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
 			header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
@@ -132,11 +132,11 @@ if(!class_exists('AddonMemberCaptcha', false))
 			header("Cache-Control: post-check=0, pre-check=0", false);
 			header("Pragma: no-cache");
 			printf("<response>\r\n <error>0</error>\r\n <message>success</message>\r\n <about_captcha><![CDATA[%s]]></about_captcha>\r\n <captcha_reload><![CDATA[%s]]></captcha_reload>\r\n <captcha_play><![CDATA[%s]]></captcha_play>\r\n <cmd_input><![CDATA[%s]]></cmd_input>\r\n <cmd_cancel><![CDATA[%s]]></cmd_cancel>\r\n </response>"
-					, Context::getLang('about_captcha')
-					, Context::getLang('captcha_reload')
-					, Context::getLang('captcha_play')
-					, Context::getLang('cmd_input')
-					, Context::getLang('cmd_cancel')
+					, lang('about_captcha')
+					, lang('captcha_reload')
+					, lang('captcha_play')
+					, lang('cmd_input')
+					, lang('cmd_cancel')
 			);
 			Context::close();
 			exit();
diff --git a/addons/mobile/classes/hdml.class.php b/addons/mobile/classes/hdml.class.php
index 7e67ce3f5..69205f741 100644
--- a/addons/mobile/classes/hdml.class.php
+++ b/addons/mobile/classes/hdml.class.php
@@ -55,7 +55,7 @@ class wap extends mobileXE {
 			foreach($this->getChilds() as $key => $val)
 			{
 				if(!$val['link']) continue;
-				printf('<ce task=go label="%s" dest="%s">%s%s',Context::getLang('cmd_select'), $val['href'], $val['text'], "\n");
+				printf('<ce task=go label="%s" dest="%s">%s%s',lang('cmd_select'), $val['href'], $val['text'], "\n");
 			}
 		}
 		else
diff --git a/addons/mobile/classes/mhtml.class.php b/addons/mobile/classes/mhtml.class.php
index 250878d11..34a9fe19b 100644
--- a/addons/mobile/classes/mhtml.class.php
+++ b/addons/mobile/classes/mhtml.class.php
@@ -71,11 +71,11 @@ class wap extends mobileXE
 		if(!parent::isLangChange())
 		{
 			$url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
-			printf('<a href="%s">%s</a><br>%s', $url, 'Language : '.Context::getLang('select_lang'), "\n");
+			printf('<a href="%s">%s</a><br>%s', $url, 'Language : '.lang('select_lang'), "\n");
 		}
 		else
 		{
-			printf('<a href="%s">%s</a><br>%s', Context::get('return_uri'), Context::getLang('lang_return'), "\n");
+			printf('<a href="%s">%s</a><br>%s', Context::get('return_uri'), lang('lang_return'), "\n");
 		}
 		if($this->upperUrl)
 		{
diff --git a/addons/mobile/classes/mobile.class.php b/addons/mobile/classes/mobile.class.php
index 53951e99e..946e5d7ea 100644
--- a/addons/mobile/classes/mobile.class.php
+++ b/addons/mobile/classes/mobile.class.php
@@ -168,12 +168,12 @@ class mobileXE
 			if($parent_srl && $listed_items[$parent_srl])
 			{
 				$parent_item = $listed_items[$parent_srl];
-				if($parent_item) $this->setUpperUrl(getUrl('','mid',$parent_item['mid']), Context::getLang('cmd_go_upper'));
+				if($parent_item) $this->setUpperUrl(getUrl('','mid',$parent_item['mid']), lang('cmd_go_upper'));
 			}
 		}
 		elseif (!$this->isNavigationMode())
 		{
-			$this->setUpperUrl(getUrl('','mid',$this->index_mid,'nm','1','cmid',0), Context::getLang('cmd_view_sitemap'));
+			$this->setUpperUrl(getUrl('','mid',$this->index_mid,'nm','1','cmid',0), lang('cmd_view_sitemap'));
 		}
 	}
 
@@ -247,14 +247,14 @@ class mobileXE
 			if($this->mobilePage>1)
 			{
 				$url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage-1);
-				$text = sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $this->mobilePage-1, $this->totalPage);
+				$text = sprintf('%s (%d/%d)', lang('cmd_prev'), $this->mobilePage-1, $this->totalPage);
 				$this->setPrevUrl($url, $text);
 			}
 
 			if($this->mobilePage<$this->totalPage)
 			{
 				$url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage+1);
-				$text = sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $this->mobilePage+1, $this->totalPage);
+				$text = sprintf('%s (%d/%d)', lang('cmd_next'), $this->mobilePage+1, $this->totalPage);
 				$this->setNextUrl($url, $text);
 			}
 		} 
@@ -353,14 +353,14 @@ class mobileXE
 		if($this->mobilePage>1)
 		{
 			$url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage-1);
-			$text = sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $this->mobilePage-1, $this->totalPage);
+			$text = sprintf('%s (%d/%d)', lang('cmd_prev'), $this->mobilePage-1, $this->totalPage);
 			$this->setPrevUrl($url, $text);
 		}
 
 		if($this->mobilePage<$this->totalPage)
 		{
 			$url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage+1);
-			$text = sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $this->mobilePage+1, $this->totalPage);
+			$text = sprintf('%s (%d/%d)', lang('cmd_next'), $this->mobilePage+1, $this->totalPage);
 			$this->setNextUrl($url, $text);
 		}
 
@@ -442,7 +442,7 @@ class mobileXE
 	function display()
 	{
 		// Home button assignments
-		$this->setHomeUrl(getUrl(), Context::getLang('cmd_go_home'));
+		$this->setHomeUrl(getUrl(), lang('cmd_go_home'));
 		// Specify the title
 		if(!$this->title) $this->setTitle(Context::getBrowserTitle());
 
@@ -520,7 +520,7 @@ class mobileXE
 			$cur_item = $this->listed_items[$this->cmid];
 			$upper_srl = $cur_item['parent_srl'];;
 			$list = $cur_item['list'];;
-			$this->setUpperUrl(getUrl('cmid',$upper_srl), Context::getLang('cmd_go_upper'));
+			$this->setUpperUrl(getUrl('cmid',$upper_srl), lang('cmd_go_upper'));
 			if(preg_match('/^([a-zA-Z0-9\_\-]+)$/', $cur_item['url']))
 			{
 				$obj = array();
@@ -575,7 +575,7 @@ class mobileXE
 		$lang_supported = Context::get('lang_supported');
 		$lang_type = Context::getLangType();
 		$obj = array();
-		$obj['link'] = $obj['text'] = Context::getLang('president_lang').' : '.$lang_supported[$lang_type];
+		$obj['link'] = $obj['text'] = lang('president_lang').' : '.$lang_supported[$lang_type];
 		$obj['href'] = getUrl('sel_lang',$lang_type);
 		$childs[] = $obj;
 
diff --git a/addons/mobile/classes/wml.class.php b/addons/mobile/classes/wml.class.php
index d46c976a7..644e5d4b9 100644
--- a/addons/mobile/classes/wml.class.php
+++ b/addons/mobile/classes/wml.class.php
@@ -87,11 +87,11 @@ class wap extends mobileXE
 		if(!parent::isLangChange())
 		{
 			$url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
-			printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', 'Language : '.Context::getLang('select_lang'), $url, "\n");
+			printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', 'Language : '.lang('select_lang'), $url, "\n");
 		}
 		else
 		{
-			printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', Context::getLang('lang_return'), Context::get('return_uri'), "\n");
+			printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', lang('lang_return'), Context::get('return_uri'), "\n");
 		}
 		if($this->homeUrl)
 		{
diff --git a/addons/point_level_icon/point_level_icon.lib.php b/addons/point_level_icon/point_level_icon.lib.php
index 2e6c6ff7c..97b40f98b 100644
--- a/addons/point_level_icon/point_level_icon.lib.php
+++ b/addons/point_level_icon/point_level_icon.lib.php
@@ -70,8 +70,8 @@ function pointLevelIconTrans($matches, $addon_info)
 			}
 		}
 
-		$title = sprintf('%s:%s%s%s, %s:%s/%s', Context::getLang('point'), $point, $config->point_name, $per ? ' (' . $per . ')' : '', Context::getLang('level'), $level, $config->max_level);
-		$alt = sprintf('[%s:%s]', Context::getLang('level'), $level);
+		$title = sprintf('%s:%s%s%s, %s:%s/%s', lang('point'), $point, $config->point_name, $per ? ' (' . $per . ')' : '', lang('level'), $level, $config->max_level);
+		$alt = sprintf('[%s:%s]', lang('level'), $level);
 
 		$GLOBALS['_pointLevelIcon'][$member_srl] = sprintf('<img src="%s" alt="%s" title="%s" class="xe_point_level_icon" style="vertical-align:middle;margin-right:3px;" />', $level_icon, $alt, $title);
 	}
diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php
index f48da0460..8ed67bf13 100644
--- a/classes/display/DisplayHandler.class.php
+++ b/classes/display/DisplayHandler.class.php
@@ -149,6 +149,27 @@ class DisplayHandler extends Handler
 		{
 			case 'panel':
 				$data = Rhymix\Framework\Debug::getDebugData();
+				$display_content = array_fill_keys(config('debug.display_content'), true);
+				if (count($display_content) && !isset($display_content['entries']))
+				{
+					$data->entries = null;
+				}
+				if (count($display_content) && !isset($display_content['queries']))
+				{
+					unset($data->queries);
+				}
+				if (count($display_content) && !isset($display_content['slow_queries']))
+				{
+					unset($data->slow_queries);
+				}
+				if (count($display_content) && !isset($display_content['slow_triggers']))
+				{
+					unset($data->slow_triggers);
+				}
+				if (count($display_content) && !isset($display_content['slow_widgets']))
+				{
+					unset($data->slow_widgets);
+				}
 				if ($data->entries)
 				{
 					foreach ($data->entries as &$entry)
@@ -206,8 +227,9 @@ class DisplayHandler extends Handler
 				}
 				ob_start();
 				$data = Rhymix\Framework\Debug::getDebugData();
+				$display_content = array_fill_keys(config('debug.display_content'), true);
 				include RX_BASEDIR . 'common/tpl/debug_comment.html';
-				$content = ob_get_clean();
+				$content = preg_replace('/\n{2,}/', "\n\n", trim(ob_get_clean())) . PHP_EOL;
 				if ($display_type === 'file')
 				{
 					$log_filename = config('debug.log_filename') ?: 'files/debug/YYYYMMDD.php';
@@ -226,7 +248,7 @@ class DisplayHandler extends Handler
 					{
 						$phpheader = '';
 					}
-					FileHandler::writeFile($log_filename, $phpheader . $content, 'a');
+					FileHandler::writeFile($log_filename, $phpheader . $content . PHP_EOL, 'a');
 					return '';
 				}
 				else
diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php
index 3960d4d94..ee70691f4 100644
--- a/classes/extravar/Extravar.class.php
+++ b/classes/extravar/Extravar.class.php
@@ -445,7 +445,7 @@ class ExtraItem
 
 				$buff[] = '<input type="hidden" name="' . $column_name . '" value="' . $value . '" />'; 
 				$buff[] =	'<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" />';
-				$buff[] =	'<input type="button" value="' . Context::getLang('cmd_delete') . '" class="btn" id="dateRemover_' . $column_name . '" />';
+				$buff[] =	'<input type="button" value="' . lang('cmd_delete') . '" class="btn" id="dateRemover_' . $column_name . '" />';
 				$buff[] =	'<script type="text/javascript">';
 				$buff[] = '//<![CDATA[';
 				$buff[] =	'(function($){';
diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 9feee0660..0dafb4390 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -86,7 +86,7 @@ class ModuleHandler extends Handler
 		if($isInvalid)
 		{
 			htmlHeader();
-			echo Context::getLang("msg_invalid_request");
+			echo lang("msg_invalid_request");
 			htmlFooter();
 			Context::close();
 			exit;
diff --git a/classes/object/Object.class.php b/classes/object/Object.class.php
index 8459f0df2..9fbb9c491 100644
--- a/classes/object/Object.class.php
+++ b/classes/object/Object.class.php
@@ -96,7 +96,7 @@ class Object
 	 */
 	function setMessage($message = 'success', $type = NULL)
 	{
-		if($str = Context::getLang($message))
+		if($str = lang($message))
 		{
 			$this->message = $str;
 		}
diff --git a/classes/validator/Validator.class.php b/classes/validator/Validator.class.php
index aa188bfe4..ea7ea10b6 100644
--- a/classes/validator/Validator.class.php
+++ b/classes/validator/Validator.class.php
@@ -467,7 +467,7 @@ class Validator
 		}
 		else
 		{
-			$lang_filter = Context::getLang('filter');
+			$lang_filter = lang('filter');
 			$msg = isset($lang_filter->{$msg}) ? $lang_filter->{$msg} : $lang_filter->invalid;
 		}
 
@@ -477,7 +477,7 @@ class Validator
 		}
 		else
 		{
-			$fieldName = Context::getLang($field);
+			$fieldName = lang($field);
 		}
 
 		$msg = sprintf($msg, $fieldName);
diff --git a/common/defaults/blacklist.php b/common/defaults/blacklist.php
index bcbe7904f..fed12c706 100644
--- a/common/defaults/blacklist.php
+++ b/common/defaults/blacklist.php
@@ -6,6 +6,9 @@
  * Copyright (c) Rhymix Developers and Contributors
  */
 return array(
+	'autolang' => true,
+	'errorlogger' => true,
+	'fix_mysql_utf8' => true,
 	'member_communication' => true,
 	'smartphone' => true,
 	'zipperupper' => true,
diff --git a/common/defaults/config.php b/common/defaults/config.php
index 71ee5ff4f..2262d7be6 100644
--- a/common/defaults/config.php
+++ b/common/defaults/config.php
@@ -87,13 +87,12 @@ return array(
 	),
 	'debug' => array(
 		'enabled' => true,
-		'log_errors' => true,
-		'log_queries' => false,
 		'log_slow_queries' => 0,
 		'log_slow_triggers' => 0,
 		'log_slow_widgets' => 0,
 		'log_filename' => null,
 		'display_type' => 'comment',
+		'display_content' => array(),
 		'display_to' => 'admin',
 		'allow' => array(),
 	),
diff --git a/common/framework/debug.php b/common/framework/debug.php
index ea1dec766..0d6ba956c 100644
--- a/common/framework/debug.php
+++ b/common/framework/debug.php
@@ -404,14 +404,14 @@ class Debug
 		}
 		
 		// Localize the error title.
-		$title = \Context::getLang('msg_server_error');
+		$title = lang('msg_server_error');
 		if ($title === 'msg_server_error')
 		{
 			$message = 'Server Error';
 		}
 		
 		// Localize the error message.
-		$message = ini_get('display_errors') ? $message : \Context::getLang('msg_server_error_see_log');
+		$message = ini_get('display_errors') ? $message : lang('msg_server_error_see_log');
 		if ($message === 'msg_server_error_see_log')
 		{
 			$message = 'Your server is configured to hide error messages. Please see your server\'s error log for details.';
@@ -496,8 +496,8 @@ class Debug
 				'trans' => sprintf('%0.4f sec', $GLOBALS['__trans_content_elapsed__']),
 			),
 			'entries' => self::$_entries,
-			'errors' => config('debug.log_errors') ? self::$_errors : null,
-			'queries' => config('debug.log_queries') ? self::$_queries : null,
+			'errors' => self::$_errors,
+			'queries' => self::$_queries,
 			'slow_queries' => self::$_slow_queries,
 			'slow_triggers' => self::$_slow_triggers,
 			'slow_widgets' => self::$_slow_widgets,
diff --git a/common/framework/lang.php b/common/framework/lang.php
index ffbaa86cb..d8c678cf0 100644
--- a/common/framework/lang.php
+++ b/common/framework/lang.php
@@ -50,6 +50,16 @@ class Lang
 		$this->_loaded_plugins['_custom_'] = new \stdClass();
 	}
 	
+	/**
+	 * Return language type.
+	 * 
+	 * @return string
+	 */
+	public function langType()
+	{
+		return $this->_language;
+	}
+	
 	/**
 	 * Load translations from a plugin (module, addon).
 	 * 
@@ -85,6 +95,7 @@ class Lang
 	 * Load translations from a directory.
 	 * 
 	 * @param string $dir
+	 * @param string $plugin_name
 	 * @return bool
 	 */
 	public function loadDirectory($dir, $plugin_name = null)
@@ -97,32 +108,17 @@ class Lang
 			return true;
 		}
 		
-		// Look for language files.
-		if (file_exists($dir . '/' . $this->_language . '.php'))
+		// Load the language file.
+		$lang = $this->getPluginLang($dir);
+		
+		// Load the default language file.
+		if ($this->_language !== 'en')
 		{
-			$filename = $dir . '/' . $this->_language . '.php';
-		}
-		elseif (($hyphen = strpos($this->_language, '-')) !== false)
-		{
-			if (file_exists($dir . '/' . substr($this->_language, 0, $hyphen) . '.php'))
-			{
-				$filename = $dir . '/' . substr($this->_language, 0, $hyphen) . '.php';
-			}
-		}
-		elseif (file_exists("$dir/lang.xml"))
-		{
-			$filename = Compat\LangParser::compileXMLtoPHP("$dir/lang.xml", $this->_language === 'ja' ? 'jp' : $this->_language);
-		}
-		elseif (file_exists($dir . '/' . ($this->_language === 'ja' ? 'jp' : $this->_language) . '.lang.php'))
-		{
-			$filename = $dir . '/' . ($this->_language === 'ja' ? 'jp' : $this->_language) . '.lang.php';
+			self::getInstance('en')->loadDirectory($dir, $plugin_name);
 		}
 		
-		// Load the language file.
-		if ($filename)
+		if (!empty($lang))
 		{
-			$lang = new \stdClass;
-			include $filename;
 			$this->_loaded_directories[$dir] = true;
 			$this->_loaded_plugins[$plugin_name] = $lang;
 			array_unshift($this->_search_priority, $plugin_name);
@@ -136,6 +132,48 @@ class Lang
 		}
 	}
 	
+	/**
+	 * Get the language file from plugin.
+	 * 
+	 * @param string $dir
+	 * @param string $language
+	 * @return object
+	 */
+	public function getPluginLang($dir, $language = null)
+	{
+		if (!$language)
+		{
+			$language = $this->_language;
+		}
+		
+		if (file_exists($dir . '/' . $language . '.php'))
+		{
+			$filename = $dir . '/' . $language . '.php';
+		}
+		elseif (($hyphen = strpos($language, '-')) !== false && file_exists($dir . '/' . substr($language, 0, $hyphen) . '.php'))
+		{
+			$filename = $dir . '/' . substr($language, 0, $hyphen) . '.php';
+		}
+		elseif (file_exists("$dir/lang.xml"))
+		{
+			$filename = Compat\LangParser::compileXMLtoPHP("$dir/lang.xml", $language === 'ja' ? 'jp' : $language);
+		}
+		elseif (file_exists($dir . '/' . ($language === 'ja' ? 'jp' : $language) . '.lang.php'))
+		{
+			$filename = $dir . '/' . ($language === 'ja' ? 'jp' : $language) . '.lang.php';
+		}
+		
+		if (!$filename)
+		{
+			return new \stdClass;
+		}
+		
+		$lang = new \stdClass;
+		include $filename;
+		
+		return $lang;
+	}
+	
 	/**
 	 * Get the list of supported languages.
 	 * 
@@ -159,6 +197,18 @@ class Lang
 		return $this->__call($key, $args);
 	}
 	
+	/**
+	 * Generic setter.
+	 * 
+	 * @param string $key
+	 * @param string $value
+	 * @return void
+	 */
+	public function set($key, $value)
+	{
+		$this->__set($key, $value);
+	}
+	
 	/**
 	 * Magic method for translations without arguments.
 	 * 
@@ -167,51 +217,80 @@ class Lang
 	 */
 	public function __get($key)
 	{
+		// Get default language
+		if ($this->_language !== 'en')
+		{
+			$lang_en = self::getInstance('en')->{$key};
+		}
+		
 		// Separate the plugin name from the key.
 		if (preg_match('/^[a-z0-9_.-]+$/i', $key) && ($keys = explode('.', $key, 2)) && count($keys) === 2)
 		{
-			list($plugin_name, $key) = $keys;
+			list($plugin_name, $lang_key) = $keys;
 			if (!isset($this->_loaded_plugins[$plugin_name]))
 			{
 				$this->loadPlugin($plugin_name);
 			}
-			if (isset($this->_loaded_plugins[$plugin_name]->{$key}))
+			
+			if (isset($this->_loaded_plugins[$plugin_name]->{$lang_key}))
 			{
-				return $this->_loaded_plugins[$plugin_name]->{$key};
-			}
-			else
-			{
-				return $key;
-			}
-		}
-		
-		// Search custom translations first.
-		if (isset($this->_loaded_plugins['_custom_']->{$key}))
-		{
-			if (is_array($this->_loaded_plugins['_custom_']->{$key}))
-			{
-				return new \ArrayObject($this->_loaded_plugins['_custom_']->{$key}, 3);
-			}
-			else
-			{
-				return $this->_loaded_plugins['_custom_']->{$key};
-			}
-		}
-		
-		// Search other plugins.
-		foreach ($this->_search_priority as $plugin_name)
-		{
-			if (isset($this->_loaded_plugins[$plugin_name]->{$key}))
-			{
-				if (is_array($this->_loaded_plugins[$plugin_name]->{$key}))
+				$lang = $this->_loaded_plugins[$plugin_name]->{$lang_key};
+				if (is_array($lang) && is_array($lang_en) && count($lang_en, COUNT_RECURSIVE) > count($lang, COUNT_RECURSIVE))
 				{
-					return new \ArrayObject($this->_loaded_plugins[$plugin_name]->{$key}, 3);
+					return $lang_en;
+				}
+				
+				return $lang;
+			}
+		}
+		else
+		{
+			// Search custom translations first.
+			if (isset($this->_loaded_plugins['_custom_']->{$key}))
+			{
+				$lang = $this->_loaded_plugins['_custom_']->{$key};
+				if (is_array($lang))
+				{
+					if (is_array($lang_en) && count($lang_en, COUNT_RECURSIVE) > count($lang, COUNT_RECURSIVE))
+					{
+						return new \ArrayObject($lang_en, 3);
+					}
+					
+					return new \ArrayObject($lang, 3);
 				}
 				else
 				{
-					return $this->_loaded_plugins[$plugin_name]->{$key};
+					return $lang;
 				}
 			}
+			
+			// Search other plugins.
+			foreach ($this->_search_priority as $plugin_name)
+			{
+				if (isset($this->_loaded_plugins[$plugin_name]->{$key}))
+				{
+					$lang = $this->_loaded_plugins[$plugin_name]->{$key};
+					if (is_array($lang))
+					{
+						if (is_array($lang_en) && count($lang_en, COUNT_RECURSIVE) > count($lang, COUNT_RECURSIVE))
+						{
+							return new \ArrayObject($lang_en, 3);
+						}
+						
+						return new \ArrayObject($lang, 3);
+					}
+					else
+					{
+						return $lang;
+					}
+				}
+			}
+		}
+		
+		// Search other language.
+		if (isset($lang_en))
+		{
+			return $lang_en;
 		}
 		
 		// If no translation is found, return the key.
diff --git a/common/functions.php b/common/functions.php
index a1bd7234a..388e8d78e 100644
--- a/common/functions.php
+++ b/common/functions.php
@@ -25,6 +25,35 @@ function config($key, $value = null)
 	}
 }
 
+/**
+ * Get or set lang variable.
+ *
+ * @param string $code Lang variable name
+ * @param string $value `$code`s value
+ * @return mixed
+ */
+function lang($code = null, $value = null)
+{
+	if (!$GLOBALS['lang'] instanceof Rhymix\Framework\Lang)
+	{
+		$GLOBALS['lang'] = Rhymix\Framework\Lang::getInstance(Context::getLangType() ?: config('locale.default_lang') ?: 'ko');
+		$GLOBALS['lang']->loadDirectory(RX_BASEDIR . 'common/lang', 'common');
+	}
+	
+	if ($code !== null && $value === null)
+	{
+		return $GLOBALS['lang']->get($code);
+	}
+	else if ($code !== null && $value !== null)
+	{
+		$GLOBALS['lang']->set($code, $value);
+	}
+	else
+	{
+		return $GLOBALS['lang']->langType();
+	}
+}
+
 /**
  * Get the first value of an array.
  * 
diff --git a/common/lang/de.php b/common/lang/de.php
index ad9200ee7..0288caff9 100644
--- a/common/lang/de.php
+++ b/common/lang/de.php
@@ -280,7 +280,6 @@ $lang->filter['invalid_korean_number'] = 'Das Format von% s ist ungültig. Bitte
 $lang->filter['invalid_alpha'] = 'Das Format von% s ist ungültig. Bitte nur Alphabete eingeben.';
 $lang->filter['invalid_alpha_number'] = 'Das Format von% s ist ungültig. Bitte nur Alphabete oder Zahlen eingeben.';
 $lang->filter['invalid_number'] = 'Das Format von% s ist ungültig. Bitte nur Zahlen eingeben.';
-$lang->security_invalid_session = '바르지 않은 접근입니다. 인증을 위해 다시 로그인해야 합니다.';
 $lang->security_warning_embed = 'Aus Sicherheitsgründen ist es nicht erlaubt, dass der Administrator den eingebetteten Teil sehen. Wenn Sie das sehen möchten, loggen Sie sich mit einem anderen ID ein.';
 $lang->msg_pc_to_mobile = 'Möchten Sie Mobile-Look?';
 $lang->cmd_yes = 'Ja';
diff --git a/common/lang/en.php b/common/lang/en.php
index 9e40662e0..7a5942434 100644
--- a/common/lang/en.php
+++ b/common/lang/en.php
@@ -298,7 +298,6 @@ $lang->filter['invalid_alpha_number'] = 'The format of %s is invalid. Please ent
 $lang->filter['invalid_mid'] = 'The format of %s is invalid. Module ID should be begun with a letter. Subsequent characters may be letters, digits or underscore characters.';
 $lang->filter['invalid_number'] = 'The format of %s is invalid. Please enter numbers only.';
 $lang->filter['invalid_extension'] = 'The format of %s is invalid. e.g.) *.* or *.jpg;*.gif;.';
-$lang->security_invalid_session = '바르지 않은 접근입니다. 인증을 위해 다시 로그인해야 합니다.';
 $lang->security_warning_embed = 'Due to security concern, administrators are not allowed to view embedded items.<BR /> To view them, please use another non-administrator ID.';
 $lang->msg_pc_to_mobile = 'View mobile optimized version of this page';
 $lang->cmd_yes = 'Yes';
diff --git a/common/lang/es.php b/common/lang/es.php
index def7d71cd..c7dfc634b 100644
--- a/common/lang/es.php
+++ b/common/lang/es.php
@@ -228,7 +228,3 @@ $lang->filter['invalid_korean_number'] = 'Sólo puede introducir los caracteres
 $lang->filter['invalid_alpha'] = 'Sólo puede introducir los alfabetos en el %s';
 $lang->filter['invalid_alpha_number'] = 'Sólo puede introducir los alfanuméricos en el %s es inválido';
 $lang->filter['invalid_number'] = 'Sólo puede introducir los dígitos numéricos en el %s';
-$lang->security_invalid_session = '바르지 않은 접근입니다. 인증을 위해 다시 로그인해야 합니다.';
-$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
-$lang->mobile_view = 'Use Mobile View';
-$lang->about_mobile_view = 'If accessing with a smartphone, display content with mobile layout.';
diff --git a/common/lang/fr.php b/common/lang/fr.php
index b39285ade..53b803ef2 100644
--- a/common/lang/fr.php
+++ b/common/lang/fr.php
@@ -224,7 +224,3 @@ $lang->filter['invalid_korean_number'] = 'La format de %s n\'est pas convenable.
 $lang->filter['invalid_alpha'] = 'La format de %s n\'est pas convenable. Entrez seulement en alphabet, S.V.P.';
 $lang->filter['invalid_alpha_number'] = 'La format de %s n\'est pas convenable. Entrez seulement des lettres d\'alphabet ou des chiffres.';
 $lang->filter['invalid_number'] = 'La format de %s n\'est pas convenable. Entrez seulement des chiffres.';
-$lang->security_invalid_session = '바르지 않은 접근입니다. 인증을 위해 다시 로그인해야 합니다.';
-$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
-$lang->mobile_view = 'Use Mobile View';
-$lang->about_mobile_view = 'If accessing with a smartphone, display content with mobile layout.';
diff --git a/common/lang/ja.php b/common/lang/ja.php
index 789706a53..949fda2f3 100644
--- a/common/lang/ja.php
+++ b/common/lang/ja.php
@@ -292,7 +292,6 @@ $lang->filter['invalid_alpha'] = '%sの形式が正しくありません。半
 $lang->filter['invalid_alpha_number'] = '%sの形式が正しくありません。半角英数字で入力してください。';
 $lang->filter['invalid_mid'] = '%sの形式が正しくありません。 最初の文字は英文から始め、「英文＋数字＋_」組合せで入力が必要です。';
 $lang->filter['invalid_number'] = '%sの形式が正しくありません。半角数字で入力してください。';
-$lang->security_invalid_session = '바르지 않은 접근입니다. 인증을 위해 다시 로그인해야 합니다.';
 $lang->security_warning_embed = 'セキュリティ問題のため、管理者IDではembedを見ることができません。<br />他のIDでログインしてください。';
 $lang->msg_pc_to_mobile = 'このページは、モバイル表示が可能です。モバイル表示へ移動しますか?';
 $lang->cmd_yes = 'はい';
diff --git a/common/lang/mn.php b/common/lang/mn.php
index 9cedc9242..937ddb473 100644
--- a/common/lang/mn.php
+++ b/common/lang/mn.php
@@ -245,5 +245,3 @@ $lang->filter['invalid_korean_number'] = '%s-ын хэлбэр буруу бай
 $lang->filter['invalid_alpha'] = '%s-ын хэлбэр буруу байна. Зөвхөн латин үсгээр оруулах ёстой';
 $lang->filter['invalid_alpha_number'] = '%s-ын хэлбэр буруу байна. Зөвхөн латин үсэг болон тоогоор л оруулах ёстой.';
 $lang->filter['invalid_number'] = '%s-ын хэлбэр буруу байна. Зөвхөн тоогоор оруулах ёстой.';
-$lang->security_invalid_session = '바르지 않은 접근입니다. 인증을 위해 다시 로그인해야 합니다.';
-$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
diff --git a/common/lang/ru.php b/common/lang/ru.php
index 37fa62c14..594fdd5ba 100644
--- a/common/lang/ru.php
+++ b/common/lang/ru.php
@@ -228,9 +228,3 @@ $lang->default_value = 'Стандартное значение';
 $lang->is_active = 'Активация';
 $lang->is_required = 'Обязательные данные';
 $lang->eid = 'Имя экстра переменных';
-$lang->filter['invalid_email'] = 'The format of %s is invalid.';
-$lang->filter['invalid_userid'] = 'The format of %s is invalid. All values should consist of alphabets, numbers or underscore(_) and the first letter should be alphabet';
-$lang->filter['invalid_user_id'] = 'The format of %s is invalid. All values should consist of alphabets, numbers or underscore(_) and the first letter should be alphabet';
-$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
-$lang->mobile_view = 'Use Mobile View';
-$lang->about_mobile_view = 'If accessing with a smartphone, display content with mobile layout.';
diff --git a/common/lang/tr.php b/common/lang/tr.php
index ca1223da7..5e98a373f 100644
--- a/common/lang/tr.php
+++ b/common/lang/tr.php
@@ -273,7 +273,6 @@ $lang->filter['invalid_alpha'] = '%s biçimi geçersiz. Lütfen sadece harfleri
 $lang->filter['invalid_alpha_number'] = ' %s biçimi geçersiz. Lütfen harfleri ve sayıları kullanınız.';
 $lang->filter['invalid_mid'] = '%s formatı geçersizdir. Modülün ID\'si harf ile başlaması gerekmektedir.';
 $lang->filter['invalid_number'] = '%s bicimi geçersizdir . Lütfen sadece numaraları kullanın.';
-$lang->security_invalid_session = '바르지 않은 접근입니다. 인증을 위해 다시 로그인해야 합니다.';
 $lang->security_warning_embed = 'Güvenlik nedeniyle, yöneticiler yerleşik öğeleri görüntülemeye yetkili değildirler.<BR /> Yerleşik öğeleri görüntüleyebilmek için, lütfen yönetici olmayan bir hesap kullanın.';
 $lang->msg_pc_to_mobile = 'Bu sayfanın mobil versiyonu bulunmaktadır. Mobil sayfaya geçiş yapmak istiyor musunuz?';
 $lang->cmd_yes = 'Evet';
diff --git a/common/lang/vi.php b/common/lang/vi.php
index ca6b82432..015d6b707 100644
--- a/common/lang/vi.php
+++ b/common/lang/vi.php
@@ -230,9 +230,7 @@ $lang->filter['invalid_korean_number'] = 'Định dạng của %s không hợp l
 $lang->filter['invalid_alpha'] = 'Định dạng của %s không hợp lệ. Chỉ sử dụng các kí tự từ a-z';
 $lang->filter['invalid_alpha_number'] = 'Định dạng của %s không hợp lệ. Chỉ sử dụng các kí tự từ a-z và các chữ số';
 $lang->filter['invalid_number'] = 'Định dạng của %s không hợp lệ. Chỉ sử dụng các chữ số';
-$lang->security_invalid_session = '바르지 않은 접근입니다. 인증을 위해 다시 로그인해야 합니다.';
 $lang->security_warning_embed = 'Vì vấn đề bảo mật, nên Administrator không được phép xem các mục đã nhúng mã.<BR /> Để xem được chúng, hãy sử dụng một tên truy cập khác không có quyền quản trị.';
-$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
 $lang->mobile_view = 'Xem bằng di động';
 $lang->about_mobile_view = 'Nếu truy cập bằng thiết bị di động, nội dung sẽ được bố trí theo từng loại thiết bị.';
 $lang->more = 'Xem thêm';
diff --git a/common/lang/zh-CN.php b/common/lang/zh-CN.php
index 7830681e2..a634fff47 100644
--- a/common/lang/zh-CN.php
+++ b/common/lang/zh-CN.php
@@ -276,9 +276,7 @@ $lang->filter['invalid_alpha'] = '%s只能输入英文字母';
 $lang->filter['invalid_alpha_number'] = '%s只能输入英文或数字';
 $lang->filter['invalid_mid'] = '%s 格式错误。 模块名称只能用英文、数字及下划线，开头必须是英文。';
 $lang->filter['invalid_number'] = '%s只能输入数字';
-$lang->security_invalid_session = '바르지 않은 접근입니다. 인증을 위해 다시 로그인해야 합니다.';
 $lang->security_warning_embed = '由于安全问题，不允许用系统管理员ID操作embed对象，请使用其他拥有管理权限的ID操作。';
-$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
 $lang->cmd_yes = '是';
 $lang->cmd_no = '否';
 $lang->cmd_set_multilingual = '选择语言';
diff --git a/common/lang/zh-TW.php b/common/lang/zh-TW.php
index cc14d4c13..18562b202 100644
--- a/common/lang/zh-TW.php
+++ b/common/lang/zh-TW.php
@@ -275,7 +275,6 @@ $lang->filter['invalid_alpha'] = '%s只能輸入英文字母';
 $lang->filter['invalid_alpha_number'] = '%s只能輸入英文或數字';
 $lang->filter['invalid_mid'] = '%s 格式錯誤。 模組名稱只能使用英文、數字及底線，開頭必須是英文。';
 $lang->filter['invalid_number'] = '%s只能輸入數字';
-$lang->security_invalid_session = '바르지 않은 접근입니다. 인증을 위해 다시 로그인해야 합니다.';
 $lang->security_warning_embed = '基於安全因素，管理員無法檢視嵌入的物件。<BR /> 請使用其他非管理員帳號檢視。';
 $lang->msg_pc_to_mobile = '此頁面有手機頁面，要移至手機頁面嗎？';
 $lang->cmd_yes = '是';
diff --git a/common/legacy.php b/common/legacy.php
index fec7ace2b..9f07cf373 100644
--- a/common/legacy.php
+++ b/common/legacy.php
@@ -594,8 +594,8 @@ function zdate($str, $format = 'Y-m-d H:i:s', $conversion = false)
 	// change day and am/pm for each language
 	if(preg_match('/[MFAa]/', $format))
 	{
-		$unit_week = (Array)Context::getLang('unit_week');
-		$unit_meridiem = (Array)Context::getLang('unit_meridiem');
+		$unit_week = (Array)lang('unit_week');
+		$unit_meridiem = (Array)lang('unit_meridiem');
 		$result = str_replace(array('Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'), $unit_week, $result);
 		$result = str_replace(array('am', 'pm', 'AM', 'PM'), $unit_meridiem, $result);
 	}
@@ -639,7 +639,7 @@ function getTimeGap($date, $format = 'Y.m.d')
 {
 	$gap = RX_TIME - ztime($date);
 
-	$lang_time_gap = Context::getLang('time_gap');
+	$lang_time_gap = lang('time_gap');
 	if($gap < 60 * 1.5)
 	{
 		$buff = sprintf($lang_time_gap['min'], round($gap / 60));
@@ -1157,7 +1157,7 @@ function stripEmbedTagForAdmin(&$content, $writer_member_srl)
 				return;
 			}
 		}
-		$security_msg = "<div style='border: 1px solid #DDD; background: #FAFAFA; text-align:center; margin: 1em 0;'><p style='margin: 1em;'>" . Context::getLang('security_warning_embed') . "</p></div>";
+		$security_msg = "<div style='border: 1px solid #DDD; background: #FAFAFA; text-align:center; margin: 1em 0;'><p style='margin: 1em;'>" . lang('security_warning_embed') . "</p></div>";
 		$content = preg_replace('/<object[^>]+>(.*?<\/object>)?/is', $security_msg, $content);
 		$content = preg_replace('/<embed[^>]+>(\s*<\/embed>)?/is', $security_msg, $content);
 		$content = preg_replace('/<img[^>]+editor_component="multimedia_link"[^>]*>(\s*<\/img>)?/is', $security_msg, $content);
diff --git a/common/tpl/debug_comment.html b/common/tpl/debug_comment.html
index db0b873b0..ca05800df 100644
--- a/common/tpl/debug_comment.html
+++ b/common/tpl/debug_comment.html
@@ -2,6 +2,7 @@
 
 <?php echo '[' . $data->timestamp . ']' . "\n"; ?>
 
+<?php if (!count($display_content) || isset($display_content['request_info'])): ?>
 Request / Response
 ==================
 Request URL:         <?php echo $data->url . "\n"; ?>
@@ -25,7 +26,9 @@ Resource Usage
 ==============
 Peak Memory Usage:  <?php echo sprintf('%0.1f MB', memory_get_peak_usage(true) / 1024 / 1024) . "\n"; ?>
 Included Files:     <?php echo count(get_included_files()) . "\n"; ?>
+<?php endif; ?>
 
+<?php if (!count($display_content) || isset($display_content['entries'])): ?>
 Debug Entries
 =============
 <?php
@@ -51,12 +54,11 @@ Debug Entries
 		}
 	}
 ?>
+<?php endif; ?>
 
+<?php if (!count($display_content) || isset($display_content['errors'])): ?>
 PHP Errors and Warnings
 =======================
-<?php if ($data->errors === null): ?>
-Error logging is disabled.
-<?php else: ?>
 <?php
 	$error_count = 0;
 	if (!count($data->errors))
@@ -74,11 +76,9 @@ Error logging is disabled.
 ?>
 <?php endif; ?>
 
+<?php if (!count($display_content) || isset($display_content['queries'])): ?>
 Database Queries
 ================
-<?php if ($data->queries === null): ?>
-Query logging is disabled.
-<?php else: ?>
 <?php
 	$query_count = 0;
 	if (!count($data->queries))
@@ -99,6 +99,7 @@ Query logging is disabled.
 ?>
 <?php endif; ?>
 
+<?php if (!count($display_content) || isset($display_content['slow_queries'])): ?>
 Slow Queries
 ============
 <?php
@@ -119,7 +120,9 @@ Slow Queries
 		echo sprintf('    - Result:      %s', $query_result) . "\n";
 	}
 ?>
+<?php endif; ?>
 
+<?php if (!count($display_content) || isset($display_content['slow_triggers'])): ?>
 Slow Triggers
 =============
 <?php
@@ -135,7 +138,9 @@ Slow Triggers
 		echo sprintf('    - Exec Time:  %0.4f sec', $trigger->trigger_time) . "\n";
 	}
 ?>
+<?php endif; ?>
 
+<?php if (!count($display_content) || isset($display_content['slow_widgets'])): ?>
 Slow Widgets
 ============
 <?php
@@ -150,3 +155,4 @@ Slow Widgets
 		echo sprintf('    - Exec Time:  %0.4f sec', $widget->widget_time) . "\n";
 	}
 ?>
+<?php endif; ?>
diff --git a/layouts/xedition/lang/ko.php b/layouts/xedition/lang/ko.php
new file mode 100644
index 000000000..b00f8c757
--- /dev/null
+++ b/layouts/xedition/lang/ko.php
@@ -0,0 +1,2 @@
+<?php
+$lang->cmd_xedition_search_close = '검색창 닫기';
diff --git a/layouts/xedition/lang/lang.xml b/layouts/xedition/lang/lang.xml
deleted file mode 100644
index 1ecfe33d3..000000000
--- a/layouts/xedition/lang/lang.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lang>
-	<item name="cmd_xedition_search_close">
-		<value xml:lang="ko"><![CDATA[검색창 닫기]]></value>
-	</item>
-</lang>
diff --git a/layouts/xedition/layout.html b/layouts/xedition/layout.html
index f1baa7776..105ab3911 100644
--- a/layouts/xedition/layout.html
+++ b/layouts/xedition/layout.html
@@ -228,7 +228,7 @@
 							</a>
 							<div class="ly ly_login">
 								<ul>
-									<li loop="$logged_info->menu_list => $key, $val"><a href="{getUrl('act', $key, 'member_srl', '', 'page', '')}">{Context::getLang($val)}</a></li>
+									<li loop="$logged_info->menu_list => $key, $val"><a href="{getUrl('act', $key, 'member_srl', '', 'page', '')}">{lang($val)}</a></li>
 									<li><a href="{getUrl('act', 'dispMemberLogout')}">{$lang->cmd_logout}</a></li>
 								</ul>
 								<span class="edge"></span>
diff --git a/modules/addon/lang/ru.php b/modules/addon/lang/ru.php
index 4fb44230b..2b41a4490 100644
--- a/modules/addon/lang/ru.php
+++ b/modules/addon/lang/ru.php
@@ -3,5 +3,4 @@ $lang->addon = 'Аддон';
 $lang->addon_info = 'Информация об аддоне';
 $lang->addon_maker = 'Автор аддона';
 $lang->addon_history = 'История аддона';
-$lang->about_addon_mid = '애드온이 사용될 대상을 지정할 수 있습니다.(모두 해제시 모든 대상에서 사용 가능합니다)';
 $lang->about_addon = 'Аддон служит больше для контролирования действий, чем для отображения HTML-результатов.<br />Простым включением/выключением любых аддонов, Вы можете использовать очень полезные функции для администрирования Вашего веб-сайта';
diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php
index a4873f482..0f2ac2ca0 100644
--- a/modules/admin/admin.admin.controller.php
+++ b/modules/admin/admin.admin.controller.php
@@ -702,14 +702,16 @@ class adminAdminController extends admin
 		
 		// Debug settings
 		Rhymix\Framework\Config::set('debug.enabled', $vars->debug_enabled === 'Y');
-		Rhymix\Framework\Config::set('debug.log_errors', $vars->debug_log_errors === 'Y');
-		Rhymix\Framework\Config::set('debug.log_queries', $vars->debug_log_queries === 'Y');
 		Rhymix\Framework\Config::set('debug.log_slow_queries', max(0, floatval($vars->debug_log_slow_queries)));
 		Rhymix\Framework\Config::set('debug.log_slow_triggers', max(0, floatval($vars->debug_log_slow_triggers)));
 		Rhymix\Framework\Config::set('debug.log_slow_widgets', max(0, floatval($vars->debug_log_slow_widgets)));
 		Rhymix\Framework\Config::set('debug.display_type', strval($vars->debug_display_type) ?: 'comment');
 		Rhymix\Framework\Config::set('debug.display_to', strval($vars->debug_display_to) ?: 'admin');
 		
+		// Debug content
+		$debug_content = array_values($vars->debug_display_content);
+		Rhymix\Framework\Config::set('debug.display_content', $debug_content);
+		
 		// Log filename
 		$log_filename = strval($vars->debug_log_filename);
 		$log_filename_today = str_replace(array('YYYY', 'YY', 'MM', 'DD'), array(
@@ -907,7 +909,7 @@ class adminAdminController extends admin
 		else
 		{
 			$name = $tmpFileName = '';
-			Context::set('msg', Context::getLang('msg_invalid_format'));
+			Context::set('msg', lang('msg_invalid_format'));
 		}
 		
 		Context::set('name', $name);
@@ -934,7 +936,7 @@ class adminAdminController extends admin
 		if ($iconname == 'favicon.ico')
 		{
 			if(!preg_match('/^.*(x-icon|\.icon)$/i',$type)) {
-				Context::set('msg', '*.ico '.Context::getLang('msg_possible_only_file'));
+				Context::set('msg', '*.ico '.lang('msg_possible_only_file'));
 				return;
 			}
 		}
@@ -942,18 +944,18 @@ class adminAdminController extends admin
 		{
 			if (!preg_match('/^.*(png).*$/',$type))
 			{
-				Context::set('msg', '*.png '.Context::getLang('msg_possible_only_file'));
+				Context::set('msg', '*.png '.lang('msg_possible_only_file'));
 				return;
 			}
 			if (!(($height == '57' && $width == '57') || ($height == '114' && $width == '114')))
 			{
-				Context::set('msg', Context::getLang('msg_invalid_format').' (size : 57x57, 114x114)');
+				Context::set('msg', lang('msg_invalid_format').' (size : 57x57, 114x114)');
 				return;
 			}
 		}
 		else
 		{
-			Context::set('msg', Context::getLang('msg_invalid_format'));
+			Context::set('msg', lang('msg_invalid_format'));
 			return;
 		}
 		
diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php
index 55e2b2e61..e4560faec 100644
--- a/modules/admin/admin.admin.model.php
+++ b/modules/admin/admin.admin.model.php
@@ -112,7 +112,7 @@ class adminAdminModel extends admin
 		$connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
 		if(!$connection)
 		{
-			return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_host));
+			return new Object(-1, sprintf(lang('msg_ftp_not_connected'), $ftp_host));
 		}
 
 		$login_result = @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password);
@@ -216,7 +216,7 @@ class adminAdminModel extends admin
 		$oFTP = new ftp();
 		if(!$oFTP->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
 		{
-			return new Object(1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_info->ftp_host));
+			return new Object(1, sprintf(lang('msg_ftp_not_connected'), $ftp_info->ftp_host));
 		}
 
 		if(!$oFTP->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index c31f8dd0c..8823175fd 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -491,13 +491,12 @@ class adminAdminView extends admin
 	{
 		// Load debug settings.
 		Context::set('debug_enabled', Rhymix\Framework\Config::get('debug.enabled'));
-		Context::set('debug_log_errors', Rhymix\Framework\Config::get('debug.log_errors'));
-		Context::set('debug_log_queries', Rhymix\Framework\Config::get('debug.log_queries'));
 		Context::set('debug_log_slow_queries', Rhymix\Framework\Config::get('debug.log_slow_queries'));
 		Context::set('debug_log_slow_triggers', Rhymix\Framework\Config::get('debug.log_slow_triggers'));
 		Context::set('debug_log_slow_widgets', Rhymix\Framework\Config::get('debug.log_slow_widgets'));
 		Context::set('debug_log_filename', Rhymix\Framework\Config::get('debug.log_filename') ?: 'files/debug/YYYYMMDD.php');
 		Context::set('debug_display_type', Rhymix\Framework\Config::get('debug.display_type'));
+		Context::set('debug_display_content', Rhymix\Framework\Config::get('debug.display_content'));
 		Context::set('debug_display_to', Rhymix\Framework\Config::get('debug.display_to'));
 		
 		// IP access control
diff --git a/modules/admin/lang/es.php b/modules/admin/lang/es.php
index 8cc33e9d1..96978864e 100644
--- a/modules/admin/lang/es.php
+++ b/modules/admin/lang/es.php
@@ -37,7 +37,7 @@ $lang->xe_license = 'Rhymix está bajo la Licencia de GPL';
 $lang->ssl_options['none'] = 'Desactivar';
 $lang->ssl_options['optional'] = 'Opcionalmente el';
 $lang->ssl_options['always'] = 'Utilice siempre el';
-$lang->about_use_ssl = 'Opcionalmente, la composición de suscripción / editar la información y el uso de SSL especificada en la acción es siempre el uso de SSL para todos los servicios que se utilizarán SSL 환경이 갖춰지지 않은 상태에서 SSL을 사용할 경우 접속이 되지 않을 수 있으니 주의 바랍니다.';
+$lang->about_use_ssl = 'Opcionalmente, la composición de suscripción / editar la información y el uso de SSL especificada en la acción es siempre el uso de SSL para todos los servicios que se utilizarán.';
 $lang->server_ports = 'Especifique el puerto del servidor';
 $lang->about_server_ports = '80 de HTTP, HTTPS al puerto 443 si se utiliza otro que se especifique lo contrario, el puerto va a necesitar.';
 $lang->about_db_session = 'This setting will use PHP session used for authentication as DB. For the Websites which do not use web server frequently, you can uncheck this setting to improve response time. However, session DB will make it difficult to get current users, so you cannot use related functions.';
diff --git a/modules/admin/lang/fr.php b/modules/admin/lang/fr.php
index 908fc55e9..bbe96bf6a 100644
--- a/modules/admin/lang/fr.php
+++ b/modules/admin/lang/fr.php
@@ -36,7 +36,7 @@ $lang->xe_license = 'Rhymix s\'applique la GPL';
 $lang->ssl_options['none'] = 'Ne Pas utiliser';
 $lang->ssl_options['optional'] = 'Optionnel';
 $lang->ssl_options['always'] = 'Toujours';
-$lang->about_use_ssl = 'Si l\'on choisit \'Optionnel\' , on utilise protocole SSL seulement dans quelques services comme inscription ou modification. Si l\'on choisit \'Toujours\', on utilise protocole SSL dans tous les services. SSL 환경이 갖춰지지 않은 상태에서 SSL을 사용할 경우 접속이 되지 않을 수 있으니 주의 바랍니다.';
+$lang->about_use_ssl = 'Si l\'on choisit \'Optionnel\' , on utilise protocole SSL seulement dans quelques services comme inscription ou modification. Si l\'on choisit \'Toujours\', on utilise protocole SSL dans tous les services.';
 $lang->server_ports = 'déclarer le port de serveur';
 $lang->about_server_ports = 'Si l\'on ne veut pas utiliser le port 80 pour HTTP mais un autre port, ou bien, si l\'on ne veut pas utiliser le port 443 pour HTTPS mais un autre port, on doit déclarer les ports.';
 $lang->about_db_session = 'This setting will use PHP session used for authentication as DB. For the Websites which do not use web server frequently, you can uncheck this setting to improve response time. However, session DB will make it difficult to get current users, so you cannot use related functions.';
@@ -44,6 +44,5 @@ $lang->trash = 'Poubelle';
 $lang->timezone = 'Fuseau horaire';
 $lang->about_use_sso = 'SSO will enable users to sign in just once for both default and virtual site. You will need this only if you are using virtual sites.';
 $lang->modify = 'Modifier';
-$lang->ftp_form_title = 'FTP 정보 입력';
 $lang->ftp = 'FTP';
 $lang->msg_ftp_no_directory = 'Succeed to connect to the host via FTP. However, can not read any directory list informaiton. Check the server configurations.';
diff --git a/modules/admin/lang/ko.php b/modules/admin/lang/ko.php
index 3e959816e..0c3f720cb 100644
--- a/modules/admin/lang/ko.php
+++ b/modules/admin/lang/ko.php
@@ -107,8 +107,6 @@ $lang->use_sftp_support = 'SFTP 사용';
 $lang->disable_sftp_support = 'SFTP를 사용하려면 PHP에 ssh2 모듈이 설치되어 있어야 합니다.';
 $lang->msg_self_restart_cache_engine = 'Memcached 또는 캐시 서비스를 재시작해 주세요.';
 $lang->debug_enabled = '디버그 기능 사용';
-$lang->debug_log_errors = '에러 기록';
-$lang->debug_log_queries = '쿼리 기록';
 $lang->debug_log_slow_queries = '느린 쿼리 기록';
 $lang->debug_log_slow_triggers = '느린 트리거 기록';
 $lang->debug_log_slow_widgets = '느린 위젯 기록';
@@ -117,6 +115,14 @@ $lang->debug_display_type = '디버그 정보 표시 방법';
 $lang->debug_display_type_comment = 'HTML 소스에 표시 (주석)';
 $lang->debug_display_type_panel = '화면에 표시 (패널)';
 $lang->debug_display_type_file = '파일에 기록';
+$lang->debug_display_content = '디버그 정보 표시 내용';
+$lang->debug_display_content_request_info = '요청/응답 정보';
+$lang->debug_display_content_entries = '디버그 메시지';
+$lang->debug_display_content_errors = '에러';
+$lang->debug_display_content_queries = '쿼리';
+$lang->debug_display_content_slow_queries = '느린 쿼리';
+$lang->debug_display_content_slow_triggers = '느린 트리거';
+$lang->debug_display_content_slow_widgets = '느린 위젯';
 $lang->debug_display_to = '디버그 정보 표시 대상';
 $lang->debug_display_to_admin = '관리자에게만 표시';
 $lang->debug_display_to_ip = '아래 IP의 방문자에게만 표시';
diff --git a/modules/admin/lang/mn.php b/modules/admin/lang/mn.php
index e5f63b3dc..a677a766c 100644
--- a/modules/admin/lang/mn.php
+++ b/modules/admin/lang/mn.php
@@ -3,8 +3,7 @@ $lang->modify = 'Засах';
 $lang->ftp_form_title = 'FTP мэдээлэл оруулах';
 $lang->ftp = 'FTP';
 $lang->cmd_check_ftp_connect = 'FTP холболт шалгах';
-$lang->msg_safe_mode_ftp_needed = 'PHP의 safe_mode가 Onбайх тохиолдолд , FTP мэдээллийг заавал оруулснаар Rhymix идэвжvvлэх болон хэрэглэх боломжтой болно.';
-$lang->msg_ftp_no_directory = 'Succeed to connect to the host via FTP. However, can not read any directory list informaiton. Check the server configurations.';
+$lang->msg_safe_mode_ftp_needed = 'PHP safe_mode Onбайх тохиолдолд , FTP мэдээллийг заавал оруулснаар Rhymix идэвжvvлэх болон хэрэглэх боломжтой болно.';
 $lang->msg_ftp_mkdir_fail = 'FTP-г ашиглан eгсeн eгeгдлийг биелvvлж чадсангvй. FTP серверийн идэвхжvvлэлтээ шалгана уу.';
 $lang->msg_ftp_chmod_fail = 'FTP-г ашиглан eeрчлeлтийг хийж чадсангvй. FTP серверийн идэвхжvvлэлтээ шалгана уу.';
 $lang->msg_ftp_connect_success = 'FTP холболт болон баталгаажуулалт хийгдлээ.';
diff --git a/modules/admin/lang/ru.php b/modules/admin/lang/ru.php
index 1d799b358..6548c7ae7 100644
--- a/modules/admin/lang/ru.php
+++ b/modules/admin/lang/ru.php
@@ -4,14 +4,6 @@ $lang->admin_index = 'Индексная страница администрат
 $lang->control_panel = 'Контрольная панель';
 $lang->start_module = 'Homepage';
 $lang->about_start_module = 'Вы можете указать модуль запуска по умолчанию.';
-$lang->select_site = 'Site';
-$lang->select_module_type = 'Module Type';
-$lang->select_module_instance = 'Page';
-$lang->module_category_title['service'] = 'Service Setting';
-$lang->module_category_title['member'] = 'Member Setting';
-$lang->module_category_title['content'] = 'Content Setting';
-$lang->module_category_title['utility'] = 'Utility Setting';
-$lang->module_category_title['interlock'] = 'Interlock Setting';
 $lang->newest_news = 'Последние новости';
 $lang->env_setup = 'Настройка';
 $lang->default_url = 'Основной URL';
@@ -40,15 +32,9 @@ $lang->today = 'Сегодня';
 $lang->ssl_options['none'] = 'Никогда';
 $lang->ssl_options['optional'] = 'На выбор';
 $lang->ssl_options['always'] = 'Всегда';
-$lang->about_use_ssl = 'In case of "Optional", SSL will be used for actions such as signing up / changing information. And for "Always", your site will be served only via https SSL 환경이 갖춰지지 않은 상태에서 SSL을 사용할 경우 접속이 되지 않을 수 있으니 주의 바랍니다.';
-$lang->about_db_session = 'It will use php session with DB when authenticating. Websites with infrequent usage of web server may expect faster response when this function is disabled. However session DB will make it unable to get current users, so you cannot use related functions';
-$lang->ftp_remove_info = 'Remove FTP Info';
 $lang->trash = 'мусор';
 $lang->timezone = 'Часовой пояс';
-$lang->about_use_sso = 'SSO will enable users to sign in just once for both default and virtual site. You will need this only if you are using virtual sites.';
 $lang->move = 'Перейти';
 $lang->modify = 'Изменить';
 $lang->ftp_form_title = 'Введите данные FTP';
 $lang->ftp = 'FTP';
-$lang->msg_ftp_no_directory = 'Succeed to connect to the host via FTP. However, can not read any directory list informaiton. Check the server configurations.';
-$lang->msg_ftp_chmod_fail = 'Chmod failed. Please check the permission and configuration of FTP server.';
diff --git a/modules/admin/lang/tr.php b/modules/admin/lang/tr.php
index 77bd8f4ec..816980428 100644
--- a/modules/admin/lang/tr.php
+++ b/modules/admin/lang/tr.php
@@ -64,7 +64,7 @@ $lang->use_ssl = '<abbr title="Secure Sockets Layer">SSL</abbr>\'i kullanmak ist
 $lang->ssl_options['none'] = 'Hiçbir zaman';
 $lang->ssl_options['optional'] = 'İsteğe Bağlı';
 $lang->ssl_options['always'] = 'Her zaman';
-$lang->about_use_ssl = '\'İsteği Bağlı\' seçiminde; SSL, kayıt olma/bilgi değiştirme gibi eylemler için kullanılacaktır. \'Her zaman\' seçiminde, siteniz sadece http yoluyla hizmet verecektir. SSL 환경이 갖춰지지 않은 상태에서 SSL을 사용할 경우 접속이 되지 않을 수 있으니 주의 바랍니다.';
+$lang->about_use_ssl = '\'İsteği Bağlı\' seçiminde; SSL, kayıt olma/bilgi değiştirme gibi eylemler için kullanılacaktır. \'Her zaman\' seçiminde, siteniz sadece http yoluyla hizmet verecektir.';
 $lang->server_ports = 'Sunucu Bağlantı Noktası (port)';
 $lang->about_server_ports = 'Eğer web sunucunuz, HTTP bağlantı noktaları için 80 ya da HTTPS 443 portunu kullanmıyorsa, sunucu bağlantı noktalarını belirtmeniz gerekmektedir.';
 $lang->use_db_session = 'Oturum Veritabanı Kullanımı';
diff --git a/modules/admin/lang/vi.php b/modules/admin/lang/vi.php
index e50d361ba..45da587f1 100644
--- a/modules/admin/lang/vi.php
+++ b/modules/admin/lang/vi.php
@@ -58,7 +58,6 @@ $lang->msg_self_restart_cache_engine = 'Hãy thiết lập lại bộ nhớ Cach
 $lang->autoinstall = 'Cập nhật tự động';
 $lang->trash = 'Thùng rác';
 $lang->timezone = 'Múi giờ';
-$lang->about_use_sso = 'SSO will enable users to sign in just once for both default and virtual site. You will need this only if you are using virtual sites.';
 $lang->move = 'Di chuyển';
 $lang->modify = 'Thay đổi';
 $lang->ftp_form_title = 'Thông tin FTP';
@@ -68,7 +67,6 @@ $lang->ftp_port = 'Cổng kết nối';
 $lang->about_ftp_password = 'Mật khẩu của FTP sẽ không lưu lại';
 $lang->cmd_check_ftp_connect = 'Kiểm tra kết nối bằng FTP';
 $lang->msg_safe_mode_ftp_needed = 'Nếu safe_mode của PHP mở, bạn có thể cài đặt các thành phần bổ xung cho Rhymix một cách tự động qua FTP.';
-$lang->msg_ftp_no_directory = 'Succeed to connect to the host via FTP. However, can not read any directory list informaiton. Check the server configurations.';
 $lang->msg_ftp_mkdir_fail = 'Lỗi khi tạo thư mục. Xin vui lòng kiểm tra lại quyền truy cập FTP.';
 $lang->msg_ftp_chmod_fail = 'CHMOD thất bại. Xin vui lòng kiểm tra lại.';
 $lang->msg_ftp_connect_success = 'Đã xác nhận và kết nối thành công tới máy chủ bằng FTP.';
diff --git a/modules/admin/lang/zh-CN.php b/modules/admin/lang/zh-CN.php
index b7ea84e8a..a2232ec92 100644
--- a/modules/admin/lang/zh-CN.php
+++ b/modules/admin/lang/zh-CN.php
@@ -12,11 +12,7 @@ $lang->favorites = '收藏';
 $lang->admin_info = '管理员信息';
 $lang->admin_index = '管理首页';
 $lang->control_panel = '控制面板';
-$lang->start_module = 'Homepage';
 $lang->about_start_module = '可指定用户访问网站时的默认首页模块。';
-$lang->select_site = 'Site';
-$lang->select_module_type = 'Module Type';
-$lang->select_module_instance = 'Page';
 $lang->module_category_title['service'] = '应用管理';
 $lang->module_category_title['member'] = '用户管理';
 $lang->module_category_title['content'] = '资源管理';
@@ -101,7 +97,6 @@ $lang->about_use_favicon = '请上传16*16像素的<em>*.ico</em>文件.';
 $lang->allow_use_mobile_icon = '是否启用移动版屏幕图标?';
 $lang->detail_use_mobile_icon = '请上传57*57像素或者114*114像素的<em>*.png</em>文件.';
 $lang->use_sso = '是否启用通行证<abbr title="Single Sign On">SSO</abbr>?';
-$lang->about_use_sso = 'SSO will enable users to sign in just once for both default and virtual site. You will need this only if you are using virtual sites.';
 $lang->about_arrange_session = '你想要整理session吗？';
 $lang->cmd_clear_session = '整理sessioon';
 $lang->save = '保存';
diff --git a/modules/admin/lang/zh-TW.php b/modules/admin/lang/zh-TW.php
index 48ebb29a2..6a517cfbd 100644
--- a/modules/admin/lang/zh-TW.php
+++ b/modules/admin/lang/zh-TW.php
@@ -2,11 +2,7 @@
 $lang->admin_info = '管理員資訊';
 $lang->admin_index = '管理頁面';
 $lang->control_panel = '控制介面';
-$lang->start_module = 'Homepage';
 $lang->about_start_module = '可將所選擇的模組作為預設首頁。';
-$lang->select_site = 'Site';
-$lang->select_module_type = 'Module Type';
-$lang->select_module_instance = 'Page';
 $lang->module_category_title['service'] = '服務設定';
 $lang->module_category_title['member'] = '會員管理';
 $lang->module_category_title['content'] = '內容管理';
@@ -45,7 +41,7 @@ $lang->today = '今天';
 $lang->ssl_options['none'] = '關閉';
 $lang->ssl_options['optional'] = '手動';
 $lang->ssl_options['always'] = '開啟';
-$lang->about_use_ssl = '選擇手動時，在會員註冊或修改資料等動作時才會使用 SSL功能。 選擇開啟時，所有的服務都會使用 SSL功能。 SSL 환경이 갖춰지지 않은 상태에서 SSL을 사용할 경우 접속이 되지 않을 수 있으니 주의 바랍니다.';
+$lang->about_use_ssl = '選擇手動時，在會員註冊或修改資料等動作時才會使用 SSL功能。 選擇開啟時，所有的服務都會使用 SSL功能。 ';
 $lang->server_ports = '主機埠口';
 $lang->about_server_ports = 'HTTP、HTTPS預設埠口分別是『80』、『443』 如果想使用其他的埠口的話，請自行設定。';
 $lang->use_db_session = 'DB session認證';
@@ -73,7 +69,6 @@ $lang->cmd_check_ftp_connect = '檢查 FTP 連線';
 $lang->msg_safe_mode_ftp_needed = '當 PHP 的安全模式(safe_mode)開啟時，請輸入相關 FTP 資訊，否則無法正常安裝或使用程式。';
 $lang->msg_safe_mode_ftp_needed2 = '可用的安裝或更新。';
 $lang->msg_safe_mode_ftp_config = '此資料會儲存在<strong>files/config/ftp.config.php</strong> 檔案中。 安裝後可在設定頁面中新增、更改或刪除此資訊。';
-$lang->msg_ftp_no_directory = 'Succeed to connect to the host via FTP. However, can not read any directory list informaiton. Check the server configurations.';
 $lang->msg_ftp_mkdir_fail = '新增資料夾失敗。請確認 FTP 主機設置。';
 $lang->msg_ftp_chmod_fail = '修改資料夾權限失敗。請確認 FTP 主機設置。';
 $lang->msg_ftp_connect_success = 'FTP連線成功。';
diff --git a/modules/admin/tpl/config_debug.html b/modules/admin/tpl/config_debug.html
index d9efecc66..7a9e68969 100644
--- a/modules/admin/tpl/config_debug.html
+++ b/modules/admin/tpl/config_debug.html
@@ -14,38 +14,24 @@
 				<label for="debug_enabled_n" class="x_inline"><input type="radio" name="debug_enabled" id="debug_enabled_n" value="N" checked="checked"|cond="!$debug_enabled" /> {$lang->cmd_no}</label>
 			</div>
 		</div>
-		<div class="x_control-group">
-			<label class="x_control-label">{$lang->debug_log_errors}</label>
-			<div class="x_controls">
-				<label for="debug_log_errors_y" class="x_inline"><input type="radio" name="debug_log_errors" id="debug_log_errors_y" value="Y" checked="checked"|cond="$debug_log_errors" /> {$lang->cmd_yes}</label>
-				<label for="debug_log_errors_n" class="x_inline"><input type="radio" name="debug_log_errors" id="debug_log_errors_n" value="N" checked="checked"|cond="!$debug_log_errors" /> {$lang->cmd_no}</label>
-			</div>
-		</div>
-		<div class="x_control-group">
-			<label class="x_control-label">{$lang->debug_log_queries}</label>
-			<div class="x_controls">
-				<label for="debug_log_queries_y" class="x_inline"><input type="radio" name="debug_log_queries" id="debug_log_queries_y" value="Y" checked="checked"|cond="$debug_log_queries" /> {$lang->cmd_yes}</label>
-				<label for="debug_log_queries_n" class="x_inline"><input type="radio" name="debug_log_queries" id="debug_log_queries_n" value="N" checked="checked"|cond="!$debug_log_queries" /> {$lang->cmd_no}</label>
-			</div>
-		</div>
 		<div class="x_control-group">
 			<label class="x_control-label" for="debug_log_slow_queries">{$lang->debug_log_slow_queries}</label>
 			<div class="x_controls">
-				<input type="text" name="debug_log_slow_queries" id="debug_log_slow_queries" size="5" value="{$debug_log_slow_queries}" />
+				<input type="text" name="debug_log_slow_queries" id="debug_log_slow_queries" size="5" value="{$debug_log_slow_queries}" style="width:60px" />
 				&nbsp;{$lang->debug_seconds}
 			</div>
 		</div>
 		<div class="x_control-group">
 			<label class="x_control-label" for="debug_log_slow_triggers">{$lang->debug_log_slow_triggers}</label>
 			<div class="x_controls">
-				<input type="text" name="debug_log_slow_triggers" id="debug_log_slow_triggers" size="5" value="{$debug_log_slow_triggers}" />
+				<input type="text" name="debug_log_slow_triggers" id="debug_log_slow_triggers" size="5" value="{$debug_log_slow_triggers}" style="width:60px" />
 				&nbsp;{$lang->debug_seconds}
 			</div>
 		</div>
 		<div class="x_control-group">
 			<label class="x_control-label" for="debug_log_slow_widgets">{$lang->debug_log_slow_widgets}</label>
 			<div class="x_controls">
-				<input type="text" name="debug_log_slow_widgets" id="debug_log_slow_widgets" size="5" value="{$debug_log_slow_widgets}" />
+				<input type="text" name="debug_log_slow_widgets" id="debug_log_slow_widgets" size="5" value="{$debug_log_slow_widgets}" style="width:60px" />
 				&nbsp;{$lang->debug_seconds}
 			</div>
 		</div>
@@ -57,10 +43,22 @@
 				<label for="debug_display_type_file" class="x_inline"><input type="radio" name="debug_display_type" id="debug_display_type_file" value="file" checked="checked"|cond="$debug_display_type=='file'" /> {$lang->debug_display_type_file}</label>
 			</div>
 		</div>
+		<div class="x_control-group">
+			<label class="x_control-label" for="debug_log_slow_widgets">{$lang->debug_display_content}</label>
+			<div class="x_controls">
+				<label for="debug_display_content_request_info" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_request_info" value="request_info" checked="checked"|cond="!count($debug_display_content) || in_array('request_info', $debug_display_content)" /> {$lang->debug_display_content_request_info}</label>
+				<label for="debug_display_content_entries" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_entries" value="entries" checked="checked"|cond="!count($debug_display_content) || in_array('entries', $debug_display_content)" /> {$lang->debug_display_content_entries}</label>
+				<label for="debug_display_content_errors" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_errors" value="errors" checked="checked"|cond="!count($debug_display_content) || in_array('errors', $debug_display_content)" /> {$lang->debug_display_content_errors}</label>
+				<label for="debug_display_content_queries" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_queries" value="queries" checked="checked"|cond="!count($debug_display_content) || in_array('queries', $debug_display_content)" /> {$lang->debug_display_content_queries}</label>
+				<label for="debug_display_content_slow_queries" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_queries" value="slow_queries" checked="checked"|cond="!count($debug_display_content) || in_array('slow_queries', $debug_display_content)" /> {$lang->debug_display_content_slow_queries}</label>
+				<label for="debug_display_content_slow_triggers" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_triggers" value="slow_triggers" checked="checked"|cond="!count($debug_display_content) || in_array('slow_triggers', $debug_display_content)" /> {$lang->debug_display_content_slow_triggers}</label>
+				<label for="debug_display_content_slow_widgets" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_widgets" value="slow_widgets" checked="checked"|cond="!count($debug_display_content) || in_array('slow_widgets', $debug_display_content)" /> {$lang->debug_display_content_slow_widgets}</label>
+			</div>
+		</div>
 		<div class="x_control-group">
 			<label class="x_control-label" for="debug_log_filename">{$lang->debug_log_filename}</label>
 			<div class="x_controls">
-				<input type="text" name="debug_log_filename" id="debug_log_filename" value="{$debug_log_filename}" />
+				<input type="text" name="debug_log_filename" id="debug_log_filename" value="{$debug_log_filename}" style="min-width: 80%" />
 				<p class="x_help-block">{$lang->about_debug_log_filename}</p>
 			</div>
 		</div>
diff --git a/modules/autoinstall/autoinstall.lib.php b/modules/autoinstall/autoinstall.lib.php
index b4542e0c6..52f0819cc 100644
--- a/modules/autoinstall/autoinstall.lib.php
+++ b/modules/autoinstall/autoinstall.lib.php
@@ -411,7 +411,7 @@ class SFTPModuleInstaller extends ModuleInstaller
 
 		if(!@ssh2_sftp_unlink($this->sftp, $target_path))
 		{
-			return new Object(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
+			return new Object(-1, sprintf(lang('msg_delete_file_failed'), $path));
 		}
 		return new Object();
 	}
@@ -432,7 +432,7 @@ class SFTPModuleInstaller extends ModuleInstaller
 
 		if(!@ssh2_sftp_rmdir($this->sftp, $target_path))
 		{
-			return new Object(-1, sprintf(Context::getLang('msg_delete_dir_failed'), $path));
+			return new Object(-1, sprintf(lang('msg_delete_dir_failed'), $path));
 		}
 		return new Object();
 	}
@@ -532,7 +532,7 @@ class PHPFTPModuleInstaller extends ModuleInstaller
 		$this->connection = ftp_connect($ftp_host, $this->ftp_info->ftp_port);
 		if(!$this->connection)
 		{
-			return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_host));
+			return new Object(-1, sprintf(lang('msg_ftp_not_connected'), $ftp_host));
 		}
 
 		$login_result = @ftp_login($this->connection, $this->ftp_info->ftp_user, $this->ftp_password);
@@ -745,7 +745,7 @@ class FTPModuleInstaller extends ModuleInstaller
 		$this->oFtp = new ftp();
 		if(!$this->oFtp->ftp_connect($ftp_host, $this->ftp_info->ftp_port))
 		{
-			return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_host));
+			return new Object(-1, sprintf(lang('msg_ftp_not_connected'), $ftp_host));
 		}
 		if(!$this->oFtp->ftp_login($this->ftp_info->ftp_user, $this->ftp_password))
 		{
@@ -772,7 +772,7 @@ class FTPModuleInstaller extends ModuleInstaller
 
 		if(!$this->oFtp->ftp_delete($target_path))
 		{
-			return new Object(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
+			return new Object(-1, sprintf(lang('msg_delete_file_failed'), $path));
 		}
 		return new Object();
 	}
@@ -792,7 +792,7 @@ class FTPModuleInstaller extends ModuleInstaller
 
 		if(!$this->oFtp->ftp_rmdir($target_path))
 		{
-			return new Object(-1, sprintf(Context::getLang('msg_delete_dir_failed'), $path));
+			return new Object(-1, sprintf(lang('msg_delete_dir_failed'), $path));
 		}
 		return new Object();
 	}
@@ -911,7 +911,7 @@ class DirectModuleInstaller extends ModuleInstaller
 
 		if(!FileHandler::removeFile($target_path))
 		{
-			return new Object(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
+			return new Object(-1, sprintf(lang('msg_delete_file_failed'), $path));
 		}
 		return new Object();
 	}
diff --git a/modules/autoinstall/lang/fr.php b/modules/autoinstall/lang/fr.php
index 98d74fb32..b3d9bbc7f 100644
--- a/modules/autoinstall/lang/fr.php
+++ b/modules/autoinstall/lang/fr.php
@@ -1,4 +1 @@
 <?php
-$lang->current_version = 'Version Courante';
-$lang->msg_ftp_invalid_auth_info = 'Cannot log in with the FTP password you entered. Please check if it is correct.';
-$lang->msg_ftp_not_connected = 'Connection to the %s via FTP failed. Please check the port number and whether the FTP service is available.';
diff --git a/modules/autoinstall/lang/ru.php b/modules/autoinstall/lang/ru.php
index aa4fc4661..dfe603e26 100644
--- a/modules/autoinstall/lang/ru.php
+++ b/modules/autoinstall/lang/ru.php
@@ -3,13 +3,5 @@ $lang->order_newest = 'Новый';
 $lang->order_popular = 'Популярный';
 $lang->order_download = 'Скачать';
 $lang->success_installed = 'Установлено успешно';
-$lang->description_ftp_note = 'If %s is not set, installation would not work. Please configure FTP information';
-$lang->description_update = 'If you have upgraded or installed programs without EasyInstall module, please press %s to renew new information';
 $lang->install = 'Инсталлировать';
 $lang->update = 'Обновить';
-$lang->require_update = 'Update is required';
-$lang->require_installation = 'Installation is required';
-$lang->description_install = 'EasyInstall will also install/update all other programs which this program is depending on';
-$lang->description_download = 'If FTP is unavailable, you should manually download it and extract it into target path. (if target path is ./modules/board, extract it at ./modules)';
-$lang->rate = 'points';
-$lang->msg_ftp_not_connected = 'Connection to %s via FTP failed. Please check the port number and if FTP service is available.';
diff --git a/modules/board/board.admin.model.php b/modules/board/board.admin.model.php
index 99d449112..f86a48657 100644
--- a/modules/board/board.admin.model.php
+++ b/modules/board/board.admin.model.php
@@ -48,10 +48,10 @@ class boardAdminModel extends board
 		// set order target list
 		foreach($this->order_target AS $key)
 		{
-			$order_target[$key] = Context::getLang($key);
+			$order_target[$key] = lang($key);
 		}
-		$order_target['list_order'] = Context::getLang('document_srl');
-		$order_target['update_order'] = Context::getLang('last_update');
+		$order_target['list_order'] = lang('document_srl');
+		$order_target['update_order'] = lang('last_update');
 		Context::set('order_target', $order_target);
 
 		// for advanced language & url
diff --git a/modules/board/board.admin.view.php b/modules/board/board.admin.view.php
index 12383f051..83f5683ab 100644
--- a/modules/board/board.admin.view.php
+++ b/modules/board/board.admin.view.php
@@ -54,9 +54,9 @@ class boardAdminView extends board {
 		$this->setTemplatePath($template_path);
 
 		// install order (sorting) options
-		foreach($this->order_target as $key) $order_target[$key] = Context::getLang($key);
-		$order_target['list_order'] = Context::getLang('document_srl');
-		$order_target['update_order'] = Context::getLang('last_update');
+		foreach($this->order_target as $key) $order_target[$key] = lang($key);
+		$order_target['list_order'] = lang('document_srl');
+		$order_target['update_order'] = lang('last_update');
 		Context::set('order_target', $order_target);
 	}
 
@@ -295,7 +295,7 @@ class boardAdminView extends board {
 	 * @brief board module message
 	 **/
 	function alertMessage($message) {
-		$script =  sprintf('<script> xAddEventListener(window,"load", function() { alert("%s"); } );</script>', Context::getLang($message));
+		$script =  sprintf('<script> xAddEventListener(window,"load", function() { alert("%s"); } );</script>', lang($message));
 		Context::addHtmlHeader( $script );
 	}
 }
diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php
index e1646246c..bfcaca55c 100644
--- a/modules/board/board.controller.php
+++ b/modules/board/board.controller.php
@@ -106,6 +106,11 @@ class boardController extends board
 			}
 		}
 
+		if($this->module_info->update_log == 'Y')
+		{
+			$obj->update_log_setting = 'Y';
+		}
+
 		// update the document if it is existed
 		if($is_update)
 		{
@@ -126,7 +131,7 @@ class boardController extends board
 			{
 				if($oDocument->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
 				{
-					$format =  Context::getLang('msg_protect_regdate_document');
+					$format =  lang('msg_protect_regdate_document');
 					$massage = sprintf($format, $this->module_info->protect_document_regdate);
 					return new Object(-1, $massage);
 				}
@@ -146,12 +151,14 @@ class boardController extends board
 				$obj->last_update = $obj->regdate = date('YmdHis');
 				$obj->update_order = $obj->list_order = (getNextSequence() * -1);
 			}
-
+			$obj->reason_update = escape($obj->reason_update);
 			$output = $oDocumentController->updateDocument($oDocument, $obj);
 			$msg_code = 'success_updated';
 
 		// insert a new document otherwise
-		} else {
+		}
+		else
+		{
 			$output = $oDocumentController->insertDocument($obj, $bAnonymous);
 			$msg_code = 'success_registed';
 			$obj->document_srl = $output->get('document_srl');
@@ -227,7 +234,7 @@ class boardController extends board
 		{
 			if($oDocument->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
 			{
-				$format =  Context::getLang('msg_protect_regdate_document');
+				$format =  lang('msg_protect_regdate_document');
 				$massage = sprintf($format, $this->module_info->protect_document_regdate);
 				return new Object(-1, $massage);
 			}
@@ -378,7 +385,7 @@ class boardController extends board
 			{
 				if($comment->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
 				{
-					$format =  Context::getLang('msg_protect_regdate_comment');
+					$format =  lang('msg_protect_regdate_comment');
 					$massage = sprintf($format, $this->module_info->protect_document_regdate);
 					return new Object(-1, $massage);
 				}
@@ -431,7 +438,7 @@ class boardController extends board
 		{
 			if($comment->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
 			{
-				$format =  Context::getLang('msg_protect_regdate_comment');
+				$format =  lang('msg_protect_regdate_comment');
 				$massage = sprintf($format, $this->module_info->protect_document_regdate);
 				return new Object(-1, $massage);
 			}
diff --git a/modules/board/board.mobile.php b/modules/board/board.mobile.php
index 6223d2d6a..a036a0156 100644
--- a/modules/board/board.mobile.php
+++ b/modules/board/board.mobile.php
@@ -105,7 +105,7 @@ class boardMobile extends boardView
 
 	function dispBoardMessage($msg_code)
 	{
-		$msg = Context::getLang($msg_code);
+		$msg = lang($msg_code);
 		$oMessageObject = &ModuleHandler::getModuleInstance('message','mobile');
 		$oMessageObject->setError(-1);
 		$oMessageObject->setMessage($msg);
diff --git a/modules/board/board.model.php b/modules/board/board.model.php
index 002632f2e..ef2fa52d3 100644
--- a/modules/board/board.model.php
+++ b/modules/board/board.model.php
@@ -48,7 +48,7 @@ class boardModel extends module
 			}
 			else
 			{
-				$output[$key] = new ExtraItem($module_srl, -1, Context::getLang($key), $key, 'N', 'N', 'N', null);
+				$output[$key] = new ExtraItem($module_srl, -1, lang($key), $key, 'N', 'N', 'N', null);
 			}
 		}
 		return $output;
@@ -64,7 +64,7 @@ class boardModel extends module
 				'user_id', 'user_name', 'readed_count', 'voted_count', 'blamed_count', 'thumbnail', 'summary', 'comment_status');
 		foreach($virtual_vars as $key)
 		{
-			$extra_vars[$key] = new ExtraItem($module_srl, -1, Context::getLang($key), $key, 'N', 'N', 'N', null);
+			$extra_vars[$key] = new ExtraItem($module_srl, -1, lang($key), $key, 'N', 'N', 'N', null);
 		}
 
 		// get the extra variables from the document model
diff --git a/modules/board/board.view.php b/modules/board/board.view.php
index 015241e69..b28836f1d 100644
--- a/modules/board/board.view.php
+++ b/modules/board/board.view.php
@@ -160,7 +160,7 @@ class boardView extends board
 		 * add extra vaiables to the search options
 		 **/
 		// use search options on the template (the search options key has been declared, based on the language selected)
-		foreach($this->search_option as $opt) $search_option[$opt] = Context::getLang($opt);
+		foreach($this->search_option as $opt) $search_option[$opt] = lang($opt);
 		$extra_keys = Context::get('extra_keys');
 		if($extra_keys)
 		{
@@ -328,11 +328,13 @@ class boardView extends board
 				// disappear the document if it is secret
 				if($oDocument->isSecret() && !$oDocument->isGranted())
 				{
-					$oDocument->add('content',Context::getLang('thisissecret'));
+					$oDocument->add('content',lang('thisissecret'));
 				}
 			}
 		}
 
+		Context::set('update_view', $this->grant->update_view);
+
 		// setup the document oject on context
 		$oDocument->add('module_srl', $this->module_srl);
 		Context::set('oDocument', $oDocument);
@@ -430,7 +432,7 @@ class boardView extends board
 			{
 				if(!$val->isAccessible())
 				{
-					$val->add('content',Context::getLang('thisissecret'));
+					$val->add('content',lang('thisissecret'));
 				}
 			}
 		}
@@ -698,7 +700,7 @@ class boardView extends board
 			{
 				if($oDocument->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
 				{
-					$format =  Context::getLang('msg_protect_regdate_document');
+					$format =  lang('msg_protect_regdate_document');
 					$massage = sprintf($format, $this->module_info->protect_document_regdate);
 					return new Object(-1, $massage);
 				}
@@ -825,7 +827,7 @@ class boardView extends board
 		{
 			if($oDocument->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
 			{
-				$format =  Context::getLang('msg_protect_regdate_document');
+				$format =  lang('msg_protect_regdate_document');
 				$massage = sprintf($format, $this->module_info->protect_document_regdate);
 				return new Object(-1, $massage);
 			}
@@ -987,7 +989,7 @@ class boardView extends board
 		{
 			if($oComment->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
 			{
-				$format =  Context::getLang('msg_protect_regdate_comment');
+				$format =  lang('msg_protect_regdate_comment');
 				$massage = sprintf($format, $this->module_info->protect_document_regdate);
 				return new Object(-1, $massage);
 			}
@@ -1055,7 +1057,7 @@ class boardView extends board
 		{
 			if($oComment->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
 			{
-				$format =  Context::getLang('msg_protect_regdate_comment');
+				$format =  lang('msg_protect_regdate_comment');
 				$massage = sprintf($format, $this->module_info->protect_document_regdate);
 				return new Object(-1, $massage);
 			}
@@ -1134,19 +1136,57 @@ class boardView extends board
 	 **/
 	function dispBoardMessage($msg_code)
 	{
-		$msg = Context::getLang($msg_code);
+		$msg = lang($msg_code);
 		if(!$msg) $msg = $msg_code;
 		Context::set('message', $msg);
 		$this->setTemplateFile('message');
 	}
 
+	function dispBoardUpdateLog()
+	{
+		$oDocumentModel = getModel('document');
+		$document_srl = Context::get('document_srl');
+
+		if($this->grant->update_view !== true)
+		{
+			return new Object(-1, 'msg_not_permitted');
+		}
+
+		$updatelog = $oDocumentModel->getDocumentUpdateLog($document_srl);
+		Context::set('total_count', $updatelog->page_navigation->total_count);
+		Context::set('total_page', $updatelog->page_navigation->total_page);
+		Context::set('page', $updatelog->page);
+		Context::set('page_navigation', $updatelog->page_navigation);
+		Context::set('updatelog', $updatelog);
+
+		$this->setTemplateFile('update_list');
+	}
+
+	function dispBoardUpdateLogView()
+	{
+		$oDocumentModel = getModel('document');
+		$update_id = Context::get('update_id');
+
+		if($this->grant->update_view !== true)
+		{
+			return new Object(-1, 'msg_not_permitted');
+		}
+		$update_log = $oDocumentModel->getUpdateLog($update_id);
+		$extra_vars = unserialize($update_log->extra_vars);
+
+		Context::set('extra_vars', $extra_vars);
+		Context::set('update_log', $update_log);
+
+		$this->setTemplateFile('update_view');
+	}
+
 	/**
 	 * @brief the method for displaying the warning messages
 	 * display an error message if it has not  a special design
 	 **/
 	function alertMessage($message)
 	{
-		$script =  sprintf('<script> jQuery(function(){ alert("%s"); } );</script>', Context::getLang($message));
+		$script =  sprintf('<script> jQuery(function(){ alert("%s"); } );</script>', lang($message));
 		Context::addHtmlFooter( $script );
 	}
 
diff --git a/modules/board/board.wap.php b/modules/board/board.wap.php
index 53e64ac96..10d06f85f 100644
--- a/modules/board/board.wap.php
+++ b/modules/board/board.wap.php
@@ -17,7 +17,7 @@ class boardWAP extends board
 		// check grant
 		if(!$this->grant->list || $this->module_info->consultation == 'Y')
 		{
-			return $oMobile->setContent(Context::getLang('msg_not_permitted'));
+			return $oMobile->setContent(lang('msg_not_permitted'));
 		}
 
 		// generate document model object
@@ -33,7 +33,7 @@ class boardWAP extends board
 				// check the grant
 				if(!$this->grant->view)
 				{
-					return $oMobile->setContent(Context::getLang('msg_not_permitted'));
+					return $oMobile->setContent(lang('msg_not_permitted'));
 				}
 
 				// setup the browser title
@@ -64,7 +64,7 @@ class boardWAP extends board
 					$oMobile->setContent( $content );
 
 					// setup upper URL
-					$oMobile->setUpperUrl( getUrl('act',''), Context::getLang('cmd_go_upper') );
+					$oMobile->setUpperUrl( getUrl('act',''), lang('cmd_go_upper') );
 
 				// display the document if the act is not display the comment list
 				} else {
@@ -74,14 +74,14 @@ class boardWAP extends board
 
 
 					// setup content information(include the comments link)
-					$content = Context::getLang('replies').' : <a href="'.getUrl('act','dispBoardContentCommentList').'">'.$oDocument->getCommentCount().'</a><br>'."\r\n".$content;
+					$content = lang('replies').' : <a href="'.getUrl('act','dispBoardContentCommentList').'">'.$oDocument->getCommentCount().'</a><br>'."\r\n".$content;
 					$content = '<b>'.$oDocument->getNickName().'</b> ('.$oDocument->getRegdate("Y-m-d").")<br>\r\n".$content;
 
 					// setup mobile contents
 					$oMobile->setContent( $content );
 
 					// setup upper URL
-					$oMobile->setUpperUrl( getUrl('document_srl',''), Context::getLang('cmd_list') );
+					$oMobile->setUpperUrl( getUrl('document_srl',''), lang('cmd_list') );
 
 				}
 
@@ -124,12 +124,12 @@ class boardWAP extends board
 		// next/prevUrl specification
 		if($page > 1)
 		{
-			$oMobile->setPrevUrl(getUrl('mid',$_GET['mid'],'page',$page-1), sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $page-1, $totalPage));
+			$oMobile->setPrevUrl(getUrl('mid',$_GET['mid'],'page',$page-1), sprintf('%s (%d/%d)', lang('cmd_prev'), $page-1, $totalPage));
 		}
 
 		if($page < $totalPage)
 		{
-			$oMobile->setNextUrl(getUrl('mid',$_GET['mid'],'page',$page+1), sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $page+1, $totalPage));
+			$oMobile->setNextUrl(getUrl('mid',$_GET['mid'],'page',$page+1), sprintf('%s (%d/%d)', lang('cmd_next'), $page+1, $totalPage));
 		}
 
 		$oMobile->mobilePage = $page;
diff --git a/modules/board/conf/module.xml b/modules/board/conf/module.xml
index 72002fed7..9643ceff0 100644
--- a/modules/board/conf/module.xml
+++ b/modules/board/conf/module.xml
@@ -21,6 +21,9 @@
 			<title xml:lang="zh-TW">檢視</title>
 			<title xml:lang="tr">görüş</title>
 		</grant>
+		<grant name="update_view" default="guest">
+			<title xml:lang="ko">수정내역 조회</title>
+		</grant>
 		<grant name="write_document" default="guest">
 			<title xml:lang="ko">글 작성</title>
 			<title xml:lang="zh-CN">发表新主题</title>
@@ -63,6 +66,7 @@
 		<action name="dispBoardCategoryList" type="view" />
 		<action name="dispBoardContentCommentList" type="view" />
 		<action name="dispBoardContentFileList" type="view" />
+		<action name="dispBoardUpdateLog" type="view" />
 
 		<action name="dispBoardTagList" type="view" />
 		<action name="dispBoardWrite" type="view" standalone="false" />
@@ -73,6 +77,7 @@
 		<action name="dispBoardDeleteComment" type="view" standalone="false" />
 		<action name="dispBoardDeleteTrackback" type="view" standalone="false" />
 		<action name="dispBoardMessage" type="view" />
+		<action name="dispBoardUpdateLogView" type="view" />
 
 		<action name="procBoardInsertDocument" type="controller" ruleset="insertDocument" standalone="false" />
 		<action name="procBoardDeleteDocument" type="controller" standalone="false" />
diff --git a/modules/board/lang/es.php b/modules/board/lang/es.php
index 3799f7ce2..40fbda476 100644
--- a/modules/board/lang/es.php
+++ b/modules/board/lang/es.php
@@ -13,7 +13,6 @@ $lang->cmd_board_info = 'Información del Tablero';
 $lang->about_layout_setup = 'Puede modificar manualmente el código del diseño de tableros. Insertar o modificar el código de widget.';
 $lang->about_board_category = 'Puede crear las categorias de tableros. Cuando no funciona la categoría de tableros, rehacer el archivo caché manualmente para solucionar.';
 $lang->about_except_notice = 'Aviso de los artículos no se mostrará en la lista normal.';
-$lang->about_use_anonymous = '글쓴이의 정보를 없애고 익명으로 게시판 사용을 할 수 있게 합니다. 스킨설정에서 글쓴이 정보등을 보이지 않도록 하시면 더욱 유용합니다';
 $lang->about_board = 'Este módulo es para crear y manejar los tableros.';
 $lang->about_consultation = 'No administrador de los miembros que consideran que su propia artocles. \\ NNon miembros no serían capaces de escribir artículos al utilizar la consulta.';
 $lang->about_secret = 'Boletín y los comentarios de bimilgeul utilizar.';
diff --git a/modules/board/lang/fr.php b/modules/board/lang/fr.php
index 30497e469..4fd5a7566 100644
--- a/modules/board/lang/fr.php
+++ b/modules/board/lang/fr.php
@@ -10,8 +10,6 @@ $lang->cmd_board_info = 'Information des Panneaux';
 $lang->about_layout_setup = 'Vous pouvez manuellement modifier le code de Mise en Page du blogue. Insérez ou administrez le code de Gadget n\'importe où vous voulez.';
 $lang->about_board_category = 'Vous pouvez créer des catégories de Panneau d\'Affichage. Quand la catégorie d\'affichage est cassé, essayez manuellement rétablir l\'antémémoire du fichier.';
 $lang->about_except_notice = 'Le titre de Notice dont l\'article se représentera toujours en tête de la liste ne sera exposé sur la liste générale.';
-$lang->about_use_anonymous = '글쓴이의 정보를 없애고 익명으로 게시판 사용을 할 수 있게 합니다. 스킨설정에서 글쓴이 정보등을 보이지 않도록 하시면 더욱 유용합니다';
 $lang->about_board = 'Ce module se sert à créer et à administrer des Panneaux d\'Affichage.';
 $lang->about_consultation = 'Les membres non-administratifs verront seulement les ariticles d\'eux-même. Non-membres ne pourraient pas écrire des articles quand la Consultation est appliqué.';
 $lang->about_admin_mail = 'Un message éléctronique sera envoyé à l\'adresse inscrite quand un article ou commentaire se soumet.  On peut inscrire multiple adresses délimité par les virgules.';
-$lang->about_list_config = '게시판의 목록형식 사용시 원하는 항목들로 배치를 할 수 있습니다. 단 스킨에서 지원하지 않는 경우 지원되지 않을 수 있습니다 대상항목/ 표시항목의 항목을 더블클릭하면 추가/ 제거가 됩니다.';
diff --git a/modules/board/lang/ko.php b/modules/board/lang/ko.php
index ce76b6e86..9f8334b92 100644
--- a/modules/board/lang/ko.php
+++ b/modules/board/lang/ko.php
@@ -14,6 +14,8 @@ $lang->consultation = '상담 기능';
 $lang->secret = '비밀글 기능';
 $lang->thisissecret = '비밀글입니다.';
 $lang->admin_mail = '관리자 메일';
+$lang->update_log = '게시글 수정 내역';
+$lang->last_updater = '수정한사람';
 $lang->cmd_board_list = '게시판 목록';
 $lang->cmd_module_config = '게시판 공통 설정';
 $lang->cmd_board_info = '게시판 정보';
@@ -31,6 +33,7 @@ $lang->about_admin_mail = '글이나 댓글이 등록될때 등록된 메일주
 $lang->about_list_config = '게시판의 목록형식 사용시 원하는 항목들로 배치를 할 수 있습니다. 단 스킨에서 지원하지 않는 경우 불가능합니다. 대상항목/ 표시항목의 항목을 더블클릭하면 추가/ 제거가 됩니다.';
 $lang->about_use_status = '글 작성 시 선택할 수 있는 상태를 지정해주세요.';
 $lang->about_protect_comment = '댓글의 댓글이 있을경우 해당댓글을 삭제 및 수정을 할 수 없도록 합니다.';
+$lang->about_update_log = '게시글을 수정할 경우 수정한 내역을 저장하도록 합니다.';
 $lang->msg_not_enough_point = '포인트가 부족합니다';
 $lang->write_comment = '댓글 쓰기';
 $lang->msg_not_allow_comment = '해당 글의 댓글 쓰기가 잠겨있습니다.';
@@ -52,4 +55,8 @@ $lang->msg_admin_comment_no_modify = '최고관리자의 댓글을 수정할 권
 $lang->msg_board_delete_protect_comment = '댓글이 작성된 댓글의 글을 삭제할 수 없습니다.';
 $lang->msg_board_update_protect_comment = '댓글이 작성된 댓글의 글을 수정할 수 없습니다.';
 $lang->msg_protect_regdate_document = '%s일 이전의 게시글은 수정 또는 삭제 할 수 없습니다.';
-$lang->msg_protect_regdate_comment = '%s일 이전의 댓글은 수정 또는 삭제 할 수 없습니다.';
\ No newline at end of file
+$lang->msg_protect_regdate_comment = '%s일 이전의 댓글은 수정 또는 삭제 할 수 없습니다.';
+$lang->msg_dont_have_update_log = '업데이트 로그가 기록되어 있지 않은 게시글입니다.';
+$lang->original_letter = '원본글';
+$lang->msg_warning_update_log = '<span class="x_label x_label-important">주의!</span> 사용시 디비가 많이 늘어날 수 있습니다.';
+$lang->reason_update = '수정한 이유';
diff --git a/modules/board/lang/ru.php b/modules/board/lang/ru.php
index 3db404004..e51067ae9 100644
--- a/modules/board/lang/ru.php
+++ b/modules/board/lang/ru.php
@@ -7,8 +7,4 @@ $lang->cmd_module_config = 'Общие настройки форума';
 $lang->cmd_board_info = 'Информация форума';
 $lang->about_layout_setup = 'Вы можете вручную изменять лейаут код блога. Вставляйте или управляйте кодом виджетов везде, где хотите';
 $lang->about_board_category = 'Вы можете сделать категории блога. Когда категория блога испорчена, попробуйте перепостроить файл кеша вручную.';
-$lang->about_use_anonymous = '글쓴이의 정보를 없애고 익명으로 게시판 사용을 할 수 있게 합니다. 스킨설정에서 글쓴이 정보등을 보이지 않도록 하시면 더욱 유용합니다';
-$lang->about_board = 'Этот модуль служит для создания и управления форумами.';
-$lang->about_consultation = '상담 기능은 관리권한이 없는 회원은 자신이 쓴 글만 보이도록 하는 기능입니다. 단 상담기능 사용시 비회원 글쓰기는 자동으로 금지됩니다.';
-$lang->about_admin_mail = '글이나 댓글이 등록될때 등록된 메일주소로 메일이 발송됩니다  ,(콤마)로 연결시 다수의 메일주소로 발송할 수 있습니다.';
-$lang->about_list_config = '게시판의 목록형식 사용시 원하는 항목들로 배치를 할 수 있습니다. 단 스킨에서 지원하지 않는 경우 지원되지 않을 수 있습니다 대상항목/ 표시항목의 항목을 더블클릭하면 추가/ 제거가 됩니다.';
+$lang->about_board = 'Этот модуль служит для создания и управления форумами.';
\ No newline at end of file
diff --git a/modules/board/lang/zh-CN.php b/modules/board/lang/zh-CN.php
index 9fab19e2e..47ad27694 100644
--- a/modules/board/lang/zh-CN.php
+++ b/modules/board/lang/zh-CN.php
@@ -16,7 +16,6 @@ $lang->cmd_list_setting = '列表设置';
 $lang->about_layout_setup = '可直接编辑博客布局代码。可以把控件代码插入到您喜欢的位置。';
 $lang->about_board_category = '可以添加/删除分类项 分类有异常情况时，可以尝试重新生成缓冲文件。';
 $lang->about_except_notice = '设置公告目录项不再重复显示到普通目录当中。';
-$lang->about_use_anonymous = '글쓴이의 정보를 없애고 익명으로 게시판 사용을 할 수 있게 합니다. 스킨설정에서 글쓴이 정보등을 보이지 않도록 하시면 더욱 유용합니다';
 $lang->about_board = '可生成及管理版面的模块。';
 $lang->about_consultation = '咨询功能是指除有管理权限的会员以外，其他会员只能浏览自己发表的主题。使用咨询功能时系统将自动禁止非会员的发表主题权限。';
 $lang->about_secret = '设置主题及评论当中使用密帖与否。';
diff --git a/modules/board/skins/default/write_form.html b/modules/board/skins/default/write_form.html
index f3e13930e..62301dd1a 100644
--- a/modules/board/skins/default/write_form.html
+++ b/modules/board/skins/default/write_form.html
@@ -10,7 +10,7 @@
 				{str_repeat("&nbsp;&nbsp;",$val->depth)} {$val->title} ({$val->document_count})
 			</option>
 		</select>
-		<input cond="$oDocument->getTitleText()" type="text" name="title" class="iText" title="{$lang->title}" value="{htmlspecialchars($oDocument->getTitleText())}" />
+		<input cond="$oDocument->getTitleText()" type="text" name="title" class="iText" title="{$lang->title}" value="{escape($oDocument->getTitleText(), false)}" />
 		<input cond="!$oDocument->getTitleText()" type="text" name="title" class="iText" title="{$lang->title}" />
 		<input cond="$grant->manager" type="checkbox" name="is_notice" value="Y" class="iCheck" checked="checked"|cond="$oDocument->isNotice()" id="is_notice" />
 		<label cond="$grant->manager" for="is_notice">{$lang->notice}</label>
diff --git a/modules/board/skins/xedition/_read.html b/modules/board/skins/xedition/_read.html
index 7c3e6030b..f0102cb25 100644
--- a/modules/board/skins/xedition/_read.html
+++ b/modules/board/skins/xedition/_read.html
@@ -114,7 +114,8 @@
 			<img cond="$oDocument->getProfileImage()" src="{$oDocument->getProfileImage()}" alt="Profile" class="pf" />
 			<div cond="$oDocument->getSignature()" class="tx">{$oDocument->getSignature()}</div>
 		</div>
-		<div class="btnArea"> 
+		<div class="btnArea">
+			<a cond="$update_view" class="btn" href="{getUrl('act','dispBoardUpdateLog','document_srl',$oDocument->document_srl,'comment_srl','')}"><i class="xi-list-ul"></i>{$lang->update_log}</a>
 			<a cond="$oDocument->isEditable()" class="btn" href="{getUrl('act','dispBoardWrite','document_srl',$oDocument->document_srl,'comment_srl','')}"><i class="xi-eraser"></i>{$lang->cmd_modify}</a>
 			<a cond="$oDocument->isEditable()" class="btn" href="{getUrl('act','dispBoardDelete','document_srl',$oDocument->document_srl,'comment_srl','')}"><i class="xi-trash"></i>{$lang->cmd_delete}</a>
 			<span class="etc">
diff --git a/modules/board/skins/xedition/board.default.css b/modules/board/skins/xedition/board.default.css
index 866a9f86f..30022f34c 100644
--- a/modules/board/skins/xedition/board.default.css
+++ b/modules/board/skins/xedition/board.default.css
@@ -263,6 +263,16 @@
 	right:0;
 	border-radius: 0 2px 2px 0;
 }
+
+.update-log {
+	width:100%;
+	border-bottom:1px solid #dbdbdb;
+	margin: 5px auto 5px auto;
+
+	padding:5px;
+
+}
+
 /* Board Write */
 
 /* write_form.html */
@@ -463,6 +473,9 @@
 	white-space: nowrap;
 	color : #666;
 }
+.update-log .read_header .meta {
+	border-bottom:0;
+}
 .read_header .meta > span { margin-left: 8px ;}
 .read_header .meta > span:first-child {margin-left:0;}
 .read_header .meta:after {
diff --git a/modules/board/skins/xedition/update_list.html b/modules/board/skins/xedition/update_list.html
new file mode 100644
index 000000000..09d962bbc
--- /dev/null
+++ b/modules/board/skins/xedition/update_list.html
@@ -0,0 +1,42 @@
+<include target="_header.html" />
+<div class="board_list" id="board_list">
+	<table width="100%" border="1" cellspacing="0" summary="List of Articles">
+		<thead>
+			<tr>
+				<th scope="col" class="title"><span>{$lang->title}</span></th>
+				<th scope="col"><span>{$lang->writer}</span></th>
+				<th scope="col"><span>{$lang->last_updater}</span></th>
+				<th scope="col"><span>{$lang->last_post}</span></th>
+			</tr>
+		</thead>
+		<tbody cond="$updatelog->data">
+			<tr loop="$updatelog->data=>$val">
+				<td class="title">
+					<a href="{getUrl('', 'mid', $mid, 'act', 'dispBoardUpdateLogView', 'update_id', $val->update_id)}">{$val->title}</a>
+				</td>
+				<td class="author">
+					{$val->update_nick_name}
+				</td>
+				<td class="author">
+					{$val->nick_name}
+				</td>
+				<td class="time">
+					{zdate($val->regdate, 'Y.m.d H:i:s')}
+				</td>
+			</tr>
+		</tbody>
+		<tbody cond="!$updatelog->data">
+			<tr>
+				<td colspan="4" style="text-align: center">{$lang->msg_dont_have_update_log}</td>
+			</tr>
+		</tbody>
+	</table>
+</div>
+<div class="pagination pagination-centered">
+	<a href="{getUrl('page','','module_srl','')}" class="direction">&laquo; {$lang->first_page}</a>
+	<!--@while($page_no = $page_navigation->getNextPage())-->
+	<strong cond="$page==$page_no">{$page_no}</strong>
+	<a cond="$page!=$page_no" href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a>
+	<!--@end-->
+	<a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="direction">{$lang->last_page} &raquo;</a>
+</div>
diff --git a/modules/board/skins/xedition/update_view.html b/modules/board/skins/xedition/update_view.html
new file mode 100644
index 000000000..390c051a2
--- /dev/null
+++ b/modules/board/skins/xedition/update_view.html
@@ -0,0 +1,29 @@
+<include target="_header.html" />
+<div class="update-log">
+	<div class="board_read" >
+		<!-- READ HEADER -->
+		<div class="read_header">
+			<h1>
+				<a href="{getUrl('category',$update_log->category_srl, 'document_srl', '')}" class="category" cond="$module_info->use_category=='Y' && $update_log->category_srl">{$category_list[$update_log->category_srl]->title}</a>
+				<a>{$update_log->title}</a>
+			</h1>
+			<p class="meta">
+				<span class="time">
+					<i class="xi-time"></i> {zdate($update_log->regdate,'Y.m.d H:i:s')}
+				</span>
+			</p>
+		</div>
+		<!-- READ BODY -->
+		<div class="read_body">
+			{$update_log->content}
+		</div>
+		<p loop="$extra_vars=>$key=>$val">
+			{$key} : {$val}
+		</p>
+		<p>
+			{$lang->reason_update} :
+			{$update_log->reason_update}
+		</p>
+		<!-- /READ BODY -->
+	</div>
+</div>
diff --git a/modules/board/skins/xedition/write_form.html b/modules/board/skins/xedition/write_form.html
index e9a197a07..98455f834 100644
--- a/modules/board/skins/xedition/write_form.html
+++ b/modules/board/skins/xedition/write_form.html
@@ -10,7 +10,7 @@
 				{str_repeat("&nbsp;&nbsp;",$val->depth)} {$val->title} ({$val->document_count})
 			</option>
 		</select>
-		<input cond="$oDocument->getTitleText()" type="text" name="title" class="iText" title="{$lang->title}" value="{htmlspecialchars($oDocument->getTitleText())}" />
+		<input cond="$oDocument->getTitleText()" type="text" name="title" class="iText" title="{$lang->title}" value="{escape($oDocument->getTitleText(), false)}" />
 		<input cond="!$oDocument->getTitleText()" type="text" name="title" class="iText" title="{$lang->title}" />
 		<input cond="$grant->manager" type="checkbox" name="is_notice" value="Y" class="iCheck" checked="checked"|cond="$oDocument->isNotice()" id="is_notice" />
 		<label cond="$grant->manager" for="is_notice">{$lang->notice}</label>
@@ -43,6 +43,7 @@
 				<input type="checkbox" name="notify_message" class="iCheck" value="Y" checked="checked"|cond="$oDocument->useNotify()" id="notify_message" />
 				<label for="notify_message">{$lang->notify}</label>
 			</block>
+
 			<!--@if(is_array($status_list))-->
 				<!--@foreach($status_list AS $key=>$value)-->
 				<input type="radio" name="status" value="{$key}" id="{$key}" <!--@if($oDocument->get('status') == $key || ($key == 'PUBLIC' && !$document_srl))-->checked="checked"<!--@end--> /> 
@@ -66,7 +67,11 @@
 			<span class="item">
 				<label for="tags" class="iLabel">{$lang->tag}: {$lang->about_tag}</label>
 				<input type="text" name="tags" id="tags" value="{htmlspecialchars($oDocument->get('tags'))}" class="iText" style="width:300px" title="Tag" />
-			</span>		
+			</span>
+			<span class="item" cond="$oDocument->get('document_srl') && $module_info->update_log == 'Y'">
+				<label for="reason_update" class="iLabel">{$lang->reason_update}</label>
+				<input type="text" name="reason_update" id="reason_update" value="" class="iText" style="width:300px" title="reason update" />
+			</span>
 		</div>
 		<div class="btnArea">
 			<block cond="!$oDocument->isExists() || $oDocument->get('status') == 'TEMP'">
diff --git a/modules/board/tpl/board_insert.html b/modules/board/tpl/board_insert.html
index ad2e7c176..457b8a550 100644
--- a/modules/board/tpl/board_insert.html
+++ b/modules/board/tpl/board_insert.html
@@ -199,6 +199,13 @@
 				<label class="x_inline" for="consultation"><input type="checkbox" name="consultation" id="consultation" value="Y" checked="checked"|cond="$module_info->consultation == 'Y'" /> {$lang->about_consultation}</label>
 			</div>
 		</div>
+		<div class="x_control-group">
+			<label class="x_control-label">{$lang->update_log}</label>
+			<div class="x_controls">
+				<label class="x_inline" for="update_log"><input type="checkbox" name="update_log" id="update_log" value="Y" checked="checked"|cond="$module_info->update_log == 'Y'" /> {$lang->about_update_log}</label>
+				<p>{$lang->msg_warning_update_log}</p>
+			</div>
+		</div>
 		<div class="x_control-group">
 			<label class="x_control-label">{$lang->protect_content}</label>
 			<div class="x_controls">
diff --git a/modules/comment/comment.admin.controller.php b/modules/comment/comment.admin.controller.php
index da6d95a78..40fd69af3 100644
--- a/modules/comment/comment.admin.controller.php
+++ b/modules/comment/comment.admin.controller.php
@@ -267,7 +267,7 @@ class commentAdminController extends comment
 		{
 			$msgCode = 'success_deleted';
 		}
-		//$this->setMessage( sprintf(Context::getLang('msg_checked_comment_is_deleted'), $deleted_count) );
+		//$this->setMessage( sprintf(lang('msg_checked_comment_is_deleted'), $deleted_count) );
 		$this->setMessage($msgCode, 'info');
 
 		//set url params
diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index 5ba090ca2..5c073722b 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -207,7 +207,7 @@ class commentController extends comment
 
 		// if an user select message from options, message would be the option.
 		$message_option = strval(Context::get('message_option'));
-		$improper_comment_reasons = Context::getLang('improper_comment_reasons');
+		$improper_comment_reasons = lang('improper_comment_reasons');
 		$declare_message = ($message_option !== 'others' && isset($improper_comment_reasons[$message_option]))?
 			$improper_comment_reasons[$message_option] : trim(Context::get('declare_message'));
 
@@ -594,7 +594,7 @@ class commentController extends comment
 		if(!$manual_inserted)
 		{
 			// send a message if notify_message option in enabled in the original article
-			$oDocument->notify(Context::getLang('comment'), $obj->content);
+			$oDocument->notify(lang('comment'), $obj->content);
 
 			// send a message if notify_message option in enabled in the original comment
 			if($obj->parent_srl)
@@ -602,7 +602,7 @@ class commentController extends comment
 				$oParent = $oCommentModel->getComment($obj->parent_srl);
 				if($oParent->get('member_srl') != $oDocument->get('member_srl'))
 				{
-					$oParent->notify(Context::getLang('comment'), $obj->content);
+					$oParent->notify(lang('comment'), $obj->content);
 				}
 			}
 		}
diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php
index 744d17994..4b1906f4a 100644
--- a/modules/comment/comment.item.php
+++ b/modules/comment/comment.item.php
@@ -312,7 +312,7 @@ class commentItem extends Object
 	{
 		if($this->isSecret() && !$this->isAccessible())
 		{
-			return Context::getLang('msg_is_secret');
+			return lang('msg_is_secret');
 		}
 
 		$content = $this->get('content');
@@ -333,7 +333,7 @@ class commentItem extends Object
 	{
 		if($this->isSecret() && !$this->isAccessible())
 		{
-			return Context::getLang('msg_is_secret');
+			return lang('msg_is_secret');
 		}
 
 		$content = $this->get('content');
@@ -343,7 +343,7 @@ class commentItem extends Object
 		if($add_popup_menu && Context::get('is_logged'))
 		{
 			$content = sprintf(
-					'%s<div class="comment_popup_menu"><a href="#popup_menu_area" class="comment_%d" onclick="return false">%s</a></div>', $content, $this->comment_srl, Context::getLang('cmd_comment_do')
+					'%s<div class="comment_popup_menu"><a href="#popup_menu_area" class="comment_%d" onclick="return false">%s</a></div>', $content, $this->comment_srl, lang('cmd_comment_do')
 			);
 		}
 
diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php
index 09ca6be0f..1a2def9d5 100644
--- a/modules/comment/comment.model.php
+++ b/modules/comment/comment.model.php
@@ -77,7 +77,7 @@ class commentModel extends comment
 		ModuleHandler::triggerCall('comment.getCommentMenu', 'after', $menu_list);
 
 		if($this->grant->manager){
-			$str_confirm = Context::getLang('confirm_move');
+			$str_confirm = lang('confirm_move');
 			$url = sprintf("if(!confirm('%s')) return; var params = new Array(); params['comment_srl']='%s'; params['mid']=current_mid;params['cur_url']=current_url; exec_xml('comment', 'procCommentAdminMoveToTrash', params)", $str_confirm, $comment_srl);
 			$oCommentController->addCommentPopupMenu($url,'cmd_trash','','javascript');
 
@@ -106,7 +106,7 @@ class commentModel extends comment
 
 		for($i = 0; $i < $menus_count; $i++)
 		{
-			$menus[$i]->str = Context::getLang($menus[$i]->str);
+			$menus[$i]->str = lang($menus[$i]->str);
 		}
 
 		// get a list of final organized pop-up menus
diff --git a/modules/comment/lang/lang.xml b/modules/comment/lang/lang.xml
deleted file mode 100644
index 6fe6ea89d..000000000
--- a/modules/comment/lang/lang.xml
+++ /dev/null
@@ -1,377 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<lang>
-	<item name="cmd_comment_do">
-		<value xml:lang="ko"><![CDATA[이 댓글을]]></value>
-		<value xml:lang="en"><![CDATA[I want to]]></value>
-		<value xml:lang="jp"><![CDATA[このコメントを…]]></value>
-		<value xml:lang="zh-CN"><![CDATA[将把此评论..]]></value>
-		<value xml:lang="zh-TW"><![CDATA[將此回覆..]]></value>
-		<value xml:lang="fr"><![CDATA[Vous voudriez]]></value>
-		<value xml:lang="ru"><![CDATA[Эту запись]]></value>
-		<value xml:lang="es"><![CDATA[Usted ]]></value>
-		<value xml:lang="tr"><![CDATA[Şunu yap]]></value>
-		<value xml:lang="vi"><![CDATA[Bình chọn / Phê bình]]></value>
-	</item>
-	<item name="comment_list">
-		<value xml:lang="ko"><![CDATA[댓글 목록]]></value>
-		<value xml:lang="en"><![CDATA[Comments List]]></value>
-		<value xml:lang="jp"><![CDATA[コメントリスト]]></value>
-		<value xml:lang="zh-CN"><![CDATA[评论列表]]></value>
-		<value xml:lang="zh-TW"><![CDATA[回覆列表]]></value>
-		<value xml:lang="fr"><![CDATA[Liste des Commentaires]]></value>
-		<value xml:lang="ru"><![CDATA[Список записей]]></value>
-		<value xml:lang="es"><![CDATA[Comentarios Lista]]></value>
-		<value xml:lang="tr"><![CDATA[Yorum Listesi]]></value>
-		<value xml:lang="vi"><![CDATA[Danh sách bình luận]]></value>
-	</item>
-	<item name="cmd_toggle_checked_comment">
-		<value xml:lang="ko"><![CDATA[선택항목 반전]]></value>
-		<value xml:lang="en"><![CDATA[Invert Selection]]></value>
-		<value xml:lang="jp"><![CDATA[選択項目の反転]]></value>
-		<value xml:lang="zh-CN"><![CDATA[反选]]></value>
-		<value xml:lang="zh-TW"><![CDATA[反向選擇]]></value>
-		<value xml:lang="fr"><![CDATA[Renverser les choisis]]></value>
-		<value xml:lang="ru"><![CDATA[Изменить выбранное]]></value>
-	</item>
-	<item name="cmd_delete_checked_comment">
-		<value xml:lang="ko"><![CDATA[선택항목 삭제]]></value>
-		<value xml:lang="en"><![CDATA[Delete selected item]]></value>
-		<value xml:lang="jp"><![CDATA[選択項目削除]]></value>
-		<value xml:lang="zh-CN"><![CDATA[删除所选]]></value>
-		<value xml:lang="zh-TW"><![CDATA[刪除所選]]></value>
-		<value xml:lang="fr"><![CDATA[Supprimer les choisis]]></value>
-		<value xml:lang="ru"><![CDATA[Удалить выбранное]]></value>
-		<value xml:lang="es"><![CDATA[Eliminar lo seleccionado]]></value>
-		<value xml:lang="tr"><![CDATA[Seçili parçayı sil]]></value>
-		<value xml:lang="vi"><![CDATA[Xóa những bình luận đã chọn]]></value>
-	</item>
-	<item name="trash">
-		<value xml:lang="ko"><![CDATA[휴지통]]></value>
-		<value xml:lang="en"><![CDATA[Recycle Bin]]></value>
-		<value xml:lang="jp"><![CDATA[ゴミ箱]]></value>
-		<value xml:lang="zh-TW"><![CDATA[回收桶]]></value>
-	</item>
-	<item name="cmd_trash">
-		<value xml:lang="ko"><![CDATA[휴지통으로 이동]]></value>
-		<value xml:lang="en"><![CDATA[Move to Recycle Bin]]></value>
-		<value xml:lang="jp"><![CDATA[ゴミ箱へ移動]]></value>
-		<value xml:lang="zh-TW"><![CDATA[移至回收桶]]></value>
-	</item>
-	<item name="comment_count">
-		<value xml:lang="ko"><![CDATA[댓글 수]]></value>
-		<value xml:lang="en"><![CDATA[Number of Comments]]></value>
-		<value xml:lang="jp"><![CDATA[コメント数]]></value>
-		<value xml:lang="zh-CN"><![CDATA[每页评论数]]></value>
-		<value xml:lang="zh-TW"><![CDATA[每頁回覆數]]></value>
-		<value xml:lang="fr"><![CDATA[Limite de Commentaires]]></value>
-		<value xml:lang="de"><![CDATA[Kommentare]]></value>
-		<value xml:lang="ru"><![CDATA[Количество ответов]]></value>
-		<value xml:lang="tr"><![CDATA[Yorum Sayısı]]></value>
-		<value xml:lang="vi"><![CDATA[Số bình luận]]></value>
-		<value xml:lang="mn"><![CDATA[Комментын тоо]]></value>
-	</item>
-	<item name="about_comment_count">
-		<value xml:lang="ko"><![CDATA[댓글을 정해진 수 만큼만 표시하고, 그 이상일 경우 페이지 번호를 표시해서 이동할 수 있게 합니다.]]></value>
-		<value xml:lang="en"><![CDATA[Display comments and if the number of them is over a specified number, move to the comment list.]]></value>
-		<value xml:lang="jp"><![CDATA[コメントを指定した数だけ表示し、それ以上はリスト化します。]]></value>
-		<value xml:lang="zh-CN"><![CDATA[可以指定要显示的每页评论数。]]></value>
-		<value xml:lang="zh-TW"><![CDATA[可以指定要顯示的每頁回覆數。]]></value>
-		<value xml:lang="fr"><![CDATA[Quand il y a plus de commentaires, ils seront bougés sur le liste.]]></value>
-		<value xml:lang="ru"><![CDATA[Отображается указанное количество ответов, после превышения этого количества производится переход к списку.]]></value>
-		<value xml:lang="tr"><![CDATA[Yorumları, kullanıcının girdiği rakam kadar gösterin. Eğer yorum sayısı belirlenen sayıyı aşarsa, yorum Liste'ye taşınır.]]></value>
-		<value xml:lang="vi"><![CDATA[Hiển thị số bình luận được gửi, và nó sẽ tạo một danh sách nếu có nhiều bình luận.]]></value>
-	</item>
-	<item name="msg_comment_voted_cancel_not">
-		<value xml:lang="ko"><![CDATA[추천수가 0이하일 경우 추천캔슬을 사용할 수 없습니다.]]></value>
-	</item>
-	<item name="msg_comment_blamed_cancel_not">
-		<value xml:lang="ko"><![CDATA[추천수가 0이하일 경우 비추천캔슬을 사용할 수 없습니다.]]></value>
-	</item>
-	<item name="msg_cart_is_null">
-		<value xml:lang="ko"><![CDATA[삭제할 글을 선택해주세요.]]></value>
-		<value xml:lang="en"><![CDATA[Please select an article to delete.]]></value>
-		<value xml:lang="jp"><![CDATA[削除するコメントを選択してください。]]></value>
-		<value xml:lang="zh-CN"><![CDATA[请选择要删除的评论。]]></value>
-		<value xml:lang="zh-TW"><![CDATA[請選擇要刪除的回覆。]]></value>
-		<value xml:lang="fr"><![CDATA[Choisissez un article à supprimer, S.V.P.]]></value>
-		<value xml:lang="ru"><![CDATA[Пожалуйста, выберите записи для удаления.]]></value>
-		<value xml:lang="es"><![CDATA[Selecciona el commentario que desea eliminar]]></value>
-		<value xml:lang="tr"><![CDATA[Lütfen silinecek makaleyi seçiniz]]></value>
-		<value xml:lang="vi"><![CDATA[Xin hãy chọn một bài viết để xóa.]]></value>
-	</item>
-	<item name="msg_checked_comment_is_deleted">
-		<value xml:lang="ko"><![CDATA[%d개의 댓글을 삭제했습니다.]]></value>
-		<value xml:lang="en"><![CDATA[%d comment(s) is(are) successfully deleted.]]></value>
-		<value xml:lang="jp"><![CDATA[%d個のコメントを削除しました。]]></value>
-		<value xml:lang="zh-CN"><![CDATA[已删除%d个评论。]]></value>
-		<value xml:lang="zh-TW"><![CDATA[已刪除 %d 個回覆。]]></value>
-		<value xml:lang="fr"><![CDATA[%d commentaire(s) est(sont) supprimé(s) avec succés.]]></value>
-		<value xml:lang="ru"><![CDATA[%d записьуспешно удалена]]></value>
-		<value xml:lang="es"><![CDATA[%d comentario eliminado correctamente.]]></value>
-		<value xml:lang="tr"><![CDATA[%d yorum başarıyla silindi.]]></value>
-		<value xml:lang="vi"><![CDATA[%d bình luận đã được xóa.]]></value>
-	</item>
-	<item name="search_target_list" type="array">
-		<item name="content">
-			<value xml:lang="ko"><![CDATA[내용]]></value>
-			<value xml:lang="en"><![CDATA[Content]]></value>
-			<value xml:lang="jp"><![CDATA[内容]]></value>
-			<value xml:lang="zh-CN"><![CDATA[内容]]></value>
-			<value xml:lang="zh-TW"><![CDATA[內容]]></value>
-			<value xml:lang="fr"><![CDATA[Contenu]]></value>
-			<value xml:lang="ru"><![CDATA[Содержание]]></value>
-			<value xml:lang="es"><![CDATA[Contenido]]></value>
-			<value xml:lang="tr"><![CDATA[İçerik]]></value>
-			<value xml:lang="vi"><![CDATA[Nội dung]]></value>
-		</item>
-		<item name="user_id">
-			<value xml:lang="ko"><![CDATA[아이디]]></value>
-			<value xml:lang="en"><![CDATA[ID]]></value>
-			<value xml:lang="jp"><![CDATA[ユーザID]]></value>
-			<value xml:lang="zh-CN"><![CDATA[I D]]></value>
-			<value xml:lang="zh-TW"><![CDATA[帳號]]></value>
-			<value xml:lang="fr"><![CDATA[Compte]]></value>
-			<value xml:lang="vi"><![CDATA[ID người gửi]]></value>
-		</item>
-		<item name="user_name">
-			<value xml:lang="ko"><![CDATA[이름]]></value>
-			<value xml:lang="en"><![CDATA[Name]]></value>
-			<value xml:lang="jp"><![CDATA[名前]]></value>
-			<value xml:lang="zh-CN"><![CDATA[姓名]]></value>
-			<value xml:lang="zh-TW"><![CDATA[姓名]]></value>
-			<value xml:lang="fr"><![CDATA[Nom]]></value>
-			<value xml:lang="ru"><![CDATA[Имя]]></value>
-			<value xml:lang="es"><![CDATA[Nombre]]></value>
-			<value xml:lang="tr"><![CDATA[İsim]]></value>
-			<value xml:lang="vi"><![CDATA[Tên]]></value>
-		</item>
-		<item name="nick_name">
-			<value xml:lang="ko"><![CDATA[닉네임]]></value>
-			<value xml:lang="en"><![CDATA[Nickname]]></value>
-			<value xml:lang="jp"><![CDATA[ニックネーム]]></value>
-			<value xml:lang="zh-CN"><![CDATA[昵称]]></value>
-			<value xml:lang="zh-TW"><![CDATA[暱稱]]></value>
-			<value xml:lang="fr"><![CDATA[Surnom]]></value>
-			<value xml:lang="ru"><![CDATA[Ник]]></value>
-			<value xml:lang="es"><![CDATA[Apodo]]></value>
-			<value xml:lang="tr"><![CDATA[Takma Ad]]></value>
-		</item>
-		<item name="member_srl">
-			<value xml:lang="ko"><![CDATA[회원 번호]]></value>
-			<value xml:lang="en"><![CDATA[Member Serial]]></value>
-			<value xml:lang="jp"><![CDATA[会員番号]]></value>
-			<value xml:lang="zh-CN"><![CDATA[会员编号]]></value>
-			<value xml:lang="zh-TW"><![CDATA[會員編號]]></value>
-			<value xml:lang="fr"><![CDATA[Numéro de Série du Membre]]></value>
-			<value xml:lang="ru"><![CDATA[Номер пользователя]]></value>
-			<value xml:lang="tr"><![CDATA[Üye Dizisi]]></value>
-			<value xml:lang="vi"><![CDATA[Mã số người gửi]]></value>
-		</item>
-		<item name="email_address">
-			<value xml:lang="ko"><![CDATA[이메일 주소]]></value>
-			<value xml:lang="en"><![CDATA[Email]]></value>
-			<value xml:lang="jp"><![CDATA[メールアドレス]]></value>
-			<value xml:lang="zh-CN"><![CDATA[电子信箱]]></value>
-			<value xml:lang="zh-TW"><![CDATA[電子信箱]]></value>
-			<value xml:lang="fr"><![CDATA[Mél]]></value>
-			<value xml:lang="ru"><![CDATA[Email адрес]]></value>
-			<value xml:lang="es"><![CDATA[Correo Electrónico]]></value>
-			<value xml:lang="tr"><![CDATA[E-posta]]></value>
-		</item>
-		<item name="homepage">
-			<value xml:lang="ko"><![CDATA[홈페이지]]></value>
-			<value xml:lang="en"><![CDATA[Homepage]]></value>
-			<value xml:lang="jp"><![CDATA[ホームページURL]]></value>
-			<value xml:lang="zh-CN"><![CDATA[主页]]></value>
-			<value xml:lang="zh-TW"><![CDATA[主頁]]></value>
-			<value xml:lang="fr"><![CDATA[Page d'Accueil]]></value>
-			<value xml:lang="ru"><![CDATA[Домашняя страница]]></value>
-			<value xml:lang="es"><![CDATA[Página web]]></value>
-			<value xml:lang="tr"><![CDATA[Anasayfa]]></value>
-			<value xml:lang="vi"><![CDATA[Trang chủ]]></value>
-		</item>
-		<item name="regdate">
-			<value xml:lang="ko"><![CDATA[등록일]]></value>
-			<value xml:lang="en"><![CDATA[Date]]></value>
-			<value xml:lang="jp"><![CDATA[登録日]]></value>
-			<value xml:lang="zh-CN"><![CDATA[日期]]></value>
-			<value xml:lang="zh-TW"><![CDATA[日期]]></value>
-			<value xml:lang="fr"><![CDATA[Jour]]></value>
-			<value xml:lang="ru"><![CDATA[Дата регистрации]]></value>
-			<value xml:lang="es"><![CDATA[Fecha del registro]]></value>
-			<value xml:lang="tr"><![CDATA[Tarih]]></value>
-			<value xml:lang="vi"><![CDATA[Ngày]]></value>
-		</item>
-		<item name="last_update">
-			<value xml:lang="ko"><![CDATA[최근수정일 ]]></value>
-			<value xml:lang="en"><![CDATA[Last update]]></value>
-			<value xml:lang="jp"><![CDATA[最終更新日 ]]></value>
-			<value xml:lang="zh-CN"><![CDATA[最后更新 ]]></value>
-			<value xml:lang="zh-TW"><![CDATA[最後更新]]></value>
-			<value xml:lang="fr"><![CDATA[Mise à Jour]]></value>
-			<value xml:lang="ru"><![CDATA[Дата последнего обновления]]></value>
-			<value xml:lang="es"><![CDATA[Ultima actualización]]></value>
-			<value xml:lang="tr"><![CDATA[Son Güncelleştirme]]></value>
-			<value xml:lang="vi"><![CDATA[Cập nhật lần cuối]]></value>
-		</item>
-		<item name="ipaddress">
-			<value xml:lang="ko"><![CDATA[IP 주소]]></value>
-			<value xml:lang="en"><![CDATA[IP Address]]></value>
-			<value xml:lang="jp"><![CDATA[IPアドレス]]></value>
-			<value xml:lang="zh-CN"><![CDATA[IP 地址]]></value>
-			<value xml:lang="zh-TW"><![CDATA[IP 位址]]></value>
-			<value xml:lang="fr"><![CDATA[Adresse IP]]></value>
-			<value xml:lang="ru"><![CDATA[IP-адрес]]></value>
-			<value xml:lang="es"><![CDATA[Dirección IP]]></value>
-			<value xml:lang="tr"><![CDATA[IP Adresi]]></value>
-			<value xml:lang="vi"><![CDATA[IP]]></value>
-		</item>
-		<item name="is_secret">
-			<value xml:lang="ko"><![CDATA[상태]]></value>
-			<value xml:lang="en"><![CDATA[Status]]></value>
-			<value xml:lang="jp"><![CDATA[状態]]></value>
-			<value xml:lang="zh-TW"><![CDATA[狀態]]></value>
-		</item>
-	</item>
-	<item name="no_text_comment">
-		<value xml:lang="ko"><![CDATA[글자가 없는 댓글입니다.]]></value>
-		<value xml:lang="en"><![CDATA[No text in this comment.]]></value>
-		<value xml:lang="jp"><![CDATA[テキストがないコメントです。]]></value>
-		<value xml:lang="zh-TW"><![CDATA[此回覆無內容。]]></value>
-		<value xml:lang="tr"><![CDATA[Bu yorumda herhangi bir metin yok.]]></value>
-	</item>
-	<item name="secret_name_list" type="array">
-		<item name="Y">
-			<value xml:lang="ko"><![CDATA[비밀]]></value>
-			<value xml:lang="en"><![CDATA[Secret]]></value>
-			<value xml:lang="jp"><![CDATA[非公開]]></value>
-			<value xml:lang="zh-TW"><![CDATA[秘密]]></value>
-		</item>
-		<item name="N">
-			<value xml:lang="ko"><![CDATA[공개]]></value>
-			<value xml:lang="en"><![CDATA[Public]]></value>
-			<value xml:lang="jp"><![CDATA[公開]]></value>
-			<value xml:lang="zh-TW"><![CDATA[公開]]></value>
-		</item>
-	</item>
-	<item name="published_name_list" type="array">
-		<item name="Y">
-			<value xml:lang="en"><![CDATA[Published]]></value>
-			<value xml:lang="ko"><![CDATA[발행완료]]></value>
-			<value xml:lang="jp"><![CDATA[発行完了]]></value>
-		</item>
-		<item name="N">
-			<value xml:lang="en"><![CDATA[Unpublished]]></value>
-			<value xml:lang="ko"><![CDATA[발행대기]]></value>
-			<value xml:lang="jp"><![CDATA[発行待機]]></value>
-		</item>
-	</item>
-	<item name="comment_manager">
-		<value xml:lang="ko"><![CDATA[선택한 댓글 관리]]></value>
-		<value xml:lang="en"><![CDATA[Manage Selected Comment]]></value>
-		<value xml:lang="jp"><![CDATA[選択したコメントを管理]]></value>
-		<value xml:lang="zh-TW"><![CDATA[管理所選回覆]]></value>
-	</item>
-	<item name="selected_comment">
-		<value xml:lang="ko"><![CDATA[선택한 댓글]]></value>
-		<value xml:lang="en"><![CDATA[Selected Comment]]></value>
-		<value xml:lang="jp"><![CDATA[選択したコメント]]></value>
-		<value xml:lang="zh-TW"><![CDATA[已選回覆]]></value>
-	</item>
-	<item name="cmd_comment_validation">
-		<value xml:lang="ko"><![CDATA[승인 후 공개]]></value>
-		<value xml:lang="en"><![CDATA[Use comment validation]]></value>
-		<value xml:lang="jp"><![CDATA[承認後公開]]></value>
-	</item>
-	<item name="about_comment_validation">
-		<value xml:lang="ko"><![CDATA[관리자 승인 후 댓글을 공개합니다.]]></value>
-		<value xml:lang="en"><![CDATA[If you want to use comment validation before displaying on your module frontend select USE, otherwise select NOT USE.]]></value>
-		<value xml:lang="jp"><![CDATA[管理者承認後コメントを公開します。]]></value>
-	</item>
-	<item name="published">
-		<value xml:lang="en"><![CDATA[Publish status]]></value>
-		<value xml:lang="ko"><![CDATA[발행 상태]]></value>
-		<value xml:lang="jp"><![CDATA[発行状態]]></value>
-	</item>
-	<item name="cmd_publish">
-		<value xml:lang="en"><![CDATA[Publish]]></value>
-		<value xml:lang="ko"><![CDATA[발행]]></value>
-		<value xml:lang="jp"><![CDATA[発行]]></value>
-	</item>
-	<item name="cmd_unpublish">
-		<value xml:lang="en"><![CDATA[Unpublish]]></value>
-		<value xml:lang="ko"><![CDATA[발행 중지]]></value>
-		<value xml:lang="jp"><![CDATA[発行中止]]></value>
-	</item>
-	<item name="select_module">
-		<value xml:lang="ko"><![CDATA[모듈 선택]]></value>
-		<value xml:lang="en"><![CDATA[Select Module]]></value>
-		<value xml:lang="jp"><![CDATA[モジュール選択]]></value>
-	</item>
-	<item name="page">
-		<value xml:lang="ko"><![CDATA[페이지]]></value>
-		<value xml:lang="en"><![CDATA[Page]]></value>
-		<value xml:lang="jp"><![CDATA[ページ]]></value>
-	</item>
-	<item name="msg_not_selected_comment">
-		<value xml:lang="ko"><![CDATA[선택한 댓글이 없습니다.]]></value>
-		<value xml:lang="en"><![CDATA[There are no selected comment.]]></value>
-		<value xml:lang="jp"><![CDATA[選択したコメントがありません。]]></value>
-	</item>
-	<item name="msg_admin_comment_no_delete">
-		<value xml:lang="ko"><![CDATA[최고관리자의 댓글을 삭제 할 수 없습니다.]]></value>
-	</item>
-	<item name="msg_admin_c_comment_no_delete">
-		<value xml:lang="ko"><![CDATA[이 댓글에 최고관리자의 댓글이 있어 삭제할 수 없습니다.]]></value>
-	</item>
-	<item name="improper_comment_declare">
-		<value xml:lang="ko"><![CDATA[불량 댓글 신고]]></value>
-		<value xml:lang="en"><![CDATA[Report an improper comment]]></value>
-	</item>
-	<item name="declaring_user">
-		<value xml:lang="ko"><![CDATA[신고자]]></value>
-		<value xml:lang="en"><![CDATA[Reporter]]></value>
-	</item>
-	<item name="improper_comment_declare_reason">
-		<value xml:lang="ko"><![CDATA[신고 이유]]></value>
-		<value xml:lang="en"><![CDATA[Reason]]></value>
-	</item>
-	<item name="improper_comment_reasons" type="array">
-		<item name="advertisement">
-			<value xml:lang="ko"><![CDATA[본문 주제나 흐름에 맞지 않는 광고 글입니다.]]></value>
-			<value xml:lang="en"><![CDATA[Advertisements that do not fit the topics or themes.]]></value>
-		</item>
-		<item name="theme">
-			<value xml:lang="ko"><![CDATA[주제에 맞지 않는 글입니다.]]></value>
-			<value xml:lang="en"><![CDATA[Comments that do not fit the topics or themes.]]></value>
-		</item>
-		<item name="bad_word">
-			<value xml:lang="ko"><![CDATA[과도한 욕설을 담고 있습니다.]]></value>
-			<value xml:lang="en"><![CDATA[Too much bad words.]]></value>
-		</item>
-		<item name="violence">
-			<value xml:lang="ko"><![CDATA[폭력적인 내용을 담고 있습니다.]]></value>
-			<value xml:lang="en"><![CDATA[Violence.]]></value>
-		</item>
-		<item name="racism">
-			<value xml:lang="ko"><![CDATA[인종차별적인 내용을 담고 있습니다.]]></value>
-			<value xml:lang="en"><![CDATA[Racism.]]></value>
-		</item>
-		<item name="pornography">
-			<value xml:lang="ko"><![CDATA[음란물을 포함하고 있습니다.]]></value>
-			<value xml:lang="en"><![CDATA[Pornography.]]></value>
-		</item>
-		<item name="privacy">
-			<value xml:lang="ko"><![CDATA[민감한 개인정보가 노출 되어있습니다.]]></value>
-			<value xml:lang="en"><![CDATA[Privacy issue.]]></value>
-		</item>
-		<item name="others">
-			<value xml:lang="ko"><![CDATA[기타(직접작성)]]></value>
-			<value xml:lang="en"><![CDATA[Others (Write your own)]]></value>
-		</item>
-	</item>
-	<item name="about_improper_comment_declare">
-		<value xml:lang="ko"><![CDATA[댓글을 신고하신 이유를 간단히 적어서 제출해주시면 관리자 검토 후 조치하겠습니다.]]></value>
-		<value xml:lang="en"><![CDATA[Write here why you report this comment as an improper thing.]]></value>
-	</item>
-</lang>
\ No newline at end of file
diff --git a/modules/communication/communication.controller.php b/modules/communication/communication.controller.php
index 289096a3b..ece930b31 100644
--- a/modules/communication/communication.controller.php
+++ b/modules/communication/communication.controller.php
@@ -837,7 +837,7 @@ class communicationController extends communication
 				$new_message_count = (int) trim(FileHandler::readFile($flag_file));
 				if($new_message_count > 0)
 				{
-					$text = preg_replace('@\r?\n@', '\\n', addslashes(Context::getLang('alert_new_message_arrived')));
+					$text = preg_replace('@\r?\n@', '\\n', addslashes(lang('alert_new_message_arrived')));
 					Context::addHtmlFooter("<script>jQuery(function(){ xeNotifyMessage('{$text}','{$new_message_count}'); });</script>");
 					Context::loadFile(array('./modules/communication/tpl/js/member_communication.js'), true);
 				}
diff --git a/modules/communication/lang/es.php b/modules/communication/lang/es.php
index 789ed1c77..55de5ace5 100644
--- a/modules/communication/lang/es.php
+++ b/modules/communication/lang/es.php
@@ -1,5 +1,4 @@
 <?php
-$lang->about_communication = '회원간의 쪽지나 친구 관리 등 커뮤니케이션 기능을 수행합니다';
 $lang->allow_message = 'Permitir la recepción del mensaje';
 $lang->allow_message_type['Y'] = 'Recibir todo';
 $lang->allow_message_type['N'] = 'Rechazar';
diff --git a/modules/communication/skins/default/common_header.html b/modules/communication/skins/default/common_header.html
index 5113f50d2..8e504c290 100644
--- a/modules/communication/skins/default/common_header.html
+++ b/modules/communication/skins/default/common_header.html
@@ -3,6 +3,6 @@
 <section class="xc">
 	<ul class="nav nav-tabs" cond="$is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl)">
 		<li loop="$logged_info->menu_list => $key,$val" class="active"|cond="$key==$act">
-			<a href="{getUrl('act',$key)}">{Context::getLang($val)}</a>
+			<a href="{getUrl('act',$key)}">{lang($val)}</a>
 		</li>
 	</ul>
diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php
index 8e6de0410..9ccb1c869 100644
--- a/modules/document/document.admin.controller.php
+++ b/modules/document/document.admin.controller.php
@@ -41,7 +41,7 @@ class documentAdminController extends document
 			$oDocumentController->deleteDocument($document_srl, true);
 		}
 
-		$this->setMessage(sprintf(Context::getLang('msg_checked_document_is_deleted'), $document_count) );
+		$this->setMessage(sprintf(lang('msg_checked_document_is_deleted'), $document_count) );
 	}
 
 	/**
@@ -145,11 +145,20 @@ class documentAdminController extends document
 			$obj->module_srl = $module_srl;
 			$obj->category_srl = $category_srl;
 			$output = executeQuery('document.updateDocumentModule', $obj);
-			if(!$output->toBool()) {
+			if(!$output->toBool())
+			{
 				$oDB->rollback();
 				return $output;
 			}
-
+			else
+			{
+				$update_output = $oDocumentController->insertDocumentUpdateLog($obj);
+				if(!$update_output->toBool())
+				{
+					$oDB->rollback();
+					return $update_output;
+				}
+			}
 			//Move a module of the extra vars
 			$output = executeQuery('document.moveDocumentExtraVars', $obj);
 			if(!$output->toBool()) {
diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php
index 4efa55613..5e322fc38 100644
--- a/modules/document/document.admin.view.php
+++ b/modules/document/document.admin.view.php
@@ -68,7 +68,7 @@ class documentAdminView extends document
 		$count_search_option = count($this->search_option);
 		for($i=0;$i<$count_search_option;$i++)
 		{
-			$search_option[$this->search_option[$i]] = Context::getLang($this->search_option[$i]);
+			$search_option[$this->search_option[$i]] = lang($this->search_option[$i]);
 		}
 		Context::set('search_option', $search_option);
 
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 086b35028..81d2685b4 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -205,7 +205,7 @@ class documentController extends document
 
 		// if an user select message from options, message would be the option.
 		$message_option = strval(Context::get('message_option'));
-		$improper_document_reasons = Context::getLang('improper_document_reasons');
+		$improper_document_reasons = lang('improper_document_reasons');
 		$declare_message = ($message_option !== 'others' && isset($improper_document_reasons[$message_option]))?
 			$improper_document_reasons[$message_option] : trim(Context::get('declare_message'));
 
@@ -439,6 +439,7 @@ class documentController extends document
 			return $output;
 		}
 		// Insert extra variables if the document successfully inserted.
+		$extra_vars = array();
 		$extra_keys = $oDocumentModel->getExtraKeys($obj->module_srl);
 		if(count($extra_keys))
 		{
@@ -449,13 +450,20 @@ class documentController extends document
 				{
 					$tmp = $obj->{'extra_vars'.$idx};
 					if(is_array($tmp))
+					{
 						$value = implode('|@|', $tmp);
+					}
 					else
+					{
 						$value = trim($tmp);
+					}
+				}
+				else if(isset($obj->{$extra_item->name}))
+				{
+					$value = trim($obj->{$extra_item->name});
 				}
-				else if(isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
 				if($value == NULL) continue;
-
+				$extra_vars[$extra_item->name] = $value;
 				$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid);
 			}
 		}
@@ -464,6 +472,16 @@ class documentController extends document
 		// Call a trigger (after)
 		if($output->toBool())
 		{
+			if($obj->update_log_setting === 'Y')
+			{
+				$obj->extra_vars = serialize($extra_vars);
+				$update_output = $this->insertDocumentUpdateLog($obj);
+				if(!$update_output->toBool())
+				{
+					$oDB->rollback();
+					return $update_output;
+				}
+			}
 			$trigger_output = ModuleHandler::triggerCall('document.insertDocument', 'after', $obj);
 			if(!$trigger_output->toBool())
 			{
@@ -686,7 +704,9 @@ class documentController extends document
 			$oDB->rollback();
 			return $output;
 		}
+
 		// Remove all extra variables
+		$extra_vars = array();
 		if(Context::get('act')!='procFileDelete')
 		{
 			$this->deleteDocumentExtraVars($source_obj->get('module_srl'), $obj->document_srl, null, Context::getLangType());
@@ -707,6 +727,7 @@ class documentController extends document
 					}
 					else if(isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
 					if($value == NULL) continue;
+					$extra_vars[$extra_item->name] = $value;
 					$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid);
 				}
 			}
@@ -723,6 +744,16 @@ class documentController extends document
 		// Call a trigger (after)
 		if($output->toBool())
 		{
+			if($obj->update_log_setting === 'Y')
+			{
+				$obj->extra_vars = serialize($extra_vars);
+				$update_output = $this->insertDocumentUpdateLog($obj, $source_obj);
+				if(!$update_output->toBool())
+				{
+					$oDB->rollback();
+					return $update_output;
+				}
+			}
 			$trigger_output = ModuleHandler::triggerCall('document.updateDocument', 'after', $obj);
 			if(!$trigger_output->toBool())
 			{
@@ -749,6 +780,45 @@ class documentController extends document
 		return $output;
 	}
 
+	function insertDocumentUpdateLog($obj, $source_obj = null)
+	{
+		$update_args = new stdClass();
+		$logged_info = Context::get('logged_info');
+		if($source_obj === null)
+		{
+			$update_args->category_srl = $obj->category_srl;
+			$update_args->module_srl = $obj->module_srl;
+			$update_args->nick_name = $obj->nick_name;
+		}
+		else
+		{
+			if($obj->category_srl)
+			{
+				$update_args->category_srl = $obj->category_srl;
+			}
+			else
+			{
+				$update_args->category_srl = $source_obj->get('category_srl');
+			}
+			$update_args->module_srl = $source_obj->get('module_srl');
+			$update_args->nick_name = $source_obj->get('nick_name');
+		}
+
+		$update_args->document_srl = $obj->document_srl;
+		$update_args->update_member_srl = $logged_info->member_srl;
+		$update_args->title = $obj->title;
+		$update_args->title_bold = $obj->title_bold;
+		$update_args->title_color = $obj->title_color;
+		$update_args->content = $obj->content;
+		$update_args->update_nick_name = $logged_info->nick_name;
+		$update_args->tags = $obj->tags;
+		$update_args->extra_vars = $obj->extra_vars;
+		$update_args->reason_update = $obj->reason_update;
+		$update_output = executeQuery('document.insertDocumentUpdateLog', $update_args);
+
+		return $update_output;
+	}
+
 	/**
 	 * Deleting Documents
 	 * @param int $document_srl
@@ -832,6 +902,7 @@ class documentController extends document
 		$this->_deleteDeclaredDocuments($args);
 		$this->_deleteDocumentReadedLog($args);
 		$this->_deleteDocumentVotedLog($args);
+		$this->_deleteDocumentUpdateLog($args);
 
 		// Remove the thumbnail file
 		FileHandler::removeDir(sprintf('files/thumbnails/%s',getNumberingPath($document_srl, 3)));
@@ -881,6 +952,11 @@ class documentController extends document
 		executeQuery('document.deleteDocumentVotedLog', $documentSrls);
 	}
 
+	function _deleteDocumentUpdateLog($document_srl)
+	{
+		executeQuery('document.deleteDocumentUpdateLog', $document_srl);
+	}
+
 	/**
 	 * Move the doc into the trash
 	 * @param object $obj
@@ -1738,9 +1814,9 @@ class documentController extends document
 			$prev_category = $val;
 		}
 		// Return if the previous category doesn't exist
-		if(!$prev_category) return new Object(-1,Context::getLang('msg_category_not_moved'));
+		if(!$prev_category) return new Object(-1,lang('msg_category_not_moved'));
 		// Return if the selected category is the top level
-		if($category_srl_list[0]==$category_srl) return new Object(-1,Context::getLang('msg_category_not_moved'));
+		if($category_srl_list[0]==$category_srl) return new Object(-1,lang('msg_category_not_moved'));
 		// Information of the selected category
 		$cur_args = new stdClass;
 		$cur_args->category_srl = $category_srl;
@@ -1784,7 +1860,7 @@ class documentController extends document
 		}
 
 		$next_category_srl = $category_srl_list[$i+1];
-		if(!$category_list[$next_category_srl]) return new Object(-1,Context::getLang('msg_category_not_moved'));
+		if(!$category_list[$next_category_srl]) return new Object(-1,lang('msg_category_not_moved'));
 		$next_category = $category_list[$next_category_srl];
 		// Information of the selected category
 		$cur_args = new stdClass;
@@ -2453,10 +2529,10 @@ class documentController extends document
 		{
 			$logged_info = Context::get('logged_info');
 			$message_content = '';
-			$default_message_verbs = Context::getLang('default_message_verbs');
+			$default_message_verbs = lang('default_message_verbs');
 			if(isset($default_message_verbs[$type]) && is_string($default_message_verbs[$type]))
 			{
-				$message_content = sprintf(Context::getLang('default_message_format'), $logged_info->nick_name, $default_message_verbs[$type]);
+				$message_content = sprintf(lang('default_message_format'), $logged_info->nick_name, $default_message_verbs[$type]);
 			}
 		}
 		else
diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index abb9e9614..3990506bd 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -411,7 +411,7 @@ class documentItem extends Object
 	{
 		if(!$this->document_srl) return;
 
-		if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
+		if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return lang('msg_is_secret');
 
 		$result = $this->_checkAccessibleFromStatus();
 		if($result && Context::getSessionStatus())
@@ -475,7 +475,7 @@ class documentItem extends Object
 	{
 		if(!$this->document_srl) return;
 
-		if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
+		if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return lang('msg_is_secret');
 
 		$result = $this->_checkAccessibleFromStatus();
 		if($result && Context::getSessionStatus())
@@ -498,7 +498,7 @@ class documentItem extends Object
 			$content = sprintf(
 				'%s<div class="document_popup_menu"><a href="#popup_menu_area" class="document_%d" onclick="return false">%s</a></div>',
 				$content,
-				$this->document_srl, Context::getLang('cmd_document_do')
+				$this->document_srl, lang('cmd_document_do')
 			);
 		}
 		// If additional content information is set
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index 2420eebb0..ac5df7e32 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -528,7 +528,7 @@ class documentModel extends document
 		ModuleHandler::triggerCall('document.getDocumentMenu', 'after', $menu_list);
 		if($this->grant->manager)
 		{
-			$str_confirm = Context::getLang('confirm_move');
+			$str_confirm = lang('confirm_move');
 			$url = sprintf("if(!confirm('%s')) return; var params = new Array(); params['document_srl']='%s'; params['mid']=current_mid;params['cur_url']=current_url; exec_xml('document', 'procDocumentAdminMoveToTrash', params)", $str_confirm, $document_srl);
 			$oDocumentController->addDocumentPopupMenu($url,'cmd_trash','','javascript');
 		}
@@ -554,7 +554,7 @@ class documentModel extends document
 		$menus_count = count($menus);
 		for($i=0;$i<$menus_count;$i++)
 		{
-			$menus[$i]->str = Context::getLang($menus[$i]->str);
+			$menus[$i]->str = lang($menus[$i]->str);
 		}
 		// Wanted to finally clean pop-up menu list
 		$this->add('menus', $menus);
@@ -1548,6 +1548,25 @@ class documentModel extends document
 
 		return $document_list;	
 	}
+
+	function getDocumentUpdateLog($document_srl)
+	{
+		$args = new stdClass();
+		$args->document_srl = $document_srl;
+		$output = executeQueryArray('document.getDocumentUpdateLog', $args);
+
+		return $output;
+	}
+
+	function getUpdateLog($update_id)
+	{
+		$args = new stdClass();
+		$args->update_id = $update_id;
+		$output = exeCuteQuery('document.getUpdateLog', $args);
+		$updage_log = $output->data;
+
+		return $updage_log;
+	}
 }
 /* End of file document.model.php */
 /* Location: ./modules/document/document.model.php */
diff --git a/modules/document/lang/es.php b/modules/document/lang/es.php
index 42ed4364a..d69d8bf4d 100644
--- a/modules/document/lang/es.php
+++ b/modules/document/lang/es.php
@@ -1,6 +1,5 @@
 <?php
 $lang->document_list = 'Document list';
-$lang->new_document_count = '새글';
 $lang->parent_category_title = 'Categoría Superior';
 $lang->category_title = 'Nombre de la categoría';
 $lang->expand = 'Expandir';
@@ -9,8 +8,6 @@ $lang->cmd_make_child = 'Agregar sub categoría';
 $lang->cmd_enable_move_category = 'Cambiar la posición de la categoría. (arrastrar y soltar luego de haber selecionado)';
 $lang->about_category_title = 'Ingresar el nombre de la categoría.';
 $lang->about_expand = 'Si seleccionas esta opción, siempre estará expandido.';
-$lang->about_category_group_srls = '선택한 그룹만 현재 카테고리를 지정할 수 있도록 합니다';
-$lang->about_category_color = '분류 폰트색깔을 지정합니다.';
 $lang->cmd_search_next = 'Buscar siguiente';
 $lang->cmd_temp_save = 'Guardar Temporales';
 $lang->cmd_toggle_checked_document = 'Invertir los elementos seleccionados';
@@ -40,5 +37,4 @@ $lang->search_target_list['uploaded_count'] = 'Número de archivos adjuntos (sob
 $lang->search_target_list['regdate'] = 'Día del registro';
 $lang->search_target_list['last_update'] = 'Día de la última actualización';
 $lang->search_target_list['ipaddress'] = 'Dirección IP';
-$lang->about_use_history = '히스토리 기능의 사용여부를 지정합니다. 히스토리 기능을 사용할 경우 문서 수정시 이전 리비전을 기록하고 복원할 수 있습니다.';
 $lang->trash_nick_name = 'Person who deleted';
diff --git a/modules/document/lang/fr.php b/modules/document/lang/fr.php
index ff4ced221..2fa9e8831 100644
--- a/modules/document/lang/fr.php
+++ b/modules/document/lang/fr.php
@@ -6,7 +6,6 @@ $lang->thumbnail_ratio = 'Proportion';
 $lang->cmd_delete_all_thumbnail = 'Supprimer toutes les vignettes';
 $lang->title_bold = 'Gras';
 $lang->title_color = 'Couleur';
-$lang->new_document_count = '새글';
 $lang->parent_category_title = 'catégorie supérieure';
 $lang->category_title = 'Catégorie';
 $lang->expand = 'Etendre';
@@ -44,5 +43,4 @@ $lang->search_target_list['uploaded_count'] = 'Fichiers Attachés (surplus)';
 $lang->search_target_list['regdate'] = 'Enrégistré';
 $lang->search_target_list['last_update'] = 'La Dernière Mise à Jour';
 $lang->search_target_list['ipaddress'] = 'Adresse IP';
-$lang->about_use_history = '히스토리 기능의 사용여부를 지정합니다. 히스토리 기능을 사용할 경우 문서 수정시 이전 리비전을 기록하고 복원할 수 있습니다.';
 $lang->trash_nick_name = 'Person who deleted';
diff --git a/modules/document/lang/ru.php b/modules/document/lang/ru.php
index 22d0bc01d..6421d2f0e 100644
--- a/modules/document/lang/ru.php
+++ b/modules/document/lang/ru.php
@@ -16,7 +16,6 @@ $lang->cmd_enable_move_category = 'Изменить местоположение
 $lang->about_category_title = 'Введите название категории';
 $lang->about_expand = 'Если эта опция выбрана, расширение будут применено всегда';
 $lang->about_category_group_srls = 'Только выбранные группы можно отнести к этой категории';
-$lang->about_category_color = '분류 폰트색깔을 지정합니다.';
 $lang->cmd_search_next = 'Искать дальше';
 $lang->cmd_temp_save = 'Сохранить временно';
 $lang->cmd_toggle_checked_document = 'Перевернуть выбранные объекты';
diff --git a/modules/document/queries/deleteDocumentUpdateLog.xml b/modules/document/queries/deleteDocumentUpdateLog.xml
new file mode 100644
index 000000000..6f0ee246c
--- /dev/null
+++ b/modules/document/queries/deleteDocumentUpdateLog.xml
@@ -0,0 +1,8 @@
+<query id="deleteDocumentUpdateLog" action="delete">
+	<tables>
+		<table name="document_update_log" />
+	</tables>
+	<conditions>
+		<condition operation="in" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
+	</conditions>
+</query>
diff --git a/modules/document/queries/getDocumentUpdateLog.xml b/modules/document/queries/getDocumentUpdateLog.xml
new file mode 100644
index 000000000..c7ceeedc0
--- /dev/null
+++ b/modules/document/queries/getDocumentUpdateLog.xml
@@ -0,0 +1,22 @@
+<query id="getDocumentUpdateLog" action="select">
+	<tables>
+		<table name="document_update_log" />
+	</tables>
+	<columns>
+		<column name="nick_name" />
+		<column name="update_nick_name" />
+		<column name="regdate" />
+		<column name="title" />
+		<column name="module_srl" />
+		<column name="update_id" />
+	</columns>
+	<conditions>
+		<condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
+	</conditions>
+	<navigation>
+		<index var="sort_index" default="update_id" order="desc" />
+		<list_count var="list_count" default="20" />
+		<page_count var="page_count" default="10" />
+		<page var="page" default="1" />
+	</navigation>
+</query>
diff --git a/modules/document/queries/getUpdateLog.xml b/modules/document/queries/getUpdateLog.xml
new file mode 100644
index 000000000..daae71601
--- /dev/null
+++ b/modules/document/queries/getUpdateLog.xml
@@ -0,0 +1,11 @@
+<query id="getUpdateLog" action="select">
+	<tables>
+		<table name="document_update_log" />
+	</tables>
+	<columns>
+		<column name="*" />
+	</columns>
+	<conditions>
+		<condition operation="equal" column="update_id" var="update_id" filter="number" notnull="notnull" />
+	</conditions>
+</query>
diff --git a/modules/document/queries/insertDocumentUpdateLog.xml b/modules/document/queries/insertDocumentUpdateLog.xml
new file mode 100644
index 000000000..921dd1b51
--- /dev/null
+++ b/modules/document/queries/insertDocumentUpdateLog.xml
@@ -0,0 +1,22 @@
+<query id="insertDocumentUpdateLog" action="insert">
+	<tables>
+		<table name="document_update_log" />
+	</tables>
+	<columns>
+		<column name="document_srl" var="document_srl" filter="number" notnull="notnull" />
+		<column name="module_srl" var="module_srl" filter="number" notnull="notnull" />
+		<column name="update_member_srl" var="update_member_srl" filter="number" />
+		<column name="category_srl" var="category_srl" filter="number" />
+		<column name="ipaddress" var="ipaddress" default="ipaddress()" />
+		<column name="nick_name" var="nick_name" notnull="notnull" />
+		<column name="title" var="title" notnull="notnull" />
+		<column name="title_bold" var="title_bold" />
+		<column name="title_color" var="title_color" />
+		<column name="content" var="content" notnull="notnull" />
+		<column name="update_nick_name" var="update_nick_name" notnull="notnull" />
+		<column name="tags" var="tags" />
+		<column name="extra_vars" var="extra_vars" />
+		<column name="reason_update" var="reason_update" />
+		<column name="regdate" var="regdate" default="curdate()" />
+	</columns>
+</query>
diff --git a/modules/document/schemas/document_update_log.xml b/modules/document/schemas/document_update_log.xml
new file mode 100644
index 000000000..85a99283a
--- /dev/null
+++ b/modules/document/schemas/document_update_log.xml
@@ -0,0 +1,18 @@
+<table name="document_update_log">
+    <column name="update_id"  type="number" size="11" notnull="notnull" auto_increment="auto_increment" primary_key="primary_key" />
+    <column name="document_srl" type="number" size="11" notnull="notnull" index="idx_document_srl" />
+    <column name="update_member_srl" type="number" size="11" notnull="notnull" />
+    <column name="module_srl" type="number" size="11" notnull="notnull" />
+    <column name="category_srl" type="number" size="11" />
+    <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress" />
+    <column name="nick_name" type="varchar" size="80" notnull="notnull" />
+    <column name="regdate" type="date" index="idx_regdate" />
+    <column name="title" type="varchar" size="250" />
+    <column name="title_bold" type="char" size="1" default="N" notnull="notnull" />
+    <column name="title_color" type="varchar" size="7" />
+    <column name="content" type="bigtext" notnull="notnull" />
+    <column name="update_nick_name" type="varchar" size="80" />
+    <column name="tags" type="text" />
+    <column name="extra_vars" type="text" />
+    <column name="reason_update" type="text" />
+</table>
diff --git a/modules/editor/editor.controller.php b/modules/editor/editor.controller.php
index b4782b307..b1a97de71 100644
--- a/modules/editor/editor.controller.php
+++ b/modules/editor/editor.controller.php
@@ -47,13 +47,13 @@ class editorController extends editor
 	{
 		$component = Context::get('component');
 		$method = Context::get('method');
-		if(!$component) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		if(!$component) return new Object(-1, sprintf(lang('msg_component_is_not_founded'), $component));
 
 		$oEditorModel = getModel('editor');
 		$oComponent = &$oEditorModel->getComponentObject($component);
 		if(!$oComponent->toBool()) return $oComponent;
 
-		if(!method_exists($oComponent, $method)) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		if(!method_exists($oComponent, $method)) return new Object(-1, sprintf(lang('msg_component_is_not_founded'), $component));
 
 		//$output = call_user_method($method, $oComponent);
 		//$output = call_user_func(array($oComponent, $method));
diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php
index 2dcbe26fd..5a95186b5 100644
--- a/modules/editor/editor.model.php
+++ b/modules/editor/editor.model.php
@@ -547,11 +547,11 @@ class editorModel extends editor
 			// Create an object of the component and execute
 			$class_path = sprintf('%scomponents/%s/', $this->module_path, $component);
 			$class_file = sprintf('%s%s.class.php', $class_path, $component);
-			if(!file_exists($class_file)) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+			if(!file_exists($class_file)) return new Object(-1, sprintf(lang('msg_component_is_not_founded'), $component));
 			// Create an object after loading the class file
 			require_once($class_file);
 			$oComponent = new $component($editor_sequence, $class_path);
-			if(!$oComponent) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+			if(!$oComponent) return new Object(-1, sprintf(lang('msg_component_is_not_founded'), $component));
 			// Add configuration information
 			$component_info = $this->getComponent($component, $site_srl);
 			$oComponent->setInfo($component_info);
diff --git a/modules/editor/editor.view.php b/modules/editor/editor.view.php
index cbe3edacf..d0dd2777b 100644
--- a/modules/editor/editor.view.php
+++ b/modules/editor/editor.view.php
@@ -33,7 +33,7 @@ class editorView extends editor
 		$oComponent = &$oEditorModel->getComponentObject($component, $editor_sequence, $site_srl);
 		if(!$oComponent->toBool())
 		{
-			Context::set('message', sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+			Context::set('message', sprintf(lang('msg_component_is_not_founded'), $component));
 			$this->setTemplatePath($this->module_path.'tpl');
 			$this->setTemplateFile('component_not_founded');
 		}
diff --git a/modules/editor/lang/en.php b/modules/editor/lang/en.php
index 75e711140..cbdbe5a99 100644
--- a/modules/editor/lang/en.php
+++ b/modules/editor/lang/en.php
@@ -1,5 +1,4 @@
 <?php
-$lang->editor_now = '현재 설정 상태';
 $lang->editor_component = 'Editor Component';
 $lang->main_editor = 'Main editor';
 $lang->comment_editor = 'Comment editor';
diff --git a/modules/editor/lang/es.php b/modules/editor/lang/es.php
index 12d6c149d..02e2166a3 100644
--- a/modules/editor/lang/es.php
+++ b/modules/editor/lang/es.php
@@ -10,7 +10,6 @@ $lang->component_description = 'Descripción';
 $lang->component_extra_vars = 'Varibles Extras';
 $lang->component_grant = 'Ajuste de las atribuciones';
 $lang->about_component = 'Presentación del componente';
-$lang->about_component_mid = '에디터 컴포넌트가 사용될 대상을 지정할 수 있습니다.(모두 해제시 모든 대상에서 사용 가능합니다)';
 $lang->msg_component_is_not_founded = 'No se puede encontrar el componente del editor %s';
 $lang->msg_component_is_inserted = 'El componente seleccionado ya esta insertado';
 $lang->msg_component_is_first_order = 'El componente seleccionado se localiza en la primera posición';
@@ -28,8 +27,6 @@ $lang->enable_html_grant = 'La autorización de uso de HTML';
 $lang->enable_autosave = 'Utilice función de guardado automático,';
 $lang->height_resizable = 'Altura cambiar de tamaño';
 $lang->editor_height = 'Altura de Editor';
-$lang->about_content_font = '콤마(,)로 여러 폰트를 지정할 수 있습니다.';
-$lang->about_content_font_size = '12px, 1em등 단위까지 포함해서 입력해주세요.';
 $lang->about_enable_autosave = 'Usted puede permitir que la función de guardado automático, en tanto que función de la redacción de artículos';
 $lang->edit['fontname'] = 'Fuente';
 $lang->edit['fontsize'] = 'Tamaño';
@@ -68,17 +65,4 @@ $lang->edit['icon_align_left'] = 'Margen izquierdo';
 $lang->edit['icon_align_middle'] = 'Margen central';
 $lang->edit['icon_align_right'] = 'Margen derecho';
 $lang->edit['lineheight'] = 'Line Height';
-$lang->edit['target_blank'] = '새창으로';
-$lang->edit['add_one_row'] = '1행추가';
-$lang->edit['del_one_row'] = '1행삭제';
-$lang->edit['add_one_col'] = '1열추가';
-$lang->edit['del_one_col'] = '1열삭제';
-$lang->edit['search_color'] = '색상찾기';
-$lang->edit['circle_bracket'] = '원,괄호';
-$lang->edit['replace_all'] = '모두바꾸기';
-$lang->edit['search_words'] = '찾을단어';
-$lang->edit['replace_words'] = '바꿀단어';
-$lang->edit['next_search_words'] = '다음찾기';
-$lang->edit['materials'] = '글감보관함';
-$lang->edit['temporary_savings'] = '임시저장목록';
 $lang->about_dblclick_in_editor = 'Para la configuracion más detallada debera hacer dobleclick sobre el texto, imagen, fondo, etc.';
diff --git a/modules/editor/lang/fr.php b/modules/editor/lang/fr.php
index 987139e9f..59f26ea7f 100644
--- a/modules/editor/lang/fr.php
+++ b/modules/editor/lang/fr.php
@@ -27,8 +27,6 @@ $lang->enable_html_grant = 'Permission d\'utiliser HTML';
 $lang->enable_autosave = 'Valider à conserver automatiquement';
 $lang->height_resizable = 'Permettre de remettre l\'hauteur';
 $lang->editor_height = 'Hauteur de l\'Editeur';
-$lang->about_content_font = '콤마(,)로 여러 폰트를 지정할 수 있습니다.';
-$lang->about_content_font_size = '12px, 1em등 단위까지 포함해서 입력해주세요.';
 $lang->about_enable_autosave = 'Vous pouvez valider la fonction à Conserver Automatiquement pendant écrire des articles.';
 $lang->edit['fontname'] = 'Police de caractères';
 $lang->edit['fontsize'] = 'Mesure';
@@ -69,17 +67,4 @@ $lang->edit['icon_align_left'] = 'Placer à gauche du texte';
 $lang->edit['icon_align_middle'] = 'Placer au centre';
 $lang->edit['icon_align_right'] = 'Placer à droite du texte';
 $lang->edit['lineheight'] = 'Line Height';
-$lang->edit['target_blank'] = '새창으로';
-$lang->edit['add_one_row'] = '1행추가';
-$lang->edit['del_one_row'] = '1행삭제';
-$lang->edit['add_one_col'] = '1열추가';
-$lang->edit['del_one_col'] = '1열삭제';
-$lang->edit['search_color'] = '색상찾기';
-$lang->edit['circle_bracket'] = '원,괄호';
-$lang->edit['replace_all'] = '모두바꾸기';
-$lang->edit['search_words'] = '찾을단어';
-$lang->edit['replace_words'] = '바꿀단어';
-$lang->edit['next_search_words'] = '다음찾기';
-$lang->edit['materials'] = '글감보관함';
-$lang->edit['temporary_savings'] = '임시저장목록';
 $lang->about_dblclick_in_editor = 'Vous pouvez configurer en détail des composants par double-clic sur un arrière-plan, un texte, une image ou une citation';
diff --git a/modules/editor/lang/ru.php b/modules/editor/lang/ru.php
index 28dd7e72e..43a17ecc1 100644
--- a/modules/editor/lang/ru.php
+++ b/modules/editor/lang/ru.php
@@ -1,16 +1,4 @@
 <?php
-$lang->editor_now = '현재 설정 상태';
-$lang->editor_component = 'Editor Component';
-$lang->main_editor = 'Main editor';
-$lang->comment_editor = 'Comment editor';
-$lang->editor_option = 'Editor Option';
-$lang->guide_choose_main_editor = 'Main editor.';
-$lang->guide_set_height_main_editor = 'Height of the main editor.';
-$lang->guide_choose_comment_editor = 'Comment editor.';
-$lang->guide_set_height_comment_editor = 'Height of the comment editor.';
-$lang->guide_choose_text_formatting = 'Text formatting.';
-$lang->guide_choose_font_body = 'Font body.';
-$lang->guide_choose_font_size_body = 'Font size body.';
 $lang->editor = 'WYSIWYG-Редактор';
 $lang->component_name = 'Компонент';
 $lang->component_version = 'Версия';
diff --git a/modules/editor/lang/tr.php b/modules/editor/lang/tr.php
index 12e1eadaf..9cafab0fd 100644
--- a/modules/editor/lang/tr.php
+++ b/modules/editor/lang/tr.php
@@ -1,16 +1,4 @@
 <?php
-$lang->editor_now = '현재 설정 상태';
-$lang->editor_component = 'Editor Component';
-$lang->main_editor = 'Main editor';
-$lang->comment_editor = 'Comment editor';
-$lang->editor_option = 'Editor Option';
-$lang->guide_choose_main_editor = 'Main editor.';
-$lang->guide_set_height_main_editor = 'Height of the main editor.';
-$lang->guide_choose_comment_editor = 'Comment editor.';
-$lang->guide_set_height_comment_editor = 'Height of the comment editor.';
-$lang->guide_choose_text_formatting = 'Text formatting.';
-$lang->guide_choose_font_body = 'Font body.';
-$lang->guide_choose_font_size_body = 'Font size body.';
 $lang->component_name = 'Bileşen';
 $lang->component_version = 'Sürüm';
 $lang->component_author = 'Geliştirici';
diff --git a/modules/editor/lang/vi.php b/modules/editor/lang/vi.php
index 7b3c69df8..468c08e81 100644
--- a/modules/editor/lang/vi.php
+++ b/modules/editor/lang/vi.php
@@ -1,16 +1,4 @@
 <?php
-$lang->editor_now = '현재 설정 상태';
-$lang->editor_component = 'Editor Component';
-$lang->main_editor = 'Main editor';
-$lang->comment_editor = 'Comment editor';
-$lang->editor_option = 'Editor Option';
-$lang->guide_choose_main_editor = 'Main editor.';
-$lang->guide_set_height_main_editor = 'Height of the main editor.';
-$lang->guide_choose_comment_editor = 'Comment editor.';
-$lang->guide_set_height_comment_editor = 'Height of the comment editor.';
-$lang->guide_choose_text_formatting = 'Text formatting.';
-$lang->guide_choose_font_body = 'Font body.';
-$lang->guide_choose_font_size_body = 'Font size body.';
 $lang->editor = 'WYSIWYG toàn diện';
 $lang->component_name = 'Thành phần';
 $lang->component_version = 'Phiên bản';
diff --git a/modules/editor/lang/zh-CN.php b/modules/editor/lang/zh-CN.php
index 4ff949d03..b8b9d5393 100644
--- a/modules/editor/lang/zh-CN.php
+++ b/modules/editor/lang/zh-CN.php
@@ -1,16 +1,4 @@
 <?php
-$lang->editor_now = '현재 설정 상태';
-$lang->editor_component = 'Editor Component';
-$lang->main_editor = 'Main editor';
-$lang->comment_editor = 'Comment editor';
-$lang->editor_option = 'Editor Option';
-$lang->guide_choose_main_editor = 'Main editor.';
-$lang->guide_set_height_main_editor = 'Height of the main editor.';
-$lang->guide_choose_comment_editor = 'Comment editor.';
-$lang->guide_set_height_comment_editor = 'Height of the comment editor.';
-$lang->guide_choose_text_formatting = 'Text formatting.';
-$lang->guide_choose_font_body = 'Font body.';
-$lang->guide_choose_font_size_body = 'Font size body.';
 $lang->editor = '网页编辑器';
 $lang->component_name = '组件';
 $lang->component_version = '版本';
diff --git a/modules/editor/lang/zh-TW.php b/modules/editor/lang/zh-TW.php
index d9db8a058..f4f3f03a8 100644
--- a/modules/editor/lang/zh-TW.php
+++ b/modules/editor/lang/zh-TW.php
@@ -1,16 +1,4 @@
 <?php
-$lang->editor_now = '현재 설정 상태';
-$lang->editor_component = 'Editor Component';
-$lang->main_editor = 'Main editor';
-$lang->comment_editor = 'Comment editor';
-$lang->editor_option = 'Editor Option';
-$lang->guide_choose_main_editor = 'Main editor.';
-$lang->guide_set_height_main_editor = 'Height of the main editor.';
-$lang->guide_choose_comment_editor = 'Comment editor.';
-$lang->guide_set_height_comment_editor = 'Height of the comment editor.';
-$lang->guide_choose_text_formatting = 'Text formatting.';
-$lang->guide_choose_font_body = 'Font body.';
-$lang->guide_choose_font_size_body = 'Font size body.';
 $lang->editor = '網頁編輯器';
 $lang->component_name = '組件';
 $lang->component_version = '版本';
diff --git a/modules/editor/skins/ckeditor/lang/en.php b/modules/editor/skins/ckeditor/lang/en.php
new file mode 100644
index 000000000..11786b678
--- /dev/null
+++ b/modules/editor/skins/ckeditor/lang/en.php
@@ -0,0 +1,4 @@
+<?php
+$lang->ckeditor_about_file_drop_area = 'Drag and drop your files here, or Click attach files button.';
+$lang->ckeditor_file_uploading = 'Uploading...';
+$lang->ckeditor_file_count = '<span class="file_count">0</span> file(s) attached';
diff --git a/modules/editor/skins/ckeditor/lang/ko.php b/modules/editor/skins/ckeditor/lang/ko.php
new file mode 100644
index 000000000..0f9b6c0f1
--- /dev/null
+++ b/modules/editor/skins/ckeditor/lang/ko.php
@@ -0,0 +1,4 @@
+<?php
+$lang->ckeditor_about_file_drop_area = '여기에 파일을 끌어 놓거나 파일 첨부 버튼을 클릭하세요.';
+$lang->ckeditor_file_uploading = '파일 업로드 중...';
+$lang->ckeditor_file_count = '<span class="file_count">0</span>개 첨부 됨';
diff --git a/modules/editor/skins/ckeditor/lang/lang.xml b/modules/editor/skins/ckeditor/lang/lang.xml
deleted file mode 100644
index 429479dbd..000000000
--- a/modules/editor/skins/ckeditor/lang/lang.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<lang>
-	<item name="ckeditor_about_file_drop_area">
-		<value xml:lang="ko"><![CDATA[여기에 파일을 끌어 놓거나 파일 첨부 버튼을 클릭하세요.]]></value>
-		<value xml:lang="en"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
-		<value xml:lang="jp"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
-		<value xml:lang="zh-CN"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
-		<value xml:lang="zh-TW"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
-		<value xml:lang="ru"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
-		<value xml:lang="tr"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
-		<value xml:lang="vi"><![CDATA[Drag and drop your files here, or Click attach files button.]]></value>
-	</item>
-	<item name="ckeditor_file_uploading">
-		<value xml:lang="ko"><![CDATA[파일 업로드 중...]]></value>
-		<value xml:lang="en"><![CDATA[Uploading...]]></value>
-		<value xml:lang="jp"><![CDATA[Uploading...]]></value>
-		<value xml:lang="zh-CN"><![CDATA[Uploading...]]></value>
-		<value xml:lang="zh-TW"><![CDATA[Uploading...]]></value>
-		<value xml:lang="ru"><![CDATA[Uploading...]]></value>
-		<value xml:lang="tr"><![CDATA[Uploading...]]></value>
-		<value xml:lang="vi"><![CDATA[Uploading...]]></value>
-	</item>
-	<item name="ckeditor_file_count">
-		<value xml:lang="ko"><![CDATA[<span class="file_count">0</span>개 첨부 됨]]></value>
-		<value xml:lang="en"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
-		<value xml:lang="jp"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
-		<value xml:lang="zh-CN"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
-		<value xml:lang="zh-TW"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
-		<value xml:lang="ru"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
-		<value xml:lang="tr"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
-		<value xml:lang="vi"><![CDATA[<span class="file_count">0</span> file(s) attached]]></value>
-	</item>
-</lang>
diff --git a/modules/file/file.admin.controller.php b/modules/file/file.admin.controller.php
index af453c707..212800d70 100644
--- a/modules/file/file.admin.controller.php
+++ b/modules/file/file.admin.controller.php
@@ -78,7 +78,7 @@ class fileAdminController extends file
 			$oFileController->deleteFile($file_srl);
 		}
 
-		$this->setMessage( sprintf(Context::getLang('msg_checked_file_is_deleted'), $file_count) );
+		$this->setMessage( sprintf(lang('msg_checked_file_is_deleted'), $file_count) );
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispFileAdminList');
 		$this->setRedirectUrl($returnUrl);
diff --git a/modules/file/file.model.php b/modules/file/file.model.php
index cd8deb2e7..a58a0f411 100644
--- a/modules/file/file.model.php
+++ b/modules/file/file.model.php
@@ -271,12 +271,12 @@ class fileModel extends file
 		// Display upload status
 		$upload_status = sprintf(
 			'%s : %s/ %s<br /> %s : %s (%s : %s)',
-			Context::getLang('allowed_attach_size'),
+			lang('allowed_attach_size'),
 			FileHandler::filesize($attached_size),
 			FileHandler::filesize($file_config->allowed_attach_size*1024*1024),
-			Context::getLang('allowed_filesize'),
+			lang('allowed_filesize'),
 			FileHandler::filesize($file_config->allowed_filesize*1024*1024),
-			Context::getLang('allowed_filetypes'),
+			lang('allowed_filetypes'),
 			$file_config->allowed_filetypes
 		);
 		return $upload_status;
diff --git a/modules/file/lang/es.php b/modules/file/lang/es.php
index ab7d83d72..1b3286f9b 100644
--- a/modules/file/lang/es.php
+++ b/modules/file/lang/es.php
@@ -28,8 +28,6 @@ $lang->msg_exceeds_limit_size = 'Ha excedido el límite del tamaño total de los
 $lang->file_search_target_list['filename'] = 'Nombre del archivo';
 $lang->file_search_target_list['filesize_more'] = 'Tamaño del archivo(Byte, sobre)';
 $lang->file_search_target_list['filesize_mega_more'] = 'Tamaño del archivo(Mb, o mb)';
-$lang->file_search_target_list['filesize_less'] = '파일크기(byte, 이하)';
-$lang->file_search_target_list['filesize_mega_less'] = '파일크기(Mb, 이하)';
 $lang->file_search_target_list['download_count'] = 'Descargados(Sobre)';
 $lang->file_search_target_list['user_id'] = 'ID';
 $lang->file_search_target_list['user_name'] = 'Nombre';
diff --git a/modules/file/lang/fr.php b/modules/file/lang/fr.php
index 0ba07d70f..c0629cd88 100644
--- a/modules/file/lang/fr.php
+++ b/modules/file/lang/fr.php
@@ -7,13 +7,10 @@ $lang->status = 'Statut';
 $lang->is_valid = 'Valide';
 $lang->is_stand_by = 'Attente';
 $lang->file_list = 'Liste des Annexes';
-$lang->allow_outlink_site = '파일 외부 허용 사이트';
 $lang->allowed_filesize = 'Mesure du Fichier Maximum';
 $lang->allowed_attach_size = 'Somme des Annexes Maximum';
 $lang->allowed_filetypes = 'Extensions consentis seulement peuvent etre attaches.';
 $lang->enable_download_group = 'Groupe permis de telecharger';
-$lang->about_allow_outlink = '리퍼러에 따라 파일 외부 링크를 차단할 수 있습니다.(*.wmv, *.mp3등 미디어 파일 제외)';
-$lang->about_allow_outlink_site = '파일 외부 링크 설정에 관계 없이 허용하는 사이트 주소입니다. 여러개 입력시에 줄을 바꿔서 구분해주세요. ex)https://www.rhymix.org/';
 $lang->about_allowed_filesize = 'Vous pouvez designer la limite de mesure pour chaque fichier.(Exclure administrateurs)';
 $lang->about_allowed_attach_size = 'Vous pouvez designer la limite de mesure pour chaque document.(Exclure administrateurs)';
 $lang->about_allowed_filetypes = 'Pour consentir une extension, utilisez "*.[extention]". Pour consentir plusieurs extensions, utilisez ";" entre chaque extension. ex) *.* ou *.jpg;*.gif;';
@@ -26,9 +23,6 @@ $lang->msg_checked_file_is_deleted = '%d Annexe(s) est(sont) supprime(s)';
 $lang->msg_exceeds_limit_size = 'La mesure de l\'(des) Annexe(s) est plus grande que celle consentie.';
 $lang->file_search_target_list['filename'] = 'Nom de Fichier';
 $lang->file_search_target_list['filesize_more'] = 'Mesure de Fichier(octet, surplus)';
-$lang->file_search_target_list['filesize_mega_more'] = '파일크기(Mb, 이상)';
-$lang->file_search_target_list['filesize_less'] = '파일크기(byte, 이하)';
-$lang->file_search_target_list['filesize_mega_less'] = '파일크기(Mb, 이하)';
 $lang->file_search_target_list['download_count'] = 'Telecharges(surplus)';
 $lang->file_search_target_list['regdate'] = 'Enrgistre';
 $lang->file_search_target_list['ipaddress'] = 'Adresse IP';
diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php
index f0ac7f915..a442c80bb 100644
--- a/modules/importer/importer.admin.controller.php
+++ b/modules/importer/importer.admin.controller.php
@@ -328,10 +328,10 @@ class importerAdminController extends importer
 		// When completing, success message appears and remove the cache files
 		if($total <= $cur)
 		{
-			$this->setMessage( sprintf(Context::getLang('msg_import_finished'), $cur, $total) );
+			$this->setMessage( sprintf(lang('msg_import_finished'), $cur, $total) );
 			FileHandler::removeDir('./files/cache/importer/'.$key);
 		}
-		else $this->setMessage( sprintf(Context::getLang('msg_importing'), $total, $cur) );
+		else $this->setMessage( sprintf(lang('msg_importing'), $total, $cur) );
 	}
 
 	/**
diff --git a/modules/importer/lang/es.php b/modules/importer/lang/es.php
index cc8b0cf41..a7a65d535 100644
--- a/modules/importer/lang/es.php
+++ b/modules/importer/lang/es.php
@@ -1,7 +1,6 @@
 <?php
 $lang->cmd_sync_member = 'Sincronizar';
 $lang->cmd_continue = 'Continuar';
-$lang->preprocessing = '데이터 이전을 위한 사전 준비중입니다.';
 $lang->importer = 'Transferir los datos de Rhymix';
 $lang->source_type = 'Objetivo a transferir';
 $lang->type_member = 'Información del usuario';
@@ -21,7 +20,6 @@ $lang->import_step_desc['13'] = 'Seleccione la categoría para transferir los da
 $lang->import_step_desc['2'] = 'Ingrese la ubicación del archivo XML para transfer los datos.
 Puede ser ruta absoluto o relativo.';
 $lang->import_step_desc['3'] = 'La información del usuario y del documento podría ser incorrecto luego de la transferencia. Si ese es el caso, sincroniza para la corrección basado a la ID del usuario.';
-$lang->import_step_desc['99'] = '데이터를 이전중입니다';
 $lang->msg_sync_member = 'Al presionar el botón sincronizar comenzará a sincronizar la información del usuario y la del artículo.';
 $lang->msg_no_xml_file = 'No se puede encontrar el archivo XML. Verifique su ruta.';
 $lang->msg_invalid_xml_file = 'Tipo de archivo XML inválido.';
diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php
index 90d608952..6b33b4229 100644
--- a/modules/install/install.controller.php
+++ b/modules/install/install.controller.php
@@ -284,7 +284,7 @@ class installController extends install
 			if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1,'msg_safe_mode_ftp_needed');
 
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_info->ftp_host));
+			if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new Object(-1, sprintf(lang('msg_ftp_not_connected'), $ftp_info->ftp_host));
 
 			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
@@ -342,7 +342,7 @@ class installController extends install
 		else
 		{
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
+			if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new Object(-1, sprintf(lang('msg_ftp_not_connected'), 'localhost'));
 
 			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
diff --git a/modules/install/install.model.php b/modules/install/install.model.php
index f4b854a50..b9d749b67 100644
--- a/modules/install/install.model.php
+++ b/modules/install/install.model.php
@@ -54,7 +54,7 @@ class installModel extends install
 		if(function_exists('ftp_connect'))
 		{
 			$connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
-			if(!$connection) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_info->ftp_host));
+			if(!$connection) return new Object(-1, sprintf(lang('msg_ftp_not_connected'), $ftp_info->ftp_host));
 			if(! @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
 				ftp_close($connection);	
diff --git a/modules/install/install.view.php b/modules/install/install.view.php
index 752208b80..0d8c0498f 100644
--- a/modules/install/install.view.php
+++ b/modules/install/install.view.php
@@ -23,7 +23,7 @@ class installView extends install
 		}
 		
 		// Set the browser title.
-		Context::setBrowserTitle(Context::getLang('introduce_title'));
+		Context::setBrowserTitle(lang('introduce_title'));
 		
 		// Specify the template path.
 		$this->setTemplatePath($this->module_path.'tpl');
diff --git a/modules/install/lang/es.php b/modules/install/lang/es.php
index 294d415dd..ac0ed2a5f 100644
--- a/modules/install/lang/es.php
+++ b/modules/install/lang/es.php
@@ -68,4 +68,3 @@ $lang->msg_ftp_invalid_auth_info = 'Los datos de login para el FTP no son correc
 $lang->msg_ftp_mkdir_fail = 'Ha fallado el comando de FTP para la creación de directorio. Verifique la configuración del servicio FTP en el servidor';
 $lang->msg_ftp_chmod_fail = 'Ha fallado el comando de FTP para la modificación de atributos de directorio. Verifique la configuración del servicio FTP en el servidor.';
 $lang->msg_ftp_connect_success = 'conexión con éxito al FTP';
-$lang->msg_ftp_installed_ftp_realpath = '설치된 Rhymix의 FTP 절대경로';
diff --git a/modules/install/lang/fr.php b/modules/install/lang/fr.php
index 4d5a64573..dbc97e419 100644
--- a/modules/install/lang/fr.php
+++ b/modules/install/lang/fr.php
@@ -59,12 +59,4 @@ $lang->msg_dbconnect_failed = 'Erreur a lieu en essayant connecter à la Base de
 $lang->msg_table_is_exists = 'La Table est déjà créée dans la Base de Données. Le fichier de Configuration est recréé.';
 $lang->msg_install_completed = 'Installation a complété. Merci pour choisir Rhymix.';
 $lang->msg_install_failed = 'Une erreur a lieu en créant le fichier d\'installation.';
-$lang->ftp_form_title = 'FTP 정보 입력';
 $lang->ftp = 'FTP';
-$lang->msg_safe_mode_ftp_needed = 'PHP의 safe_mode가 On일 경우 FTP 정보를 꼭 입력해야 Rhymix의 설치 및 사용이 가능합니다';
-$lang->msg_ftp_not_connected = 'localhost로의 FTP 접속 오류가 발생하였습니다. ftp 포트 번호를 확인하거나 ftp 서비스가 가능한지 확인해주세요';
-$lang->msg_ftp_invalid_auth_info = '입력한 FTP 정보로 로그인을 하지 못했습니다. FTP정보를 확인해주세요';
-$lang->msg_ftp_mkdir_fail = 'FTP를 이용한 디렉토리 생성 명령을 실패하였습니다. FTP 서버의 설정을 확인해주세요';
-$lang->msg_ftp_chmod_fail = 'FTP를 이용한 디렉토리의 속성 변경을 실패하였습니다. FTP 서버의 설정을 확인해주세요';
-$lang->msg_ftp_connect_success = 'FTP 접속 및 인증 성공하였습니다';
-$lang->msg_ftp_installed_ftp_realpath = '설치된 Rhymix의 FTP 절대경로';
diff --git a/modules/install/lang/ru.php b/modules/install/lang/ru.php
index 041ee560d..22cc1d90c 100644
--- a/modules/install/lang/ru.php
+++ b/modules/install/lang/ru.php
@@ -61,5 +61,3 @@ $lang->msg_install_completed = 'Установка завершена. Спас
 $lang->msg_install_failed = 'Произошла ошибка при создании файла конфигурации.';
 $lang->ftp_form_title = 'Введите данные FTP';
 $lang->ftp = 'FTP';
-$lang->msg_ftp_not_connected = 'Connection to localhost via FTP failed. Please check the port number and if FTP service is available.';
-$lang->msg_ftp_chmod_fail = 'Chmod failed. Please check the permission and configuration of FTP server.';
diff --git a/modules/layout/lang/de.php b/modules/layout/lang/de.php
index 11ebb2963..eaa712107 100644
--- a/modules/layout/lang/de.php
+++ b/modules/layout/lang/de.php
@@ -1,23 +1,3 @@
 <?php
 $lang->cmd_layout_edit = 'Layout bearbeiten';
 $lang->about_layout = 'Layouts schmücken das Aussehen Ihrer Module. Sie können sie von Layout-Menü am oberen Rand ';
-$lang->layout_manager['0'] = 'L';
-$lang->layout_manager['1'] = 'a';
-$lang->layout_manager['2'] = 'y';
-$lang->layout_manager['3'] = 'o';
-$lang->layout_manager['4'] = 'u';
-$lang->layout_manager['5'] = 't';
-$lang->layout_manager['6'] = '-';
-$lang->layout_manager['7'] = 'E';
-$lang->layout_manager['8'] = 'i';
-$lang->layout_manager['9'] = 'n';
-$lang->layout_manager['10'] = 's';
-$lang->layout_manager['11'] = 't';
-$lang->layout_manager['12'] = 'e';
-$lang->layout_manager['13'] = 'l';
-$lang->layout_manager['14'] = 'l';
-$lang->layout_manager['15'] = 'u';
-$lang->layout_manager['16'] = 'n';
-$lang->layout_manager['17'] = 'g';
-$lang->layout_manager['18'] = 'e';
-$lang->layout_manager['19'] = 'n';
diff --git a/modules/layout/lang/es.php b/modules/layout/lang/es.php
index 9247e495d..2740a312c 100644
--- a/modules/layout/lang/es.php
+++ b/modules/layout/lang/es.php
@@ -16,16 +16,3 @@ $lang->about_title = 'Ingresar un nombre fácil de distinguir cuando conecta al
 $lang->about_not_apply_menu = 'Al seleccionar esta opción, cambia todos los diseños conectados.';
 $lang->about_layout = 'Módulo del diseño ayuda a usted para crear el diseño de la página web fácilmente. Por usar la configuración del diseño y el menú de conección, completa con varios módulos la forma de la página web que a ser mostrados Esos diseños que no pueden ser modificados ni eliminados son propios de blog y de otros módulos, por lo cual para la configuración de ellos debe hacerse en los modulos correspondientes.';
 $lang->about_layout_code = 'El diseño sera aplicado al servicio cuando usted guarda el código del diseño luego de haber editado. Primero visualiza previamente tus códigos y luego guardalos. Referente al código de planillas de XE dirijirse a<a href="http://code.google.com/p/xe-core/wiki/TemplateSyntax" target="_blank">XE Pamphlet(Ingles)</a> ';
-$lang->about_layout_import = '가져오기를 할 경우 기존 수정된 레이아웃을 삭제가 됩니다. 가져오기를 하기전에 내보내기를 통해 백업을 하세요.';
-$lang->layout_manager['30'] = '가로 너비';
-$lang->layout_manager['31'] = '높이';
-$lang->about_layout_image_repository = '선택된 레이아웃에 사용될 이미지/플래시파일등을 올릴 수 있습니다. 내보내기에 같이 포함이 됩니다';
-$lang->msg_layout_image_target = 'gif, png, jpg, swf, flv파일만 가능합니다';
-$lang->layout_migration = '레이아웃 내보내기/ 들이기';
-$lang->about_layout_migration = '수정된 레이아웃을 tar 파일로 내보내거나 tar 파일로 저장된 것을 불러올 수 있습니다
-(아직은 faceOff레이아웃만 내보내기/들이기가 됩니다';
-$lang->about_faceoff['description'] = 'FaceOff Layout관리자는 웹상에서 쉽게 레이아웃을 꾸밀 수 있습니다.<br/>아래 그림을 보고 구성요소와 기능을 이용하여 원하는 레이아웃을 만드세요';
-$lang->about_faceoff['layout'] = 'FaceOff는 위와 같은 HTML 구조로 되어 있습니다.<br/>이 구조에서 CSS를 이용하여 형태/배열/정렬을 할 수 있고 또 Style을 이용하여 꾸밀 수 있습니다.<br/>위젯 추가는 Extension(e1, e2)와 Neck, Knee에서 가능합니다.<br/>이 외 Body, Layout, Header, Body, Footer는 Style을 꾸밀 수 있고 Content는 내용이 출력됩니다.';
-$lang->about_faceoff['setting'] = '좌측 상단의 메뉴에 대해 설명 드립니다.<br/><ul><li>저장 : 설정된 내용을 저장합니다.</li><li>취소 : 설정한 내용을 저장하지 않고 돌아갑니다.</li><li>초기화 : 아무 설정도 되어 있지 않은 백지 상태로 돌립니다</li><li>형태 : 고정/ 가변/ 고정+가변(내용)의 형태를 지정합니다.</li><li>배열 : Extension 2개와 Content를 배열합니다.</li><li>정렬 : 레이아웃의 위치를 정렬시킬 수 있습니다.</li></ul>';
-$lang->about_faceoff['hotkey'] = '마우스로 각 영역을 선택하면서 Hot Key를 이용하면 더 쉽게 꾸밀 수 있습니다.<br/><ul><li>tab 키 : 위젯이 선택되어 있지 않으면 Header, Body, Footer 순으로 선택됩니다. 위젯이 선택되어 있다면 다음 위젯으로 선택이 이동됩니다.</li><li>Shift + tab키 : tab키와 반대 역할을 합니다.</li><li>Esc : 아무것도 선택되어 있지 않을때 Esc를 누르면 Neck, Extension(e1,e2),Knee 순서대로 선택이 되며 위젯이 선택되어 있다면 선택된 위젯을 감싸는 영역이 선택됩니다.</li><li>방향키 : 위젯이 선택되어 있을때 방향키를 이용하여 위젯을 다른 영역으로 이동시킬 수 있습니다.</li></ul>';
-$lang->about_apply_mobile_view = 'All connected module use mobile view to display when accessing with mobile device.';
diff --git a/modules/layout/lang/fr.php b/modules/layout/lang/fr.php
index 88c0fd147..2ec0bedde 100644
--- a/modules/layout/lang/fr.php
+++ b/modules/layout/lang/fr.php
@@ -16,16 +16,3 @@ $lang->about_title = 'Entrez le titre pour distinguer facilement quand vous le l
 $lang->about_not_apply_menu = 'Tous les Mises en Page qui sont liés sur le menu seront changés si vous cochez cette option.';
 $lang->about_layout = 'Le module de Mise en Page vous aide à créer facilement le Mise en Page du site.  Vous pouvez présentez la forme du site Web complété par les modules divers en utilisant la configuration du Mise en Page et la connexion sur le menu. Les Mises en Page qui ne sont pas possibles à supprimer ou à modifier sont propres à ceux des blogues ou d\'autres Mises en Page. Essayez à modifier/supprimer en dedans elles-mêmes';
 $lang->about_layout_code = 'Vous conservez la code de Mise en Page après l\'éditer, la code sera appliquée sur le service. Utilisez [Avant-première] avant conserver la code S.V.P. Vous pouvez référer la grammaire de modèle de XE sur <a href="http://code.google.com/p/xe-core/wiki/TemplateSyntax" target="_blank">Modèle du XE</a>.';
-$lang->about_layout_import = '가져오기를 할 경우 기존 수정된 레이아웃을 삭제가 됩니다. 가져오기를 하기전에 내보내기를 통해 백업을 하세요.';
-$lang->layout_manager['30'] = '가로 너비';
-$lang->layout_manager['31'] = '높이';
-$lang->about_layout_image_repository = '선택된 레이아웃에 사용될 이미지/플래시파일등을 올릴 수 있습니다. 내보내기에 같이 포함이 됩니다';
-$lang->msg_layout_image_target = 'gif, png, jpg, swf, flv파일만 가능합니다';
-$lang->layout_migration = '레이아웃 내보내기/ 들이기';
-$lang->about_layout_migration = '수정된 레이아웃을 tar 파일로 내보내거나 tar 파일로 저장된 것을 불러올 수 있습니다
-(아직은 faceOff레이아웃만 내보내기/들이기가 됩니다';
-$lang->about_faceoff['description'] = 'FaceOff Layout관리자는 웹상에서 쉽게 레이아웃을 꾸밀 수 있습니다.<br/>아래 그림을 보고 구성요소와 기능을 이용하여 원하는 레이아웃을 만드세요';
-$lang->about_faceoff['layout'] = 'FaceOff는 위와 같은 HTML 구조로 되어 있습니다.<br/>이 구조에서 CSS를 이용하여 형태/배열/정렬을 할 수 있고 또 Style을 이용하여 꾸밀 수 있습니다.<br/>위젯 추가는 Extension(e1, e2)와 Neck, Knee에서 가능합니다.<br/>이 외 Body, Layout, Header, Body, Footer는 Style을 꾸밀 수 있고 Content는 내용이 출력됩니다.';
-$lang->about_faceoff['setting'] = '좌측 상단의 메뉴에 대해 설명 드립니다.<br/><ul><li>저장 : 설정된 내용을 저장합니다.</li><li>취소 : 설정한 내용을 저장하지 않고 돌아갑니다.</li><li>초기화 : 아무 설정도 되어 있지 않은 백지 상태로 돌립니다</li><li>형태 : 고정/ 가변/ 고정+가변(내용)의 형태를 지정합니다.</li><li>배열 : Extension 2개와 Content를 배열합니다.</li><li>정렬 : 레이아웃의 위치를 정렬시킬 수 있습니다.</li></ul>';
-$lang->about_faceoff['hotkey'] = '마우스로 각 영역을 선택하면서 Hot Key를 이용하면 더 쉽게 꾸밀 수 있습니다.<br/><ul><li>tab 키 : 위젯이 선택되어 있지 않으면 Header, Body, Footer 순으로 선택됩니다. 위젯이 선택되어 있다면 다음 위젯으로 선택이 이동됩니다.</li><li>Shift + tab키 : tab키와 반대 역할을 합니다.</li><li>Esc : 아무것도 선택되어 있지 않을때 Esc를 누르면 Neck, Extension(e1,e2),Knee 순서대로 선택이 되며 위젯이 선택되어 있다면 선택된 위젯을 감싸는 영역이 선택됩니다.</li><li>방향키 : 위젯이 선택되어 있을때 방향키를 이용하여 위젯을 다른 영역으로 이동시킬 수 있습니다.</li></ul>';
-$lang->about_apply_mobile_view = 'All connected module use mobile view to display when accessing with mobile device.';
diff --git a/modules/layout/lang/ru.php b/modules/layout/lang/ru.php
index bfc6385f6..74aa07a09 100644
--- a/modules/layout/lang/ru.php
+++ b/modules/layout/lang/ru.php
@@ -16,12 +16,3 @@ $lang->about_title = 'Пожалуйста, введите название, к
 $lang->about_not_apply_menu = 'Все подключенные лейауты модулей будут изменены при включении это опции.';
 $lang->about_layout = 'Модуль лейаутов помогает Вам создать лейаут сайта с легкостью. Используя настройки лейаута и подключение меню, полная форма сайта будет отображена множеством модулей. Теми лейаутами, которые невозможно удалить или изменить, являются лейауты блога и лейауты других модулей.';
 $lang->about_layout_code = 'Применения к службе будут проиведены, когда Вы сохраните код лейаут после редактирование. Пожалуйста, сначала используйте предпросмотр кода и затем сохраните его. Вы можете обратиться к грамматике шаблонов XE с <a href="http://code.google.com/p/xe-core/wiki/TemplateSyntax" target="_blank">XE Template</a>.';
-$lang->about_layout_export = 'Export currently editted layout.';
-$lang->about_layout_import = 'Original layout will be deleted when you import. Please export current layout before importing.';
-$lang->about_layout_image_repository = 'You can upload images/flash files for selected layout. They will be included in exports';
-$lang->about_layout_migration = 'You can export or import editted layout as tar file
-(So far only FaceOff supports exports/imports)';
-$lang->about_faceoff['setting'] = 'Let me explain you the upper menu on left.<br/><ul><li>Save : Save current settings.</li><li>Cancel : Discard current settings and go back.</li><li>Reset : Clear current settings</li><li>Form : Set form as Fixed/ Variable/ Fixed+Variable(Content).</li><li>Arrange : Arrange 2 Extensions and Content.</li><li>Align : Align the position of layout.</li></ul>';
-$lang->about_faceoff['hotkey'] = 'You can design your layout more easily with Hot Keys.<br/><ul><li>tab : Unless a widget is selected, Header, Body, Footer will be selected in order. If not, next widget will be selected.</li><li>Shift + tab : It does the opposite function to tab key.</li><li>Esc : If nothing is selected, Neck, Extension(e1,e2),Knee will be selected in order, if a widget is selected, area of the widget will be selected.</li><li>Arrow Key : If a widget is selected, arrow key will move the widget to other areas.</li></ul>';
-$lang->about_faceoff['attribute'] = 'You can set background color/image to every area except widget, and font color(include <a> tag).';
-$lang->about_apply_mobile_view = 'All connected module use mobile view to display when accessing with mobile device.';
diff --git a/modules/layout/lang/vi.php b/modules/layout/lang/vi.php
index 7f4d6e73f..f9a5a38d3 100644
--- a/modules/layout/lang/vi.php
+++ b/modules/layout/lang/vi.php
@@ -88,4 +88,3 @@ $lang->about_faceoff['layout'] = 'FaceOff có cấu trúc HTML như trên.<br/>b
 $lang->about_faceoff['setting'] = 'Menu phía bên trái.<br/><ul><li>"Lưu lại": là lưu lại những thiết lập hiện tại.</li><li>"Loại bỏ": là bỏ qua những thay đổi hiện tại và trở lại.</li><li>"Thiết lập lại": là xóa bỏ tất cả những thay đổi.</li><li>"Form": đặt Form dạng Cố định, Biến thiên, Cố định+Biến thiên (Nội dung).</li><li>"Thu nhỏ": là thu nhỏ hai phần mở rộng và nội dung.</li><li>"Căn chỉnh" : là sắp xếp sự thẳng hàng.</li></ul>';
 $lang->about_faceoff['hotkey'] = 'Bạn có thể thiết kế giao diện của mình dễ dàng hơn nữa với những phím tắt.<br/><ul><li>"Tab": trừ khi một Widget được chọn, Header, Body, Footer sẽ được chọn trong lệnh. Nếu không, Widget tiếp theo sẽ được chọn.</li><li>"Shift+Tab": nó ngược lại với phím "Tab".</li><li>"Esc": Nếu không có gì được chọn, Neck, Extension (e1, e2 ), Knee sẽ được lựa chọn theo thứ tự, nếu một Widget được chọn, kích thước Widget sẽ được lựa chọn.</li><li>"4 phím mũi tên": Nếu Widget đã được chọn, nó sẽ di chuyển Widget tới một vị trí mới.</li></ul>';
 $lang->about_faceoff['attribute'] = 'Bạn có thể đặt màu nền / hình nền tới mọi khu vực trừ Widget, và màu chữ (bao gồm cả Tag).';
-$lang->about_apply_mobile_view = 'All connected module use mobile view to display when accessing with mobile device.';
diff --git a/modules/layout/lang/zh-TW.php b/modules/layout/lang/zh-TW.php
index cdec0df1d..8fb73d324 100644
--- a/modules/layout/lang/zh-TW.php
+++ b/modules/layout/lang/zh-TW.php
@@ -91,7 +91,6 @@ $lang->about_faceoff['attribute'] = '除了 Widget 以外的各個區域都可
 $lang->mobile_layout_list = '手機版面列表';
 $lang->mobile_downloaded_list = '下載手機版面';
 $lang->apply_mobile_view = '使用手機面板';
-$lang->about_apply_mobile_view = 'All connected module use mobile view to display when accessing with mobile device.';
 $lang->installed_layout = '已安裝版面';
 $lang->instance_layout = '已安裝版面';
 $lang->faceoff_export = '匯出 FaceOff 版面';
diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php
index 1e571a24f..6a3342021 100644
--- a/modules/layout/layout.admin.controller.php
+++ b/modules/layout/layout.admin.controller.php
@@ -927,13 +927,13 @@ class layoutAdminController extends layout
 
 		if(!$img['tmp_name'] || !is_uploaded_file($img['tmp_name']) || !checkUploadedFile($img['tmp_name']))
 		{
-			Context::set('msg', Context::getLang('upload failed'));
+			Context::set('msg', lang('upload failed'));
 			return;
 		}
 
 		if(!preg_match('/\.(jpg|jpeg|gif|png|swf)$/i', $img['name']))
 		{
-			Context::set('msg', Context::getLang('msg_layout_image_target'));
+			Context::set('msg', lang('msg_layout_image_target'));
 			return;
 		}
 
@@ -941,7 +941,7 @@ class layoutAdminController extends layout
 		$tmpPath = $path . 'tmp/';
 		if(!FileHandler::makeDir($tmpPath))
 		{
-			Context::set('msg', Context::getLang('make directory failed'));
+			Context::set('msg', lang('make directory failed'));
 			return;
 		}
 
@@ -952,7 +952,7 @@ class layoutAdminController extends layout
 
 		if(!move_uploaded_file($img['tmp_name'], $tmpFileName))
 		{
-			Context::set('msg', Context::getLang('move file failed'));
+			Context::set('msg', lang('move file failed'));
 			return;
 		}
 
@@ -990,7 +990,7 @@ class layoutAdminController extends layout
 		$output = $this->updateLayout($args);
 		if(!$output->toBool())
 		{
-			Context::set('msg', Context::getLang($output->getMessage()));
+			Context::set('msg', lang($output->getMessage()));
 			return $output;
 		}
 
diff --git a/modules/layout/layout.admin.view.php b/modules/layout/layout.admin.view.php
index 33d9ff6b8..75a384088 100644
--- a/modules/layout/layout.admin.view.php
+++ b/modules/layout/layout.admin.view.php
@@ -324,7 +324,7 @@ class layoutAdminView extends layout
 		}
 
 		Context::set('layout_info', $layout_info);
-		Context::set('content', Context::getLang('layout_preview_content'));
+		Context::set('content', lang('layout_preview_content'));
 		// Temporary save the codes
 		$edited_layout_file = sprintf('./files/cache/layout/tmp.tpl');
 		FileHandler::writeFile($edited_layout_file, $code);
diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php
index 7797edf4d..0ea869c7b 100644
--- a/modules/layout/layout.model.php
+++ b/modules/layout/layout.model.php
@@ -58,7 +58,7 @@ class layoutModel extends layout
 			$siteDefaultLayoutInfo = $this->getlayout($siteDefaultLayoutSrl);
 			$newLayout = sprintf('%s, %s', $siteDefaultLayoutInfo->title, $siteDefaultLayoutInfo->layout);
 			$siteDefaultLayoutInfo->layout_srl = -1;
-			$siteDefaultLayoutInfo->title = Context::getLang('use_site_default_layout');
+			$siteDefaultLayoutInfo->title = lang('use_site_default_layout');
 			$siteDefaultLayoutInfo->layout = $newLayout;
 
 			array_unshift($output->data, $siteDefaultLayoutInfo);
@@ -1030,7 +1030,7 @@ class layoutModel extends layout
 		// Display edit button for faceoff layout
 		if(Context::get('module')!='admin' && strpos(Context::get('act'),'Admin')===false && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin))
 		{
-			Context::addHtmlFooter('<div class="faceOffManager" style="height: 23px; position: fixed; right: 3px; top: 3px;"><a href="'.getUrl('','mid',Context::get('mid'),'act','dispLayoutAdminLayoutModify','delete_tmp','Y').'">'.Context::getLang('cmd_layout_edit').'</a></div>');
+			Context::addHtmlFooter('<div class="faceOffManager" style="height: 23px; position: fixed; right: 3px; top: 3px;"><a href="'.getUrl('','mid',Context::get('mid'),'act','dispLayoutAdminLayoutModify','delete_tmp','Y').'">'.lang('cmd_layout_edit').'</a></div>');
 		}
 		// Display menu when editing the faceOff page
 		if(Context::get('act')=='dispLayoutAdminLayoutModify' && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin))
diff --git a/modules/layout/layout.view.php b/modules/layout/layout.view.php
index 50b134560..acacca938 100644
--- a/modules/layout/layout.view.php
+++ b/modules/layout/layout.view.php
@@ -55,7 +55,7 @@ class layoutView extends layout
 			$logged_info = Context::get('logged_info');
 			if($logged_info->is_admin != 'Y')
 			{
-				throw new Exception(Context::getLang('msg_invalid_request'));
+				throw new Exception(lang('msg_invalid_request'));
 			}
 
 			// if module is 'ARTiCLE' and from site design setting, make content directly
@@ -64,7 +64,7 @@ class layoutView extends layout
 				$oDocumentModel = getModel('document');
 				$oDocument = $oDocumentModel->getDocument(0, true);
 
-				$t = Context::getLang('article_preview_title');
+				$t = lang('article_preview_title');
 
 				$c = '';
 				for($i = 0; $i < 4; $i++)
@@ -72,7 +72,7 @@ class layoutView extends layout
 					$c .= '<p>';
 					for($j = 0; $j < 20; $j++)
 					{
-						$c .= Context::getLang('article_preview_content') . ' ';
+						$c .= lang('article_preview_content') . ' ';
 					}
 					$c .= '</p>';
 				}
@@ -259,7 +259,7 @@ class layoutView extends layout
 			// if there is no module instance, error...
 			if(!$output->data)
 			{
-				throw new Exception(Context::getLang('msg_unabled_preview'));
+				throw new Exception(lang('msg_unabled_preview'));
 			}
 		
 			$mid = current($output->data)->mid;
@@ -301,7 +301,7 @@ class layoutView extends layout
 		$oModule = $oModuleHandler->procModule();
 		if(!$oModule->toBool())
 		{
-			throw new Exception(Context::getLang('not_support_layout_preview'));
+			throw new Exception(lang('not_support_layout_preview'));
 		}
 
 		// get module html
@@ -361,7 +361,7 @@ class layoutView extends layout
 		}
 
 		Context::set('layout_info', $layout_info);
-		Context::set('content', Context::getLang('layout_preview_content'));
+		Context::set('content', lang('layout_preview_content'));
 		// Temporary save the codes
 		$edited_layout_file = _XE_PATH_ . 'files/cache/layout/tmp.tpl';
 		FileHandler::writeFile($edited_layout_file, $code);
diff --git a/modules/member/lang/en.php b/modules/member/lang/en.php
index e98843ecc..e21f18402 100644
--- a/modules/member/lang/en.php
+++ b/modules/member/lang/en.php
@@ -63,7 +63,6 @@ $lang->allow_message_type['F'] = 'Allow for Friends only';
 $lang->allow_message_type['N'] = 'Reject All';
 $lang->about_allow_message = 'You may allow or reject messages.';
 $lang->logged_users = 'Logged on Users';
-$lang->msg_mail_authorization = '메일 인증을 사용하려면 웸마스터의 이름과 메일주소가 유효해야 합니다.';
 $lang->webmaster_name = 'Webmaster Name';
 $lang->webmaster_email = 'Webmaster Email';
 $lang->column_id = 'The column id';
diff --git a/modules/member/lang/es.php b/modules/member/lang/es.php
index 45557fec6..b8901be12 100644
--- a/modules/member/lang/es.php
+++ b/modules/member/lang/es.php
@@ -42,18 +42,14 @@ $lang->agreement = 'Acuerdo del registro del usuario';
 $lang->accept_agreement = 'Acepto';
 $lang->member_info = 'Información del Usuario';
 $lang->current_password = 'Contraseña actual';
-$lang->about_allow_message = '쪽지 허용 방법 및 대상을 지정할 수 있습니다';
 $lang->logged_users = 'Logged Users';
 $lang->webmaster_name = 'Nombre del Webmaster';
 $lang->webmaster_email = 'Correo electrónico Webmaster';
-$lang->about_keep_signed = '브라우저를 닫더라도 로그인이 계속 유지될 수 있습니다.\\n\\n로그인 유지 기능을 사용할 경우 다음 접속부터는 로그인할 필요가 없습니다.\\n\\n단, 게임방, 학교 등 공공장소에서 이용시 개인정보가 유출될 수 있으니 꼭 로그아웃을 해주세요';
 $lang->about_webmaster_name = 'Por favor, webmaster de entrada el nombre que se utilizará para la autenticación de los correos u otros sitio de la administración. (Por defecto: webmaster)';
 $lang->about_webmaster_email = 'Introduzca la dirección de correo electrónico webmaster.';
 $lang->search_target_list['email_address'] = 'Dirección de Email';
 $lang->search_target_list['regdate'] = 'Fecha del registro';
 $lang->search_target_list['last_login'] = 'Fecha de su última conección';
-$lang->search_target_list['last_login_more'] = '최근로그인일시(이상)';
-$lang->search_target_list['last_login_less'] = '최근로그인일시(이하)';
 $lang->search_target_list['birthday'] = 'Fecha de Nacimiento';
 $lang->search_target_list['extra_vars'] = 'Variables Extra';
 $lang->cmd_login = 'Conectar';
@@ -80,10 +76,7 @@ $lang->msg_cart_is_null = 'Seleciona el objetivo';
 $lang->msg_checked_file_is_deleted = '%d archivos adjuntos son eliminados';
 $lang->msg_find_account_info = 'Esto se solicita la información de la cuenta';
 $lang->msg_find_account_comment = 'La contraseña se modificará para arriba al hacer clic en un enlace a continuación. <br /> Por favor, después de modificar la contraseña de acceso.';
-$lang->msg_confirm_account_title = '가입 인증 메일입니다';
-$lang->msg_confirm_account_info = '가입한 계정 정보는 아래와 같습니다';
 $lang->msg_auth_mail_sent = 'La autenticación de correo ha sido enviado a% s. Por favor, compruebe su correo.';
-$lang->msg_invalid_auth_key = '잘못된 계정 인증 요청입니다.<br />아이디/비밀번호 찾기를 다시 하거나 사이트 관리자에게 계정 정보를 문의해주세요';
 $lang->msg_success_authed = 'Esto no es válido solicitud de autenticación. <br /> Por favor, inténtelo encontrar información de la cuenta o póngase en contacto con el administrador.';
 $lang->msg_new_member = 'Agregar usuario';
 $lang->msg_update_member = 'Modificar información del usuario';
@@ -102,10 +95,8 @@ $lang->msg_insert_group_name = 'Por favor ingresar el nombre del grupo';
 $lang->msg_check_group = 'Introduce nombre de grupo';
 $lang->msg_not_uploaded_image_name = 'Imagen del nombre no puede ser registrado';
 $lang->msg_not_uploaded_image_mark = 'Imagen de marca no puede ser resistrado';
-$lang->msg_not_uploaded_group_image_mark = '그룹 이미지 마크를 등록할 수가 없습니다';
 $lang->msg_accept_agreement = 'Usted primero debe aceptar el acuerdo';
 $lang->msg_user_denied = 'ID ingresado ha sido prohibido para su uso';
-$lang->msg_user_not_confirmed = '아직 메일 인증이 이루어지지 않았습니다. 메일을 확인해 주세요';
 $lang->msg_user_limited = 'ID ingresado puede ser usado luego de %s';
 $lang->msg_admin_ip_not_allowed = 'Su dirección IP no se puede iniciar la sesión como administrador.';
 $lang->about_user_id = 'ID del usuario debe ser entre 3-20 letras que consiste en alfabetos+número con alfabeto como primera letra.';
@@ -129,20 +120,14 @@ $lang->about_active = 'Si selecciona "Activar" los artículos seran mostrados en
 $lang->about_form_description = 'Si Usted ingresa la forma de la descripción, será mostrado en el momento de registrar';
 $lang->about_required = 'Si selecciona esta opción, será artículo esencial para el registro';
 $lang->about_enable_join = 'Debe seleccionar esta opción para permitir el registro de los usuarios';
-$lang->about_enable_confirm = '입력된 메일 주소로 인증 메일을 보내 회원 가입을 확인합니다';
 $lang->about_enable_find_account_question = 'Compruebe si desea permitir a los miembros a recuperar sus cuentas utilizando una pregunta y respuesta de seguridad.';
-$lang->about_enable_ssl = '서버에서 SSL지원이 될 경우 회원가입/정보수정/로그인등의 개인정보가 서버로 보내질때 SSL(https)를 이용하도록 할 수 있습니다';
 $lang->about_limit_day = 'Usted puede limitar la fecha de la certificación luego de registrar';
 $lang->about_limit_date = 'Usuario no podra conectarse hasta la fecha indicada';
 $lang->about_redirect_url = 'Ingresar la URL que va a abrir luego de registrar los usuarios. Cuando esto esta vacío, se habrirá la página anterior a la del registro.';
 $lang->about_agreement = 'Acuerdo del registro no será mostrado si esta vacío';
 $lang->about_image_name = 'Permitir a los usuarios el uso de imagen del nombre en ves del nombre del usuario';
 $lang->about_image_mark = 'Permitir a los usuarios el uso de imagen de marca delante de sus nombres';
-$lang->about_group_image_mark = '회원의 이름앞에 그룹 마크를 달 수 있습니다';
 $lang->about_profile_image = 'Permitir a los usuarios a utilizar nombre de la imagen en lugar de texto nombre';
 $lang->about_accept_agreement = 'Yo he leído todo el acuerdo y acepto';
 $lang->about_member_default = 'Al registrar se configura como grupo predefinido';
 $lang->about_find_member_account = 'Su información de la cuenta será observado por dirección de correo electrónico registrada. Introduce la dirección de correo electrónico que usted tiene de entrada en el registro, y pulse "Buscar" Información de la cuenta ". <br />';
-$lang->about_ssl_port = 'Please input if you are using different SSL port with default one';
-$lang->about_resend_auth_mail = 'You can request for authentication mail if you have failed before.';
-$lang->no_article = 'There exists no article';
diff --git a/modules/member/lang/fr.php b/modules/member/lang/fr.php
index d3674d841..3f0dba7b0 100644
--- a/modules/member/lang/fr.php
+++ b/modules/member/lang/fr.php
@@ -46,7 +46,6 @@ $lang->agreement = 'Accord de l\'Inscription comme Membre';
 $lang->accept_agreement = 'D\'accord';
 $lang->member_info = 'Information de Membre';
 $lang->current_password = 'Mot de Passe courant';
-$lang->about_allow_message = '쪽지 허용 방법 및 대상을 지정할 수 있습니다';
 $lang->logged_users = 'Logged Users';
 $lang->webmaster_name = 'Nom de Webmestre';
 $lang->webmaster_email = 'Mél de Webmestre';
@@ -57,8 +56,6 @@ $lang->about_webmaster_email = 'Entrez l\'adresse du mél de webmestre, S.V.P.';
 $lang->search_target_list['email_address'] = 'Mél';
 $lang->search_target_list['regdate'] = 'Jour d\'Inscription';
 $lang->search_target_list['last_login'] = 'Jour de la connexion dernière';
-$lang->search_target_list['last_login_more'] = '최근로그인일시(이상)';
-$lang->search_target_list['last_login_less'] = '최근로그인일시(이하)';
 $lang->search_target_list['birthday'] = 'Anniversaire';
 $lang->search_target_list['extra_vars'] = 'Variables additionnels ';
 $lang->cmd_login = 'Connexion';
@@ -115,7 +112,6 @@ $lang->msg_check_group = 'Choisissez le groupe';
 $lang->msg_not_uploaded_profile_image = 'L\'image de Profil n\'a pas pu être enrégistré';
 $lang->msg_not_uploaded_image_name = 'Le nom d\'image n\'a pas pu être enrégistré';
 $lang->msg_not_uploaded_image_mark = 'La marque en image n\'a pas pu être enrégistrée';
-$lang->msg_not_uploaded_group_image_mark = '그룹 이미지 마크를 등록할 수가 없습니다';
 $lang->msg_accept_agreement = 'Vous devez agréer l\'accord';
 $lang->msg_user_denied = 'Le compte que vous avez entré est suspendu';
 $lang->msg_user_not_confirmed = 'Vous n\'avez pas encore authentifié. Verifiez votre mél, S.V.P.';
@@ -153,7 +149,6 @@ $lang->about_redirect_url = 'Entrez URL où l\'utilisateur irra après l\'inscri
 $lang->about_agreement = 'L\'Accord d\'Inscription comme Membre sera exposé seulement quand il n\'est pas vide.';
 $lang->about_image_name = 'Permettre aux utilisateurs d\'utiliser une image pour présenter leurs noms au lieu des lettres';
 $lang->about_image_mark = 'Permettre aux utilisateurs d\'utiliser une marque devent leurs noms';
-$lang->about_group_image_mark = '회원의 이름앞에 그룹 마크를 달 수 있습니다';
 $lang->about_profile_image = 'Permettre aux utilisateurs d\'utiliser une image de profil';
 $lang->about_accept_agreement = 'J\'ai lu l\'Accord et je suis d\'accord.';
 $lang->about_member_default = 'On sera par défaut dans ce groupe après l\'inscription';
diff --git a/modules/member/lang/ja.php b/modules/member/lang/ja.php
index 2338a3d7f..95a0165b8 100644
--- a/modules/member/lang/ja.php
+++ b/modules/member/lang/ja.php
@@ -190,7 +190,6 @@ $lang->about_column_name = 'テンプレートで使用できる英文字の名
 $lang->about_column_title = '登録または情報修正・閲覧時に表示されるタイトルです。';
 $lang->about_default_value = 'デフォルトで入力される値を指定することができます。';
 $lang->about_active = '有効項目にチェックを入れないと加入時に正常に表示されません。';
-$lang->about_emailhost_check = 'Empty value will allow almost all email account providers.<br />You can set new member\'s e-mail address providers. You can allow or prohibit some e-mail hosts(eg.: naver.com, gmail.com).';
 $lang->about_form_description = '説明欄に入力すると登録時に表示されます。';
 $lang->about_required = 'チェックを入れると会員登録時に必須入力項目として設定されます。';
 $lang->about_enable_join = 'チェックを入れないとユーザーが会員に登録できません。';
@@ -260,7 +259,6 @@ $lang->cmd_input_extend_form = '会員拡張項目入力';
 $lang->about_multi_type = '多重または単一項目の選択値を入力してください。（改行で区別）';
 $lang->msg_delete_extend_form = '選択した項目を削除します。';
 $lang->set_manage_id = '改行で区別';
-$lang->count_manage_email_host = 'There are <span class="_managededEmailHostCount">%s</span> <span id="managededEmailHostType">%s</span> e-mail address providers below.';
 $lang->count_manage_id = '<span class="_deniedIDCount">%s</span>個の禁止IDがあります。';
 $lang->count_manage_nick_name = '<span class="_deniedNickNameCount">%s</span>個の禁止ニックネームがあります。';
 $lang->user_list = '会員リスト';
@@ -281,7 +279,6 @@ $lang->multi_line_input = '複数の項目は、改行して入力してくだ
 $lang->add_extend_form = 'ユーザー定義項目追加';
 $lang->msg_null_prohibited_id = '追加する禁止IDを入力してください。';
 $lang->msg_null_prohibited_nick_name = '追加するニックネームを入力してください。';
-$lang->msg_null_managed_emailhost = 'Please enter email address providers to manage. (eg.: gmail.com)';
 $lang->identifier = 'ログインアカウント';
 $lang->about_identifier = 'ログインに使用するアカウントを選択してください。';
 $lang->about_public_item = '本人以外に他の会員にも露出される情報なのか選択します。';
diff --git a/modules/member/lang/ru.php b/modules/member/lang/ru.php
index 0b1497fbf..b9df8e47a 100644
--- a/modules/member/lang/ru.php
+++ b/modules/member/lang/ru.php
@@ -48,7 +48,6 @@ $lang->allow_message = 'Сообщения разрешены';
 $lang->allow_message_type['Y'] = 'Разрешено всем';
 $lang->allow_message_type['F'] = 'Разрешено только зарегистрированным друзьям';
 $lang->allow_message_type['N'] = 'Запрещено всем';
-$lang->about_allow_message = '쪽지 허용 방법 및 대상을 지정할 수 있습니다';
 $lang->logged_users = 'Logged Users';
 $lang->webmaster_name = 'Имя веб-мастера';
 $lang->webmaster_email = 'Email веб-мастера';
diff --git a/modules/member/lang/zh-CN.php b/modules/member/lang/zh-CN.php
index cdc5fefd5..f9cf9e4b2 100644
--- a/modules/member/lang/zh-CN.php
+++ b/modules/member/lang/zh-CN.php
@@ -12,8 +12,6 @@ $lang->remember_user_id = '保存ID';
 $lang->already_logged = '您已经登录！';
 $lang->denied_user_id = '被禁止的用户名。';
 $lang->denied_nick_name = '被禁止的昵称。';
-$lang->managed_email_host['allowed'] = 'Only %s e-mail accounts are allowed. (%s)';
-$lang->managed_email_host['prohibited'] = 'E-mail accounts at %s are not allowed. (%s)';
 $lang->null_user_id = '请输入用户名。';
 $lang->null_password = '请输入密码。';
 $lang->invalid_authorization = '还没有认证！';
@@ -174,7 +172,6 @@ $lang->about_column_name = '请输入在模板中可以使用的英文名称。
 $lang->about_column_title = '注册或修改/查看信息时要显示的标题。';
 $lang->about_default_value = '可以设置缺省值。';
 $lang->about_active = '必须选择此项后才可以正常启用。';
-$lang->about_emailhost_check = 'Empty value will allow almost all email account providers.<br />You can set new member\'s e-mail address providers. You can allow or prohibit some e-mail hosts(eg.: naver.com, gmail.com).';
 $lang->about_form_description = '说明栏里输入的内容，注册时将会显示。';
 $lang->about_required = '注册时成为必填项目。';
 $lang->about_enable_join = '选择此项后用户才可以注册。';
@@ -237,7 +234,6 @@ $lang->cmd_input_extend_form = '使用者自定';
 $lang->about_multi_type = '请输入单个或多个项目值。(用换行区分)';
 $lang->msg_delete_extend_form = '删除所选项目';
 $lang->set_manage_id = '用换行区分';
-$lang->count_manage_email_host = 'There are <span class="_managededEmailHostCount">%s</span> <span id="managededEmailHostType">%s</span> e-mail address providers below.';
 $lang->count_manage_id = '已有 <span class="_deniedIDCount">%s</span>个禁止账号';
 $lang->count_manage_nick_name = '已有 <span class="_deniedIDCount">%s</span>个禁止昵称';
 $lang->user_list = '会员列表';
@@ -258,7 +254,6 @@ $lang->multi_line_input = '多各项请换行';
 $lang->add_extend_form = '增加自定义项目';
 $lang->msg_null_prohibited_id = '请输入禁止账号';
 $lang->msg_null_prohibited_nick_name = '请输入禁止昵称';
-$lang->msg_null_managed_emailhost = 'Please enter email address providers to manage. (eg.: gmail.com)';
 $lang->identifier = '登录账号';
 $lang->about_identifier = '请选择账号登录方式';
 $lang->about_public_item = '选择是不是除了本人别的会员也能看到';
diff --git a/modules/member/lang/zh-TW.php b/modules/member/lang/zh-TW.php
index 8b168786e..3fcd0bb9c 100644
--- a/modules/member/lang/zh-TW.php
+++ b/modules/member/lang/zh-TW.php
@@ -10,8 +10,6 @@ $lang->keep_signed = '自動登入';
 $lang->remember_user_id = '儲存帳號';
 $lang->already_logged = '您已經登入！';
 $lang->denied_user_id = '被禁止的帳號。';
-$lang->managed_email_host['allowed'] = 'Only %s e-mail accounts are allowed. (%s)';
-$lang->managed_email_host['prohibited'] = 'E-mail accounts at %s are not allowed. (%s)';
 $lang->null_user_id = '請輸入帳號。';
 $lang->null_password = '請輸入密碼。';
 $lang->invalid_authorization = '還沒有認證！';
@@ -92,7 +90,6 @@ $lang->cmd_module_config = '基本設置';
 $lang->cmd_member_group = '群組管理';
 $lang->cmd_send_mail = '發送郵件';
 $lang->cmd_manage_id = '禁止帳號';
-$lang->cmd_manage_email_host = 'E-mail provider check';
 $lang->cmd_manage_form = '註冊表單管理';
 $lang->cmd_view_own_document = '發表主題';
 $lang->cmd_manage_member_info = '管理會員資料';
@@ -161,7 +158,6 @@ $lang->about_column_name = '請輸入在樣板中可以使用的英文名稱。(
 $lang->about_column_title = '註冊或修改/檢視資料時要顯示的標題。';
 $lang->about_default_value = '可以設置預設值。';
 $lang->about_active = '必須選擇此項後才可以正常啟用。';
-$lang->about_emailhost_check = 'Empty value will allow almost all email account providers.<br />You can set new member\'s e-mail address providers. You can allow or prohibit some e-mail hosts(eg.: naver.com, gmail.com).';
 $lang->about_form_description = '說明欄裡輸入的內容，在註冊時會顯示。';
 $lang->about_required = '註冊時成為必填項目。';
 $lang->about_enable_join = '選擇此項後，用戶才可以註冊。';
@@ -206,7 +202,6 @@ $lang->msg_question_not_exists = '尚未輸入提示問答';
 $lang->msg_answer_not_matches = '答案不正確';
 $lang->change_password_date = '密碼更新';
 $lang->about_change_password_date = '可設定密碼更新週期，將會定期通知更換密碼。 (設為零則不使用)';
-$lang->msg_kr_address = 'Search for the name of eup, myeon or dong of your address.';
 $lang->msg_kr_address_etc = '請輸入住址。';
 $lang->cmd_search_again = '再找一次';
 $lang->msg_select_user = '請選擇一位會員進行管理。';
@@ -214,8 +209,6 @@ $lang->msg_delete_user = '刪除所選會員';
 $lang->cmd_selected_user_manage = '管理所選會員';
 $lang->about_change_user_group = '重新設定所選會員群組';
 $lang->about_send_message = '向此會員發送通知信';
-$lang->cmd_allowed = 'Allowed';
-$lang->cmd_prohibited = 'Prohibited';
 $lang->cmd_required = '必填';
 $lang->cmd_optional = '選填';
 $lang->cmd_image_max_width = '寬度限制';
@@ -224,7 +217,6 @@ $lang->cmd_input_extend_form = '使用者自訂';
 $lang->about_multi_type = '請輸入單個或多個項目值。(換行區隔)';
 $lang->msg_delete_extend_form = '刪除所選項目';
 $lang->set_manage_id = '換行區隔';
-$lang->count_manage_email_host = 'There are <span class="_managededEmailHostCount">%s</span> <span id="managededEmailHostType">%s</span> e-mail address providers below.';
 $lang->count_manage_id = '已有 <span class="_deniedIDCount">%s</span> 個禁止帳號';
 $lang->user_list = '會員列表';
 $lang->cmd_show_all_member = '所有會員';
@@ -238,11 +230,9 @@ $lang->add_group_image_mark = '新增群組圖標';
 $lang->link_file_box = '前往檔案盒';
 $lang->msg_group_delete = '刪除所選群組';
 $lang->email = '電子郵件';
-$lang->add_managed_emailhost = 'Add E-mail Host';
 $lang->add_prohibited_id = '新增禁止帳號';
 $lang->add_extend_form = '新增自訂項目';
 $lang->msg_null_prohibited_id = '請輸入禁止帳號';
-$lang->msg_null_managed_emailhost = 'Please enter email address providers to manage. (eg.: gmail.com)';
 $lang->identifier = '登入帳號';
 $lang->about_identifier = '請選擇帳號登入方式。';
 $lang->cmd_add_group = '新增群組';
diff --git a/modules/member/m.skins/default/common_header.html b/modules/member/m.skins/default/common_header.html
index 5d824928b..f882e2d41 100644
--- a/modules/member/m.skins/default/common_header.html
+++ b/modules/member/m.skins/default/common_header.html
@@ -3,7 +3,7 @@
 	<div class="mtab" cond="$is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl)">
 		<ul class="mtab">
 			<li loop="$logged_info->menu_list=>$key,$val" class="active"|cond="$key==$act">
-				<a href="{getUrl('', 'act',$key, 'mid', $mid, 'vid', $vid)}"><span>{Context::getLang($val)}</span></a>
+				<a href="{getUrl('', 'act',$key, 'mid', $mid, 'vid', $vid)}"><span>{lang($val)}</span></a>
 			</li>
 		</ul>
 	</div>
\ No newline at end of file
diff --git a/modules/member/m.skins/default/leave_form.html b/modules/member/m.skins/default/leave_form.html
index b81eb1ee7..77698aabd 100644
--- a/modules/member/m.skins/default/leave_form.html
+++ b/modules/member/m.skins/default/leave_form.html
@@ -12,7 +12,7 @@
 	<input type="hidden" name="xe_validator_id" value="modules/member/m.skin/default/leave_form/1" />
 	<ul>
 		<li>
-			<label for="identifier">{Context::getLang($identifier)}</label>
+			<label for="identifier">{lang($identifier)}</label>
 			<p id="identifier">{$formValue}</p>
 		</li>
 		<li>
diff --git a/modules/member/m.skins/default/modify_password.html b/modules/member/m.skins/default/modify_password.html
index df0e96976..9a466f847 100644
--- a/modules/member/m.skins/default/modify_password.html
+++ b/modules/member/m.skins/default/modify_password.html
@@ -14,7 +14,7 @@
 	
 	<ul>
 		<li>
-			<label for="uid">{Context::getLang($identifier)}</label>
+			<label for="uid">{lang($identifier)}</label>
 			<input type="text" disabled="disabled" value="{$formValue}" id="uid" />
 		</li>
 		<li>
diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index ddfb69ba8..918838a72 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -1296,7 +1296,7 @@ class memberAdminController extends member
 		$default_args->group_srl = $defaultGroupSrl;
 		$output = $this->updateGroup($default_args);
 
-		$this->setMessage(Context::getLang('success_updated').' ('.Context::getLang('msg_insert_group_name_detail').')');
+		$this->setMessage(lang('success_updated').' ('.lang('msg_insert_group_name_detail').')');
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList');
 		$this->setRedirectUrl($returnUrl);
diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php
index 21e3d6ba8..93619b3c4 100644
--- a/modules/member/member.admin.view.php
+++ b/modules/member/member.admin.view.php
@@ -506,7 +506,7 @@ class memberAdminView extends member
 								$val);
 						}
 						$inputTag = sprintf($inputTag, implode('', $optionTag));
-						$inputTag .= '<input type="text" name="find_account_answer" id="find_account_answer" title="'.Context::getLang('find_account_answer').'" value="'.$memberInfo['find_account_answer'].'" />';
+						$inputTag .= '<input type="text" name="find_account_answer" id="find_account_answer" title="'.lang('find_account_answer').'" value="'.$memberInfo['find_account_answer'].'" />';
 					}
 					else if($formInfo->name == 'email_address')
 					{
diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index 84328637d..b2a63f159 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -110,19 +110,19 @@ class member extends ModuleObject {
 		{
 			// Set an administrator, regular member(group1), and associate member(group2)
 			$group_args = new stdClass;
-			$group_args->title = Context::getLang('admin_group');
+			$group_args->title = lang('admin_group');
 			$group_args->is_default = 'N';
 			$group_args->is_admin = 'Y';
 			$output = $oMemberAdminController->insertGroup($group_args);
 
 			$group_args = new stdClass;
-			$group_args->title = Context::getLang('default_group_1');
+			$group_args->title = lang('default_group_1');
 			$group_args->is_default = 'Y';
 			$group_args->is_admin = 'N';
 			$output = $oMemberAdminController->insertGroup($group_args);
 
 			$group_args = new stdClass;
-			$group_args->title = Context::getLang('default_group_2');
+			$group_args->title = lang('default_group_2');
 			$group_args->is_default = 'N';
 			$group_args->is_admin = 'N';
 			$oMemberAdminController->insertGroup($group_args);
@@ -455,14 +455,14 @@ class member extends ModuleObject {
 		{
 			//update
 			$content = unserialize($output->data->content);
-			$content[] = array($_SERVER['REMOTE_ADDR'],Context::getLang($message),$_SERVER['REQUEST_TIME']);
+			$content[] = array($_SERVER['REMOTE_ADDR'],lang($message),$_SERVER['REQUEST_TIME']);
 			$args->content = serialize($content);
 			$output = executeQuery('member.updateLoginCountHistoryByMemberSrl', $args);
 		}
 		else
 		{
 			//insert
-			$content[0] = array($_SERVER['REMOTE_ADDR'],Context::getLang($message),$_SERVER['REQUEST_TIME']);
+			$content[0] = array($_SERVER['REMOTE_ADDR'],lang($message),$_SERVER['REQUEST_TIME']);
 			$args->content = serialize($content);
 			$output = executeQuery('member.insertLoginCountHistoryByMemberSrl', $args);
 		}
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index c99dc0062..c6bb4c134 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -67,7 +67,7 @@ class memberController extends member
 			$oMemberModel = getModel('member');
 			if($this->memberInfo->change_password_date < date ('YmdHis', strtotime ('-' . $limit_date . ' day')))
 			{
-				$msg = sprintf(Context::getLang('msg_change_password_date'), $limit_date);
+				$msg = sprintf(lang('msg_change_password_date'), $limit_date);
 				return $this->setRedirectUrl(getNotEncodedUrl('','vid',Context::get('vid'),'mid',Context::get('mid'),'act','dispMemberModifyPassword'), new Object(-1, $msg));
 			}
 		}
@@ -245,7 +245,7 @@ class memberController extends member
 					$config = $oMemberModel->getMemberConfig();
 					$emailhost_check = $config->emailhost_check;
 
-					$managed_email_host = Context::getLang('managed_email_host');
+					$managed_email_host = lang('managed_email_host');
 
 					$email_hosts = $oMemberModel->getManagedEmailHosts();
 					foreach ($email_hosts as $host)
@@ -313,7 +313,7 @@ class memberController extends member
 		// check password strength
 		if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
 		{
-			$message = Context::getLang('about_password_strength');
+			$message = lang('about_password_strength');
 			return new Object(-1, $message[$config->password_strength]);
 		}
 
@@ -412,7 +412,7 @@ class memberController extends member
 		if($config->redirect_url) $this->add('redirect_url', $config->redirect_url);
 		if($config->enable_confirm == 'Y')
 		{
-			$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address);
+			$msg = sprintf(lang('msg_confirm_mail_sent'), $args->email_address);
 			$this->setMessage($msg);
 			return $this->setRedirectUrl(getUrl('', 'act', 'dispMemberLoginForm'), new Object(-12, $msg));
 		}
@@ -1048,13 +1048,13 @@ class memberController extends member
 		$member_config = $oModuleModel->getModuleConfig('member');
 		// Send a mail
 		$oMail = new Mail();
-		$oMail->setTitle( Context::getLang('msg_find_account_title') );
+		$oMail->setTitle( lang('msg_find_account_title') );
 		$oMail->setContent($content);
 		$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
 		$oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
 		$oMail->send();
 		// Return message
-		$msg = sprintf(Context::getLang('msg_auth_mail_sent'), $member_info->email_address);
+		$msg = sprintf(lang('msg_auth_mail_sent'), $member_info->email_address);
 		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberFindAccount');
@@ -1273,13 +1273,13 @@ class memberController extends member
 		$content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
 		// Send a mail
 		$oMail = new Mail();
-		$oMail->setTitle( Context::getLang('msg_confirm_account_title') );
+		$oMail->setTitle( lang('msg_confirm_account_title') );
 		$oMail->setContent($content);
 		$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
 		$oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
 		$oMail->send();
 
-		$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address);
+		$msg = sprintf(lang('msg_confirm_mail_sent'), $args->email_address);
 		$this->setMessage($msg);
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
@@ -1349,7 +1349,7 @@ class memberController extends member
 		// resend auth mail.
 		$this->_sendAuthMail($auth_args, $memberInfo);
 
-		$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $memberInfo->email_address);
+		$msg = sprintf(lang('msg_confirm_mail_sent'), $memberInfo->email_address);
 		$this->setMessage($msg);
 
 		$returnUrl = getUrl('');
@@ -1401,7 +1401,7 @@ class memberController extends member
 		$content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
 		// Send a mail
 		$oMail = new Mail();
-		$oMail->setTitle( Context::getLang('msg_confirm_account_title') );
+		$oMail->setTitle( lang('msg_confirm_account_title') );
 		$oMail->setContent($content);
 		$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
 		$oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
@@ -1720,12 +1720,12 @@ class memberController extends member
 			if($term < $config->max_error_count_time)
 			{
 				$term = $config->max_error_count_time - $term;
-				if($term < 60) $term = intval($term).Context::getLang('unit_sec');
-				elseif(60 <= $term && $term < 3600) $term = intval($term/60).Context::getLang('unit_min');
-				elseif(3600 <= $term && $term < 86400) $term = intval($term/3600).Context::getLang('unit_hour');
-				else $term = intval($term/86400).Context::getLang('unit_day');
+				if($term < 60) $term = intval($term).lang('unit_sec');
+				elseif(60 <= $term && $term < 3600) $term = intval($term/60).lang('unit_min');
+				elseif(3600 <= $term && $term < 86400) $term = intval($term/3600).lang('unit_hour');
+				else $term = intval($term/86400).lang('unit_day');
 
-				return new Object(-1, sprintf(Context::getLang('excess_ip_access_count'),$term));
+				return new Object(-1, sprintf(lang('excess_ip_access_count'),$term));
 			}
 			else
 			{
@@ -1751,13 +1751,13 @@ class memberController extends member
 				$redirectUrl = getUrl('', 'act', 'dispMemberResendAuthMail');
 				return $this->setRedirectUrl($redirectUrl, new Object(-1,'msg_user_not_confirmed'));
 			}
-			return new Object(-1, ($this->memberInfo->refused_reason)? Context::getLang('msg_user_denied') . "\n" . $this->memberInfo->refused_reason : 'msg_user_denied');
+			return new Object(-1, ($this->memberInfo->refused_reason)? lang('msg_user_denied') . "\n" . $this->memberInfo->refused_reason : 'msg_user_denied');
 		}
 		
 		// Notify if user is limited
 		if($this->memberInfo->limit_date && substr($this->memberInfo->limit_date,0,8) >= date("Ymd"))
 		{
-			return new Object(-9,sprintf(Context::getLang('msg_user_limited'),zdate($this->memberInfo->limit_date,"Y-m-d")));
+			return new Object(-9,sprintf(lang('msg_user_limited'),zdate($this->memberInfo->limit_date,"Y-m-d")));
 		}
 		
 		// Do not allow login as admin if not in allowed IP list
@@ -1785,17 +1785,17 @@ class memberController extends member
 			$output = executeQuery('member.getLoginCountHistoryByMemberSrl', $args);
 			if($output->data && $output->data->content)
 			{
-				$title = Context::getLang('login_fail_report');
+				$title = lang('login_fail_report');
 				$message = '<ul>';
 				$content = unserialize($output->data->content);
 				if(count($content) > $config->max_error_count)
 				{
 					foreach($content as $val)
 					{
-						$message .= '<li>'.Context::getLang('regdate').': '.date('Y-m-d h:i:sa',$val[2]).'<ul><li>'.Context::getLang('ipaddress').': '.$val[0].'</li><li>'.Context::getLang('message').': '.$val[1].'</li></ul></li>';
+						$message .= '<li>'.lang('regdate').': '.date('Y-m-d h:i:sa',$val[2]).'<ul><li>'.lang('ipaddress').': '.$val[0].'</li><li>'.lang('message').': '.$val[1].'</li></ul></li>';
 					}
 					$message .= '</ul>';
-					$content = sprintf(Context::getLang('login_fail_report_contents'),$message,date('Y-m-d h:i:sa'));
+					$content = sprintf(lang('login_fail_report_contents'),$message,date('Y-m-d h:i:sa'));
 
 					//send message
 					$oCommunicationController = getController('communication');
@@ -1906,7 +1906,7 @@ class memberController extends member
 	{
 		$logged_info = Context::get('logged_info');
 
-		$logged_info->menu_list[$act] = Context::getLang($str);
+		$logged_info->menu_list[$act] = lang($str);
 
 		Context::set('logged_info', $logged_info);
 	}
@@ -1988,7 +1988,7 @@ class memberController extends member
 		{
 			if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
 			{
-				$message = Context::getLang('about_password_strength');
+				$message = lang('about_password_strength');
 				return new Object(-1, $message[$config->password_strength]);
 			}
 			$args->password = $oMemberModel->hashPassword($args->password);
@@ -2030,7 +2030,7 @@ class memberController extends member
 			$config = $oMemberModel->getMemberConfig();
 			$emailhost_check = $config->emailhost_check;
 
-			$managed_email_host = Context::getLang('managed_email_host');
+			$managed_email_host = lang('managed_email_host');
 			$email_hosts = $oMemberModel->getManagedEmailHosts();
 			foreach ($email_hosts as $host)
 			{
@@ -2191,7 +2191,7 @@ class memberController extends member
 			$config = $oMemberModel->getMemberConfig();
 			$emailhost_check = $config->emailhost_check;
 
-			$managed_email_host = Context::getLang('managed_email_host');
+			$managed_email_host = lang('managed_email_host');
 			$email_hosts = $oMemberModel->getManagedEmailHosts();
 			foreach ($email_hosts as $host)
 			{
@@ -2261,7 +2261,7 @@ class memberController extends member
 		{
 			if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
 			{
-				$message = Context::getLang('about_password_strength');
+				$message = lang('about_password_strength');
 				return new Object(-1, $message[$config->password_strength]);
 			}
 			$args->password = $oMemberModel->hashPassword($args->password);
@@ -2364,7 +2364,7 @@ class memberController extends member
 
 			if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
 			{
-				$message = Context::getLang('about_password_strength');
+				$message = lang('about_password_strength');
 				return new Object(-1, $message[$config->password_strength]);
 			}
 
@@ -2542,7 +2542,7 @@ class memberController extends member
 			$config = $oMemberModel->getMemberConfig();
 			$emailhost_check = $config->emailhost_check;
 
-			$managed_email_host = Context::getLang('managed_email_host');
+			$managed_email_host = lang('managed_email_host');
 			$email_hosts = $oMemberModel->getManagedEmailHosts();
 			foreach ($email_hosts as $host)
 			{
@@ -2601,13 +2601,13 @@ class memberController extends member
 		$content = $oTemplate->compile($tpl_path, 'confirm_member_new_email');
 
 		$oMail = new Mail();
-		$oMail->setTitle( Context::getLang('title_modify_email_address') );
+		$oMail->setTitle( lang('title_modify_email_address') );
 		$oMail->setContent($content);
 		$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
 		$oMail->setReceiptor( $member_info->nick_name, $newEmail );
 		$result = $oMail->send();
 
-		$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $newEmail);
+		$msg = sprintf(lang('msg_confirm_mail_sent'), $newEmail);
 		$this->setMessage($msg);
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
@@ -2803,7 +2803,7 @@ class memberController extends member
 		$args->description = trim( $member_info->description );
 		if( $args->description != "" ) $args->description .= "\n";	// add new line
 
-		$args->description .= Context::getLang('cmd_spammer') . "[" . date("Y-m-d H:i:s") . " from:" . $logged_info->user_id . " info:" . $spam_description . " docuemnts count:" . $total_count . "]";
+		$args->description .= lang('cmd_spammer') . "[" . date("Y-m-d H:i:s") . " from:" . $logged_info->user_id . " info:" . $spam_description . " docuemnts count:" . $total_count . "]";
 
 		$output = $this->updateMember($args, true);
 
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index fd72ef1ce..7b26ef013 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -44,7 +44,7 @@ class memberModel extends member
 		//for multi language
 		foreach($config->signupForm AS $key=>$value)
 		{
-			$config->signupForm[$key]->title = ($value->isDefaultForm) ? Context::getLang($value->name) : $value->title;
+			$config->signupForm[$key]->title = ($value->isDefaultForm) ? lang($value->name) : $value->title;
 			if($config->signupForm[$key]->isPublic != 'N') $config->signupForm[$key]->isPublic = 'Y';
 			if($value->name == 'find_account_question') $config->signupForm[$key]->isPublic = 'N';
 		}
@@ -186,7 +186,7 @@ class memberModel extends member
 		$menus_count = count($menus);
 		for($i=0;$i<$menus_count;$i++)
 		{
-			$menus[$i]->str = Context::getLang($menus[$i]->str);
+			$menus[$i]->str = lang($menus[$i]->str);
 		}
 		// Get a list of finalized pop-up menu
 		$this->add('menus', $menus);
diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index 687dd1cc9..b54f40144 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -128,7 +128,7 @@ class memberView extends member
 
 			if($formInfo->isDefaultForm)
 			{
-				$item->title = Context::getLang($formInfo->name);
+				$item->title = lang($formInfo->name);
 				$item->value = $memberInfo->{$formInfo->name};
 
 				if($formInfo->name == 'profile_image' && $memberInfo->profile_image)
@@ -265,12 +265,12 @@ class memberView extends member
 
 		if ($this->member_config->identifier == 'email_address')
 		{
-			Context::set('identifierTitle', Context::getLang('email_address'));
+			Context::set('identifierTitle', lang('email_address'));
 			Context::set('identifierValue', $logged_info->email_address); 
 		}
 		else
 		{
-			Context::set('identifierTitle', Context::getLang('user_id'));
+			Context::set('identifierTitle', lang('user_id'));
 			Context::set('identifierValue', $logged_info->user_id);
 		}
 
diff --git a/modules/member/skins/default/common_header.html b/modules/member/skins/default/common_header.html
index 7a755d48d..6d930eaf4 100644
--- a/modules/member/skins/default/common_header.html
+++ b/modules/member/skins/default/common_header.html
@@ -4,6 +4,6 @@
 <section class="xm">
 	<ul class="nav nav-tabs" cond="$is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl)">
 		<li loop="$logged_info->menu_list=>$key,$val" class="active"|cond="$key==$act">
-			<a href="{getUrl('', 'act',$key, 'mid', $mid, 'vid', $vid)}">{Context::getLang($val)}</a>
+			<a href="{getUrl('', 'act',$key, 'mid', $mid, 'vid', $vid)}">{lang($val)}</a>
 		</li>
 	</ul>
diff --git a/modules/member/skins/default/leave_form.html b/modules/member/skins/default/leave_form.html
index db2653ed4..839f941e5 100644
--- a/modules/member/skins/default/leave_form.html
+++ b/modules/member/skins/default/leave_form.html
@@ -11,7 +11,7 @@
     <input type="hidden" name="page" value="{$page}" />
 	<input type="hidden" name="xe_validator_id" value="modules/member/skin/default/1" />
 	<div>
-		<input type="email" value="{$formValue}" readonly title="{Context::getLang($identifier)}" />
+		<input type="email" value="{$formValue}" readonly title="{lang($identifier)}" />
 	</div>
 	<div>
 		<span class="input-append">
diff --git a/modules/member/skins/default/modify_password.html b/modules/member/skins/default/modify_password.html
index ff1940b9b..09fbb12b2 100644
--- a/modules/member/skins/default/modify_password.html
+++ b/modules/member/skins/default/modify_password.html
@@ -12,7 +12,7 @@
     <input type="hidden" name="xe_validator_id" value="modules/member/skins/default/1" />
     <input type="hidden" name="success_return_url" value="{getUrl('act','dispMemberInfo')}" />
 	<div>
-		<input type="email" disabled="disabled" value="{$formValue}" id="uid" placeholder="{Context::getLang($identifier)}" title="{Context::getLang($identifier)}" />
+		<input type="email" disabled="disabled" value="{$formValue}" id="uid" placeholder="{lang($identifier)}" title="{lang($identifier)}" />
 	</div>
 	<div>
 		<input type="password" name="current_password" id="cpw" required placeholder="{$lang->current_password}" title="{$lang->current_password}" />
diff --git a/modules/menu/lang/en.php b/modules/menu/lang/en.php
index 764a949aa..68dde004e 100644
--- a/modules/menu/lang/en.php
+++ b/modules/menu/lang/en.php
@@ -88,31 +88,24 @@ $lang->site_design = 'Site design';
 $lang->use_site_design = 'Use site design';
 $lang->full_settings = 'Full settings';
 $lang->install_other_menu_types = 'Install other menu types';
-$lang->about_new_menu_id = 'URL을 사용할 필요가 없다면 생략 가능. 메뉴 생성 후 [메뉴 수정]에서 수정 가능.';
-$lang->about_menu_id = '페이지 URL로 사용(40자 이내).';
-$lang->skip_menu_id = '생략시 임의값 사용';
 $lang->url_link = 'URL link';
 $lang->menu_link = 'Menu link';
-$lang->about_menu_link = '메뉴를 선택하면 자동 입력됨';
 $lang->view_zoom = 'Zoom';
 $lang->use_site_default_layout = 'Use site default layout';
 $lang->site_default_layout_settings = 'Site default layout settings';
 $lang->no_use_layout = 'No use layout';
-$lang->about_apply_layout = '클릭하면 레이아웃이 적용됩니다.';
 $lang->make_copy = 'Make copy';
 $lang->install_other_layouts = 'Install other layouts';
 $lang->layout_html_css_settings = 'HTML/CSS settings';
 $lang->layout_settings = 'Settings';
 $lang->use_site_default_skin = 'Use site default skin';
 $lang->site_default_skin_settings = 'Site default skin settings';
-$lang->about_apply_skin = '클릭하면 스킨이 적용됩니다.';
 $lang->install_other_skins = 'Install other themes';
 $lang->no_downloadable_item = 'There are no downloadable item.';
 $lang->confirm_sitemap_delete = 'Do you want to remove this sitemap?';
 $lang->confirm_menu_delete = 'Do you want to remove this menu item?';
 $lang->confirm_delete_all_contents = 'I understand that the contents will be deleted as well.';
 $lang->confirm_shortcut_delete = 'Do you want to remove this shortcut item?';
-$lang->confirm_shortcut_desc = '바로가기를 삭제해도 실제 메뉴는 지워지지 않습니다.';
 $lang->confirm_delete_all_sub_items_title = 'The menu has sub-menu(s)';
 $lang->confirm_delete_all_sub_items = 'Do you want to delete all the sub-menu(s)?';
 $lang->confirm_delete_all_item = 'I know delete all menu of sitemap.';
@@ -122,14 +115,10 @@ $lang->shortcut_desc = 'A shortcut is a link to a URL or to another menu';
 $lang->msg_target_is_sub_of_origin = 'Target menu is sub of origin menu.';
 $lang->target_of_view_menu = 'Target of view menu';
 $lang->input_new_layout_name = 'Input new layout name';
-$lang->skip_new_layout_name = '생략 시 임의의 값이 사용 됩니다.';
 $lang->need_to_ftp_setup = 'Need to FTP setup.';
 $lang->go_to_ftp_setup = 'Redirecting to FTP Setup page.';
 $lang->go_to_site_design_setup = 'Redirecting to Site Design page.';
 $lang->about_menu_type_in_default = 'To change the menu type, you have to delete and recreate the menu.';
-$lang->how_to_modify_menu = '생성한 메뉴는 [메뉴 수정]에서 수정 할 수 있습니다.';
-$lang->can_drag_menu = '사이트 맵에서 메뉴를 드래그 해서도 위치를 변경 할 수 있습니다.';
-$lang->good_to_duplicate_layout = '레이아웃 설정 변경 시, [복사본 생성] 버튼을 눌러 복사본을 만들어 설정을 변경 하는 것이 좋습니다.';
 $lang->img_uploaded = 'Button image is uploaded.';
 $lang->img_deleted = 'Button image is deleted.';
 $lang->do_not_display_again = 'Do not display again.';
diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php
index 011b09128..c007af59b 100644
--- a/modules/menu/menu.admin.controller.php
+++ b/modules/menu/menu.admin.controller.php
@@ -1517,12 +1517,12 @@ class menuAdminController extends menu
 		// Error occurs when the target is neither a uploaded file nor a valid file
 		if(!$menu_srl || !$menu_item_srl)
 		{
-			Context::set('error_messge', Context::getLang('msg_invalid_request'));
+			Context::set('error_messge', lang('msg_invalid_request'));
 
 		}
 		else if(!$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)$/i',$target_file['name'])  || !checkUploadedFile($target_file['tmp_name']))
 		{
-			Context::set('error_messge', Context::getLang('msg_invalid_request'));
+			Context::set('error_messge', lang('msg_invalid_request'));
 		}
 
 		// Move the file to a specific director if the uploaded file meets requirement
diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php
index 06878c186..d9efeb90b 100644
--- a/modules/menu/menu.admin.model.php
+++ b/modules/menu/menu.admin.model.php
@@ -366,7 +366,7 @@ class menuAdminModel extends menu
 
 			if($module_name == 'page')
 			{
-				$pageTypeName = Context::getLang('page_type_name');
+				$pageTypeName = lang('page_type_name');
 				$module->title = $pageTypeName['ARTICLE'];
 				$allModules['ARTICLE'] = $module;
 				$wModuleInfo = clone $module;
@@ -451,7 +451,7 @@ class menuAdminModel extends menu
 
 				if($value == 'page')
 				{
-					$pageTypeName = Context::getLang('page_type_name');
+					$pageTypeName = lang('page_type_name');
 					$moduleInfo->title = $pageTypeName['ARTICLE'];
 					$moduleInfoList['ARTICLE'] = $moduleInfo;
 					$wModuleInfo = clone $moduleInfo;
diff --git a/modules/module/lang/es.php b/modules/module/lang/es.php
index 3dcaae354..425fb2399 100644
--- a/modules/module/lang/es.php
+++ b/modules/module/lang/es.php
@@ -17,10 +17,7 @@ $lang->skin_author = 'Desarrollador de tema';
 $lang->skin_history = 'Historia de actualización';
 $lang->module_copy = 'Copy Module';
 $lang->about_domain = 'Para crear un dominio privado de la site requiere.   Independiente de dominio o subdominio, y Rhymix está instalado, el camino que en su conjunto.   Ej.) www.rhymix.org/rx';
-$lang->about_vid = '별도의 도메인이 아닌 https://Rhymix주소/ID 로 접속할 수 있습니다. 모듈명(mid)와 중복될 수 없습니다. 첫글자는 영문으로 시작해야 하고 영문과 숫자 그리고 _ 만 사용할 수 있습니다';
-$lang->msg_already_registed_vid = '이미 등록된 사이트 ID 입니다. 게시판등의 mid와도 중복이 되지 않습니다. 다른 ID를 입력해주세요.';
 $lang->msg_already_registed_domain = 'Ya es de dominio registrado. Por favor, use un dominio diferente.';
-$lang->about_header_script = 'html의 &lt;header&gt;와 &lt;/header&gt; 사이에 들어가는 코드를 직접 입력할 수 있습니다. &lt;script&gt;, &lt;style&gt;, &lt;meta&gt; 태그등을 이용할 수 있습니다';
 $lang->grant_to_site_user = 'Joined users';
 $lang->cmd_add_shortcut = 'añadir acceso directo';
 $lang->cmd_install = 'Instalar';
@@ -37,8 +34,6 @@ $lang->msg_grant_is_null = 'No existe el objetivo de atribución registrado.';
 $lang->msg_no_checked_document = 'No existe documento seleccionado.';
 $lang->msg_move_failed = 'No pudo moverse';
 $lang->msg_cannot_delete_for_child = 'No puede eliminar la categoría si posee subcategoría.';
-$lang->msg_limit_mid = '모듈이름은 영문+[영문+숫자+_] 만 가능합니다.';
-$lang->msg_extra_name_exists = '이미 존재하는 사용자 정의 이름입니다. 다른 이름을 입력해주세요.';
 $lang->about_browser_title = 'Esto es el valor que se mostrará en el título del navegador. También es usado en RSS/Trackback.';
 $lang->about_mid = 'El nombre del módulo será usado como http://direccion/?mid=NombreMódulo.
 (sólo alfabeto español+[alfabeto español, números y el gión abajo(_)] son permitidos. The maximum length is 40.)';
@@ -54,9 +49,6 @@ $lang->about_search_list_count = 'Usted puede configurar el número de artículo
 $lang->about_page_count = 'Usted puede definir el número de página enlazada para mover páginas en un botón de la página.(Predefinido es 10)';
 $lang->about_mobile_page_count = 'Usted puede definir el número de página enlazada para mover páginas en un botón de la página.(Predefinido es 5)';
 $lang->about_admin_id = 'Usted puede definir el administrador de atribuciones superiores al módulo.\\n Usted puede asignar múltiples IDs.';
-$lang->about_grant_deatil = '가입한 사용자는 cafeXE등 분양형 가상 사이트에 가입을 한 로그인 사용자를 의미합니다';
 $lang->about_module = 'Rhymix consiste de módulos excepto la librería básica.
  Módulo del Manejo del Módulo muestra todos los módulos instalados y ayuda el manejo de ellos.';
 $lang->about_extra_vars_default_value = 'Si múltiples valores predefinidos son requeridos, usted puede enlazar con la coma(,).';
-$lang->about_search_virtual_site = '가상 사이트(카페XE등)의 도메인을 입력한 후 검색하세요. 가상 사이트이외의 모듈은 내용을 비우고 검색하면 됩니다.  (http:// 는 제외)';
-$lang->about_langcode = '언어별로 다르게 설정하고 싶으면 언어코드 찾기를 이용해주세요';
diff --git a/modules/module/lang/fr.php b/modules/module/lang/fr.php
index 13e8fab09..7f845b6b7 100644
--- a/modules/module/lang/fr.php
+++ b/modules/module/lang/fr.php
@@ -17,8 +17,6 @@ $lang->skin_author = 'Developpeur de l\'habillage';
 $lang->skin_license = 'Licence';
 $lang->skin_history = 'Histoire des Mises à jour';
 $lang->module_copy = 'Copier un Module';
-$lang->about_vid = '별도의 도메인이 아닌 https://Rhymix주소/ID 로 접속할 수 있습니다. 모듈명(mid)와 중복될 수 없습니다. 첫글자는 영문으로 시작해야 하고 영문과 숫자 그리고 _ 만 사용할 수 있습니다';
-$lang->msg_already_registed_vid = '이미 등록된 사이트 ID 입니다. 게시판등의 mid와도 중복이 되지 않습니다. 다른 ID를 입력해주세요.';
 $lang->header_script = 'Script en-tête';
 $lang->about_header_script = 'Vous pouvez entrer un script en html par vous-même entre &lt;header&gt; et &lt;/header&gt;. Vous pouvez utiliser &lt;script&gt;, &lt;style&gt; ou &lt;meta&gt; tag';
 $lang->grant_to_site_user = 'Joined users';
@@ -37,8 +35,6 @@ $lang->msg_grant_is_null = 'Il n\'y a pas de liste de permission.';
 $lang->msg_no_checked_document = 'Pas un article est choisi.';
 $lang->msg_move_failed = 'Echoué de bouger';
 $lang->msg_cannot_delete_for_child = 'On ne peut pas supprimer une catégorie qui a des catégories inférieures.';
-$lang->msg_limit_mid = '모듈이름은 영문+[영문+숫자+_] 만 가능합니다.';
-$lang->msg_extra_name_exists = '이미 존재하는 사용자 정의 이름입니다. 다른 이름을 입력해주세요.';
 $lang->about_browser_title = 'C\'est la valeur qui se représentera dans le titre de navigateur Web. Ce sera encore utilisé dans RSS/Rétrolien.';
 $lang->about_mid = 'Le nom de module sera utilisé comme http://adresse/?mid=ModuleName.
 (alphabet anglais + [alphabet anglais, nombres, et soulignement(_)] sont seulement permis. The maximum length is 40.)';
@@ -54,9 +50,6 @@ $lang->about_search_list_count = 'Vous pouvez configurer combien d\'articles soi
 $lang->about_page_count = 'Vous pouvez configurer combien de liens pour les Pages à Bouger en bas de chaque page.(10 par défaut)';
 $lang->about_mobile_page_count = 'Vous pouvez configurer combien de liens pour les Pages à Bouger en bas de chaque page.(5 par défaut)';
 $lang->about_admin_id = 'Vous pouvez désigner un directeur qui aura tous les permissions sur le module.\\nVous pouvez entrer plusieurs compte en utilisant.';
-$lang->about_grant_deatil = '가입한 사용자는 cafeXE등 분양형 가상 사이트에 가입을 한 로그인 사용자를 의미합니다';
 $lang->about_module = 'Rhymix se compose des modules sauf la bibliothèque fondamental.
 Le module [Administration des Modules] montera tous les modules installés et vous aidera les administrer.';
 $lang->about_extra_vars_default_value = 'Si plusieurs valeurs sont nécessaires, vous pouvez les connecter avec la virgule(,).';
-$lang->about_search_virtual_site = '가상 사이트(카페XE등)의 도메인을 입력한 후 검색하세요. 가상 사이트이외의 모듈은 내용을 비우고 검색하면 됩니다.  (http:// 는 제외)';
-$lang->about_langcode = '언어별로 다르게 설정하고 싶으면 언어코드 찾기를 이용해주세요';
diff --git a/modules/module/lang/ja.php b/modules/module/lang/ja.php
index 4b0d74776..72b3dd67d 100644
--- a/modules/module/lang/ja.php
+++ b/modules/module/lang/ja.php
@@ -47,7 +47,6 @@ $lang->grant_manager = '管理権限';
 $lang->grant_to_all = 'すべてのユーザー';
 $lang->grant_to_login_user = 'ログインユーザー';
 $lang->grant_to_site_user = '登録ユーザー';
-$lang->grant_to_admin = 'Administrator only';
 $lang->grant_to_group = '特定グループのユーザー';
 $lang->cmd_add_shortcut = 'ショートカット追加';
 $lang->cmd_install = 'インストール';
diff --git a/modules/module/lang/ru.php b/modules/module/lang/ru.php
index 1860b73c0..a7ca150cf 100644
--- a/modules/module/lang/ru.php
+++ b/modules/module/lang/ru.php
@@ -23,10 +23,7 @@ $lang->filebox = 'Файлбокс';
 $lang->access_type = 'Способ соединения';
 $lang->access_domain = 'Domain соединения';
 $lang->access_vid = 'Site ID соединение';
-$lang->about_vid = '별도의 도메인이 아닌 https://Rhymix주소/ID 로 접속할 수 있습니다. 모듈명(mid)와 중복될 수 없습니다. 첫글자는 영문으로 시작해야 하고 영문과 숫자 그리고 _ 만 사용할 수 있습니다';
-$lang->msg_already_registed_vid = '이미 등록된 사이트 ID 입니다. 게시판등의 mid와도 중복이 되지 않습니다. 다른 ID를 입력해주세요.';
 $lang->header_script = 'Скрипт Header';
-$lang->about_header_script = 'html의 &lt;header&gt;와 &lt;/header&gt; 사이에 들어가는 코드를 직접 입력할 수 있습니다. &lt;script&gt;, &lt;style&gt;, &lt;meta&gt; 태그등을 이용할 수 있습니다';
 $lang->grant_to_site_user = 'Joined users';
 $lang->cmd_add_shortcut = 'Добавить ярлык';
 $lang->cmd_install = 'Установить';
@@ -44,8 +41,6 @@ $lang->msg_grant_is_null = 'Списка для управления права
 $lang->msg_no_checked_document = 'Нет выбранных статей.';
 $lang->msg_move_failed = 'Невозможно переместить';
 $lang->msg_cannot_delete_for_child = 'Невозможно удалить категорию, имеющую дочерние категории.';
-$lang->msg_limit_mid = '모듈이름은 영문+[영문+숫자+_] 만 가능합니다.';
-$lang->msg_extra_name_exists = '이미 존재하는 사용자 정의 이름입니다. 다른 이름을 입력해주세요.';
 $lang->about_browser_title = 'Это будет показано в заголовке браузера. Также, это будет использоваться в RSS/Трекбеке.';
 $lang->about_mid = 'Имя модуля будет использовано как http://address/?mid=Имя_модуля.
 (только латиница, цифры и символ подчеркивания(_) разрешены. The maximum length is 40.)';
@@ -57,13 +52,9 @@ $lang->about_footer_text = 'Это содержимое будет показа
 $lang->about_skin = 'Вы можете выбрать скин модуля.';
 $lang->about_use_category = 'Если выбрано, функция категорий будет включена.';
 $lang->about_list_count = 'Вы можете установить лимит показа статей на страницу. (по умолчанию: 20)';
-$lang->about_search_list_count = '검색 또는 카테고리 선택등을 할 경우 표시될 글의 수를 지정할 수 있습니다. 기본(20개)';
 $lang->about_page_count = 'Вы можете установить число страниц внизу. (по умолчанию: 10)';
 $lang->about_mobile_page_count = 'Вы можете установить число страниц внизу. (по умолчанию: 5)';
 $lang->about_admin_id = 'Вы можете разрешить менеджеру иметь полные права доступа к этому модулю.\\nВы можете ввести несколько ID, используя ';
-$lang->about_grant_deatil = '가입한 사용자는 cafeXE등 분양형 가상 사이트에 가입을 한 로그인 사용자를 의미합니다';
 $lang->about_module = 'Rhymix состоит из модулей, за исключением базовой библиотеки.
  Управление модулем покажет все установленные модули и поможет управлять ими.';
 $lang->about_extra_vars_default_value = 'Если нужно несколько значений по умолчанию, разделите их запятыми(,).';
-$lang->about_search_virtual_site = '가상 사이트(카페XE등)의 도메인을 입력한 후 검색하세요. 가상 사이트이외의 모듈은 내용을 비우고 검색하면 됩니다.  (http:// 는 제외)';
-$lang->about_langcode = '언어별로 다르게 설정하고 싶으면 언어코드 찾기를 이용해주세요';
diff --git a/modules/module/lang/zh-TW.php b/modules/module/lang/zh-TW.php
index cf707b710..fc519a5a7 100644
--- a/modules/module/lang/zh-TW.php
+++ b/modules/module/lang/zh-TW.php
@@ -38,14 +38,12 @@ $lang->about_domain = '要建立網站必須要有個專屬域名。 頂級域
 $lang->about_vid = '直接以 https://程式安裝位址/ID 的方式訪問。模組名稱(mid)不能重複。 必須要以英文字母開頭，只允許使用底線、英文及數字。';
 $lang->msg_already_registed_vid = '已註冊的 Site ID。不可與討論板的 mid 相同。請輸入其他 ID 名稱。';
 $lang->msg_already_registed_domain = '已註冊的域名。請使用其他的網域。';
-$lang->header_script = 'Header Script';
 $lang->about_header_script = '可以直接輸入，並插入到 HTML 的&lt;head&gt;之間。 可使用&lt;script&gt;,&lt;style&gt;或&lt;meta&gt;等標籤。';
 $lang->grant_access = '訪問';
 $lang->grant_manager = '管理';
 $lang->grant_to_all = '所有用戶';
 $lang->grant_to_login_user = '已登入用戶';
 $lang->grant_to_site_user = '網站用戶';
-$lang->grant_to_admin = 'Administrator only';
 $lang->grant_to_group = '特定群組';
 $lang->cmd_add_shortcut = '新增到快速選單';
 $lang->cmd_install = '安裝';
@@ -99,5 +97,3 @@ $lang->msg_cannot_delete_startmodule = '無法刪除預設模組';
 $lang->attribute_name = '變數名稱';
 $lang->attribute_value = '變數值';
 $lang->cmd_add = '新增';
-$lang->keep_existing_value = 'Keep existing value';
-$lang->about_maintain_existing = 'If content empty, maintain existing value.';
diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php
index 671a86027..25319d5b8 100644
--- a/modules/module/module.admin.controller.php
+++ b/modules/module/module.admin.controller.php
@@ -826,7 +826,7 @@ class moduleAdminController extends module
 						}
 						else
 						{
-							$mid_list[$module]->list[$key]->module_category_srl = Context::getLang('none_category');
+							$mid_list[$module]->list[$key]->module_category_srl = lang('none_category');
 						}
 					}
 				}
diff --git a/modules/module/module.admin.model.php b/modules/module/module.admin.model.php
index 5fbaf1f95..66282e3fc 100644
--- a/modules/module/module.admin.model.php
+++ b/modules/module/module.admin.model.php
@@ -90,7 +90,7 @@ class moduleAdminModel extends module
 			$grantList =new stdClass();
 		}
 		$grantList->access = new stdClass();
-		$grantList->access->title = Context::getLang('grant_access');
+		$grantList->access->title = lang('grant_access');
 		$grantList->access->default = 'guest';
 		if(count($grantList))
 		{
@@ -102,7 +102,7 @@ class moduleAdminModel extends module
 			}
 		}
 		$grant_list->manager = new stdClass();
-		$grant_list->manager->title = Context::getLang('grant_manager');
+		$grant_list->manager->title = lang('grant_manager');
 		$grant_list->manager->default = 'manager';
 		Context::set('grant_list', $grant_list);
 
@@ -152,7 +152,7 @@ class moduleAdminModel extends module
 		// Grant virtual permission for access and manager
 		$grant_list = new stdClass();
 		$grant_list->access = new stdClass();
-		$grant_list->access->title = Context::getLang('grant_access');
+		$grant_list->access->title = lang('grant_access');
 		$grant_list->access->default = 'guest';
 		if(count($source_grant_list))
 		{
@@ -164,7 +164,7 @@ class moduleAdminModel extends module
 			}
 		}
 		$grant_list->manager = new stdClass();
-		$grant_list->manager->title = Context::getLang('grant_manager');
+		$grant_list->manager->title = lang('grant_manager');
 		$grant_list->manager->default = 'manager';
 		Context::set('grant_list', $grant_list);
 		// Get a permission group granted to the current module
@@ -229,7 +229,7 @@ class moduleAdminModel extends module
 		// Grant virtual permission for access and manager
 		$grantList = new stdClass();
 		$grantList->access = new stdClass();
-		$grantList->access->title = Context::getLang('grant_access');
+		$grantList->access->title = lang('grant_access');
 		$grantList->access->default = 'guest';
 		if(count($xmlInfo->grant))
 		{
@@ -241,7 +241,7 @@ class moduleAdminModel extends module
 			}
 		}
 		$grantList->manager = new stdClass();
-		$grantList->manager->title = Context::getLang('grant_manager');
+		$grantList->manager->title = lang('grant_manager');
 		$grantList->manager->default = 'manager';
 
 		// Get a permission group granted to the current module
diff --git a/modules/module/module.admin.view.php b/modules/module/module.admin.view.php
index 26544c456..70057bdb7 100644
--- a/modules/module/module.admin.view.php
+++ b/modules/module/module.admin.view.php
@@ -232,7 +232,7 @@ class moduleAdminView extends module
 		$xml_info = $oModuleModel->getModuleActionXml($module_info->module);
 		$source_grant_list = $xml_info->grant;
 		// Grant virtual permissions for access and manager
-		$grant_list->access->title = Context::getLang('grant_access');
+		$grant_list->access->title = lang('grant_access');
 		$grant_list->access->default = 'guest';
 		if(count($source_grant_list))
 		{
@@ -243,7 +243,7 @@ class moduleAdminView extends module
 				$grant_list->{$key} = $val;
 			}
 		}
-		$grant_list->manager->title = Context::getLang('grant_manager');
+		$grant_list->manager->title = lang('grant_manager');
 		$grant_list->manager->default = 'manager';
 		Context::set('grant_list', $grant_list);
 		// Get a list of groups
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index 62ceba564..f1785a715 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -1129,7 +1129,7 @@ class moduleModel extends module
 				$defaultSkinInfo = $this->loadSkinInfo($path, $defaultSkinName, $dir);
 
 				$useDefault = new stdClass();
-				$useDefault->title = Context::getLang('use_site_default_skin') . ' (' . $defaultSkinInfo->title . ')';
+				$useDefault->title = lang('use_site_default_skin') . ' (' . $defaultSkinInfo->title . ')';
 
 				$useDefaultList['/USE_DEFAULT/'] = $useDefault;
 
diff --git a/modules/page/lang/ru.php b/modules/page/lang/ru.php
index dc85b7651..c07f88689 100644
--- a/modules/page/lang/ru.php
+++ b/modules/page/lang/ru.php
@@ -3,5 +3,4 @@ $lang->page = 'Страница';
 $lang->about_page = 'Это модуль блога, который создает полную страницу. Используя последние и другие виджеты, Вы можете создавать динамические страницы. Посредством компонента редактора, Вы можете также создать различные вариации страницы. URL модуля следует тем же правилам, что и другие модули: mid=имя_модуля. Если он выбран как модуль по умолчанию, то он будет главной страницей сайта.';
 $lang->cmd_page_modify = 'Изменить';
 $lang->page_caching_interval = 'Установить время кеширования';
-$lang->about_page_caching_interval = 'Единица измерения равна одной минуте. Это отображает временно сохраненные данные для присвоенного времени. Рекомендуется устанавливать разумное время кеширования, если множество ресурсов нуждаются в показе данных с других серверов. Значение 0 отключает кеширование.';
-$lang->about_mcontent = 'This is the page for the mobile view. If you do not write this page, the mobile view display reoragnized PC view\'s page.';
+$lang->about_page_caching_interval = 'Единица измерения равна одной минуте. Это отображает временно сохраненные данные для присвоенного времени. Рекомендуется устанавливать разумное время кеширования, если множество ресурсов нуждаются в показе данных с других серверов. Значение 0 отключает кеширование.';
\ No newline at end of file
diff --git a/modules/page/lang/vi.php b/modules/page/lang/vi.php
index 2937b4538..ee161a573 100644
--- a/modules/page/lang/vi.php
+++ b/modules/page/lang/vi.php
@@ -3,5 +3,4 @@ $lang->page = 'Trang';
 $lang->about_page = 'Là Module tạo ra một trang đầy đủ. Sử dụng Widget mới nhất hoặc những Widget khác giúp bạn có thể tạo một trang động. Thông qua trình bên tập Component, bạn có thể tạo ra sự phong phú cho những trang khác nhau. Địa chỉ của nó như một Module dạng \'<b>mid=module name</b>\'. Nếu chọn là mặc định, nó sẽ là trang chủ của Website.';
 $lang->cmd_page_modify = 'Sửa đổi';
 $lang->page_caching_interval = 'Thời gian lưu trữ';
-$lang->about_page_caching_interval = 'Đơn vị được tính bằng phút, nó sẽ là thời gian lưu trữ tạm thời. Đó là khuyến cáo thời gian lưu trữ tạm thời thích hợp khi cần để hiển thị. Nhập 0 nếu không sử dụng tính năng này.';
-$lang->about_mcontent = 'This is the page for the mobile view. If you do not write this page, the mobile view display reoragnized PC view\'s page.';
+$lang->about_page_caching_interval = 'Đơn vị được tính bằng phút, nó sẽ là thời gian lưu trữ tạm thời. Đó là khuyến cáo thời gian lưu trữ tạm thời thích hợp khi cần để hiển thị. Nhập 0 nếu không sử dụng tính năng này.';
\ No newline at end of file
diff --git a/modules/page/page.wap.php b/modules/page/page.wap.php
index ea30a524b..ad60f0999 100644
--- a/modules/page/page.wap.php
+++ b/modules/page/page.wap.php
@@ -15,7 +15,7 @@ class pageWap extends page
 	function procWAP(&$oMobile)
 	{
 		// Check permissions
-		if(!$this->grant->access) return $oMobile->setContent(Context::getLang('msg_not_permitted'));
+		if(!$this->grant->access) return $oMobile->setContent(lang('msg_not_permitted'));
 		// The contents of the widget chuchulham
 		$oWidgetController = getController('widget');
 		$content = $oWidgetController->transWidgetCode($this->module_info->content);
diff --git a/modules/point/lang/es.php b/modules/point/lang/es.php
index b6a016e6a..14300bab0 100644
--- a/modules/point/lang/es.php
+++ b/modules/point/lang/es.php
@@ -15,12 +15,10 @@ $lang->level_point = 'Nivel del punto';
 $lang->about_level_point = 'El nivel sera ajustado cuando los puntos alcancen a cada nivel de puntos o cuando disminuyen a cada nivel de puntos';
 $lang->disable_download = 'Prohibida la descarga';
 $lang->about_disable_download = 'Se prohibe la descarga de archivos al tener los puntos insuficientes.. (Excepto los archivos de imagen)';
-$lang->about_disable_read_document = '포인트가 없을 경우 글 열람을 금지하게 됩니다';
 $lang->level_point_calc = 'Punto por punto cálculo';
 $lang->expression = 'Por favor, de entrada mediante el uso de Javascript fórmula nivel variable <b> i </ b>. Ex) Math.pow (i, 2) * 90';
 $lang->cmd_exp_calc = 'Calcular';
 $lang->cmd_exp_reset = 'Restablecer';
-$lang->about_cmd_point_recal = '게시글/댓글/첨부파일/회원가입 점수만 이용하여 모든 포인트 점수를 초기화 합니다.<br />회원 가입 점수는 초기화 후 해당 회원이 활동을 하면 부여되고 그 전에는 부여되지 않습니다.<br />데이터 이전등을 하여 포인트를 완전히 초기화 해야 할 경우에만 사용하세요.';
 $lang->point_link_group = 'Grupo de cambio de nivel';
 $lang->about_point_link_group = 'Si especifica nivel para un grupo específico, a los usuarios se les asigna en el grupo cuando se adavnce al nivel por conseguir puntos.';
 $lang->about_module_point = 'Usted puede definir los puntos para cada módulo y los módulos que no tengan ningun valor usarán punto predefinido.<br />Todos los puntos serán restituidos al actuar en forma contraria.';
@@ -38,13 +36,10 @@ $lang->cmd_point_module_config = 'Configuración del módulo';
 $lang->cmd_point_act_config = 'Configuración de actos';
 $lang->cmd_point_member_list = 'Lista de puntos del usuario';
 $lang->msg_cannot_download = 'No tiene puntos suficientes para descagar';
-$lang->msg_disallow_by_point = '포인트가 부족하여 글을 읽을 수 없습니다 (필요포인트 : %d, 현재포인트 : %d)';
 $lang->point_recal_message = 'Ajuste de Punto. (%d / %d)';
 $lang->point_recal_finished = 'Punto cálculo está acabado.';
 $lang->search_target_list['nick_name'] = 'Apodo';
 $lang->search_target_list['user_name'] = 'Nombre del Usuario';
 $lang->search_target_list['regdate'] = 'Fecha del registro';
 $lang->search_target_list['last_login'] = 'Fecha de su última conección';
-$lang->search_target_list['last_login_more'] = '최근로그인일시(이상)';
-$lang->search_target_list['last_login_less'] = '최근로그인일시(이하)';
 $lang->search_target_list['extra_vars'] = 'Variables Extra';
diff --git a/modules/point/lang/fr.php b/modules/point/lang/fr.php
index 7b8949337..a16315b3b 100644
--- a/modules/point/lang/fr.php
+++ b/modules/point/lang/fr.php
@@ -12,7 +12,6 @@ $lang->level_point = 'Point de niveau';
 $lang->about_level_point = 'Le Niveau sera ajusté quand le point devient les valeurs aux Points de Niveaux ci-dessous.';
 $lang->disable_download = 'Interdire de télécharger';
 $lang->about_disable_download = 'Il est impossible de télécharger quand il n\'y a pas de points suffisants. (Sauf les fichier d\'images)';
-$lang->about_disable_read_document = '포인트가 없을 경우 글 열람을 금지하게 됩니다';
 $lang->level_point_calc = 'Calcul des Points par Niveau';
 $lang->expression = 'Entrez la formule en Javascript en utilisant la Variable de Niveau <b>i</b>. ex) Math.pow(i, 2) * 90';
 $lang->cmd_exp_calc = 'Calculer';
@@ -38,13 +37,10 @@ $lang->cmd_point_module_config = 'Configuration du Module';
 $lang->cmd_point_act_config = 'Configuration des Actions de chaque fonction';
 $lang->cmd_point_member_list = 'Liste des Points des Membres';
 $lang->msg_cannot_download = 'Vous n\'avez pas assez de point pour télécharger';
-$lang->msg_disallow_by_point = '포인트가 부족하여 글을 읽을 수 없습니다 (필요포인트 : %d, 현재포인트 : %d)';
 $lang->point_recal_message = 'En train d\'Adjuster le Point. (%d / %d)';
 $lang->point_recal_finished = 'Recalcul des Points est fini.';
 $lang->search_target_list['nick_name'] = 'Surnom';
 $lang->search_target_list['user_name'] = 'Nom';
 $lang->search_target_list['regdate'] = 'Jour d\'Inscription';
 $lang->search_target_list['last_login'] = 'Jour de la connexion dernière';
-$lang->search_target_list['last_login_more'] = '최근로그인일시(이상)';
-$lang->search_target_list['last_login_less'] = '최근로그인일시(이하)';
 $lang->search_target_list['extra_vars'] = 'Variables additionnels ';
diff --git a/modules/point/lang/ja.php b/modules/point/lang/ja.php
index 1c0085d8e..30d247080 100644
--- a/modules/point/lang/ja.php
+++ b/modules/point/lang/ja.php
@@ -3,8 +3,6 @@ $lang->point = 'ポイント';
 $lang->level = 'レベル';
 $lang->about_point_module = 'ポイントモジュールでは、書き込み作成/コメント作成/アップロード/ダウンロードなどのユーザーの活動に対してポイントの計算を行います。';
 $lang->about_act_config = '掲示板、ブログなどのモジュールごとに「書き込み作成・削除/コメント作成・削除」などのアクションがあります。掲示板/ブログ以外のモジュールにポイントシステムを連動させたい場合は、各機能のアクションの「act値」を追加します。連動は半角「,（コンマ）」で区切って追加します。';
-$lang->point_io = 'Point module On';
-$lang->about_point_io = 'Point module can be on or off. If you OFF this module, every triggers will be deleted from database and will not be called by Rhymix Core. Point record would be preserved.';
 $lang->max_level = '最高レベル';
 $lang->about_max_level = '最高レベルを指定することができます。最高レベルは「1000」が最大値であるため、レベルアイコンに注意が必要です。';
 $lang->level_icon = 'レベルアイコン';
diff --git a/modules/point/lang/ru.php b/modules/point/lang/ru.php
index 6b3844e6f..83b2aa2ae 100644
--- a/modules/point/lang/ru.php
+++ b/modules/point/lang/ru.php
@@ -15,9 +15,6 @@ $lang->level_point = 'Уровень поинтов';
 $lang->about_level_point = 'Уровень будет изменен, когда поинты достигают каждого уровня поинтов или падают ниже его';
 $lang->disable_download = 'Запретить скачивание';
 $lang->about_disable_download = 'Это запретит скачивание файлов, когда не хватает достаточного кол-ва поинтов. (За исключением файлов изображений)';
-$lang->about_disable_read_document = '포인트가 없을 경우 글 열람을 금지하게 됩니다';
-$lang->about_cmd_point_recal = '게시글/댓글/첨부파일/회원가입 점수만 이용하여 모든 포인트 점수를 초기화 합니다.<br />회원 가입 점수는 초기화 후 해당 회원이 활동을 하면 부여되고 그 전에는 부여되지 않습니다.<br />데이터 이전등을 하여 포인트를 완전히 초기화 해야 할 경우에만 사용하세요.';
-$lang->about_point_link_group = '그룹에 원하는 레벨을 지정하면 해당 레벨에 도달할때 그룹이 변경됩니다.';
 $lang->about_module_point = 'Вы можете установть поинты для каждого модуля, а модули, не имеющие значения будут использовать значение по умолчанию для поинтов.<br />Все поинты будут восстановлены при обратном действии.';
 $lang->point_signup = 'Присвоить';
 $lang->point_insert_document = 'При написании';
@@ -32,8 +29,6 @@ $lang->cmd_point_module_config = 'Настройки модуля';
 $lang->cmd_point_act_config = 'Настройки действий';
 $lang->cmd_point_member_list = 'Список поинтов пользователей';
 $lang->msg_cannot_download = 'У Вас нет достаточного количества поитов, чтобы иметь разрешение скачивать файлы.';
-$lang->msg_disallow_by_point = '포인트가 부족하여 글을 읽을 수 없습니다 (필요포인트 : %d, 현재포인트 : %d)';
-$lang->point_recal_finished = '포인트 재계산이 모두 완료되었습니다';
 $lang->search_target_list['nick_name'] = 'Ник';
 $lang->search_target_list['user_name'] = 'Имя пользователя';
 $lang->search_target_list['regdate'] = 'Дата регистрации';
diff --git a/modules/point/lang/zh-CN.php b/modules/point/lang/zh-CN.php
index 9ce042e7e..ada98e17d 100644
--- a/modules/point/lang/zh-CN.php
+++ b/modules/point/lang/zh-CN.php
@@ -3,8 +3,6 @@ $lang->point = '积分';
 $lang->level = '级别';
 $lang->about_point_module = '积分系统可以在发表新帖及评论，上传/下载文件等动作时，付与其相应的积分的模块。';
 $lang->about_act_config = '版面，博客等模块都有发表/删除新帖，发表/删除评论等动作。 <br />要想与版面/博客之外的模块关联积分功能时，添加与其各模块功能相适合的act值即可。';
-$lang->point_io = 'Point module On';
-$lang->about_point_io = 'Point module can be on or off. If you OFF this module, every triggers will be deleted from database and will not be called by Rhymix Core. Point record would be preserved.';
 $lang->max_level = '最高级别';
 $lang->about_max_level = '可以指定最高级别。级别共设1000级，因此制作级别图标时要好好考虑一下。';
 $lang->level_icon = '级别图标';
diff --git a/modules/point/lang/zh-TW.php b/modules/point/lang/zh-TW.php
index be20b4862..baec73b50 100644
--- a/modules/point/lang/zh-TW.php
+++ b/modules/point/lang/zh-TW.php
@@ -3,8 +3,6 @@ $lang->point = '點數';
 $lang->level = '等級';
 $lang->about_point_module = '點數系統可以在發表/刪除主題，發表/刪除評論，上傳/下載/刪除/檔案等動作時，付出相對應的點數。';
 $lang->about_act_config = '討論板，部落格等模組都有發表/刪除主題，發表/刪除評論等動作。 <br />想要與討論板/部落格之外的模組關聯點數功能時，新增與其各模組功能適合的act值即可。';
-$lang->point_io = 'Point module On';
-$lang->about_point_io = 'Point module can be on or off. If you OFF this module, every triggers will be deleted from database and will not be called by Rhymix Core. Point record would be preserved.';
 $lang->max_level = '最高等級';
 $lang->about_max_level = '可以指定最高等級。等級共設1000級，因此製作等級圖示時要好好考慮一下。';
 $lang->level_icon = '等級圖示';
@@ -47,7 +45,6 @@ $lang->msg_cannot_download = '點數不足無法下載！';
 $lang->msg_disallow_by_point = '點數不足無法閱讀文章 (需要 : %d, 目前 : %d)';
 $lang->point_recal_message = '計算並套用中(%d / %d)。';
 $lang->point_recal_finished = '點數重新計算並套用完畢。';
-$lang->point_update_desc = 'Insert + in front of the number to increase the point or - to decrease, and update the point. If you don\'t insert + or -, the point will be set as the value you entered.';
 $lang->give_point = '給予點數';
 $lang->search_target_list['nick_name'] = '暱稱';
 $lang->search_target_list['user_name'] = '姓名';
diff --git a/modules/point/point.admin.controller.php b/modules/point/point.admin.controller.php
index 4727e7242..77fa68645 100644
--- a/modules/point/point.admin.controller.php
+++ b/modules/point/point.admin.controller.php
@@ -332,7 +332,7 @@ class pointAdminController extends point
 
 		$this->add('total', count($member));
 		$this->add('position', 0);
-		$this->setMessage( sprintf(Context::getLang('point_recal_message'), 0, $this->get('total')) );
+		$this->setMessage( sprintf(lang('point_recal_message'), 0, $this->get('total')) );
 	}
 
 	/**
@@ -376,7 +376,7 @@ class pointAdminController extends point
 
 		$this->add('total', $total);
 		$this->add('position', $idx);
-		$this->setMessage(sprintf(Context::getLang('point_recal_message'), $idx, $total));
+		$this->setMessage(sprintf(lang('point_recal_message'), $idx, $total));
 
 	}
 
diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php
index 9fef9fe5f..21ca270ea 100644
--- a/modules/point/point.controller.php
+++ b/modules/point/point.controller.php
@@ -436,7 +436,7 @@ class pointController extends point
 		$_SESSION['banned_document'][$obj->document_srl] = false;
 		if($config->disable_read_document == 'Y' && $point < 0 && abs($point)>$cur_point)
 		{
-			$message = sprintf(Context::getLang('msg_disallow_by_point'), abs($point), $cur_point);
+			$message = sprintf(lang('msg_disallow_by_point'), abs($point), $cur_point);
 			$obj->add('content', $message);
 			$_SESSION['banned_document'][$obj->document_srl] = true;
 			return new Object(-1, $message);
diff --git a/modules/point/tpl/member_list.html b/modules/point/tpl/member_list.html
index 447944c6d..cfb81364f 100644
--- a/modules/point/tpl/member_list.html
+++ b/modules/point/tpl/member_list.html
@@ -22,7 +22,7 @@
 					<option loop="$group_list => $key,$val" value="{$val->group_srl}" selected="selected"|cond="$selected_group_srl==$val->group_srl">{$val->title}</option>
 				</select>
 				<select name="search_target" style="width:auto;margin:0" title="{$lang->search_target}">
-					<option value="{$identifier}" selected="selected"|cond="$search_target == $identifier">{Context::getLang($identifier)}</option>
+					<option value="{$identifier}" selected="selected"|cond="$search_target == $identifier">{lang($identifier)}</option>
 					<option loop="$lang->search_target_list => $key,$val" value="{$key}" selected="selected"|cond="$search_target==$key">{$val}</option>
 				</select>
 				<span class="x_input-append">
@@ -36,7 +36,7 @@
 	<thead>
 		<tr>
 			<th scope="col">{$lang->no}</th>
-			<th scope="col">{Context::getLang($identifier)}</th>
+			<th scope="col">{lang($identifier)}</th>
 			<th scope="col">{$lang->nick_name}</th>
 			<th scope="col">{$lang->point}</th>
 			<th scope="col">{$lang->level}</th>
@@ -125,7 +125,7 @@
 				<option loop="$group_list => $key,$val" value="{$val->group_srl}" selected="selected"|cond="$selected_group_srl==$val->group_srl">{$val->title}</option>
 			</select>
 			<select name="search_target" style="width:auto;margin:0" title="{$lang->search_target}">
-				<option value="{$identifier}" selected="selected"|cond="$search_target == $identifier">{Context::getLang($identifier)}</option>
+				<option value="{$identifier}" selected="selected"|cond="$search_target == $identifier">{lang($identifier)}</option>
 				<option loop="$lang->search_target_list => $key,$val" value="{$key}" selected="selected"|cond="$search_target==$key">{$val}</option>
 			</select>
 			<span class="x_input-append">
diff --git a/modules/poll/poll.admin.controller.php b/modules/poll/poll.admin.controller.php
index a4c023e62..7cf9d47ae 100644
--- a/modules/poll/poll.admin.controller.php
+++ b/modules/poll/poll.admin.controller.php
@@ -55,7 +55,7 @@ class pollAdminController extends poll
 			if(!$output->toBool()) return $output;
 		}
 
-		$this->setMessage( sprintf(Context::getLang('msg_checked_poll_is_deleted'), $poll_count) );
+		$this->setMessage( sprintf(lang('msg_checked_poll_is_deleted'), $poll_count) );
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminList');
 		$this->setRedirectUrl($returnUrl);
diff --git a/modules/poll/poll.model.php b/modules/poll/poll.model.php
index 7c42be029..f34170c8c 100644
--- a/modules/poll/poll.model.php
+++ b/modules/poll/poll.model.php
@@ -139,7 +139,7 @@ class pollModel extends poll
 						$ip = md5($value->ip_address);
 						$poll->member[$ip] = new stdClass();
 						$poll->member[$ip]->member_srl = 0;
-						$poll->member[$ip]->nick_name = Context::getLang("anonymous") . ' IP: ' . $value->ip_address;
+						$poll->member[$ip]->nick_name = lang("anonymous") . ' IP: ' . $value->ip_address;
 						$poll->member[$ip]->profile_image = "";
 					}
 					else
@@ -147,7 +147,7 @@ class pollModel extends poll
 						$ip = md5($value->ip_address);
 						$poll->member[$ip] = new stdClass();
 						$poll->member[$ip]->member_srl = 0;
-						$poll->member[$ip]->nick_name = Context::getLang("anonymous");
+						$poll->member[$ip]->nick_name = lang("anonymous");
 						$poll->member[$ip]->profile_image = "";
 					}
 				}
diff --git a/modules/rss/rss.admin.controller.php b/modules/rss/rss.admin.controller.php
index 6d1de7db3..cb7e9c5bd 100644
--- a/modules/rss/rss.admin.controller.php
+++ b/modules/rss/rss.admin.controller.php
@@ -76,7 +76,7 @@ class rssAdminController extends rss
 
 		if(!$alt_message) $alt_message = 'success_updated';
 
-		$alt_message = Context::getLang($alt_message);
+		$alt_message = lang($alt_message);
 		$this->setMessage($alt_message, 'info');
 
 		//$this->setLayoutPath('./common/tpl');
diff --git a/modules/rss/rss.view.php b/modules/rss/rss.view.php
index f37823cd9..1e7258089 100644
--- a/modules/rss/rss.view.php
+++ b/modules/rss/rss.view.php
@@ -227,7 +227,7 @@ class rssView extends rss
 	function dispError()
 	{
 		// Prepare the output message
-		$this->rss(null, null, Context::getLang('msg_rss_is_disabled') );
+		$this->rss(null, null, lang('msg_rss_is_disabled') );
 	}
 
 	/**
diff --git a/modules/session/session.admin.controller.php b/modules/session/session.admin.controller.php
index 627043b4a..5dbc28e92 100644
--- a/modules/session/session.admin.controller.php
+++ b/modules/session/session.admin.controller.php
@@ -22,7 +22,7 @@ class sessionAdminController extends session
 		$oSessionController = getController('session');
 		$oSessionController->gc(0);
 
-		$this->add('result',Context::getLang('session_cleared'));
+		$this->add('result',lang('session_cleared'));
 	}
 }
 /* End of file session.admin.controller.php */
diff --git a/modules/spamfilter/spamfilter.admin.controller.php b/modules/spamfilter/spamfilter.admin.controller.php
index af1969ffa..d2e78244c 100644
--- a/modules/spamfilter/spamfilter.admin.controller.php
+++ b/modules/spamfilter/spamfilter.admin.controller.php
@@ -41,8 +41,8 @@ class spamfilterAdminController extends spamfilter
 			$output = $oSpamfilterController->insertIP($ipaddress_list);
 			if(!$output->toBool() && !$output->get('fail_list')) return $output;
 
-			if($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
-			$this->setMessage(Context::getLang('success_registed').$message_fail);
+			if($output->get('fail_list')) $message_fail = '<em>'.sprintf(lang('msg_faillist'),$output->get('fail_list')).'</em>';
+			$this->setMessage(lang('success_registed').$message_fail);
 		}
 
 
@@ -59,8 +59,8 @@ class spamfilterAdminController extends spamfilter
 			$output = $this->insertWord($word_list);
 			if(!$output->toBool() && !$output->get('fail_list')) return $output;
 
-			if($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
-			$this->setMessage(Context::getLang('success_registed').$message_fail);
+			if($output->get('fail_list')) $message_fail = '<em>'.sprintf(lang('msg_faillist'),$output->get('fail_list')).'</em>';
+			$this->setMessage(lang('success_registed').$message_fail);
 		}
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminDeniedWordList');
@@ -75,7 +75,7 @@ class spamfilterAdminController extends spamfilter
 		$ipAddressList = Context::get('ipaddress');
 		if($ipAddressList) $this->deleteIP($ipAddressList);
 
-		$this->setMessage(Context::getLang('success_deleted'));
+		$this->setMessage(lang('success_deleted'));
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminDeniedIPList');
 		return $this->setRedirectUrl($returnUrl);
@@ -89,7 +89,7 @@ class spamfilterAdminController extends spamfilter
 		$wordList = Context::get('word');
 		$this->deleteWord($wordList);
 
-		$this->setMessage(Context::getLang('success_deleted'));
+		$this->setMessage(lang('success_deleted'));
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminDeniedWordList','active','word');
 		return $this->setRedirectUrl($returnUrl);
diff --git a/modules/spamfilter/spamfilter.model.php b/modules/spamfilter/spamfilter.model.php
index a521e0bb0..e29bf0494 100644
--- a/modules/spamfilter/spamfilter.model.php
+++ b/modules/spamfilter/spamfilter.model.php
@@ -87,7 +87,7 @@ class spamfilterModel extends spamfilter
 			{
 				$args->word = $word;
 				$output = executeQuery('spamfilter.updateDeniedWordHit', $args);
-				return new Object(-1,sprintf(Context::getLang('msg_alert_denied_word'), $word));
+				return new Object(-1,sprintf(lang('msg_alert_denied_word'), $word));
 			}
 		}
 
@@ -120,11 +120,11 @@ class spamfilterModel extends spamfilter
 		{
 			if($isMessage)
 			{
-				$message = sprintf(Context::getLang('msg_alert_limited_message_by_config'), $interval);
+				$message = sprintf(lang('msg_alert_limited_message_by_config'), $interval);
 			}
 			else
 			{
-				$message = sprintf(Context::getLang('msg_alert_limited_by_config'), $interval);
+				$message = sprintf(lang('msg_alert_limited_by_config'), $interval);
 			}
 
 			$oSpamFilterController = getController('spamfilter');
diff --git a/modules/widget/lang/fr.php b/modules/widget/lang/fr.php
index 6d7cf6014..ced2de80e 100644
--- a/modules/widget/lang/fr.php
+++ b/modules/widget/lang/fr.php
@@ -25,7 +25,6 @@ $lang->generated_code = 'Code généré';
 $lang->msg_widget_is_not_exists = 'Le Gadget de(d\') \'%s\' n\'existe pas.';
 $lang->msg_widget_object_is_null = 'L\'Objet de \'%s\' n\'a pas pu être créé.';
 $lang->msg_widget_proc_is_null = 'proc() de \'%s\' n\'a pas pu être exécuté.';
-$lang->msg_widget_skin_is_null = '위젯의 스킨을 선택해야 정상적으로 동작할 수 있습니다';
 $lang->about_widget_code = 'Entrez les valeurs qui sont requises par le gadget choisi, et puis cliquz le bouton [Générer le Code] pour générer le code. Le code à appliquer au fichier de modèl se présentera en bas.';
 $lang->about_widget_code_in_page = 'Après entrer les valeurs requies, cliquez le bouton [Ajouter] pour insérer le gadjet dans la page.';
 $lang->about_widget = 'Un gadjet est un petit application indépendant qui est utilisé dans une Mise en Page ou dans une module de Page. Un gajet peut être lié avec un module intérieur ou avec un API extérieur ouvert. L\'application divers est possible par la configuration. 
diff --git a/modules/widget/lang/ru.php b/modules/widget/lang/ru.php
index c54ac65b9..c0e85b86b 100644
--- a/modules/widget/lang/ru.php
+++ b/modules/widget/lang/ru.php
@@ -26,6 +26,5 @@ $lang->generated_code = 'Сгенерированный код';
 $lang->msg_widget_is_not_exists = '%s виджет не существует.';
 $lang->msg_widget_object_is_null = '%s объектов виджета не могут быть созданы.';
 $lang->msg_widget_proc_is_null = 'proc() %s виджета не может быть исполнена.';
-$lang->msg_widget_skin_is_null = '위젯의 스킨을 선택해야 정상적으로 동작할 수 있습니다';
 $lang->about_widget_code = 'Пожалуйста, сначала введите требуемые значения, и затем щелкните кнопку [Генерировать Код] для генерации кода и добавления его в файл шаблона.';
 $lang->about_widget_code_in_page = 'После ввода требуемых значений, нажмите пнопку [Добавить], чтобы вставить код виджета в страницу.';
diff --git a/modules/widget/lang/vi.php b/modules/widget/lang/vi.php
index dfcf777e7..1c9d19a97 100644
--- a/modules/widget/lang/vi.php
+++ b/modules/widget/lang/vi.php
@@ -35,7 +35,6 @@ $lang->cmd_content_insert = 'Chèn nội dung của bạn';
 $lang->cmd_box_widget_insert = 'Chèn khung Widget';
 $lang->cmd_remove_all_widgets = 'Xóa tất cả Widget';
 $lang->cmd_widget_size = 'Kích thước';
-$lang->cmd_widget_css_class = '위젯 CSS class';
 $lang->cmd_widget_align = 'Căn chỉnh';
 $lang->cmd_widget_align_left = 'Trái';
 $lang->cmd_widget_align_right = 'Phải';
diff --git a/modules/widget/lang/zh-CN.php b/modules/widget/lang/zh-CN.php
index 2dad8b717..e27fb2db1 100644
--- a/modules/widget/lang/zh-CN.php
+++ b/modules/widget/lang/zh-CN.php
@@ -38,7 +38,6 @@ $lang->cmd_content_insert = '添加内容';
 $lang->cmd_box_widget_insert = '添加控件盒';
 $lang->cmd_remove_all_widgets = '清空内容';
 $lang->cmd_widget_size = '大小';
-$lang->cmd_widget_css_class = '위젯 CSS class';
 $lang->cmd_widget_align = '对齐';
 $lang->cmd_widget_align_left = '左对齐';
 $lang->cmd_widget_align_right = '右对齐';
diff --git a/modules/widget/lang/zh-TW.php b/modules/widget/lang/zh-TW.php
index 167f93748..106f63df0 100644
--- a/modules/widget/lang/zh-TW.php
+++ b/modules/widget/lang/zh-TW.php
@@ -38,7 +38,6 @@ $lang->cmd_content_insert = '新增內容';
 $lang->cmd_box_widget_insert = '新增 Widget Box';
 $lang->cmd_remove_all_widgets = '全部清空';
 $lang->cmd_widget_size = '大小';
-$lang->cmd_widget_css_class = '위젯 CSS class';
 $lang->cmd_widget_align = '對齊';
 $lang->cmd_widget_align_left = '靠左';
 $lang->cmd_widget_align_right = '靠右';
diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php
index 1cd42c78c..bc0154136 100644
--- a/modules/widget/widget.controller.php
+++ b/modules/widget/widget.controller.php
@@ -51,7 +51,7 @@ class widgetController extends widget
 	{
 		$widget = Context::get('selected_widget');
 		if(!$widget) return new Object(-1,'msg_invalid_request');
-		if(!Context::get('skin')) return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
+		if(!Context::get('skin')) return new Object(-1,lang('msg_widget_skin_is_null'));
 
 		$attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
 
@@ -68,7 +68,7 @@ class widgetController extends widget
 		$widget = Context::get('selected_widget');
 		if(!$widget) return new Object(-1,'msg_invalid_request');
 
-		if(!in_array($widget,array('widgetBox','widgetContent')) && !Context::get('skin')) return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
+		if(!in_array($widget,array('widgetBox','widgetContent')) && !Context::get('skin')) return new Object(-1,lang('msg_widget_skin_is_null'));
 
 		$attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
 		// Wanted results
@@ -660,7 +660,7 @@ class widgetController extends widget
 	{
 		if(!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $widget))
 		{
-			return Context::getLang('msg_invalid_request');
+			return lang('msg_invalid_request');
 		}
 
 		if(!$GLOBALS['_xe_loaded_widgets_'][$widget])
@@ -670,20 +670,20 @@ class widgetController extends widget
 			$path = $oWidgetModel->getWidgetPath($widget);
 			// If you do not find the class file error output widget (html output)
 			$class_file = sprintf('%s%s.class.php', $path, $widget);
-			if(!file_exists($class_file)) return sprintf(Context::getLang('msg_widget_is_not_exists'), $widget);
+			if(!file_exists($class_file)) return sprintf(lang('msg_widget_is_not_exists'), $widget);
 			// Widget classes include
 			require_once($class_file);
 
 			// Creating Objects
 			if(!class_exists($widget, false))
 			{
-				return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
+				return sprintf(lang('msg_widget_object_is_null'), $widget);
 			}
 
 			$oWidget = new $widget();
-			if(!is_object($oWidget)) return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
+			if(!is_object($oWidget)) return sprintf(lang('msg_widget_object_is_null'), $widget);
 
-			if(!method_exists($oWidget, 'proc')) return sprintf(Context::getLang('msg_widget_proc_is_null'), $widget);
+			if(!method_exists($oWidget, 'proc')) return sprintf(lang('msg_widget_proc_is_null'), $widget);
 
 			$oWidget->widget_path = $path;
 
diff --git a/tests/unit/framework/LangTest.php b/tests/unit/framework/LangTest.php
index d4059690b..2ca57cb61 100644
--- a/tests/unit/framework/LangTest.php
+++ b/tests/unit/framework/LangTest.php
@@ -19,10 +19,12 @@ class LangTest extends \Codeception\TestCase\Test
 		$this->assertEquals('도움말', $ko->help);
 		$this->assertEquals('Help', $en->help);
 		
-		$this->assertEquals('nonexistent', $ko->get('common.nonexistent'));
-		$this->assertEquals('nonexistent', $ko->get('common.nonexistent', 'foo', 'bar'));
+		$this->assertEquals('common.nonexistent', $ko->get('common.nonexistent'));
+		$this->assertEquals('common.nonexistent', $ko->get('common.nonexistent', 'foo', 'bar'));
+		
+		$this->assertEquals('admin.help', $ko->get('admin.help'));
+		$this->assertEquals('admin.help', $en->get('admin.help'));
 		
-		$this->assertEquals('help', $ja->help);
 		$ja->loadPlugin('common');
 		$this->assertEquals('ヘルプ', $ja->help);
 		
diff --git a/widgets/login_info/skins/xe_global/login_info.html b/widgets/login_info/skins/xe_global/login_info.html
index f49cabf56..71f0c9781 100644
--- a/widgets/login_info/skins/xe_global/login_info.html
+++ b/widgets/login_info/skins/xe_global/login_info.html
@@ -19,7 +19,7 @@
     </div>
     <ul class="userMenu">
         <!--@foreach($logged_info->menu_list as $key => $val)-->
-        <li><a href="{getUrl('act',$key,'member_srl','','page','')}">{Context::getLang($val)}</a></li>
+        <li><a href="{getUrl('act',$key,'member_srl','','page','')}">{lang($val)}</a></li>
         <!--@end-->
 
         <!--@if($logged_info->is_admin=="Y" && !$site_module_info->site_srl)-->
diff --git a/widgets/login_info/skins/xe_globalTwo/login_info.html b/widgets/login_info/skins/xe_globalTwo/login_info.html
index 57e104dff..b3d8e882e 100644
--- a/widgets/login_info/skins/xe_globalTwo/login_info.html
+++ b/widgets/login_info/skins/xe_globalTwo/login_info.html
@@ -19,7 +19,7 @@
     </div>
     <ul class="userMenu">
         <!--@foreach($logged_info->menu_list as $key => $val)-->
-        <li><a href="{getUrl('act',$key,'member_srl','','page','')}">{Context::getLang($val)}</a></li>
+        <li><a href="{getUrl('act',$key,'member_srl','','page','')}">{lang($val)}</a></li>
         <!--@end-->
 
         <!--@if($logged_info->is_admin=="Y" && !$site_module_info->site_srl)-->
diff --git a/widgets/login_info/skins/xe_official/login_info.html b/widgets/login_info/skins/xe_official/login_info.html
index 5911eca27..d9cb71874 100644
--- a/widgets/login_info/skins/xe_official/login_info.html
+++ b/widgets/login_info/skins/xe_official/login_info.html
@@ -10,7 +10,7 @@
 			<p class="latestLogin">{$lang->last_login}: {zDate($logged_info->last_login, "Y-m-d")}</p>
 		</div>
 		<ul class="userMenu">
-			<li loop="$logged_info->menu_list => $key,$val"><a href="{getUrl('', 'act',$key, 'mid', $mid, 'vid', $vid)}">{Context::getLang($val)}</a></li>
+			<li loop="$logged_info->menu_list => $key,$val"><a href="{getUrl('', 'act',$key, 'mid', $mid, 'vid', $vid)}">{lang($val)}</a></li>
 			<li cond="$logged_info->is_admin=='Y' && !$site_module_info->site_srl"><a href="{getUrl('','module','admin')}">{$lang->cmd_management}</a></li>
 		</ul>
 	</fieldset>
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/login_info.html b/widgets/login_info/skins/xe_solid_enterprise_login/login_info.html
index 738f4983d..30cf7c434 100644
--- a/widgets/login_info/skins/xe_solid_enterprise_login/login_info.html
+++ b/widgets/login_info/skins/xe_solid_enterprise_login/login_info.html
@@ -15,7 +15,7 @@
 				<!--@foreach($logged_info->menu_list as $key => $val)-->
 				<li class="i{$i}">
 
-				<a href="{getUrl('act',$key,'member_srl','','page','')}">{Context::getLang($val)}</a></li>
+				<a href="{getUrl('act',$key,'member_srl','','page','')}">{lang($val)}</a></li>
 				{@ $i++;}
 				<!--@end-->
 				<li class="i7"><a href="{getUrl('','module','admin')}" onclick="window.open(this.href);return false;">{$lang->cmd_management}</a></li>