From 2bc3b80d2954c568c0f1eaf25b3a84152c222962 Mon Sep 17 00:00:00 2001
From: chschy <chschy@gmail.com>
Date: Mon, 5 Sep 2011 04:22:53 +0000
Subject: [PATCH] Modify config general page (lang file,cdn label)

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9022 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/admin/lang/lang.xml   | 16 ++++++++++++++--
 modules/admin/tpl/config.html | 10 +++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/modules/admin/lang/lang.xml b/modules/admin/lang/lang.xml
index 1f0046538..896ccead4 100644
--- a/modules/admin/lang/lang.xml
+++ b/modules/admin/lang/lang.xml
@@ -659,6 +659,10 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></value>
 		<value xml:lang="tr"><![CDATA[Yetersiz web sunucusu kullanımı olan websiteleri için, bu özellik devredışı bırakıldığı zaman daha hızlı bir tepki beklenebilir.<br/>Ancak oturum veritabanı, mevcut kullanıcılar için veritabanını erişilemez hâle getirecektir ve ilgili işler kullanılamaz hale gelecektir.]]></value>
 		<value xml:lang="vi"><![CDATA[PHP sẽ xác nhận với Database. Có thể cải thiện được tốc độ của Website.]]></value>
 	</item>
+	<item name="qmail_compatibility">
+        	<value xml:lang="ko"><![CDATA[Qmail 사용]]></value>
+	        <value xml:lang="en"><![CDATA[Enable Qmail]]></value>
+	</item>
 	<item name="sftp">
 		<value xml:lang="ko"><![CDATA[SFTP 사용]]></value>
 		<value xml:lang="en"><![CDATA[Use SFTP]]></value>
@@ -696,6 +700,10 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></value>
 		<value xml:lang="tr"><![CDATA[Belirtilen FTP Yolunu okuma işlemi başarız oldu.]]></value>
 		<value xml:lang="vi"><![CDATA[Không tìm thấy thông tin của thư mục bạn đã nhập trên FTP.]]></value>
 	</item>
+	<item name="about_use_ftp_passive_mode">
+		<value xml:lang="ko"><![CDATA[Passive 모드를 사용하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Use FTP Passive Mode?]]></value>
+	</item>
 	<item name="msg_self_restart_cache_engine">
 		<value xml:lang="ko"><![CDATA[Memcached 또는 캐쉬데몬을 재시작 해주세요.]]></value>
 		<value xml:lang="en"><![CDATA[Please restart Memcached or cache daemon.]]></value>
@@ -875,7 +883,11 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></value>
 	<item name="about_arrange_session">
 		<value xml:lang="ko"><![CDATA[세션을 정리하시겠습니까?]]></value>
 		<value xml:lang="en"><![CDATA[Arrange session?]]></value>
-	</item>	
+	</item>
+	<item name="cmd_clear_session">
+		<value xml:lang="ko"><![CDATA[세션 정리]]></value>
+		<value xml:lang="en"><![CDATA[Arrange session]]></value>
+	</item>
 	<item name="msg_not_correct_iconname">
 		<value xml:lang="ko"><![CDATA[아이콘 형식이 바르지 않습니다.]]></value>
 		<value xml:lang="en"><![CDATA[아이콘 형식이 바르지 않습니다.]]></value>
@@ -908,4 +920,4 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></value>
 		<value xml:lang="ko"><![CDATA[추가]]></value>
 		<value xml:lang="en"><![CDATA[Add]]></value>
 	</item>
-</lang>
\ No newline at end of file
+</lang>
diff --git a/modules/admin/tpl/config.html b/modules/admin/tpl/config.html
index 0dfaf52b1..5c4653501 100644
--- a/modules/admin/tpl/config.html
+++ b/modules/admin/tpl/config.html
@@ -105,10 +105,10 @@ jQuery(function($){
 				</li>
 				<li>
 					<p class="q"><label for="ftp_port">{$lang->ftp_port}</label></p>
-					<p class="a"><input type="text" name="ftp_port" id="ftp_port" value="21" /></p>
+					<p class="a"><input type="text" name="ftp_port" id="ftp_port" value="{$ftp_info->ftp_port}" /></p>
 				</li>
 				<li>
-					<p class="q"><label for="ftp_passive">Use FTP Passive Mode?</label></p>
+					<p class="q"><label for="ftp_passive">{$lang->about_use_ftp_passive_mode}</label></p>
 					<p class="a">
 						<input type="radio" name="ftp_pasv" id="ftp_passive_y" value="Y" <!--@if($ftp_info->ftp_pasv == 'Y')-->checked="checked" <!--@end-->/> <label for="ftp_passive_y">{$lang->cmd_yes}</label>
 						<input type="radio" name="ftp_pasv" id="ftp_passive_n" value="N" <!--@if($ftp_info->ftp_pasv != 'Y')-->checked="checked" <!--@end-->/> <label for="ftp_passive_n">{$lang->cmd_no}</label>
@@ -172,8 +172,8 @@ jQuery(function($){
 				<li>
 					<p class="q">{$lang->about_cdn}</p>
 					<p class="a">
-						<input type="radio" name="use_cdn" id="cdn_y" value="Y" <!--@if($use_cdn=='Y')-->checked="checked" <!--@end-->/> <label for="sso_y">{$lang->cmd_yes}</label>
-						<input type="radio" name="use_cdn" id="cdn_n" value="N" <!--@if($use_cdn!='Y')-->checked="checked" <!--@end-->/> <label for="sso_n">{$lang->cmd_no}</label>
+						<input type="radio" name="use_cdn" id="cdn_y" value="Y" <!--@if($use_cdn=='Y')-->checked="checked" <!--@end-->/> <label for="cdn_y">{$lang->cmd_yes}</label>
+						<input type="radio" name="use_cdn" id="cdn_n" value="N" <!--@if($use_cdn!='Y')-->checked="checked" <!--@end-->/> <label for="cdn_n">{$lang->cmd_no}</label>
 					</p>
 				</li>
 				<li>
@@ -218,4 +218,4 @@ jQuery(function($){
 		</div>
 	</form>	
 </div>
-<!--#include("./_spFooter.html")-->
\ No newline at end of file
+<!--#include("./_spFooter.html")-->