Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/sslo/sslo/wizard/wizard.html
===================================================================
--- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/sslo/sslo/wizard/wizard.html	(revision 38412)
+++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/apv/templates/sslo/sslo/wizard/wizard.html	(working copy)
@@ -20,7 +20,7 @@
                     </el-form-item>
                 </el-form>
                 <div slot="footer" class="dialog-footer">
-                    <el-button @click="dialogFormVisible = false">{% trans %}Cancel{% endtrans %}</el-button>
+                    <el-button @click="dialogFormVisible = false">{% trans %}Back{% endtrans %}</el-button>
                     <el-button type="primary" @click="topoPage()">{% trans %}Confirm{% endtrans %}</el-button>
                 </div>
             </el-dialog>
@@ -65,7 +65,7 @@
         <el-main>
             <el-row :gutter="20">
                 <el-col :span="2">
-                    <el-button icon="el-icon-arrow-left" @click="returnMainPage">{[gettext('Back')]}</el-button>
+                    <el-button icon="el-icon-arrow-left" @click="returnMainPage">{[gettext('Cancel')]}</el-button>
                 </el-col>
                 <el-col :span="22" v-if="!addslb && !addpolicy && !addslbpolicy">
                     <el-steps :active="active" finish-status="success" process-status="finish" align-center>
@@ -313,9 +313,9 @@
                                                     </el-col>
                                                 </el-form-item>
                                                 <el-form-item>
-                                                    <el-button type="primary" plain @click="configRule(0)">{% trans %}Create{% endtrans %}</el-button>
-                                                    <el-button v-if="!ruleDataAdd['editFlag']" type="primary" plain @click="configRule(1)">{% trans %}Create&Create Next{% endtrans %}</el-button>
-                                                    <el-button type="primary" plain @click="addrule1=0">{% trans %}Cancel{% endtrans %}</el-button>
+                                                    <el-button type="primary" plain @click="configRule(0)">{% trans %}Add{% endtrans %}</el-button>
+                                                    <el-button v-if="!ruleDataAdd['editFlag']" type="primary" plain @click="configRule(1)">{% trans %}Create{% endtrans %}</el-button>
+                                                    <el-button type="primary" plain @click="addrule1=0">{% trans %}Back{% endtrans %}</el-button>
                                                 </el-form-item>
                                             </el-form>
                                         </el-col>
@@ -508,7 +508,7 @@
                                                 </el-form-item>
                                                 <el-form-item>
                                                     <el-button type="primary" plain @click="confirmSSLDecryptDevice(0)">{% trans %}Confirm{% endtrans %}</el-button>
-                                                    <el-button type="primary" plain @click="addSSLDecryptDevice1=0">{% trans %}Cancel{% endtrans %}</el-button>
+                                                    <el-button type="primary" plain @click="addSSLDecryptDevice1=0">{% trans %}Back{% endtrans %}</el-button>
                                                 </el-form-item>
                                             </el-form>
                                         </el-col>
@@ -694,9 +694,9 @@
                                                         <el-switch v-model="service_pool.enable"></el-switch>
                                                     </el-form-item>
                                                     <el-form-item>
-                                                        <el-button type="primary" plain @click="confirmpage(0)">{% trans %}Create{% endtrans %}</el-button>
-                                                        <el-button type="primary" plain  @click="confirmpage(1)" v-if="!service_pool.editFlag">{% trans %}Create&Create Next{% endtrans %}</el-button>
-                                                        <el-button type="primary" plain @click="addpage1=0">{% trans %}Cancel{% endtrans %}</el-button>
+                                                        <el-button type="primary" plain @click="confirmpage(0)">{% trans %}Add{% endtrans %}</el-button>
+                                                        <el-button type="primary" plain  @click="confirmpage(1)" v-if="!service_pool.editFlag">{% trans %}Create{% endtrans %}</el-button>
+                                                        <el-button type="primary" plain @click="addpage1=0">{% trans %}Back{% endtrans %}</el-button>
                                                     </el-form-item>
                                                 </el-col>
                                                 <el-col :span="24" v-if="showHCConfig && service_pool.protocol != 'TAP' && service_pool.protocol != 'L4'">
@@ -787,12 +787,12 @@
                                                                 
                                                                 <el-form-item v-if="hc['editFlag']">
                                                                     <el-button type="primary" plain @click="confirmHC(0)">{% trans %}Create{% endtrans %}</el-button>
