From afd1712fda9a6f3403c9fff11e908a2affc970cc Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Tue, 22 Nov 2016 10:39:59 +0800
Subject: [PATCH] =?UTF-8?q?volume=E7=9A=84brick=E7=A9=BA=E9=97=B4=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=8F=AF=E7=94=A8=EF=BC=8C=E7=B3=BB=E7=BB=9F=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E7=B3=BB=E7=BB=9F=E7=B1=BB=E5=9E=8Bsqlserver?=
 =?UTF-8?q?=20->=20sql=20Server?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/configs/html/glusterfsSetting.html | 2 +-
 plugins/system/ts/systemList.ts            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/configs/html/glusterfsSetting.html b/plugins/configs/html/glusterfsSetting.html
index c85b053..04e79ca 100644
--- a/plugins/configs/html/glusterfsSetting.html
+++ b/plugins/configs/html/glusterfsSetting.html
@@ -59,7 +59,7 @@
                             <span class="sj_table_td02">存储路径:{{row.path}}</span>
                         </td>
                         <td>
-                            <span class="">已用&nbsp;{{row.formatUsedSize}}&nbsp;&nbsp;/&nbsp;&nbsp;共&nbsp;{{row.formatAllSize}}</span>
+                            <span class="">已用&nbsp;{{row.formatUsedSize}}&nbsp;&nbsp;/&nbsp;&nbsp;可用&nbsp;{{row.formatAllSize}}</span>
                         </td>
                         <td></td>
                     </tr>
diff --git a/plugins/system/ts/systemList.ts b/plugins/system/ts/systemList.ts
index f97a383..00e255a 100644
--- a/plugins/system/ts/systemList.ts
+++ b/plugins/system/ts/systemList.ts
@@ -220,9 +220,9 @@ module System{
 		function booleanChoose(){
 			return [{id: '是', title: '是'}, {id: '否', title: '否'}];
 		}
-		// 数据库类型选择条件：oracle/sqlServer
+		// 数据库类型选择条件：oracle/sql Server
 		function databaseType(){
-			return [{id: 'oracle', title: 'ORACLE'}, {id: 'sqlServer', title: 'SQLSERVER'}];
+			return [{id: 'oracle', title: 'ORACLE'}, {id: 'sql Server', title: 'SQL SERVER'}];
 		}
 
 		//level选择条件