-                                                                    <el-button type="primary" plain @click="addHC1=0">{% trans %}Cancel{% endtrans %}</el-button>
+                                                                    <el-button type="primary" plain @click="addHC1=0">{% trans %}Back{% endtrans %}</el-button>
                                                                 </el-form-item>
                                                                 <el-form-item v-if="!hc['editFlag']">
                                                                     <el-button type="primary" plain @click="confirmHC(0)">{% trans %}Confirm{% endtrans %}</el-button>
-                                                                    <el-button type="primary" plain  @click="confirmHC(1)" v-if="!hc.editFlag">{% trans %}Confirm&Add Next{% endtrans %}</el-button>
-                                                                    <el-button type="primary" plain @click="addHC1=0">{% trans %}Cancel{% endtrans %}</el-button>
+                                                                    <el-button type="primary" plain  @click="confirmHC(1)" v-if="!hc.editFlag">{% trans %}Add{% endtrans %}</el-button>
+                                                                    <el-button type="primary" plain @click="addHC1=0">{% trans %}Back{% endtrans %}</el-button>
                                                                 </el-form-item>
                                                             </el-form>
                                                         </el-col>
@@ -848,7 +848,7 @@
                                                         </el-form-item>
                                                         <el-form-item>
                                                             <el-button type="primary" plain @click="confirmservicemember()">{% trans %}Create{% endtrans %}</el-button>
-                                                            <el-button type="primary" plain @click="addServiceMemberPage1=0">{% trans %}Cancel{% endtrans %}</el-button>
+                                                            <el-button type="primary" plain @click="addServiceMemberPage1=0">{% trans %}Back{% endtrans %}</el-button>
                                                         </el-form-item>
                                                         <el-col :span="24" v-if="showL4HCConfig && exits_device['L4Flag']">
                                                             <h2>{% trans %}Health Check Configuration{% endtrans %}</h2>
@@ -975,8 +975,8 @@
                                                             </el-form-item>
                                                             <el-form-item>
                                                                 <el-button type="primary" plain @click="confirmMember(0)">{% trans %}Create{% endtrans %}</el-button>
-                                                                <el-button type="primary" plain @click="confirmMember(1)" v-if="!device.editFlag">{% trans %}Create&Create Next{% endtrans %}</el-button>
-                                                                <el-button type="primary" plain @click="addMember1=0">{% trans %}Cancel{% endtrans %}</el-button>
+                                                                <el-button type="primary" plain @click="confirmMember(1)" v-if="!device.editFlag">{% trans %}Create{% endtrans %}</el-button>
+                                                                <el-button type="primary" plain @click="addMember1=0">{% trans %}Back{% endtrans %}</el-button>
                                                             </el-form-item>
                                                         </el-col>
                                                         <el-col :span="24" v-if="showDeviceHCConfig && device.protocol == 'L3'">
@@ -1078,12 +1078,12 @@
                                                                         
                                                                         <el-form-item v-if="device_hc['editFlag']">
                                                                             <el-button type="primary" plain @click="confirmDeviceHC(0)">{% trans %}Create{% endtrans %}</el-button>
-                                                                            <el-button type="primary" plain @click="addDeviceHC1=0">{% trans %}Cancel{% endtrans %}</el-button>
+                                                                            <el-button type="primary" plain @click="addDeviceHC1=0">{% trans %}Back{% endtrans %}</el-button>
                                                                         </el-form-item>
                                                                         <el-form-item v-if="!device_hc['editFlag']">
                                                                             <el-button type="primary" plain @click="confirmDeviceHC(0)">{% trans %}Confirm{% endtrans %}</el-button>
-                                                                            <el-button type="primary" plain  @click="confirmDeviceHC(1)" v-if="!device_hc.editFlag">{% trans %}Confirm&Add Next{% endtrans %}</el-button>
-                                                                            <el-button type="primary" plain @click="addDeviceHC1=0">{% trans %}Cancel{% endtrans %}</el-button>
+                                                                            <el-button type="primary" plain  @click="confirmDeviceHC(1)" v-if="!device_hc.editFlag">{% trans %}Add{% endtrans %}</el-button>
+                                                                            <el-button type="primary" plain @click="addDeviceHC1=0">{% trans %}Back{% endtrans %}</el-button>
                                                                         </el-form-item>
                                                                     </el-form>
                                                                 </el-col>
@@ -1162,9 +1162,9 @@
                                                     </el-select>
                                                 </el-form-item>
                                                 <el-form-item>
-                                                    <el-button type="primary" plain @click="addchain(0)">{% trans %}Create{% endtrans %}</el-button>
-                                                    <el-button type="primary" plain @click="addchain(1)" v-if="!chain.editFlag">{% trans %}Create&Create Next{% endtrans %}</el-button>
-                                                    <el-button type="primary" plain @click="addchain1=0">{% trans %}Cancel{% endtrans %}</el-button>
+                                                    <el-button type="primary" plain @click="addchain(0)">{% trans %}Add{% endtrans %}</el-button>
+                                                    <el-button type="primary" plain @click="addchain(1)" v-if="!chain.editFlag">{% trans %}Create{% endtrans %}</el-button>
+                                                    <el-button type="primary" plain @click="addchain1=0">{% trans %}Back{% endtrans %}</el-button>
                                                 </el-form-item>
                                             </el-form>
                                         </el-row>
@@ -1188,8 +1188,8 @@
                                                 </el-col>
                                             </el-form-item>
                                             <el-form-item>
-                                                <el-button type="primary" plain @click="confirmchainmember()">{% trans %}Create{% endtrans %}</el-button>
-                                                <el-button type="primary" plain @click="addchainmember = 0">{% trans %}Cancel{% endtrans %}</el-button>
+                                                <el-button type="primary" plain @click="confirmchainmember()">{% trans %}Add{% endtrans %}</el-button>
+                                                <el-button type="primary" plain @click="addchainmember = 0">{% trans %}Back{% endtrans %}</el-button>
                                             </el-form-item>
                                         </el-form>
                                     </el-row>
@@ -1340,8 +1340,8 @@
                                                     </el-form-item>
                                                     <el-form-item>
                                                         <el-button type="primary" plain @click="confirmServiceChain(0)">{% trans %}Confirm{% endtrans %}</el-button>
-                                                        <el-button type="primary" plain @click="confirmServiceChain(1)" v-if="!asso_chain.editFlag">{% trans %}Confirm&Add Next{% endtrans %}</el-button>
-                                                        <el-button type="primary" plain @click="attachServiveChain1 = 0">{% trans %}Cancel{% endtrans %}</el-button>
+                                                        <el-button type="primary" plain @click="confirmServiceChain(1)" v-if="!asso_chain.editFlag">{% trans %}Add{% endtrans %}</el-button>
+                                                        <el-button type="primary" plain @click="attachServiveChain1 = 0">{% trans %}Back{% endtrans %}</el-button>
                                                     </el-form-item>
                                                 </el-form>
                                             </el-row>
@@ -1385,8 +1385,8 @@
                                             </el-form-item>
                                             <el-form-item>
                                                 <el-button type="primary" plain @click="confirmURLPolicy(0)">{% trans %}Confirm{% endtrans %}</el-button>
-                                                <el-button type="primary" plain @click="confirmURLPolicy(1)" v-if="!L7_router_rule.editFlag">{% trans %}Confirm&Add Next{% endtrans %}</el-button>
-                                                <el-button type="primary" plain @click="addurlpolicy = 0">{% trans %}Cancel{% endtrans %}</el-button>
+                                                <el-button type="primary" plain @click="confirmURLPolicy(1)" v-if="!L7_router_rule.editFlag">{% trans %}Add{% endtrans %}</el-button>
+                                                <el-button type="primary" plain @click="addurlpolicy = 0">{% trans %}Back{% endtrans %}</el-button>
                                             </el-form-item>
                                         </el-form>
                                     </el-row>
@@ -1559,8 +1559,8 @@
                                                 </el-form-item>
                                                 <el-form-item>
                                                     <el-button type="primary" plain @click="confirmServiceChain_SLB(0)">{% trans %}Confirm{% endtrans %}</el-button>
-                                                    <el-button type="primary" plain @click="confirmServiceChain_SLB(1)" v-if="!SLB.editFlag">{% trans %}Confirm&Add Next{% endtrans %}</el-button>
-                                                    <el-button type="primary" plain @click="attachServiceChain_SLB1 = 0">{% trans %}Cancel{% endtrans %}</el-button>
+                                                    <el-button type="primary" plain @click="confirmServiceChain_SLB(1)" v-if="!SLB.editFlag">{% trans %}Add{% endtrans %}</el-button>
+                                                    <el-button type="primary" plain @click="attachServiceChain_SLB1 = 0">{% trans %}Back{% endtrans %}</el-button>
                                                 </el-form-item>
                                             </el-form>
                                         </el-row>
@@ -1610,8 +1610,8 @@
                                                         <el-input v-model.number="SLB_vs_config.max_conn"></el-input>
                                                     </el-form-item>
                                                     <el-form-item>
-                                                        <el-button type="primary" plain @click="confirmVirtualService()">{% trans %}Create{% endtrans %}</el-button>
-                                                        <el-button type="primary" plain @click="add_vs = 0">{% trans %}Cancel{% endtrans %}</el-button>
+                                                        <el-button type="primary" plain @click="confirmVirtualService()">{% trans %}Add{% endtrans %}</el-button>
+                                                        <el-button type="primary" plain @click="add_vs = 0">{% trans %}Back{% endtrans %}</el-button>
                                                     </el-form-item>
                                                 </el-form>
                                             </el-row>
@@ -1668,8 +1668,8 @@
                                                     <el-input v-model.number="SLB_rs_config.hc_down"></el-input>
                                                 </el-form-item>
                                                 <el-form-item>
-                                                    <el-button type="primary" plain @click="confirmRealService()">{% trans %}Create{% endtrans %}</el-button>
-                                                    <el-button type="primary" plain @click="add_rs = 0">{% trans %}Cancel{% endtrans %}</el-button>
+                                                    <el-button type="primary" plain @click="confirmRealService()">{% trans %}Add{% endtrans %}</el-button>
+                                                    <el-button type="primary" plain @click="add_rs = 0">{% trans %}Back{% endtrans %}</el-button>
                                                 </el-form-item>
                                             </el-form>
                                         </el-row>
@@ -1725,8 +1725,8 @@
                                                     <el-checkbox v-model="asso_chain.priority_mode"></el-checkbox>
                                                 </el-form-item>
                                                 <el-form-item>
-                                                    <el-button type="primary" plain @click="confirmGroup()">{% trans %}Create{% endtrans %}</el-button>
-                                                    <el-button type="primary" plain @click="add_group = 0">{% trans %}Cancel{% endtrans %}</el-button>
+                                                    <el-button type="primary" plain @click="confirmGroup()">{% trans %}Add{% endtrans %}</el-button>
+                                                    <el-button type="primary" plain @click="add_group = 0">{% trans %}Back{% endtrans %}</el-button>
                                                 </el-form-item>
                                             </el-form>
                                         </el-row>
@@ -1768,8 +1768,8 @@
                                                     </el-select>
                                                 </el-form-item>
                                                 <el-form-item>
-                                                    <el-button type="primary" plain @click="confirmPolicy()">{% trans %}Create{% endtrans %}</el-button>
-                                                    <el-button type="primary" plain @click="add_policy = 0">{% trans %}Cancel{% endtrans %}</el-button>
+                                                    <el-button type="primary" plain @click="confirmPolicy()">{% trans %}Add{% endtrans %}</el-button>
+                                                    <el-button type="primary" plain @click="add_policy = 0">{% trans %}Back{% endtrans %}</el-button>
                                                 </el-form-item>
                                             </el-form>
                                         </el-row>
Index: /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/locale/zh_TW/LC_MESSAGES/django.po
===================================================================
--- /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/locale/zh_TW/LC_MESSAGES/django.po	(revision 38412)
+++ /branches/rel_apv_10_7/usr/click/webui/htdocs/new/src/locale/zh_TW/LC_MESSAGES/django.po	(working copy)
@@ -1860,14 +1860,14 @@
 #: apv/templates/sslo/sslo/wizard/wizard.html:1717
 #: apv/templates/sslo/sslo/wizard/wizard.html:1760
 msgid "Create"
-msgstr "建立"
+msgstr "創建"
 
 #: apv/templates/sslo/sslo/wizard/wizard.html:317
 #: apv/templates/sslo/sslo/wizard/wizard.html:695
 #: apv/templates/sslo/sslo/wizard/wizard.html:975
 #: apv/templates/sslo/sslo/wizard/wizard.html:1163
 msgid "Create&Create Next"
-msgstr "建立及建立下一個"
+msgstr "創建&創建下一个"
 
 #: apv/templates/sslo/sslo/wizard/wizard.html:331
 #: apv/templates/sslo/sslo/wizard/wizard.html:1200