From 43a44166d2c8b939e428e207f298a9351d5acabd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E5=8D=8E?= <hua.fang@xin-lai.com>
Date: Tue, 26 Nov 2019 18:01:08 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=91=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=A4=9A=E8=AF=AD=E8=A8=80=E4=B8=BA=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/account/account.component.html            |  2 +-
 src/account/login/login.component.html        |  2 +-
 .../passwords/forgot-password.component.html  | 12 ++---
 .../passwords/forgot-password.component.ts    |  2 +-
 .../passwords/reset-password.component.html   | 12 ++---
 src/account/register/register.component.html  | 16 +++---
 .../tenant-register.component.html            | 14 ++---
 .../tenant/tenant-change-modal.component.ts   |  2 +-
 .../audit-logs-detail.component.html          |  6 +--
 .../audit-logs/audit-logs.component.html      | 54 +++++++++----------
 .../create-or-edit-edition.component.html     | 22 ++++----
 src/app/admin/editions/editions.component.ts  |  4 +-
 .../host-settings.component.html              | 14 ++---
 .../edit-language-text.component.html         |  8 +--
 .../create-or-edit-language.component.html    |  8 +--
 .../add-member/add-member.component.html      |  4 +-
 ...e-or-edit-organiaztion-unit.component.html |  6 +--
 .../create-or-edit-role.component.html        | 10 ++--
 .../tenant-settings.component.html            | 18 +++----
 .../create-tenant.component.html              | 22 ++++----
 .../edit-tenant-features.component.html       |  4 +-
 .../edit-tenant/edit-tenant.component.html    | 10 ++--
 .../create-or-edit-user.component.html        | 18 +++----
 .../edit-user-permissions.component.html      |  4 +-
 src/app/admin/users/users.component.html      |  2 +-
 .../advertising/advertising.component.html    |  2 +-
 .../change-password-modal.component.html      | 12 ++---
 .../profile/my-settings-modal.component.html  | 12 ++---
 28 files changed, 151 insertions(+), 151 deletions(-)

diff --git a/src/account/account.component.html b/src/account/account.component.html
index 23081d9..5a157a7 100644
--- a/src/account/account.component.html
+++ b/src/account/account.component.html
@@ -26,7 +26,7 @@
 
 <!-- #region 暂时先注释后期做处理 -->
   <!-- 语言选择 -->
-  <!-- <div class="text-center">{{l('LanguageSelection')}}</div>
+  <!-- <div class="text-center">语言选择</div>
   <account-languages></account-languages> -->
 
 <!-- #endregion -->
diff --git a/src/account/login/login.component.html b/src/account/login/login.component.html
index 02dde56..d99ee6e 100644
--- a/src/account/login/login.component.html
+++ b/src/account/login/login.component.html
@@ -21,7 +21,7 @@
           </nz-form-control>
         </nz-form-item>
         <button nz-button [nzType]="'primary'" [nzLoading]="submitting" class="login-btn" style="width:100%;height: 35px;">
-          <span>{{l("LogIn")}}</span>
+          <span>登录</span>
         </button>
       </form>
   </nz-spin>
diff --git a/src/account/passwords/forgot-password.component.html b/src/account/passwords/forgot-password.component.html
index e964b61..655f1b8 100644
--- a/src/account/passwords/forgot-password.component.html
+++ b/src/account/passwords/forgot-password.component.html
@@ -1,16 +1,16 @@
 <div [@routerTransition]>
-  <nz-card [nzTitle]="l('ForgotPassword')">
+  <nz-card [nzTitle]="'不记得密码了?'">
     <form nz-form #forgotPassForm="ngForm" (ngSubmit)="save()" autocomplete="off">
-      <nz-alert class="mb-md" nzType="info" nzCloseable [nzMessage]="l('SendPasswordResetLink_Information')" nzShowIcon>
+      <nz-alert class="mb-md" nzType="info" nzCloseable [nzMessage]="'系统在几十秒内向您发送一封密码重置邮件，如果在3分钟内还没收到这封邮件，请重试.'" nzShowIcon>
       </nz-alert>
 
       <nz-form-item>
         <nz-form-control nzHasFeedback>
           <input nz-input name="emailAddress" #emailAddressInput="ngModel" [(ngModel)]="model.emailAddress"
-            [placeholder]="l('EmailAddress')" autoFocus required maxlength="255" type="email" email>
+            [placeholder]="'邮箱地址'" autoFocus required maxlength="255" type="email" email>
           <nz-form-explain *ngIf="emailAddressInput.control.dirty&&emailAddressInput.control.errors">
             <ng-container *ngIf="emailAddressInput.control.hasError('email')">{{l('NotEmail')}}</ng-container>
-            <ng-container *ngIf="emailAddressInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+            <ng-container *ngIf="emailAddressInput.control.hasError('required')">请填写此项内容</ng-container>
           </nz-form-explain>
         </nz-form-control>
       </nz-form-item>
@@ -18,11 +18,11 @@
         <nz-col nzSm="12">
           <button nz-button nzType="primary" type="submit" [nzLoading]="saving" [disabled]="!forgotPassForm.form.valid || saving"
             nzBlock>
-            {{l("Submit")}}
+            提交
           </button>
         </nz-col>
         <nz-col nzSm="12">
-          <button nz-button nzType="default" type="button" [disabled]="saving" routerLink="/account/login" nzBlock>{{l("Back")}}</button>
+          <button nz-button nzType="default" type="button" [disabled]="saving" routerLink="/account/login" nzBlock>返回</button>
         </nz-col>
       </nz-form-item>
     </form>
diff --git a/src/account/passwords/forgot-password.component.ts b/src/account/passwords/forgot-password.component.ts
index bf03ffa..d22ca9b 100644
--- a/src/account/passwords/forgot-password.component.ts
+++ b/src/account/passwords/forgot-password.component.ts
@@ -30,7 +30,7 @@ export class ForgotPasswordComponent extends AppComponentBase implements OnInit
 
 
   ngOnInit(): void {
-    this.titleSrvice.setTitle(this.l('ForgotPassword'));
+    this.titleSrvice.setTitle(this.不记得密码了?);
   }
 
   save(): void {
diff --git a/src/account/passwords/reset-password.component.html b/src/account/passwords/reset-password.component.html
index 373d04f..abc0658 100644
--- a/src/account/passwords/reset-password.component.html
+++ b/src/account/passwords/reset-password.component.html
@@ -3,12 +3,12 @@
     <ng-template #nzTitle>
       <div class="text-center magicodes__block">
         <i class="anticon anticon-lock"></i>
-        <span>{{l('ChangePassword')}}</span>
+        <span>修改密码</span>
       </div>
     </ng-template>
     <form nz-form #resetPassForm="ngForm" (ngSubmit)="save()"  autocomplete="off">
 
-      <nz-alert class="mb-md" nzType="info" nzCloseable [nzMessage]="l('PleaseEnterYourNewPassword')" nzShowIcon>
+      <nz-alert class="mb-md" nzType="info" nzCloseable [nzMessage]="'请输入新密码.'" nzShowIcon>
       </nz-alert>
 
       <nz-form-item>
@@ -19,7 +19,7 @@
               required>
           </nz-input-group>
           <nz-form-explain *ngIf="password.control.dirty&&password.control.errors">
-            <ng-container *ngIf="password.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+            <ng-container *ngIf="password.control.hasError('required')">请填写此项内容</ng-container>
             <ng-container *ngIf="password.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
             <ng-container *ngIf="password.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
           </nz-form-explain>
@@ -34,7 +34,7 @@
               minlength="6" maxlength="32">
           </nz-input-group>
           <nz-form-explain *ngIf="passwordRepeat.control.dirty&&passwordRepeat.control.errors">
-            <ng-container *ngIf="passwordRepeat.control.hasError('validateEqual')">{{l('PasswordsDontMatch')}}</ng-container>
+            <ng-container *ngIf="passwordRepeat.control.hasError('validateEqual')">两次密码不一致</ng-container>
           </nz-form-explain>
         </nz-form-control>
       </nz-form-item>
@@ -43,11 +43,11 @@
         <nz-form-control nz-col class="text-center">
           <button nz-button routerLink="/account/login" [nzType]="'default'" [disabled]="saving" type="button">
             <i class="anticon anticon-rollback"></i>
-            <span>{{l("Back")}}</span>
+            <span>返回</span>
           </button>
           <button nz-button [nzType]="'primary'" [nzLoading]="saving" [disabled]="!resetPassForm.form.valid" type="submit">
             <i class="anticon anticon-check"></i>
-            <span>{{l("LogIn")}}</span>
+            <span>登录</span>
           </button>
         </nz-form-control>
       </nz-form-item>
diff --git a/src/account/register/register.component.html b/src/account/register/register.component.html
index 976af88..4a52fa6 100644
--- a/src/account/register/register.component.html
+++ b/src/account/register/register.component.html
@@ -19,7 +19,7 @@
               <input nz-input name="name" #name='ngModel' [(ngModel)]="model.name" [placeholder]="l('Name')" required>
             </nz-input-group>
             <nz-form-explain *ngIf="name.control.dirty&&name.control.errors">
-              <ng-container *ngIf="name.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+              <ng-container *ngIf="name.control.hasError('required')">请填写此项内容</ng-container>
             </nz-form-explain>
           </nz-form-control>
         </nz-form-item> -->
@@ -32,7 +32,7 @@
                 required>
             </nz-input-group>
             <nz-form-explain *ngIf="surname.control.dirty&&surname.control.errors">
-              <ng-container *ngIf="surname.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+              <ng-container *ngIf="surname.control.hasError('required')">请填写此项内容</ng-container>
             </nz-form-explain>
           </nz-form-control>
         </nz-form-item> -->
@@ -43,11 +43,11 @@
           <nz-form-control nzHasFeedback>
             <nz-input-group nzPrefixIcon="anticon anticon-mail">
               <input nz-input type="email" name="emailAddress" #emailAddress="ngModel" [(ngModel)]="model.emailAddress"
-                [placeholder]="l('EmailAddress')" required email>
+                [placeholder]="'邮箱地址'" required email>
             </nz-input-group>
             <nz-form-explain *ngIf="emailAddress.control.dirty&&emailAddress.control.errors">
               <ng-container *ngIf="emailAddress.control.hasError('email')">{{l('NotEmail')}}</ng-container>
-              <ng-container *ngIf="emailAddress.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+              <ng-container *ngIf="emailAddress.control.hasError('required')">请填写此项内容</ng-container>
             </nz-form-explain>
           </nz-form-control>
         </nz-form-item>
@@ -61,7 +61,7 @@
                 required maxlength="32">
             </nz-input-group>
             <nz-form-explain *ngIf="userName.control.dirty&&userName.control.errors">
-              <ng-container *ngIf="userName.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+              <ng-container *ngIf="userName.control.hasError('required')">请填写此项内容</ng-container>
             </nz-form-explain>
           </nz-form-control>
         </nz-form-item>
@@ -74,7 +74,7 @@
                 [placeholder]="l('Password')" required maxlength="32" minlength="6">
             </nz-input-group>
             <nz-form-explain *ngIf="password.control.dirty&&password.control.errors">
-              <ng-container *ngIf="password.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+              <ng-container *ngIf="password.control.hasError('required')">请填写此项内容</ng-container>
               <ng-container *ngIf="password.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
             </nz-form-explain>
           </nz-form-control>
@@ -89,7 +89,7 @@
             </magicodes-captcha>
 
             <nz-form-explain *ngIf="verificationCodeInput.control.dirty&&verificationCodeInput.control.errors">
-                <ng-container *ngIf="verificationCodeInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+                <ng-container *ngIf="verificationCodeInput.control.hasError('required')">请填写此项内容</ng-container>
               <ng-container *ngIf="verificationCodeInput.control.hasError('minlength')||verificationCodeInput.control.hasError('maxlength')">
                 {{l('LengthError')}}
               </ng-container>
@@ -108,7 +108,7 @@
         <nz-col [nzSpan]="12">
         </nz-col>
         <nz-col [nzSpan]="12" class="text-right">
-          <a (click)="back()">{{l("Back")}}</a>
+          <a (click)="back()">返回</a>
         </nz-col>
       </nz-form-item>
 
diff --git a/src/account/tenant-register/tenant-register.component.html b/src/account/tenant-register/tenant-register.component.html
index 8f290f1..df6dc95 100644
--- a/src/account/tenant-register/tenant-register.component.html
+++ b/src/account/tenant-register/tenant-register.component.html
@@ -23,7 +23,7 @@
                 [placeholder]="l('TenancyCodeName')" required expression="^[a-zA-Z][a-zA-Z0-9_-]{1,}$">
             </nz-input-group>
             <nz-form-explain *ngIf="tenancyName.control.dirty&&tenancyName.control.errors">
-              <ng-container *ngIf="tenancyName.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+              <ng-container *ngIf="tenancyName.control.hasError('required')">请填写此项内容</ng-container>
               <ng-container *ngIf="tenancyName.control.hasError('expression')">{{l('ExpressionCheckFailed')}}</ng-container>
             </nz-form-explain>
           </nz-form-control>
@@ -38,7 +38,7 @@
                 [placeholder]="l('DisplayTenancyName')" required maxlength="32">
             </nz-input-group>
             <nz-form-explain *ngIf="displayTenancyNameInput.control.dirty&&displayTenancyNameInput.control.errors">
-              <ng-container *ngIf="displayTenancyNameInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+              <ng-container *ngIf="displayTenancyNameInput.control.hasError('required')">请填写此项内容</ng-container>
             </nz-form-explain>
           </nz-form-control>
         </nz-form-item> -->
@@ -51,7 +51,7 @@
                 [placeholder]="l('AdminUserName')" required maxlength="32">
             </nz-input-group>
             <nz-form-explain *ngIf="adminUserNameInput.control.dirty&&adminUserNameInput.control.errors">
-              <ng-container *ngIf="adminUserNameInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+              <ng-container *ngIf="adminUserNameInput.control.hasError('required')">请填写此项内容</ng-container>
             </nz-form-explain>
           </nz-form-control>
         </nz-form-item> -->
@@ -65,7 +65,7 @@
             </nz-input-group>
             <nz-form-explain *ngIf="adminEmailAddress.control.dirty&&adminEmailAddress.control.errors">
               <ng-container *ngIf="adminEmailAddress.control.hasError('email')">{{l('NotEmail')}}</ng-container>
-              <ng-container *ngIf="adminEmailAddress.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+              <ng-container *ngIf="adminEmailAddress.control.hasError('required')">请填写此项内容</ng-container>
             </nz-form-explain>
           </nz-form-control>
         </nz-form-item> -->
@@ -78,7 +78,7 @@
                 [placeholder]="l('Password')" required maxlength="32" minlength="6">
             </nz-input-group>
             <nz-form-explain *ngIf="tenantAdminPassword.control.dirty&&tenantAdminPassword.control.errors">
-              <ng-container *ngIf="tenantAdminPassword.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+              <ng-container *ngIf="tenantAdminPassword.control.hasError('required')">请填写此项内容</ng-container>
               <ng-container *ngIf="tenantAdminPassword.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
             </nz-form-explain>
           </nz-form-control>
@@ -93,7 +93,7 @@
             </magicodes-captcha>
 
             <nz-form-explain *ngIf="verificationCodeInput.control.dirty&&verificationCodeInput.control.errors">
-              <ng-container *ngIf="verificationCodeInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+              <ng-container *ngIf="verificationCodeInput.control.hasError('required')">请填写此项内容</ng-container>
               <ng-container *ngIf="verificationCodeInput.control.hasError('minlength')||verificationCodeInput.control.hasError('maxlength')">
                 {{l('LengthError')}}
               </ng-container>
@@ -113,7 +113,7 @@
         <nz-col [nzSpan]="12">
         </nz-col>
         <nz-col [nzSpan]="12" class="text-right">
-          <a (click)="back()">{{l("Back")}}</a>
+          <a (click)="back()">返回</a>
         </nz-col>
       </nz-form-item>
 
diff --git a/src/account/tenant/tenant-change-modal.component.ts b/src/account/tenant/tenant-change-modal.component.ts
index 4a4779c..b46f7ac 100644
--- a/src/account/tenant/tenant-change-modal.component.ts
+++ b/src/account/tenant/tenant-change-modal.component.ts
@@ -62,7 +62,7 @@ export class TenantChangeModalComponent extends ModalComponentBase
             location.reload();
             return;
           case AppTenantAvailabilityState.InActive:
-            this.message.warn(this.l('TenantIsNotActive', this.tenancyName));
+            this.message.warn('租户 {0} 未激活.', this.tenancyName);
             break;
           case AppTenantAvailabilityState.NotFound: // NotFound
             this.message.warn(
diff --git a/src/app/admin/audit-logs/audit-logs-detail/audit-logs-detail.component.html b/src/app/admin/audit-logs/audit-logs-detail/audit-logs-detail.component.html
index 67865ec..f050aa2 100644
--- a/src/app/admin/audit-logs/audit-logs-detail/audit-logs-detail.component.html
+++ b/src/app/admin/audit-logs/audit-logs-detail/audit-logs-detail.component.html
@@ -1,5 +1,5 @@
 <div class="modal-header">
-  <div class="modal-title" *ngIf="auditLog">{{l('AuditLogDetail')}}</div>
+  <div class="modal-title" *ngIf="auditLog">审计日志详情</div>
 </div>
 
 <div>
@@ -111,8 +111,8 @@
     <h3>{{l("ErrorState")}}</h3>
     <div nz-row [nzGutter]="8">
       <div nz-col [nzSpan]="4">
-        <nz-badge *ngIf="auditLog.exception " [nzStatus]="'error'" [nzText]="l('Error')"></nz-badge>
-        <nz-badge *ngIf="!auditLog.exception " [nzStatus]="'success'" [nzText]="l('Success')"></nz-badge>
+        <nz-badge *ngIf="auditLog.exception " [nzStatus]="'error'" [nzText]="'错误!'"></nz-badge>
+        <nz-badge *ngIf="!auditLog.exception " [nzStatus]="'success'" [nzText]="'成功'"></nz-badge>
       </div>
     </div>
   </div>
diff --git a/src/app/admin/audit-logs/audit-logs.component.html b/src/app/admin/audit-logs/audit-logs.component.html
index 8c97ad6..0284fa5 100644
--- a/src/app/admin/audit-logs/audit-logs.component.html
+++ b/src/app/admin/audit-logs/audit-logs.component.html
@@ -1,15 +1,15 @@
-<page-header [title]="l('AuditLogs')"></page-header>
+<page-header [title]="'审计日志'"></page-header>
 
 <nz-card [nzBordered]="false">
   <!-- 检索表单 -->
   <form nz-form (ngSubmit)="refreshGoFirstPage()" class="mb-md">
     <nz-form-item nz-row nzGutter="8">
       <nz-form-label nz-col [nzSm]="2">
-        {{l("UserName")}}
+        用户名
       </nz-form-label>
       <nz-form-control nz-col [nzSm]="22">
         <nz-input-group nzSearch [nzSuffix]="suffixButton">
-          <input type="text" nz-input [(ngModel)]="username" name="UserName" [placeholder]="l('UserName')">
+          <input type="text" nz-input [(ngModel)]="username" name="UserName" [placeholder]="'用户名'">
           <ng-template #suffixButton>
             <button nz-button nzType="primary" nzSearch type="submit">
               <i class="anticon anticon-search"></i>
@@ -21,62 +21,62 @@
     <!-- 错误状态 -->
     <nz-form-item nz-row nzGutter="8">
       <nz-form-label nz-col [nzSm]="2">
-        {{l("ErrorState")}}
+        错误状态
       </nz-form-label>
       <nz-form-control nz-col [nzSm]="10">
-        <nz-select [(ngModel)]="hasException" name="HasException" [nzPlaceHolder]="l('ErrorState')" nzAllowClear
+        <nz-select [(ngModel)]="hasException" name="HasException" [nzPlaceHolder]="'错误状态'" nzAllowClear
           (ngModelChange)="refreshGoFirstPage()">
-          <nz-option [nzLabel]="l('All')" nzValue=""></nz-option>
-          <nz-option [nzLabel]="l('Success')" nzValue="false"></nz-option>
-          <nz-option [nzLabel]="l('HasError')" nzValue="true"></nz-option>
+          <nz-option [nzLabel]="'全部'" nzValue=""></nz-option>
+          <nz-option [nzLabel]="'成功'" nzValue="false"></nz-option>
+          <nz-option [nzLabel]="'出现错误'" nzValue="true"></nz-option>
         </nz-select>
       </nz-form-control>
       <nz-form-label nz-col [nzSm]="2">
-        {{l("DateRange")}}
+        日期范围
       </nz-form-label>
       <nz-form-control nz-col [nzSm]="10">
         <nz-range-picker name="DateRange" [(ngModel)]="startToEndDate" (ngModelChange)="refreshGoFirstPage()"
-          [nzPlaceHolder]="[l('StartDateTime'),l('EndDateTime')]"></nz-range-picker>
+          [nzPlaceHolder]="['开始日期','结束日期']"></nz-range-picker>
       </nz-form-control>
     </nz-form-item>
 
     <nz-form-item nz-row nzGutter="8" *ngIf="advancedFiltersVisible">
       <nz-form-label nz-col [nzSm]="2">
-        {{l("Service")}}
+        服务
       </nz-form-label>
       <nz-form-control nz-col [nzSm]="10">
-        <input nz-input name="Service" [(ngModel)]="serviceName" [placeholder]="l('Service')">
+        <input nz-input name="Service" [(ngModel)]="serviceName" [placeholder]="'服务'">
       </nz-form-control>
 
       <nz-form-label nz-col [nzSm]="2">
-        {{l("Duration")}}
+        持续时间
       </nz-form-label>
       <nz-form-control nz-col [nzSm]="10">
         <nz-input-group nzCompact>
           <nz-input-number name="MinExecutionDuration" [(ngModel)]="minExecutionDuration"
-            [nzPlaceHolder]="l('MinExecutionDuration')" [nzMin]="0" [nzMax]="86400000" [nzStep]="1"
+            [nzPlaceHolder]="'最短执行时间'" [nzMin]="0" [nzMax]="86400000" [nzStep]="1"
             style="text-align: center; width: 152px;"></nz-input-number>
           <input type="text" disabled nz-input placeholder="~"
             style="width: 30px; border-left: 0px;pointer-events: none; background-color: rgb(255, 255, 255);">
           <nz-input-number name="MaxExecutionDuration" [(ngModel)]="maxExecutionDuration"
-            [nzPlaceHolder]="l('MaxExecutionDuration')" [nzMin]="0" [nzMax]="86400000" [nzStep]="1"
+            [nzPlaceHolder]="'最长执行时间'" [nzMin]="0" [nzMax]="86400000" [nzStep]="1"
             style="text-align: center; border-left: 0px; width: 152px;"></nz-input-number>
         </nz-input-group>
       </nz-form-control>
     </nz-form-item>
     <nz-form-item nz-row nzGutter="8" *ngIf="advancedFiltersVisible">
       <nz-form-label nz-col [nzSm]="2">
-        {{l("MethodName")}}
+        方法名
       </nz-form-label>
       <nz-form-control nz-col [nzSm]="10">
-        <input nz-input name="MethodName" [(ngModel)]="methodName" [placeholder]="l('MethodName')">
+        <input nz-input name="MethodName" [(ngModel)]="methodName" [placeholder]="'方法名'">
       </nz-form-control>
 
       <nz-form-label nz-col [nzSm]="2">
-        {{l("Browser")}}
+        浏览器
       </nz-form-label>
       <nz-form-control nz-col [nzSm]="10">
-        <input nz-input name="BrowserInfo" [(ngModel)]="browserInfo" [placeholder]="l('Browser')">
+        <input nz-input name="BrowserInfo" [(ngModel)]="browserInfo" [placeholder]="'浏览器'">
       </nz-form-control>
     </nz-form-item>
   </form>
@@ -86,13 +86,13 @@
       <!-- <button nz-button nzType="primary" (click)="exportToExcel()" [nzLoading]="exporting">
         <i class="anticon anticon-file-excel" *ngIf="!exporting"></i>
         <span>
-          {{l("ExportToExcel")}}
+          导出到Excel
         </span>
       </button> -->
     </nz-col>
     <nz-col nzMd="4" nzSm="12" class="text-right">
       <a (click)="advancedFiltersVisible=!advancedFiltersVisible">
-        {{advancedFiltersVisible ? l('HideAdvancedFilters') : l('ShowAdvancedFilters')}}
+        {{advancedFiltersVisible ? '隐藏高级过滤' : '显示高级过滤'}}
         <i class="anticon" [class.anticon-down]="!advancedFiltersVisible"
           [class.anticon-up]="advancedFiltersVisible"></i>
       </a>
@@ -125,13 +125,13 @@
       <thead nz-thead (nzSortChange)="gridSort($event)">
         <tr>
           <th nz-th nzShowSort nzSortKey="executionTime">
-            <span>{{l('Time')}}</span>
+            <span>时间</span>
           </th>
           <th nz-th nzShowSort nzSortKey="userName">
-            <span>{{l('UserName')}}</span>
+            <span>用户名</span>
           </th>
           <th nz-th nzShowSort nzSortKey="serviceName">
-            <span>{{l('Service')}}</span>
+            <span>服务</span>
           </th>
           <th nz-th nzShowSort nzSortKey="methodName">
             <span>{{l('Action')}}</span>
@@ -146,7 +146,7 @@
             <span>{{l('Client')}}</span>
           </th>
           <th class="text-center" nzShowSort nzSortKey="browserInfo">
-            <span>{{l('Browser')}}</span>
+            <span>{{'浏览器'}}</span>
           </th>
           <th nzWidth="100px" class="text-center">
             <span>{{l('ExceptionType')}}</span>
@@ -216,9 +216,9 @@
             </ellipsis>
           </td>
           <td class="text-center">
-            <i *ngIf="item.exception" nz-tooltip [nzTitle]="l('HasError')"
+            <i *ngIf="item.exception" nz-tooltip [nzTitle]="'出现错误'"
               class="anticon anticon-warning text-warning"></i>
-            <i *ngIf="!item.exception" nz-tooltip [nzTitle]="l('Success')"
+            <i *ngIf="!item.exception" nz-tooltip [nzTitle]="'成功'"
               class="anticon anticon-check-circle text-green"></i>
           </td>
           <td nzWidth="120px" class="text-center">
diff --git a/src/app/admin/editions/create-or-edit-edition/create-or-edit-edition.component.html b/src/app/admin/editions/create-or-edit-edition/create-or-edit-edition.component.html
index e280a86..aaa6bdf 100644
--- a/src/app/admin/editions/create-or-edit-edition/create-or-edit-edition.component.html
+++ b/src/app/admin/editions/create-or-edit-edition/create-or-edit-edition.component.html
@@ -1,9 +1,9 @@
 <div class="modal-header">
   <div class="modal-title" *ngIf="!editionId">
-    {{l('CreateNewEdition')}}
+    创建新的版本
   </div>
   <div class="modal-title" *ngIf="editionId">
-    {{l('EditEdition')}}:
+    编辑版本:
     <span>{{edition.displayName}}</span>
   </div>
 </div>
@@ -11,44 +11,44 @@
 <form nz-form #validateForm="ngForm" (ngSubmit)="save()"  autocomplete="off">
 
   <nz-tabset>
-    <nz-tab nzTitle="{{l('EditionProperties')}}">
+    <nz-tab nzTitle="'版本属性列表'">
 
       <!-- 版本名称-->
     <nz-form-item>
-        <nz-form-label nzFor="editionName" nzRequired>{{l('EditionName')}}</nz-form-label>
+        <nz-form-label nzFor="editionName" nzRequired>版本名称</nz-form-label>
         <nz-form-control nzHasFeedback>
             <input nz-input #editionNameInput="ngModel" type="text" name="EditionDisplayName" [ngClass]="{'edited':edition.displayName}"
             [(ngModel)]="edition.displayName" required maxlength="64" />
           <nz-form-explain *ngIf="editionNameInput.control.dirty&&editionNameInput.control.errors">
-            <ng-container *ngIf="editionNameInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+            <ng-container *ngIf="editionNameInput.control.hasError('required')">请填写此项内容</ng-container>
           </nz-form-explain>
         </nz-form-control>
       </nz-form-item>
 
       <!-- <nz-form-item>
-          <nz-form-label>{{l("EditionName")}} *</nz-form-label>
+          <nz-form-label>版本名称 *</nz-form-label>
           <nz-form-control>
             <input nz-input #editionNameInput="ngModel" type="text" name="EditionDisplayName" [ngClass]="{'edited':edition.displayName}"
               [(ngModel)]="edition.displayName" required maxlength="64" />
             <nz-form-explain *ngIf="editionNameInput.control.dirty&&editionNameInput.control.errors">
-              <ng-container *ngIf="editionNameInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+              <ng-container *ngIf="editionNameInput.control.hasError('required')">请填写此项内容</ng-container>
             </nz-form-explain>
           </nz-form-control>
         </nz-form-item> -->
 
       <!--<nz-form-item>-->
-      <!--<nz-form-label>{{l("SubscriptionPrice")}}</nz-form-label>-->
+      <!--<nz-form-label>订阅价格</nz-form-label>-->
       <!--<nz-form-control>-->
       <!--<nz-radio-group name="SubscriptionPrice" nzName="SubscriptionPrice" [(ngModel)]="isFree" (ngModelChange)="resetPrices($event)" >-->
-      <!--<label nz-radio nzValue="true">{{l("Free")}}</label>-->
-      <!--<label nz-radio nzValue="false">{{l("Paid")}}</label>-->
+      <!--<label nz-radio nzValue="true">免费</label>-->
+      <!--<label nz-radio nzValue="false">支付</label>-->
       <!--</nz-radio-group>-->
       <!--</nz-form-control>-->
       <!--</nz-form-item>-->
 
     </nz-tab>
 
-    <nz-tab nzTitle="{{l('Features')}}">
+    <nz-tab nzTitle="'特性参数列表'">
       <edition-feature-tree #featureTree></edition-feature-tree>
     </nz-tab>
   </nz-tabset>
diff --git a/src/app/admin/editions/editions.component.ts b/src/app/admin/editions/editions.component.ts
index 5d5b5fd..2af8f46 100644
--- a/src/app/admin/editions/editions.component.ts
+++ b/src/app/admin/editions/editions.component.ts
@@ -64,12 +64,12 @@ export class EditionsComponent extends PagedListingComponentBase<EditionListDto>
   delete(entity: EditionListDto) {
     this.message.confirm(
       this.l('EditionDeleteWarningMessage', entity.displayName),
-      this.l('MessageConfirmOperation'),
+      '确认操作',
       isConfirmed => {
           if (isConfirmed) {
               this._editionService.deleteEdition(entity.id).subscribe(() => {
                   this.refresh();
-                  this.notify.success(this.l('SuccessfullyDeleted'));
+                  this.notify.success('删除成功.');
               });
           }
       }
diff --git a/src/app/admin/host-settings/host-settings.component.html b/src/app/admin/host-settings/host-settings.component.html
index 4cfcd9c..dca3c8a 100644
--- a/src/app/admin/host-settings/host-settings.component.html
+++ b/src/app/admin/host-settings/host-settings.component.html
@@ -205,7 +205,7 @@
                 email maxlength="128">
 
               <nz-form-explain *ngIf="defaultFromAddressInput.control.dirty&&defaultFromAddressInput.control.errors">
-                <ng-container *ngIf="defaultFromAddressInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+                <ng-container *ngIf="defaultFromAddressInput.control.hasError('required')">请填写此项内容</ng-container>
                 <ng-container *ngIf="defaultFromAddressInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
                 <ng-container *ngIf="defaultFromAddressInput.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
               </nz-form-explain>
@@ -220,7 +220,7 @@
               <input nz-input #defaultFromDisplayNameInput="ngModel" name="DefaultFromDisplayName" [(ngModel)]="hostSettings.email.defaultFromDisplayName"
                 maxlength="128">
               <nz-form-explain *ngIf="defaultFromDisplayNameInput.control.dirty&&defaultFromDisplayNameInput.control.errors">
-                <ng-container *ngIf="defaultFromDisplayNameInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+                <ng-container *ngIf="defaultFromDisplayNameInput.control.hasError('required')">请填写此项内容</ng-container>
                 <ng-container *ngIf="defaultFromDisplayNameInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
                 <ng-container *ngIf="defaultFromDisplayNameInput.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
               </nz-form-explain>
@@ -234,7 +234,7 @@
               <input nz-input #smtpHostInput="ngModel" name="SmtpHost" [(ngModel)]="hostSettings.email.smtpHost"
                 required maxlength="64">
               <nz-form-explain *ngIf="smtpHostInput.control.dirty&&smtpHostInput.control.errors">
-                <ng-container *ngIf="smtpHostInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+                <ng-container *ngIf="smtpHostInput.control.hasError('required')">请填写此项内容</ng-container>
                 <ng-container *ngIf="smtpHostInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
                 <ng-container *ngIf="smtpHostInput.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
               </nz-form-explain>
@@ -247,7 +247,7 @@
             <nz-form-control>
               <input nz-input type="number" #smtpPortInput="ngModel" name="SmtpPort" [(ngModel)]="hostSettings.email.smtpPort">
               <nz-form-explain *ngIf="smtpPortInput.control.dirty&&smtpPortInput.control.errors">
-                <ng-container *ngIf="smtpPortInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+                <ng-container *ngIf="smtpPortInput.control.hasError('required')">请填写此项内容</ng-container>
                 <ng-container *ngIf="smtpPortInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
                 <ng-container *ngIf="smtpPortInput.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
               </nz-form-explain>
@@ -267,7 +267,7 @@
               <input nz-input #smtpDomainNameInput="ngModel" name="SmtpDomainName" [(ngModel)]="hostSettings.email.smtpDomain"
                 maxlength="128">
               <nz-form-explain *ngIf="smtpDomainNameInput.control.dirty&&smtpDomainNameInput.control.errors">
-                <ng-container *ngIf="smtpDomainNameInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+                <ng-container *ngIf="smtpDomainNameInput.control.hasError('required')">请填写此项内容</ng-container>
                 <ng-container *ngIf="smtpDomainNameInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
                 <ng-container *ngIf="smtpDomainNameInput.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
               </nz-form-explain>
@@ -281,7 +281,7 @@
               <input nz-input #smtpUserNameInput="ngModel" name="SmtpUserName" [(ngModel)]="hostSettings.email.smtpUserName"
                 maxlength="128">
               <nz-form-explain *ngIf="smtpUserNameInput.control.dirty&&smtpUserNameInput.control.errors">
-                <ng-container *ngIf="smtpUserNameInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+                <ng-container *ngIf="smtpUserNameInput.control.hasError('required')">请填写此项内容</ng-container>
                 <ng-container *ngIf="smtpUserNameInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
                 <ng-container *ngIf="smtpUserNameInput.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
               </nz-form-explain>
@@ -295,7 +295,7 @@
               <input nz-input type="password" #smtpPasswordInput="ngModel" name="SmtpPassword" [(ngModel)]="hostSettings.email.smtpPassword"
                 maxlength="128">
               <nz-form-explain *ngIf="smtpPasswordInput.control.dirty&&smtpPasswordInput.control.errors">
-                <ng-container *ngIf="smtpPasswordInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+                <ng-container *ngIf="smtpPasswordInput.control.hasError('required')">请填写此项内容</ng-container>
                 <ng-container *ngIf="smtpPasswordInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
                 <ng-container *ngIf="smtpPasswordInput.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
               </nz-form-explain>
diff --git a/src/app/admin/language-texts/edit-language-text/edit-language-text.component.html b/src/app/admin/language-texts/edit-language-text/edit-language-text.component.html
index e2d401b..526be59 100644
--- a/src/app/admin/language-texts/edit-language-text/edit-language-text.component.html
+++ b/src/app/admin/language-texts/edit-language-text/edit-language-text.component.html
@@ -1,12 +1,12 @@
 <div class="modal-header">
   <div class="modal-title">
     <i class="anticon anticon-form mr-sm"></i>
-    <span>{{l("EditText")}}</span>
+    <span>编辑文本</span>
   </div>
 </div>
 <div>
   <div>
-    <p>{{l("Key")}}</p>
+    <p>键值</p>
     <p>
       <strong>{{data.key}}</strong>
     </p>
@@ -33,10 +33,10 @@
 
 <div class="modal-footer">
   <button nz-button type="button" [disabled]="saving" (click)="close()">
-    {{l("Cancel")}}
+    取消
   </button>
   <button nz-button [nzType]="'primary'" type="button" (click)="save()">
     <!-- <button nz-button [nzType]="'primary'" type="button"  (click)="save()" [disabled]="!validateForm.valid"> -->
-    {{l("Save")}}
+    保存
   </button>
 </div>
diff --git a/src/app/admin/languages/create-or-edit-language/create-or-edit-language.component.html b/src/app/admin/languages/create-or-edit-language/create-or-edit-language.component.html
index 693b5c6..f3927da 100644
--- a/src/app/admin/languages/create-or-edit-language/create-or-edit-language.component.html
+++ b/src/app/admin/languages/create-or-edit-language/create-or-edit-language.component.html
@@ -23,7 +23,7 @@
           <nz-option *ngFor="let option of languageNames" [nzLabel]="option.displayText" [nzValue]="option.value"></nz-option>
         </nz-select>
         <nz-form-explain *ngIf="languageName.control.dirty&&languageName.control.errors">
-          <ng-container *ngIf="languageName.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+          <ng-container *ngIf="languageName.control.hasError('required')">请填写此项内容</ng-container>
         </nz-form-explain>
       </nz-form-control>
     </nz-form-item>
@@ -46,7 +46,7 @@
           </nz-option>
         </nz-select>
         <nz-form-explain *ngIf="languageIcon.control.dirty&&languageIcon.control.errors">
-          <ng-container *ngIf="languageIcon.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+          <ng-container *ngIf="languageIcon.control.hasError('required')">请填写此项内容</ng-container>
         </nz-form-explain>
       </nz-form-control>
     </nz-form-item> -->
@@ -67,11 +67,11 @@
     <!-- 功能按钮 -->
     <div class="modal-footer">
       <button nz-button [nzType]="'default'" type="button" (click)="close()" [disabled]="saving">
-        <i class="anticon anticon-close-circle-o"></i> {{l("Cancel")}}
+        <i class="anticon anticon-close-circle-o"></i> 取消
       </button>
       <button nz-button [nzType]="'primary'" type="submit" [disabled]="!languageCreateOrEditForm.form.valid || saving"
         [nzLoading]="saving">
-        <i class="anticon anticon-save" *ngIf="!saving"></i> {{l("Save")}}
+        <i class="anticon anticon-save" *ngIf="!saving"></i> 保存
       </button>
 
 
diff --git a/src/app/admin/organization-units/add-member/add-member.component.html b/src/app/admin/organization-units/add-member/add-member.component.html
index 4612442..81e19d1 100644
--- a/src/app/admin/organization-units/add-member/add-member.component.html
+++ b/src/app/admin/organization-units/add-member/add-member.component.html
@@ -73,10 +73,10 @@
 
       <div class="modal-footer">
         <button nz-button [nzType]="'default'" type="button" (click)="close($event)" [disabled]="saving">
-          <i class="anticon anticon-close-circle-o"></i> {{l("Cancel")}}
+          <i class="anticon anticon-close-circle-o"></i> 取消
         </button>
         <button nz-button [nzType]="'primary'" [disabled]="saving" [nzLoading]="saving" (click)="addUsersToOrganizationUnit()">
-          <i class="anticon anticon-save" *ngIf="!saving"></i> {{l("Save")}}
+          <i class="anticon anticon-save" *ngIf="!saving"></i> 保存
         </button>
       </div>
 
diff --git a/src/app/admin/organization-units/create-or-edit-organiaztion-unit/create-or-edit-organiaztion-unit.component.html b/src/app/admin/organization-units/create-or-edit-organiaztion-unit/create-or-edit-organiaztion-unit.component.html
index 9c5d651..becbb0a 100644
--- a/src/app/admin/organization-units/create-or-edit-organiaztion-unit/create-or-edit-organiaztion-unit.component.html
+++ b/src/app/admin/organization-units/create-or-edit-organiaztion-unit/create-or-edit-organiaztion-unit.component.html
@@ -21,7 +21,7 @@
         </nz-input-group>
 
         <nz-form-explain *ngIf="organizationUnitDisplayName.control.dirty&&organizationUnitDisplayName.control.errors">
-          <ng-container *ngIf="organizationUnitDisplayName.control.hasError('required')">{{l('ThisFieldIsRequired')}}
+          <ng-container *ngIf="organizationUnitDisplayName.control.hasError('required')">请填写此项内容
           </ng-container>
           <ng-container *ngIf="organizationUnitDisplayName.control.hasError('minlength')">{{l('MinLength')}}
           </ng-container>
@@ -34,11 +34,11 @@
 
   <div class="modal-footer">
     <button nz-button [nzType]="'default'" type="button" (click)="close($event)" [disabled]="saving">
-      <i class="anticon anticon-close-circle-o"></i> {{l("Cancel")}}
+      <i class="anticon anticon-close-circle-o"></i> 取消
     </button>
     <button nz-button [nzType]="'primary'" type="submit" [disabled]="!organizationCreateOrEditForm.form.valid || saving"
       [nzLoading]="saving">
-      <i class="anticon anticon-save" *ngIf="!saving"></i> {{l("Save")}}
+      <i class="anticon anticon-save" *ngIf="!saving"></i> 保存
     </button>
   </div>
 
diff --git a/src/app/admin/roles/create-or-edit-role/create-or-edit-role.component.html b/src/app/admin/roles/create-or-edit-role/create-or-edit-role.component.html
index 3a17eed..b87981d 100644
--- a/src/app/admin/roles/create-or-edit-role/create-or-edit-role.component.html
+++ b/src/app/admin/roles/create-or-edit-role/create-or-edit-role.component.html
@@ -3,8 +3,8 @@
   <div class="modal-header">
     <div class="modal-title">
       <i class="anticon anticon-medicine-box mr-sm"></i>
-      <span *ngIf="role.id">{{l('EditRole')}}:{{role.displayName}}</span>
-      <span *ngIf="!role.id">{{l('CreateNewRole')}}</span>
+      <span *ngIf="role.id">修改角色:{{role.displayName}}</span>
+      <span *ngIf="!role.id">添加角色</span>
     </div>
   </div>
   <!-- 模态框内部部分 -->
@@ -30,7 +30,7 @@
                 [placeholder]="l('RoleName')" required maxlength="64">
             </nz-input-group>
             <nz-form-explain *ngIf="roleNameInput.control.dirty&&roleNameInput.control.errors">
-              <ng-container *ngIf="roleNameInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}
+              <ng-container *ngIf="roleNameInput.control.hasError('required')">请填写此项内容
               </ng-container>
               <ng-container *ngIf="roleNameInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
               <ng-container *ngIf="roleNameInput.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
@@ -70,11 +70,11 @@
   <!-- 模态框底部 -->
   <div class="modal-footer">
     <button nz-button [nzType]="'default'" type="button" (click)="close($event)" [disabled]="saving">
-      <i class="anticon anticon-close-circle-o"></i> {{l("Cancel")}}
+      <i class="anticon anticon-close-circle-o"></i> 取消
     </button>
     <button nz-button [nzType]="'primary'" type="submit" [disabled]="!roleCreateOrEditForm.form.valid|| saving"
       [nzLoading]="saving">
-      <i class="anticon anticon-save" *ngIf="!saving"></i> {{l("Save")}}
+      <i class="anticon anticon-save" *ngIf="!saving"></i> 保存
     </button>
   </div>
 
diff --git a/src/app/admin/tenant-settings/tenant-settings.component.html b/src/app/admin/tenant-settings/tenant-settings.component.html
index 3c28699..e6d16c1 100644
--- a/src/app/admin/tenant-settings/tenant-settings.component.html
+++ b/src/app/admin/tenant-settings/tenant-settings.component.html
@@ -110,7 +110,7 @@
                                 <input nz-input #ldapDomainNameInput="ngModel" name="LdapDomainName" [(ngModel)]="settings.ldap.domain"
                                     [placeholder]="l('DomainName')" maxlength="128">
                                 <nz-form-explain *ngIf="ldapDomainNameInput.control.dirty&&ldapDomainNameInput.control.errors">
-                                    <ng-container *ngIf="ldapDomainNameInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+                                    <ng-container *ngIf="ldapDomainNameInput.control.hasError('required')">请填写此项内容</ng-container>
                                     <ng-container *ngIf="ldapDomainNameInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
                                     <ng-container *ngIf="ldapDomainNameInput.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
                                 </nz-form-explain>
@@ -124,7 +124,7 @@
                                 <input nz-input #ldapUserNameInput="ngModel" name="LdapUserName" [(ngModel)]="settings.ldap.userName"
                                     [placeholder]="l('UserName')"  maxlength="128">
                                 <nz-form-explain *ngIf="ldapUserNameInput.control.dirty&&ldapUserNameInput.control.errors">
-                                    <ng-container *ngIf="ldapUserNameInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+                                    <ng-container *ngIf="ldapUserNameInput.control.hasError('required')">请填写此项内容</ng-container>
                                     <ng-container *ngIf="ldapUserNameInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
                                     <ng-container *ngIf="ldapUserNameInput.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
                                 </nz-form-explain>
@@ -138,7 +138,7 @@
                                 <input nz-input #ldapPasswordInput="ngModel" name="LdapPassword" [(ngModel)]="settings.ldap.password"
                                     [placeholder]="l('Password')" maxlength="128">
                                 <nz-form-explain *ngIf="ldapPasswordInput.control.dirty&&ldapPasswordInput.control.errors">
-                                    <ng-container *ngIf="ldapPasswordInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+                                    <ng-container *ngIf="ldapPasswordInput.control.hasError('required')">请填写此项内容</ng-container>
                                     <ng-container *ngIf="ldapPasswordInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
                                     <ng-container *ngIf="ldapPasswordInput.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
                                 </nz-form-explain>
@@ -234,7 +234,7 @@
                             <input nz-input #defaultFromAddressInput="ngModel" name="DefaultFromAddress" [(ngModel)]="settings.email.defaultFromAddress"
                                email maxlength="128">
                             <nz-form-explain *ngIf="defaultFromAddressInput.control.dirty&&defaultFromAddressInput.control.errors">
-                                <ng-container *ngIf="defaultFromAddressInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+                                <ng-container *ngIf="defaultFromAddressInput.control.hasError('required')">请填写此项内容</ng-container>
                                 <ng-container *ngIf="defaultFromAddressInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
                                 <ng-container *ngIf="defaultFromAddressInput.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
                             </nz-form-explain>
@@ -249,7 +249,7 @@
                                 [(ngModel)]="settings.email.defaultFromDisplayName" 
                                 maxlength="128">
                             <nz-form-explain *ngIf="defaultFromDisplayNameInput.control.dirty&&defaultFromDisplayNameInput.control.errors">
-                                <ng-container *ngIf="defaultFromDisplayNameInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+                                <ng-container *ngIf="defaultFromDisplayNameInput.control.hasError('required')">请填写此项内容</ng-container>
                                 <ng-container *ngIf="defaultFromDisplayNameInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
                                 <ng-container *ngIf="defaultFromDisplayNameInput.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
                             </nz-form-explain>
@@ -263,7 +263,7 @@
                             <input nz-input #smtpHostInput="ngModel" name="SmtpHost" [(ngModel)]="settings.email.smtpHost"
                                maxlength="64">
                             <nz-form-explain *ngIf="smtpHostInput.control.dirty&&smtpHostInput.control.errors">
-                                <ng-container *ngIf="smtpHostInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+                                <ng-container *ngIf="smtpHostInput.control.hasError('required')">请填写此项内容</ng-container>
                                 <ng-container *ngIf="smtpHostInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
                                 <ng-container *ngIf="smtpHostInput.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
                             </nz-form-explain>
@@ -292,7 +292,7 @@
                             <input nz-input #smtpDomainNameInput="ngModel" name="SmtpDomainName" [(ngModel)]="settings.email.smtpDomain"
                                maxlength="128">
                             <nz-form-explain *ngIf="smtpDomainNameInput.control.dirty&&smtpDomainNameInput.control.errors">
-                                <ng-container *ngIf="smtpDomainNameInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+                                <ng-container *ngIf="smtpDomainNameInput.control.hasError('required')">请填写此项内容</ng-container>
                                 <ng-container *ngIf="smtpDomainNameInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
                                 <ng-container *ngIf="smtpDomainNameInput.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
                             </nz-form-explain>
@@ -306,7 +306,7 @@
                             <input nz-input #smtpUserNameInput="ngModel" name="SmtpUserName" [(ngModel)]="settings.email.smtpUserName"
                                maxlength="128">
                             <nz-form-explain *ngIf="smtpUserNameInput.control.dirty&&smtpUserNameInput.control.errors">
-                                <ng-container *ngIf="smtpUserNameInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+                                <ng-container *ngIf="smtpUserNameInput.control.hasError('required')">请填写此项内容</ng-container>
                                 <ng-container *ngIf="smtpUserNameInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
                                 <ng-container *ngIf="smtpUserNameInput.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
                             </nz-form-explain>
@@ -320,7 +320,7 @@
                             <input nz-input type="password" #smtpPasswordInput="ngModel" name="SmtpPassword"
                                 [(ngModel)]="settings.email.smtpPassword" maxlength="128">
                             <nz-form-explain *ngIf="smtpPasswordInput.control.dirty&&smtpPasswordInput.control.errors">
-                                <ng-container *ngIf="smtpPasswordInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+                                <ng-container *ngIf="smtpPasswordInput.control.hasError('required')">请填写此项内容</ng-container>
                                 <ng-container *ngIf="smtpPasswordInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
                                 <ng-container *ngIf="smtpPasswordInput.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
                             </nz-form-explain>
diff --git a/src/app/admin/tenants/create-tenant/create-tenant.component.html b/src/app/admin/tenants/create-tenant/create-tenant.component.html
index ad6902e..fdd9abb 100644
--- a/src/app/admin/tenants/create-tenant/create-tenant.component.html
+++ b/src/app/admin/tenants/create-tenant/create-tenant.component.html
@@ -12,7 +12,7 @@
         <input nz-input name="tenancyName" #tenancyName="ngModel" [(ngModel)]="model.tenancyName" [placeholder]="l('TenancyName')"
           required>
         <nz-form-explain *ngIf="tenancyName.control.dirty&&tenancyName.control.errors">
-          <ng-container *ngIf="tenancyName.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+          <ng-container *ngIf="tenancyName.control.hasError('required')">请填写此项内容</ng-container>
         </nz-form-explain>
       </nz-form-control>
     </nz-form-item>
@@ -23,7 +23,7 @@
       <nz-form-control nzHasFeedback>
         <input nz-input name="name" #name="ngModel" [(ngModel)]="model.name" [placeholder]="l('Name')" required>
         <nz-form-explain *ngIf="name.control.dirty&&name.control.errors">
-          <ng-container *ngIf="name.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+          <ng-container *ngIf="name.control.hasError('required')">请填写此项内容</ng-container>
         </nz-form-explain>
       </nz-form-control>
     </nz-form-item>
@@ -47,10 +47,10 @@
       <nz-form-label nzFor="adminEmailAddress" nzRequired>{{l('AdminEmailAddress')}}</nz-form-label>
       <nz-form-control nzHasFeedback>
         <input nz-input type="email" name="adminEmailAddress" #adminEmailAddress="ngModel" [(ngModel)]="model.adminEmailAddress"
-          [placeholder]="l('EmailAddress')" required email>
+          [placeholder]="'邮箱地址'" required email>
         <nz-form-explain *ngIf="adminEmailAddress.control.dirty&&adminEmailAddress.control.errors">
           <ng-container *ngIf="adminEmailAddress.control.hasError('email')">{{l('NotEmail')}}</ng-container>
-          <ng-container *ngIf="adminEmailAddress.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+          <ng-container *ngIf="adminEmailAddress.control.hasError('required')">请填写此项内容</ng-container>
         </nz-form-explain>
       </nz-form-control>
     </nz-form-item>
@@ -66,14 +66,14 @@
 
     <!-- 租户管理员密码 -->
     <nz-form-item *ngIf="!useDefaultPassword">
-      <nz-form-label nzFor="password" nzRequired>{{l('Password')}}</nz-form-label>
+      <nz-form-label nzFor="password" nzRequired>密码</nz-form-label>
       <nz-form-control nzHasFeedback>
-        <input nz-input name="password" #passwordInput="ngModel" [(ngModel)]="model.adminPassword" [placeholder]="l('Password')"
+        <input nz-input name="password" #passwordInput="ngModel" [(ngModel)]="model.adminPassword" [placeholder]="'密码'"
           type="password" validateEqual="confirmPassword" reverse="true" required minlength="6" maxlength="32">
         <nz-form-explain *ngIf="passwordInput.control.dirty&&passwordInput.control.errors">
           <ng-container *ngIf="passwordInput.control.hasError('minlength')">{{l('minlength')}}</ng-container>
           <ng-container *ngIf="passwordInput.control.hasError('maxlength')">{{l('maxlength')}}</ng-container>
-          <ng-container *ngIf="passwordInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+          <ng-container *ngIf="passwordInput.control.hasError('required')">请填写此项内容</ng-container>
         </nz-form-explain>
       </nz-form-control>
     </nz-form-item>
@@ -85,7 +85,7 @@
         <input nz-input name="confirmPassword" #confirmPasswordInput='ngModel' [(ngModel)]="confirmPassword"
           [placeholder]="l('ConfirmPassword')" type="password" validateEqual="password" reverse="false" required>
         <nz-form-explain *ngIf="confirmPasswordInput.control.dirty&&confirmPasswordInput.control.errors">
-          <ng-container *ngIf="confirmPasswordInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+          <ng-container *ngIf="confirmPasswordInput.control.hasError('required')">请填写此项内容</ng-container>
           <ng-container *ngIf="confirmPasswordInput.control.hasError('validateEqual')">{{l('PasswordInconsistent')}}</ng-container>
         </nz-form-explain>
       </nz-form-control>
@@ -112,7 +112,7 @@
         <nz-date-picker name="subscriptionEndUtc" #subscriptionEndUtcInput="ngModel" [(ngModel)]="model.subscriptionEndUtc"
           required></nz-date-picker>
         <nz-form-explain *ngIf="subscriptionEndUtcInput.control.dirty&&subscriptionEndUtcInput.control.errors">
-          <ng-container *ngIf="subscriptionEndUtcInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+          <ng-container *ngIf="subscriptionEndUtcInput.control.hasError('required')">请填写此项内容</ng-container>
         </nz-form-explain>
       </nz-form-control>
     </nz-form-item>
@@ -143,10 +143,10 @@
     <!-- 功能按钮 -->
     <div class="modal-footer">
       <button nz-button type="button" [disabled]="saving" (click)="close()">
-        {{l("Cancel")}}
+        取消
       </button>
       <button nz-button [nzType]="'primary'" type="submit" [disabled]="!validateForm.valid||saving">
-        {{l("Save")}}
+        保存
       </button>
     </div>
 
diff --git a/src/app/admin/tenants/edit-tenant-features/edit-tenant-features.component.html b/src/app/admin/tenants/edit-tenant-features/edit-tenant-features.component.html
index e0e909c..2b6e50c 100644
--- a/src/app/admin/tenants/edit-tenant-features/edit-tenant-features.component.html
+++ b/src/app/admin/tenants/edit-tenant-features/edit-tenant-features.component.html
@@ -12,11 +12,11 @@
         </button>
         <button nz-button type="button" [disabled]="saving || resettingFeatures"
                 (click)="close()">
-            {{l("Cancel")}}
+            取消
         </button>
         <button nz-button type="submit" [disabled]="resettingFeatures" [nzLoading]="saving"
                 [nzType]="'primary'">
-            <i class="anticon anticon-save"></i> <span>{{l("Save")}}</span>
+            <i class="anticon anticon-save"></i> <span>保存</span>
         </button>
     </div>
 </form>
diff --git a/src/app/admin/tenants/edit-tenant/edit-tenant.component.html b/src/app/admin/tenants/edit-tenant/edit-tenant.component.html
index 2f0b4ab..897f9f0 100644
--- a/src/app/admin/tenants/edit-tenant/edit-tenant.component.html
+++ b/src/app/admin/tenants/edit-tenant/edit-tenant.component.html
@@ -14,7 +14,7 @@
       <nz-form-control nzHasFeedback>
         <input nz-input name="name" #name="ngModel" [(ngModel)]="entity.name" [placeholder]="l('Name')" required>
         <nz-form-explain *ngIf="name.control.dirty&&name.control.errors">
-          <ng-container *ngIf="name.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+          <ng-container *ngIf="name.control.hasError('required')">请填写此项内容</ng-container>
         </nz-form-explain>
       </nz-form-control>
     </nz-form-item>
@@ -26,7 +26,7 @@
         <input nz-input name="connectionString" #connectionString="ngModel" [(ngModel)]="entity.connectionString"
           [placeholder]="l('DatabaseConnectionString')+l('Optional')" required>
         <nz-form-explain *ngIf="connectionString.control.dirty&&connectionString.control.errors">
-          <ng-container *ngIf="connectionString.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+          <ng-container *ngIf="connectionString.control.hasError('required')">请填写此项内容</ng-container>
         </nz-form-explain>
       </nz-form-control>
     </nz-form-item>
@@ -51,7 +51,7 @@
         <nz-date-picker name="subscriptionEndUtc" #subscriptionEndUtcInput="ngModel" [(ngModel)]="subscriptionEndUtc"
           required></nz-date-picker>
         <nz-form-explain *ngIf="subscriptionEndUtcInput.control.dirty&&subscriptionEndUtcInput.control.errors">
-          <ng-container *ngIf="subscriptionEndUtcInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+          <ng-container *ngIf="subscriptionEndUtcInput.control.hasError('required')">请填写此项内容</ng-container>
         </nz-form-explain>
       </nz-form-control>
     </nz-form-item>
@@ -71,10 +71,10 @@
     <!-- 功能按钮 -->
     <div class="modal-footer">
       <button nz-button type="button" [disabled]="saving" (click)="close()">
-        {{l("Cancel")}}
+        取消
       </button>
       <button nz-button [nzType]="'primary'" type="submit" [disabled]="!validateForm.valid||saving">
-        {{l("Save")}}
+        保存
       </button>
     </div>
 
diff --git a/src/app/admin/users/create-or-edit-user/create-or-edit-user.component.html b/src/app/admin/users/create-or-edit-user/create-or-edit-user.component.html
index dfe2a2a..080545b 100644
--- a/src/app/admin/users/create-or-edit-user/create-or-edit-user.component.html
+++ b/src/app/admin/users/create-or-edit-user/create-or-edit-user.component.html
@@ -29,7 +29,7 @@
                 </nz-input-group>
                 <nz-form-explain *ngIf="isAdmin">{{l('ThisAdminUser')}}</nz-form-explain>
                 <nz-form-explain *ngIf="!isAdmin&&userNameInput.control.dirty&&userNameInput.control.errors">
-                  <ng-container *ngIf="userNameInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}
+                  <ng-container *ngIf="userNameInput.control.hasError('required')">请填写此项内容
                   </ng-container>
                   <ng-container *ngIf="userNameInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
                   <ng-container *ngIf="userNameInput.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
@@ -63,10 +63,10 @@
           <nz-form-control nz-col [nzSm]="20" nzHasFeedback>
             <nz-input-group nzPrefixIcon="anticon anticon-mail">
               <input nz-input #emailAddressInput="ngModel" name="emailAddress" [(ngModel)]="user.emailAddress"
-                [placeholder]="l('EmailAddress')" type="email" required maxlength="256" email>
+                [placeholder]="'邮箱地址'" type="email" required maxlength="256" email>
             </nz-input-group>
             <nz-form-explain *ngIf="emailAddressInput.control.dirty&&emailAddressInput.control.errors">
-              <ng-container *ngIf="emailAddressInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}
+              <ng-container *ngIf="emailAddressInput.control.hasError('required')">请填写此项内容
               </ng-container>
               <ng-container *ngIf="emailAddressInput.control.hasError('email')">{{l('InvalidEmailAddress')}}
               </ng-container>
@@ -84,7 +84,7 @@
                 [placeholder]="l('PhoneNumber')" maxlength="24">
             </nz-input-group>
             <nz-form-explain *ngIf="phoneNumberInput.control.dirty&&phoneNumberInput.control.errors">
-              <ng-container *ngIf="phoneNumberInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}
+              <ng-container *ngIf="phoneNumberInput.control.hasError('required')">请填写此项内容
               </ng-container>
               <ng-container *ngIf="phoneNumberInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
               <ng-container *ngIf="phoneNumberInput.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
@@ -120,11 +120,11 @@
           <nz-form-control nz-col [nzSm]="20" nzHasFeedback>
             <nz-input-group nzPrefixIcon="anticon anticon-lock">
               <input nz-input type="password" name="password" #password="ngModel" [(ngModel)]="user.password"
-                [placeholder]="l('Password')" validateEqual="passwordRepeat" reverse="true"
+                [placeholder]="'密码'" validateEqual="passwordRepeat" reverse="true"
                 [required]="!user.id && !setRandomPassword" minlength="6" maxlength="32">
             </nz-input-group>
             <nz-form-explain *ngIf="password.control.dirty&&password.control.errors">
-              <ng-container *ngIf="password.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+              <ng-container *ngIf="password.control.hasError('required')">请填写此项内容</ng-container>
               <ng-container *ngIf="password.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
               <ng-container *ngIf="password.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
             </nz-form-explain>
@@ -142,7 +142,7 @@
                 reverse="false" [required]="!user.id && !setRandomPassword" minlength="6" maxlength="32">
             </nz-input-group>
             <nz-form-explain *ngIf="passwordRepeat.control.dirty&&passwordRepeat.control.errors">
-              <ng-container *ngIf="passwordRepeat.control.hasError('validateEqual')">{{l('PasswordsDontMatch')}}
+              <ng-container *ngIf="passwordRepeat.control.hasError('validateEqual')">两次密码不一致
               </ng-container>
             </nz-form-explain>
           </nz-form-control>
@@ -221,12 +221,12 @@
   <div class="modal-footer">
     <!-- {{roles | json}} -->
     <button nz-button [nzType]="'default'" type="button" (click)="close($event)" [disabled]="saving">
-      <i class="anticon anticon-close-circle-o"></i> {{l("Cancel")}}
+      <i class="anticon anticon-close-circle-o"></i> 取消
     </button>
 
     <button nz-button [nzType]="'primary'" type="submit" [disabled]="!validateForm.form.valid || saving"
       [nzLoading]="saving">
-      <i class="anticon anticon-save" *ngIf="!saving"></i> {{l("Save")}}
+      <i class="anticon anticon-save" *ngIf="!saving"></i> 保存
     </button>
   </div>
 
diff --git a/src/app/admin/users/edit-user-permissions/edit-user-permissions.component.html b/src/app/admin/users/edit-user-permissions/edit-user-permissions.component.html
index f6ad114..1d2f6fb 100644
--- a/src/app/admin/users/edit-user-permissions/edit-user-permissions.component.html
+++ b/src/app/admin/users/edit-user-permissions/edit-user-permissions.component.html
@@ -27,12 +27,12 @@
     </button>
 
     <button nz-button [nzType]="'default'" type="button" (click)="close($event)" [disabled]="saving || resettingPermissions">
-      <i class="anticon anticon-close-circle-o"></i> {{l("Cancel")}}
+      <i class="anticon anticon-close-circle-o"></i> 取消
     </button>
 
     <button nz-button [nzType]="'primary'" type="submit" [disabled]="!editUserPermissionsForm.form.valid || saving || resettingPermissions"
       [nzLoading]="saving">
-      <i class="anticon anticon-save" *ngIf="!saving"></i> {{l("Save")}}
+      <i class="anticon anticon-save" *ngIf="!saving"></i> 保存
     </button>
   </div>
 
diff --git a/src/app/admin/users/users.component.html b/src/app/admin/users/users.component.html
index 96ac7ef..3e33a8b 100644
--- a/src/app/admin/users/users.component.html
+++ b/src/app/admin/users/users.component.html
@@ -105,7 +105,7 @@
           </th>
 
           <th nzShowSort nzSortKey="emailAddress">
-            <span>{{l('EmailAddress')}}</span>
+            <span>{{'邮箱地址'}}</span>
           </th>
           <th nzShowSort nzSortKey="isEmailConfirmed" nzShowFilter [nzFilterMultiple]="false" [nzFilters]="booleanFilterList"
             (nzFilterChange)="isEmailConfirmedFilter($event)" class="text-center">
diff --git a/src/app/main/advertising/advertising.component.html b/src/app/main/advertising/advertising.component.html
index 6d755ef..a756c48 100644
--- a/src/app/main/advertising/advertising.component.html
+++ b/src/app/main/advertising/advertising.component.html
@@ -70,6 +70,6 @@
 <!-- 功能按钮 -->
 <div class="modal-footer">
   <button nz-button type="button" (click)="close()">
-    {{l("Cancel")}}
+    取消
   </button>
 </div>
diff --git a/src/layout/default/profile/change-password-modal.component.html b/src/layout/default/profile/change-password-modal.component.html
index b7b4564..02b5b47 100644
--- a/src/layout/default/profile/change-password-modal.component.html
+++ b/src/layout/default/profile/change-password-modal.component.html
@@ -1,5 +1,5 @@
 <div class="modal-header">
-  <div class="modal-title">{{l('ChangePassword')}}</div>
+  <div class="modal-title">修改密码</div>
 </div>
 
 <form nz-form #validateForm="ngForm" (ngSubmit)="save()"  autocomplete="off">
@@ -10,7 +10,7 @@
       <input nz-input name="currentPassword" #currentPassword="ngModel" [(ngModel)]="input.currentPassword"
         [placeholder]="l('CurrentPassword')" type="password" required>
       <nz-form-explain *ngIf="currentPassword.control.dirty&&currentPassword.control.errors">
-        <ng-container *ngIf="currentPassword.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+        <ng-container *ngIf="currentPassword.control.hasError('required')">请填写此项内容</ng-container>
       </nz-form-explain>
     </nz-form-control>
   </nz-form-item>
@@ -22,7 +22,7 @@
       <input nz-input name="newPassword" #newPassword="ngModel" [(ngModel)]="input.newPassword" [placeholder]="l('NewPassword')"
         type="password" validateEqual=confirmNewPassword reverse="true" minlength="6" maxlength="32" required>
       <nz-form-explain *ngIf="newPassword.control.dirty&&newPassword.control.errors">
-        <ng-container *ngIf="newPassword.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+        <ng-container *ngIf="newPassword.control.hasError('required')">请填写此项内容</ng-container>
         <ng-container *ngIf="newPassword.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
         <ng-container *ngIf="newPassword.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
       </nz-form-explain>
@@ -36,7 +36,7 @@
       <input nz-input name="confirmNewPassword" #confirmNewPassword="ngModel" [(ngModel)]="confirmNewPasswordStr"
         [placeholder]="l('ConfirmPassword')" type="password" validateEqual=newPassword reverse="false" required>
       <nz-form-explain *ngIf="confirmNewPassword.control.dirty&&confirmNewPassword.control.errors">
-        <ng-container *ngIf="confirmNewPassword.control.hasError('validateEqual')">{{l('PasswordsDontMatch')}}</ng-container>
+        <ng-container *ngIf="confirmNewPassword.control.hasError('validateEqual')">两次密码不一致</ng-container>
       </nz-form-explain>
     </nz-form-control>
   </nz-form-item>
@@ -46,10 +46,10 @@
   <!-- 功能按钮 -->
   <div class="modal-footer">
     <button nz-button type="button" [disabled]="saving" (click)="close()">
-      {{l("Cancel")}}
+      取消
     </button>
     <button nz-button [nzType]="'primary'" type="submit" [disabled]="!validateForm.valid">
-      {{l("Save")}}
+      保存
     </button>
   </div>
 
diff --git a/src/layout/default/profile/my-settings-modal.component.html b/src/layout/default/profile/my-settings-modal.component.html
index 3a1407c..93afc09 100644
--- a/src/layout/default/profile/my-settings-modal.component.html
+++ b/src/layout/default/profile/my-settings-modal.component.html
@@ -9,7 +9,7 @@
       <input nz-input name="userName" #userNameInput="ngModel" [(ngModel)]="user.userName" [disabled]="isAdmin"
         autocomplete="username" required>
       <nz-form-explain *ngIf="userNameInput.control.dirty&&userNameInput.control.errors">
-        <ng-container *ngIf="userNameInput.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+        <ng-container *ngIf="userNameInput.control.hasError('required')">请填写此项内容</ng-container>
       </nz-form-explain>
       <nz-form-explain *ngIf="isAdmin">{{l('ThisAdminUser')}}</nz-form-explain>
     </nz-form-control>
@@ -23,12 +23,12 @@
   </nz-form-item>
   <!-- 邮箱地址 -->
   <nz-form-item>
-    <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="emailAddress">{{l('EmailAddress')}}</nz-form-label>
+    <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="emailAddress">{{'邮箱地址'}}</nz-form-label>
     <nz-form-control [nzSm]="14" [nzXs]="24" nzHasFeedback>
-      <input nz-input name="emailAddress" #emailAddress="ngModel" [(ngModel)]="user.emailAddress" [placeholder]="l('EmailAddress')"
+      <input nz-input name="emailAddress" #emailAddress="ngModel" [(ngModel)]="user.emailAddress" [placeholder]="'邮箱地址'"
         autocomplete="email" required email>
       <nz-form-explain *ngIf="emailAddress.control.dirty&&emailAddress.control.errors">
-        <ng-container *ngIf="emailAddress.control.hasError('required')">{{l('ThisFieldIsRequired')}}</ng-container>
+        <ng-container *ngIf="emailAddress.control.hasError('required')">请填写此项内容</ng-container>
         <ng-container *ngIf="emailAddress.control.hasError('email')">{{l('NotEmail')}}</ng-container>
       </nz-form-explain>
     </nz-form-control>
@@ -38,10 +38,10 @@
   <!-- 功能按钮 -->
   <div class="modal-footer">
     <button nz-button type="button" [disabled]="saving" (click)="close()">
-      {{l("Cancel")}}
+      取消
     </button>
     <button nz-button [nzType]="'primary'" type="submit" [disabled]="!validateForm.valid||saving">
-      {{l("Save")}}
+      保存
     </button>
   </div>
 
-- 
Gitee


From bec7167038650b4b7ab95a70fa69954be89e2138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E5=8D=8E?= <hua.fang@xin-lai.com>
Date: Tue, 26 Nov 2019 18:02:43 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=91=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=A4=9A=E8=AF=AD=E8=A8=80=E4=B8=BA=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/account/login/login.component.html        |  2 +-
 src/account/login/login.component.ts          |  2 +-
 .../passwords/forgot-password.component.ts    |  2 +-
 .../passwords/reset-password.component.html   |  4 +--
 src/account/register/register.component.html  |  8 ++---
 src/account/register/register.component.ts    |  4 +--
 .../tenant-register.component.html            |  8 ++---
 .../tenant-register.component.ts              |  2 +-
 .../tenant/tenant-change-modal.component.html | 12 ++++----
 .../tenant/tenant-change-modal.component.ts   |  2 +-
 .../tenant/tenant-change.component.html       |  6 ++--
 .../audit-logs-detail.component.html          | 30 +++++++++----------
 .../audit-logs/audit-logs.component.html      | 16 +++++-----
 .../admin/audit-logs/audit-logs.component.ts  | 22 +++++++-------
 .../common-lookup.component.html              | 12 ++++----
 .../create-or-edit-edition.component.html     |  4 +--
 .../create-or-edit-edition.component.ts       |  2 +-
 .../host-settings.component.html              |  6 ++--
 .../create-or-edit-role.component.html        |  4 +--
 .../tenant-settings.component.html            |  2 +-
 20 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/src/account/login/login.component.html b/src/account/login/login.component.html
index d99ee6e..30575e2 100644
--- a/src/account/login/login.component.html
+++ b/src/account/login/login.component.html
@@ -16,7 +16,7 @@
           <p class="login-p"><i nz-icon [type]="'password'" theme="fill"></i>密码</p>
           <nz-form-control>
             <nz-input-group>
-              <input class="login-input" nz-input [(ngModel)]="loginService.authenticateModel.password" [placeholder]="l('Password')" type="password" required maxlength="32" style="border-radius:5px;height: 35px;" formControlName="password">
+              <input class="login-input" nz-input [(ngModel)]="loginService.authenticateModel.password" [placeholder]="'密码'" type="password" required maxlength="32" style="border-radius:5px;height: 35px;" formControlName="password">
             </nz-input-group>
           </nz-form-control>
         </nz-form-item>
diff --git a/src/account/login/login.component.ts b/src/account/login/login.component.ts
index 10424ce..f100b98 100644
--- a/src/account/login/login.component.ts
+++ b/src/account/login/login.component.ts
@@ -82,7 +82,7 @@ export class LoginComponent extends AppComponentBase implements OnInit {
   }
 
   ngOnInit(): void {
-    this.titleSrvice.setTitle(this.l('LogIn'));
+    this.titleSrvice.setTitle('登录');
     if (this._abpSessionService.userId > 0 && UrlHelper.getReturnUrl()) {
       this._sessionAppService.updateUserSignInToken()
         .subscribe((result: UpdateUserSignInTokenOutput) => {
diff --git a/src/account/passwords/forgot-password.component.ts b/src/account/passwords/forgot-password.component.ts
index d22ca9b..11df553 100644
--- a/src/account/passwords/forgot-password.component.ts
+++ b/src/account/passwords/forgot-password.component.ts
@@ -44,7 +44,7 @@ export class ForgotPasswordComponent extends AppComponentBase implements OnInit
       )
       .subscribe(() => {
         this.message
-          .success(this.l('PasswordResetMailSentMessage'), this.l('MailSent'))
+          .success('已向您的邮箱发送了一封密码重置邮件，请查收.', '邮件已发送')
           .done(() => {
             this._router.navigate(['account/login']);
           });
diff --git a/src/account/passwords/reset-password.component.html b/src/account/passwords/reset-password.component.html
index abc0658..3052f2e 100644
--- a/src/account/passwords/reset-password.component.html
+++ b/src/account/passwords/reset-password.component.html
@@ -14,7 +14,7 @@
       <nz-form-item>
         <nz-form-control nzHasFeedback>
           <nz-input-group nzPrefixIcon="anticon anticon-lock">
-            <input nz-input name="password" #password="ngModel" [(ngModel)]="model.password" [placeholder]="l('Password')"
+            <input nz-input name="password" #password="ngModel" [(ngModel)]="model.password" [placeholder]="'密码'"
               autoFocus type="password" validateEqual="passwordRepeat" reverse="true" minlength="6" maxlength="32"
               required>
           </nz-input-group>
@@ -30,7 +30,7 @@
         <nz-form-control nzHasFeedback>
           <nz-input-group nzPrefixIcon="anticon anticon-lock">
             <input nz-input name="passwordRepeat" #passwordRepeat="ngModel" [(ngModel)]="model.passwordRepeat"
-              [placeholder]="l('PasswordRepeat')" required type="password" validateEqual="password" reverse="false"
+              [placeholder]="'密码 (核对)'" required type="password" validateEqual="password" reverse="false"
               minlength="6" maxlength="32">
           </nz-input-group>
           <nz-form-explain *ngIf="passwordRepeat.control.dirty&&passwordRepeat.control.errors">
diff --git a/src/account/register/register.component.html b/src/account/register/register.component.html
index 4a52fa6..dcd268f 100644
--- a/src/account/register/register.component.html
+++ b/src/account/register/register.component.html
@@ -16,7 +16,7 @@
         <!-- <nz-form-item>
           <nz-form-control nzHasFeedback>
             <nz-input-group nzPrefixIcon="anticon anticon-user">
-              <input nz-input name="name" #name='ngModel' [(ngModel)]="model.name" [placeholder]="l('Name')" required>
+              <input nz-input name="name" #name='ngModel' [(ngModel)]="model.name" [placeholder]="'名字'" required>
             </nz-input-group>
             <nz-form-explain *ngIf="name.control.dirty&&name.control.errors">
               <ng-container *ngIf="name.control.hasError('required')">请填写此项内容</ng-container>
@@ -28,7 +28,7 @@
         <!-- <nz-form-item>
           <nz-form-control nzHasFeedback>
             <nz-input-group nzPrefixIcon="anticon anticon-user">
-              <input nz-input name="surname" #surname="ngModel" [(ngModel)]="model.surname" [placeholder]="l('Surname')"
+              <input nz-input name="surname" #surname="ngModel" [(ngModel)]="model.surname" [placeholder]="'姓氏'"
                 required>
             </nz-input-group>
             <nz-form-explain *ngIf="surname.control.dirty&&surname.control.errors">
@@ -57,7 +57,7 @@
         <nz-form-item>
           <nz-form-control nzHasFeedback>
             <nz-input-group nzPrefixIcon="anticon anticon-user">
-              <input nz-input name="userName" #userName="ngModel" [(ngModel)]="model.userName" [placeholder]="l('UserName')"
+              <input nz-input name="userName" #userName="ngModel" [(ngModel)]="model.userName" [placeholder]="'用户名'"
                 required maxlength="32">
             </nz-input-group>
             <nz-form-explain *ngIf="userName.control.dirty&&userName.control.errors">
@@ -71,7 +71,7 @@
           <nz-form-control nzHasFeedback>
             <nz-input-group nzPrefixIcon="anticon anticon-lock">
               <input nz-input type="password" name="password" #password="ngModel" [(ngModel)]="model.password" type="password"
-                [placeholder]="l('Password')" required maxlength="32" minlength="6">
+                [placeholder]="'密码'" required maxlength="32" minlength="6">
             </nz-input-group>
             <nz-form-explain *ngIf="password.control.dirty&&password.control.errors">
               <ng-container *ngIf="password.control.hasError('required')">请填写此项内容</ng-container>
diff --git a/src/account/register/register.component.ts b/src/account/register/register.component.ts
index bd58ad5..c015d44 100644
--- a/src/account/register/register.component.ts
+++ b/src/account/register/register.component.ts
@@ -63,7 +63,7 @@ export class RegisterComponent extends AppComponentBase implements OnInit {
   }
 
   ngOnInit(): void {
-    this.titleSrvice.setTitle(this.l('CreateAnAccount'));
+    this.titleSrvice.setTitle('注册');
 
     if (!this.appSession.tenant) {
       this.back();
@@ -92,7 +92,7 @@ export class RegisterComponent extends AppComponentBase implements OnInit {
       })
       .subscribe((result: RegisterOutput) => {
         if (!result.canLogin) {
-          this.notify.success(this.l('SuccessfullyRegistered'));
+          this.notify.success('注册成功');
           this._router.navigate(['/login']);
           return;
         }
diff --git a/src/account/tenant-register/tenant-register.component.html b/src/account/tenant-register/tenant-register.component.html
index df6dc95..56c87d5 100644
--- a/src/account/tenant-register/tenant-register.component.html
+++ b/src/account/tenant-register/tenant-register.component.html
@@ -20,7 +20,7 @@
           <nz-form-control nzHasFeedback>
             <nz-input-group nzPrefixIcon="anticon anticon-cloud">
               <input nz-input type="text" name="tenancyName" #tenancyName="ngModel" [(ngModel)]="model.tenancyName"
-                [placeholder]="l('TenancyCodeName')" required expression="^[a-zA-Z][a-zA-Z0-9_-]{1,}$">
+                [placeholder]="'租户编码'" required expression="^[a-zA-Z][a-zA-Z0-9_-]{1,}$">
             </nz-input-group>
             <nz-form-explain *ngIf="tenancyName.control.dirty&&tenancyName.control.errors">
               <ng-container *ngIf="tenancyName.control.hasError('required')">请填写此项内容</ng-container>
@@ -35,7 +35,7 @@
           <nz-form-control nzHasFeedback>
             <nz-input-group nzPrefixIcon="anticon anticon-user">
               <input nz-input name="displayTenancyName" #displayTenancyNameInput="ngModel" [(ngModel)]="model.name"
-                [placeholder]="l('DisplayTenancyName')" required maxlength="32">
+                [placeholder]="'租户显示名称'" required maxlength="32">
             </nz-input-group>
             <nz-form-explain *ngIf="displayTenancyNameInput.control.dirty&&displayTenancyNameInput.control.errors">
               <ng-container *ngIf="displayTenancyNameInput.control.hasError('required')">请填写此项内容</ng-container>
@@ -61,7 +61,7 @@
           <nz-form-control nzHasFeedback>
             <nz-input-group nzPrefixIcon="anticon anticon-mail">
               <input nz-input type="email" name="adminEmailAddress" #adminEmailAddress="ngModel" [(ngModel)]="model.adminEmailAddress"
-                [placeholder]="l('AdminEmailAddress')" required email>
+                [placeholder]="'管理员邮箱'" required email>
             </nz-input-group>
             <nz-form-explain *ngIf="adminEmailAddress.control.dirty&&adminEmailAddress.control.errors">
               <ng-container *ngIf="adminEmailAddress.control.hasError('email')">{{l('NotEmail')}}</ng-container>
@@ -75,7 +75,7 @@
           <nz-form-control nzHasFeedback>
             <nz-input-group nzPrefixIcon="anticon anticon-lock">
               <input nz-input type="password" name="tenantAdminPassword" #tenantAdminPassword="ngModel" [(ngModel)]="model.tenantAdminPassword"
-                [placeholder]="l('Password')" required maxlength="32" minlength="6">
+                [placeholder]="'密码'" required maxlength="32" minlength="6">
             </nz-input-group>
             <nz-form-explain *ngIf="tenantAdminPassword.control.dirty&&tenantAdminPassword.control.errors">
               <ng-container *ngIf="tenantAdminPassword.control.hasError('required')">请填写此项内容</ng-container>
diff --git a/src/account/tenant-register/tenant-register.component.ts b/src/account/tenant-register/tenant-register.component.ts
index da0ee5f..ae3584b 100644
--- a/src/account/tenant-register/tenant-register.component.ts
+++ b/src/account/tenant-register/tenant-register.component.ts
@@ -80,7 +80,7 @@ export class TenantRegisterComponent extends AppComponentBase
     //     }),
     //   )
     //   .subscribe(result => {
-    //     this.notify.success(this.l('SavedSuccessfully'));
+    //     this.notify.success('保存成功.');
     //     abp.multiTenancy.setTenantIdCookie(result.tenantId);
 
     //     // 租户默认激活，并且登陆没有使用验证码，自动登陆
diff --git a/src/account/tenant/tenant-change-modal.component.html b/src/account/tenant/tenant-change-modal.component.html
index 2ccc8f9..be6c512 100644
--- a/src/account/tenant/tenant-change-modal.component.html
+++ b/src/account/tenant/tenant-change-modal.component.html
@@ -1,7 +1,7 @@
 <form nz-form #changeTenantForm="ngForm" (ngSubmit)="save()" >
   <div class="modal-header">
     <div class="modal-title">
-      <i class="anticon anticon-home"></i> {{l("ChangeTenant")}}
+      <i class="anticon anticon-home"></i> 修改租户
     </div>
   </div>
 
@@ -9,13 +9,13 @@
   <fieldset>
     <nz-form-item nz-row>
       <nz-form-label nz-col [nzSm]="4" nzFor="TenancyName">
-        {{l("TenancyName")}}
+        租户名称
       </nz-form-label>
       <nz-form-control nz-col [nzSm]="20">
         <nz-input-group nzPrefixIcon="anticon anticon-home">
-          <input nz-input name="TenancyName" [(ngModel)]="tenancyName" type="text" [placeholder]="l('TenancyName')" />
+          <input nz-input name="TenancyName" [(ngModel)]="tenancyName" type="text" [placeholder]="'租户名称'" />
         </nz-input-group>
-        <span class="text-sm text-grey">{{l("LeaveEmptyToSwitchToHost")}}</span>
+        <span class="text-sm text-grey">想要切换到宿主请留空</span>
 
       </nz-form-control>
     </nz-form-item>
@@ -23,11 +23,11 @@
 
   <div class="modal-footer">
     <button nz-button [nzType]="'default'" type="button" (click)="close()" [disabled]="saving">
-      <i class="anticon anticon-close-circle-o"></i> {{l("Cancel")}}
+      <i class="anticon anticon-close-circle-o"></i> 取消
     </button>
     <button nz-button [nzType]="'primary'" type="submit" [disabled]="!changeTenantForm.form.valid" [disabled]="saving"
       [nzLoading]="saving">
-      <i class="anticon anticon-save"></i> {{l("Save")}}
+      <i class="anticon anticon-save"></i> 保存
     </button>
   </div>
 
diff --git a/src/account/tenant/tenant-change-modal.component.ts b/src/account/tenant/tenant-change-modal.component.ts
index b46f7ac..4a4779c 100644
--- a/src/account/tenant/tenant-change-modal.component.ts
+++ b/src/account/tenant/tenant-change-modal.component.ts
@@ -62,7 +62,7 @@ export class TenantChangeModalComponent extends ModalComponentBase
             location.reload();
             return;
           case AppTenantAvailabilityState.InActive:
-            this.message.warn('租户 {0} 未激活.', this.tenancyName);
+            this.message.warn(this.l('TenantIsNotActive', this.tenancyName));
             break;
           case AppTenantAvailabilityState.NotFound: // NotFound
             this.message.warn(
diff --git a/src/account/tenant/tenant-change.component.html b/src/account/tenant/tenant-change.component.html
index a80b557..9a6c96c 100644
--- a/src/account/tenant/tenant-change.component.html
+++ b/src/account/tenant/tenant-change.component.html
@@ -1,13 +1,13 @@
 <div *ngIf="isMultiTenancyEnabled" class="card tenant-change-component">
   <div class=" body text-center">
     <span>
-      {{l("CurrentTenant")}}:
+     当前租户名称:
       <span *ngIf="tenancyName" title="{{name}}">
         <strong>{{tenancyName}}</strong>
       </span>
-      <span *ngIf="!tenancyName">{{l("NotSelected")}}</span>
+      <span *ngIf="!tenancyName">未选择</span>
       (
-      <a href="javascript:void();" (click)="showChangeModal()">{{l("Change")}}</a>)
+      <a href="javascript:void();" (click)="showChangeModal()">修改</a>)
     </span>
   </div>
 </div>
diff --git a/src/app/admin/audit-logs/audit-logs-detail/audit-logs-detail.component.html b/src/app/admin/audit-logs/audit-logs-detail/audit-logs-detail.component.html
index f050aa2..d439f43 100644
--- a/src/app/admin/audit-logs/audit-logs-detail/audit-logs-detail.component.html
+++ b/src/app/admin/audit-logs/audit-logs-detail/audit-logs-detail.component.html
@@ -5,10 +5,10 @@
 <div>
   <!-- 用户信息 -->
   <div>
-    <h3>{{l("UserInformations")}}</h3>
+    <h3>用户信息</h3>
     <div nz-row [nzGutter]="8">
       <div nz-col [nzSpan]="4">
-        <label>{{l("UserName")}}:</label>
+        <label>用户名:</label>
       </div>
       <div nz-col [nzSpan]="10">
         <span>{{auditLog.userName}}</span>
@@ -16,7 +16,7 @@
     </div>
     <div nz-row [nzGutter]="8">
       <div nz-col [nzSpan]="4">
-        <label>{{l("IpAddress")}}:</label>
+        <label>IP地址:</label>
       </div>
       <div nz-col [nzSpan]="10">
         <span>{{auditLog.clientIpAddress}}</span>
@@ -24,7 +24,7 @@
     </div>
     <div nz-row [nzGutter]="8">
       <div nz-col [nzSpan]="4">
-        <label>{{l("Client")}}:</label>
+        <label>客户端:</label>
       </div>
       <div nz-col [nzSpan]="10">
         <span>{{auditLog.clientName}}</span>
@@ -32,7 +32,7 @@
     </div>
     <div nz-row [nzGutter]="8">
       <div nz-col [nzSpan]="4">
-        <label>{{l("Browser")}}:</label>
+        <label>浏览器:</label>
       </div>
       <div nz-col [nzSpan]="10">
         <span>{{auditLog.browserInfo}}</span>
@@ -50,10 +50,10 @@
 
   <!-- 操作信息 -->
   <div>
-    <h3>{{l("ActionInformations")}}</h3>
+    <h3>操作信息</h3>
     <div nz-row [nzGutter]="8">
       <div nz-col [nzSpan]="4">
-        <label>{{l("Service")}}:</label>
+        <label>服务:</label>
       </div>
       <div nz-col [nzSpan]="10">
         <span>{{auditLog.serviceName}}</span>
@@ -61,7 +61,7 @@
     </div>
     <div nz-row [nzGutter]="8">
       <div nz-col [nzSpan]="4">
-        <label>{{l("Action")}}:</label>
+        <label>操作:</label>
       </div>
       <div nz-col [nzSpan]="10">
         <span>{{auditLog.methodName}}</span>
@@ -69,7 +69,7 @@
     </div>
     <div nz-row [nzGutter]="8">
       <div nz-col [nzSpan]="4">
-        <label>{{l("Time")}}:</label>
+        <label>时间:</label>
       </div>
       <div nz-col [nzSpan]="10">
         <span>{{getExecutionTime()}}</span>
@@ -77,7 +77,7 @@
     </div>
     <div nz-row [nzGutter]="8">
       <div nz-col [nzSpan]="4">
-        <label>{{l("Duration")}}:</label>
+        <label>持续时间:</label>
       </div>
       <div nz-col [nzSpan]="10">
         <span>{{getDurationAsMs()}}</span>
@@ -85,7 +85,7 @@
     </div>
     <div nz-row [nzGutter]="8">
       <div nz-col [nzSpan]="4">
-        <label>{{l("Parameters")}}:</label>
+        <label>参数:</label>
       </div>
       <div nz-col [nzSpan]="10">
         <pre lang="js">{{getFormattedParameters()}}</pre>
@@ -95,10 +95,10 @@
 
   <!-- 自定义数据 -->
   <div>
-    <h3>{{l("CustomData")}}</h3>
+    <h3>自定义数据</h3>
     <div nz-row [nzGutter]="8">
       <div nz-col [nzSpan]="8">
-        <label> {{l("None")}}:</label>
+        <label> 没有:</label>
       </div>
       <div nz-col [nzSpan]="10">
         <span>{{auditLog.customData}}</span>
@@ -108,7 +108,7 @@
 
   <!-- 错误状态 -->
   <div>
-    <h3>{{l("ErrorState")}}</h3>
+    <h3>错误状态</h3>
     <div nz-row [nzGutter]="8">
       <div nz-col [nzSpan]="4">
         <nz-badge *ngIf="auditLog.exception " [nzStatus]="'error'" [nzText]="'错误!'"></nz-badge>
@@ -121,6 +121,6 @@
 <!-- 功能按钮 -->
 <div class="modal-footer">
   <button nz-button type="button" (click)="close()">
-    {{l("Cancel")}}
+    取消
   </button>
 </div>
diff --git a/src/app/admin/audit-logs/audit-logs.component.html b/src/app/admin/audit-logs/audit-logs.component.html
index 0284fa5..0083345 100644
--- a/src/app/admin/audit-logs/audit-logs.component.html
+++ b/src/app/admin/audit-logs/audit-logs.component.html
@@ -134,24 +134,24 @@
             <span>服务</span>
           </th>
           <th nz-th nzShowSort nzSortKey="methodName">
-            <span>{{l('Action')}}</span>
+            <span>操作</span>
           </th>
           <th nz-th nzShowSort nzSortKey="executionDuration">
-            <span>{{l('Duration')}}</span>
+            <span>持续时间</span>
           </th>
           <th nz-th nzShowSort nzSortKey="ipAddress">
-            <span>{{l('IpAddress')}}</span>
+            <span>IP地址</span>
           </th>
           <th nz-th nzShowSort nzSortKey="clientIpAddress">
-            <span>{{l('Client')}}</span>
+            <span>客户端</span>
           </th>
           <th class="text-center" nzShowSort nzSortKey="browserInfo">
-            <span>{{'浏览器'}}</span>
+            <span>浏览器</span>
           </th>
           <th nzWidth="100px" class="text-center">
-            <span>{{l('ExceptionType')}}</span>
+            <span>异常</span>
           <th nzWidth="120px" class="text-center">
-            <span>{{l('Actions')}}</span>
+            <span>操作</span>
           </th>
         </tr>
       </thead>
@@ -225,7 +225,7 @@
             <span>
               <a (click)="showDetails(item)">
                 <i class="anticon anticon-search"></i>
-                <span>{{l('ViewDetails')}}</span>
+                <span>查看详情</span>
 
               </a>
             </span>
diff --git a/src/app/admin/audit-logs/audit-logs.component.ts b/src/app/admin/audit-logs/audit-logs.component.ts
index 7ee3cdf..deacc39 100644
--- a/src/app/admin/audit-logs/audit-logs.component.ts
+++ b/src/app/admin/audit-logs/audit-logs.component.ts
@@ -15,8 +15,12 @@ import { AuditLogsDetailComponent } from '@app/admin/audit-logs/audit-logs-detai
   styles: [],
 })
 export class AuditLogsComponent extends PagedListingComponentBase<AuditLogListDto> {
-  protected exportDataList(request: PagedRequestDto,undefined): void {
-    throw new Error("Method not implemented.");
+
+  constructor(
+    injector: Injector,
+    private auditLogService: AuditLogServiceProxy,
+  ) {
+    super(injector);
   }
   //  <nz-range-picker [(ngModel)]="dateRange" (ngModelChange)="onChange($event)" nzShowTime></nz-range-picker>
   startToEndDate = []; // [ new Date(), addDays(new Date(), 3) ];
@@ -30,16 +34,12 @@ export class AuditLogsComponent extends PagedListingComponentBase<AuditLogListDt
   maxExecutionDuration: number;
 
   errorState = [
-    { label: this.l('All'), value: '' },
-    { label: this.l('Success'), value: 'false' },
-    { label: this.l('HasError'), value: 'true' },
+    { label: '全部', value: '' },
+    { label: '成功', value: 'false' },
+    { label: '出现错误', value: 'true' },
   ];
-
-  constructor(
-    injector: Injector,
-    private auditLogService: AuditLogServiceProxy,
-  ) {
-    super(injector);
+  protected exportDataList(request: PagedRequestDto,undefined): void {
+    throw new Error("Method not implemented.");
   }
 
   fetchDataList(
diff --git a/src/app/admin/common/common-lookup/common-lookup.component.html b/src/app/admin/common/common-lookup/common-lookup.component.html
index 5565527..543e2bc 100644
--- a/src/app/admin/common/common-lookup/common-lookup.component.html
+++ b/src/app/admin/common/common-lookup/common-lookup.component.html
@@ -6,11 +6,11 @@
   <nz-form-item *ngIf="options.isFilterEnabled">
     <nz-form-control>
       <nz-input-group nzSearch nzSize="large" [nzSuffix]="suffixButton">
-        <input type="text" nz-input autoFocus name="filterText" [(ngModel)]="filterText" placeholder="{{l('SearchWithThreeDot')}}">
+        <input type="text" nz-input autoFocus name="filterText" [(ngModel)]="filterText" placeholder="'搜索...'">
       </nz-input-group>
       <ng-template #suffixButton>
         <button nz-button nzType="primary" nzSize="large" nzSearch (click)="refresh()" type="submit">
-          {{l('Search')}}
+          '搜索'
         </button>
       </ng-template>
     </nz-form-control>
@@ -22,8 +22,8 @@
   (nzPageIndexChange)="refresh()" (nzPageSizeChange)="refresh()">
   <thead>
     <tr>
-      <th nzWidth="130px" [style]="{'text-align':'center'}">{{l('Select')}}</th>
-      <th>{{ l('Name')}}</th>
+      <th nzWidth="130px" [style]="{'text-align':'center'}">选择</th>
+      <th>名字</th>
     </tr>
   </thead>
   <tbody>
@@ -31,7 +31,7 @@
       <td>
         <button nz-button [nzType]="'primary'" (click)="selectItem(item)">
           <i class="anticon anticon-select"></i>
-          {{l('Select')}}
+          选择
         </button>
       </td>
       <td>{{item.name}}</td>
@@ -39,5 +39,5 @@
 </nz-table>
 
 <div class="modal-footer">
-  <button nz-button [nzType]="'primary'" type="button" (click)="close()">{{l("Cancel")}}</button>
+  <button nz-button [nzType]="'primary'" type="button" (click)="close()">取消</button>
 </div>
diff --git a/src/app/admin/editions/create-or-edit-edition/create-or-edit-edition.component.html b/src/app/admin/editions/create-or-edit-edition/create-or-edit-edition.component.html
index aaa6bdf..bafb8ba 100644
--- a/src/app/admin/editions/create-or-edit-edition/create-or-edit-edition.component.html
+++ b/src/app/admin/editions/create-or-edit-edition/create-or-edit-edition.component.html
@@ -55,11 +55,11 @@
 
   <div class="modal-footer">
     <button nz-button [disabled]="saving" type="button" (click)="close()">
-      {{l("Cancel")}}
+      取消
     </button>
     <button nz-button [nzType]="'primary'" type="submit" [disabled]="!validateForm.form.valid" [nzLoading]="saving">
       <i class="acticon acticon-save"></i>
-      <span>{{l("Save")}}</span>
+      <span>保存</span>
     </button>
   </div>
 
diff --git a/src/app/admin/editions/create-or-edit-edition/create-or-edit-edition.component.ts b/src/app/admin/editions/create-or-edit-edition/create-or-edit-edition.component.ts
index b901c00..5a2299f 100644
--- a/src/app/admin/editions/create-or-edit-edition/create-or-edit-edition.component.ts
+++ b/src/app/admin/editions/create-or-edit-edition/create-or-edit-edition.component.ts
@@ -87,7 +87,7 @@ export class CreateOrEditEditionComponent extends ModalComponentBase implements
     this._editionService.createOrUpdateEdition(input)
       .pipe(finalize(() => this.saving = false))
       .subscribe(() => {
-        this.notify.success(this.l('SavedSuccessfully'));
+        this.notify.success('保存成功.');
         this.saving = false;
         this.success();
       });
diff --git a/src/app/admin/host-settings/host-settings.component.html b/src/app/admin/host-settings/host-settings.component.html
index dca3c8a..3efebe9 100644
--- a/src/app/admin/host-settings/host-settings.component.html
+++ b/src/app/admin/host-settings/host-settings.component.html
@@ -1,9 +1,9 @@
 <page-header [title]="title">
   <ng-template #title>
-    {{l('Settings')}}
+    设置
     <span class="text-sm text-grey-dark">
       <nz-divider nzType="vertical"></nz-divider>
-      {{l('SettingsHeaderInfo')}}
+      显示和修改程序设置.
     </span>
   </ng-template>
 </page-header>
@@ -316,7 +316,7 @@
     </nz-tabset> -->
     <ng-template #extraTemplate>
       <button nz-button [nzType]="'primary'" type="submit">
-        <i nz-icon type="save"></i> {{l("SaveAll")}}
+        <i nz-icon type="save"></i> 保存全部
       </button>
     </ng-template>
   </form>
diff --git a/src/app/admin/roles/create-or-edit-role/create-or-edit-role.component.html b/src/app/admin/roles/create-or-edit-role/create-or-edit-role.component.html
index b87981d..025ff02 100644
--- a/src/app/admin/roles/create-or-edit-role/create-or-edit-role.component.html
+++ b/src/app/admin/roles/create-or-edit-role/create-or-edit-role.component.html
@@ -17,12 +17,12 @@
       <!-- 第一组标签 -->
       <nz-tab [nzTitle]="roleTabTitleTpl">
         <ng-template #roleTabTitleTpl>
-          <i class="anticon anticon-medicine-box"></i>{{l('RoleName')}}
+          <i class="anticon anticon-medicine-box"></i>角色名称
         </ng-template>
 
         <nz-form-item nz-row>
           <nz-form-label nz-col [nzSm]="4" nzFor="RoleName" nzRequired>
-            {{l("RoleName")}}
+            角色名称
           </nz-form-label>
           <nz-form-control nz-col [nzSm]="20" nzHasFeedback>
             <nz-input-group nzPrefixIcon="anticon anticon-book">
diff --git a/src/app/admin/tenant-settings/tenant-settings.component.html b/src/app/admin/tenant-settings/tenant-settings.component.html
index e6d16c1..3da489d 100644
--- a/src/app/admin/tenant-settings/tenant-settings.component.html
+++ b/src/app/admin/tenant-settings/tenant-settings.component.html
@@ -136,7 +136,7 @@
                             </nz-form-label>
                             <nz-form-control nzHasFeedback>
                                 <input nz-input #ldapPasswordInput="ngModel" name="LdapPassword" [(ngModel)]="settings.ldap.password"
-                                    [placeholder]="l('Password')" maxlength="128">
+                                    [placeholder]="'密码'" maxlength="128">
                                 <nz-form-explain *ngIf="ldapPasswordInput.control.dirty&&ldapPasswordInput.control.errors">
                                     <ng-container *ngIf="ldapPasswordInput.control.hasError('required')">请填写此项内容</ng-container>
                                     <ng-container *ngIf="ldapPasswordInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
-- 
Gitee


From a38851533f474776018d786b84bb63c30ef1f96f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E5=8D=8E?= <hua.fang@xin-lai.com>
Date: Wed, 27 Nov 2019 09:28:08 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=AF=AD=E8=A8=80=E6=9B=B4=E6=94=B9=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/admin/tenants/tenants.component.html | 60 ++++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/app/admin/tenants/tenants.component.html b/src/app/admin/tenants/tenants.component.html
index 6bb4dbe..24b94c8 100644
--- a/src/app/admin/tenants/tenants.component.html
+++ b/src/app/admin/tenants/tenants.component.html
@@ -1,4 +1,4 @@
-<page-header [title]="l('Tenants')">
+<page-header [title]="'租户'">
 </page-header>
 
 <!-- 表格部分 -->
@@ -9,12 +9,12 @@
       <nz-col nzSm="12">
         <nz-form-item>
           <nz-form-label>
-            {{l('TenantNameOrTenancyCode')}}
+            租客名或租客编号
           </nz-form-label>
           <nz-form-control>
             <nz-input-group nzSearch [nzSuffix]="suffixButton">
               <input type="text" nz-input [(ngModel)]="filterText" (keyup.enter)="refresh()" name="filterText"
-                [placeholder]="l('SearchWithThreeDot')">
+                [placeholder]="'搜索...'">
               <ng-template #suffixButton>
                 <button nz-button nzType="primary" nzSearch type="submit">
                   <i class="anticon anticon-search"></i>
@@ -27,10 +27,10 @@
       <nz-col nzSm="12">
         <nz-form-item>
           <nz-form-label>
-            {{l('Edition')}}
+            版本
           </nz-form-label>
           <nz-form-control>
-            <edition-combo [placeholder]="l('FilterByEdition')" [addAllItem]="'true'" [addNotAssignedItem]="'true'"
+            <edition-combo [placeholder]="'版本过滤'" [addAllItem]="'true'" [addNotAssignedItem]="'true'"
               (selectedEditionChange)="selectedEditionChange($event)"></edition-combo>
           </nz-form-control>
         </nz-form-item>
@@ -41,11 +41,11 @@
       <nz-col nzSm="12">
         <nz-form-item>
           <nz-form-label>
-            {{l('SubscriptionEndDateUtc')}}
+            订阅结束时间
           </nz-form-label>
           <nz-form-control>
             <nz-range-picker name="SubscriptionEndDateRange" [(ngModel)]="subscribableDateRange"
-              [nzPlaceHolder]="[l('StartDateTime'),l('EndDateTime')]" (ngModelChange)="refresh()" style="width:100%;">
+              [nzPlaceHolder]="['开始日期','结束日期']" (ngModelChange)="refresh()" style="width:100%;">
             </nz-range-picker>
           </nz-form-control>
         </nz-form-item>
@@ -57,7 +57,7 @@
           </nz-form-label>
           <nz-form-control>
             <nz-range-picker name="CreationDateRange" [(ngModel)]="createDateRange"
-              [nzPlaceHolder]="[l('StartDateTime'),l('EndDateTime')]" (ngModelChange)="refresh()" style="width:100%;">
+              [nzPlaceHolder]="['开始日期','结束日期']" (ngModelChange)="refresh()" style="width:100%;">
             </nz-range-picker>
           </nz-form-control>
         </nz-form-item>
@@ -71,19 +71,19 @@
       <button nz-button [nzType]="'primary'" *ngIf="isGranted('Pages.Tenants.Create')" (click)="create()">
         <i class="anticon anticon-plus"></i>
         <span>
-          {{l("CreateNewTenant")}}
+           添加租户
         </span>
       </button>
       <button nz-button [nzType]="'danger'" *ngIf="isGranted('Pages.Tenants.Delete')" (click)="batchDelete()">
         <i class="anticon anticon-delete"></i>
         <span>
-          {{l("BatchDelete")}}
+          批量删除
         </span>
       </button>
     </nz-col>
     <nz-col nzMd="4" nzSm="12" class="text-right">
       <a (click)="advancedFiltersVisible=!advancedFiltersVisible">
-        {{advancedFiltersVisible ? l('HideAdvancedFilters') : l('ShowAdvancedFilters')}}
+        {{advancedFiltersVisible ? '隐藏高级过滤' : '显示高级过滤'}}
         <i class="anticon" [class.anticon-down]="!advancedFiltersVisible"
           [class.anticon-up]="advancedFiltersVisible"></i>
       </a>
@@ -97,11 +97,11 @@
       <ng-template #message>
         <span [innerHTML]="l('GridSelectedXItemsTips',selectedDataItems.length)"></span>
         <a (click)="restCheckStatus(dataList)" class="ml-md">
-          {{l('ClearEmpty')}}
+          清空
         </a>
         <nz-divider nzType="vertical"></nz-divider>
         <a (click)="forceRefresh()">
-          {{l('Refresh')}}
+          刷新
         </a>
       </ng-template>
     </nz-alert>
@@ -126,25 +126,25 @@
             [nzIndeterminate]="checkboxIndeterminate" (nzCheckedChange)="checkAll($event)"></th>
 
           <th nzShowSort nzSortKey="tenancyName">
-            <span>{{l('TenancyCodeName')}}</span>
+            <span>租户编码</span>
           </th>
           <th nzShowSort nzSortKey="name">
-            <span>{{l('Name')}}</span>
+            <span>名字</span>
           </th>
           <th nzShowSort nzSortKey="editionDisplayName">
-            <span>{{l('Edition')}}</span>
+            <span>版本列表</span>
           </th>
           <th nzShowSort nzSortKey="subscriptionEndUtc" class="text-center">
-            <span>{{l('SubscriptionEndUtc')}}</span>
+            <span>订阅</span>
           </th>
           <th nzShowSort nzSortKey="isActive" class="text-center">
-            <span>{{l('Active')}}</span>
+            <span>激活</span>
           </th>
           <th nzShowSort nzSortKey="creationTime" class="text-center">
-            <span>{{l('CreationTime')}}</span>
+            <span>创建时间</span>
           </th>
           <th nzWidth="240px" class="text-center">
-            <span>{{l('Actions')}}</span>
+            <span>操作</span>
           </th>
         </tr>
       </thead>
@@ -154,7 +154,7 @@
           <td nzShowCheckbox [(nzChecked)]="item.checked" (nzCheckedChange)="refreshCheckStatus(this.dataList)"></td>
 
           <td>
-            <span *ngIf="item.connectionString" nz-tooltip [nzTitle]="l('HasOwnDatabase')">
+            <span *ngIf="item.connectionString" nz-tooltip [nzTitle]="'使用自己的数据库'">
               <i class="anticon anticon-database"></i>
             </span>
             {{item.tenancyName}}
@@ -170,7 +170,7 @@
           </td>
           <td class="text-center">
             <nz-switch [ngModel]="item.isActive" [nzDisabled]="!isGranted('Pages.Tenants.Edit')"
-            (ngModelChange)="updateIsActiveonChange(item)" [nzCheckedChildren]="l('Yes')" [nzUnCheckedChildren]="l('No')">
+            (ngModelChange)="updateIsActiveonChange(item)" [nzCheckedChildren]="l('Yes')" [nzUnCheckedChildren]="'否'">
             </nz-switch>
           </td>
           <td class="text-center">
@@ -181,17 +181,17 @@
             <ng-container *ngIf="isGranted('Pages.Tenants.Edit')">
               <a (click)="edit(item.id)">
                 <i class="anticon anticon-edit mr-sm"></i>
-                <span>{{l('Edit')}}</span>
+                <span>编辑</span>
               </a>
               <nz-divider nzType="vertical"></nz-divider>
             </ng-container>
             <!-- 删除 -->
             <ng-container *ngIf="isGranted('Pages.Tenants.Delete')">
-              <nz-popconfirm [nzTitle]="l('ConfirmDeleteWarningMessage')" (nzOnConfirm)="delete(item)"
-                [nzOkText]="l('Ok')" [nzCancelText]="l('Cancel')">
+              <nz-popconfirm [nzTitle]="'确定要删除吗？'" (nzOnConfirm)="delete(item)"
+                [nzOkText]="'确定'" [nzCancelText]="'取消'">
                 <a nz-popconfirm>
                   <i class="anticon anticon-delete mr-sm"></i>
-                  <span>{{l('Delete')}}</span>
+                  <span>删除</span>
                 </a>
               </nz-popconfirm>
               <nz-divider nzType="vertical"></nz-divider>
@@ -201,7 +201,7 @@
               <nz-dropdown>
                 <a nz-dropdown>
                   <i class="icon-options-vertical mr-sm"></i>
-                  <span>{{l('More')}}</span>
+                  <span>更多...</span>
                   <i class="anticon anticon-down"></i>
                 </a>
                 <ul nz-menu>
@@ -209,20 +209,20 @@
                     (click)="tenantImpersonateLogin(item)">
                     <a>
                       <i class="anticon anticon-login mr-sm"></i>
-                      <span>{{l('LoginAsThisTenant')}}</span>
+                      <span>使用这个租户登录</span>
                     </a>
                   </li>
                   <li nz-menu-item *ngIf="item.isActive&&isGranted('Pages.Tenants.ChangeFeatures')"
                     (click)="changeTenantFeatures(item)">
                     <a>
                       <i class="anticon anticon-codepen mr-sm"></i>
-                      <span>{{l('Features')}}</span>
+                      <span>特性参数列表</span>
                     </a>
                   </li>
                   <li nz-menu-item (click)="unlockTenantAdminUser(item)">
                     <a>
                       <i class="anticon anticon-unlock mr-sm"></i>
-                      <span>{{l('Unlock')}}</span>
+                      <span>解锁</span>
                     </a>
                   </li>
                 </ul>
-- 
Gitee


From 25fa8a9838e709b4e7332b5155d21a2ac065ede8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E5=8D=8E?= <hua.fang@xin-lai.com>
Date: Wed, 27 Nov 2019 09:38:27 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E7=A7=9F=E6=88=B7=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E5=92=8C=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/editions/editions.component.html    |  2 +-
 .../create-tenant.component.html              | 38 +++++++++----------
 .../edit-tenant-features.component.html       |  4 +-
 .../edit-tenant/edit-tenant.component.html    | 20 +++++-----
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/app/admin/editions/editions.component.html b/src/app/admin/editions/editions.component.html
index b2dfb86..2032eca 100644
--- a/src/app/admin/editions/editions.component.html
+++ b/src/app/admin/editions/editions.component.html
@@ -51,7 +51,7 @@
           <th nzShowCheckbox [(nzChecked)]="allChecked" [nzDisabled]="allCheckboxDisabled" [nzIndeterminate]="checkboxIndeterminate"
             (nzCheckedChange)="checkAll($event)"></th>
           <th nzShowSort nzSortKey="name">
-            <span>{{l('Edition')}}</span>
+            <span>版本</span>
           </th>
           <th nzShowSort nzSortKey="editionName">
             <span>{{l('EditionName')}}</span>
diff --git a/src/app/admin/tenants/create-tenant/create-tenant.component.html b/src/app/admin/tenants/create-tenant/create-tenant.component.html
index fdd9abb..14a4f92 100644
--- a/src/app/admin/tenants/create-tenant/create-tenant.component.html
+++ b/src/app/admin/tenants/create-tenant/create-tenant.component.html
@@ -1,5 +1,5 @@
 <div class="modal-header">
-  <div class="modal-title">{{l('CreateNewTenant')}}</div>
+  <div class="modal-title">添加租户</div>
 </div>
 
 <nz-spin [nzSpinning]="saving">
@@ -7,9 +7,9 @@
 
     <!-- 租户名称(租户代码) -->
     <nz-form-item>
-      <nz-form-label nzFor="tenancyName" nzRequired>{{l('TenancyName')}}</nz-form-label>
+      <nz-form-label nzFor="tenancyName" nzRequired>租户名称</nz-form-label>
       <nz-form-control nzHasFeedback>
-        <input nz-input name="tenancyName" #tenancyName="ngModel" [(ngModel)]="model.tenancyName" [placeholder]="l('TenancyName')"
+        <input nz-input name="tenancyName" #tenancyName="ngModel" [(ngModel)]="model.tenancyName" [placeholder]="'租户名称'"
           required>
         <nz-form-explain *ngIf="tenancyName.control.dirty&&tenancyName.control.errors">
           <ng-container *ngIf="tenancyName.control.hasError('required')">请填写此项内容</ng-container>
@@ -19,9 +19,9 @@
 
     <!-- 名称 -->
     <nz-form-item>
-      <nz-form-label nzFor="Name" nzRequired>{{l('DisplayTenancyName')}}</nz-form-label>
+      <nz-form-label nzFor="Name" nzRequired>租户显示名称</nz-form-label>
       <nz-form-control nzHasFeedback>
-        <input nz-input name="name" #name="ngModel" [(ngModel)]="model.name" [placeholder]="l('Name')" required>
+        <input nz-input name="name" #name="ngModel" [(ngModel)]="model.name" [placeholder]="'名字'" required>
         <nz-form-explain *ngIf="name.control.dirty&&name.control.errors">
           <ng-container *ngIf="name.control.hasError('required')">请填写此项内容</ng-container>
         </nz-form-explain>
@@ -30,21 +30,21 @@
 
     <!-- 租户管理员使用默认密码 -->
     <nz-form-control>
-      <label nz-checkbox name="useHostDatabase" #useHostDatabaseInput="ngModel" [(ngModel)]="useHostDatabase">{{l("UseHostDatabase")}}</label>
+      <label nz-checkbox name="useHostDatabase" #useHostDatabaseInput="ngModel" [(ngModel)]="useHostDatabase">使用Host数据库</label>
     </nz-form-control>
 
     <!-- 自定义数据库链接字符串 -->
     <nz-form-item *ngIf="!useHostDatabase">
-      <nz-form-label nzFor="connectionString" nzRequired>{{l('DatabaseConnectionString')}}</nz-form-label>
+      <nz-form-label nzFor="connectionString" nzRequired>数据库连接字符串</nz-form-label>
       <nz-form-control nzHasFeedback>
         <input nz-input name="connectionString" #connectionString="ngModel" [(ngModel)]="model.connectionString"
-          [placeholder]="l('DatabaseConnectionString')">
+          [placeholder]="'数据库连接字符串'">
       </nz-form-control>
     </nz-form-item>
 
     <!-- 租户管理员邮箱 -->
     <nz-form-item>
-      <nz-form-label nzFor="adminEmailAddress" nzRequired>{{l('AdminEmailAddress')}}</nz-form-label>
+      <nz-form-label nzFor="adminEmailAddress" nzRequired>管理员邮箱</nz-form-label>
       <nz-form-control nzHasFeedback>
         <input nz-input type="email" name="adminEmailAddress" #adminEmailAddress="ngModel" [(ngModel)]="model.adminEmailAddress"
           [placeholder]="'邮箱地址'" required email>
@@ -80,10 +80,10 @@
 
     <!-- 租户管理员确认密码 -->
     <nz-form-item *ngIf="!useDefaultPassword">
-      <nz-form-label nzFor="password" nzRequired>{{l('ConfirmPassword')}}</nz-form-label>
+      <nz-form-label nzFor="password" nzRequired>确认密码</nz-form-label>
       <nz-form-control nzHasFeedback>
         <input nz-input name="confirmPassword" #confirmPasswordInput='ngModel' [(ngModel)]="confirmPassword"
-          [placeholder]="l('ConfirmPassword')" type="password" validateEqual="password" reverse="false" required>
+          [placeholder]="'确认密码'" type="password" validateEqual="password" reverse="false" required>
         <nz-form-explain *ngIf="confirmPasswordInput.control.dirty&&confirmPasswordInput.control.errors">
           <ng-container *ngIf="confirmPasswordInput.control.hasError('required')">请填写此项内容</ng-container>
           <ng-container *ngIf="confirmPasswordInput.control.hasError('validateEqual')">{{l('PasswordInconsistent')}}</ng-container>
@@ -93,21 +93,21 @@
 
     <!-- 版本 -->
     <nz-form-item>
-      <nz-form-label>{{l('Edition')}}</nz-form-label>
+      <nz-form-label>版本</nz-form-label>
       <nz-form-control nzHasFeedback>
         <edition-combo [(selectedEdition)]="edition" (selectedEditionChange)="selectedEditionChange($event)"
-          [placeholder]="l('PleaseSelect')"></edition-combo>
+          [placeholder]="'请至少选择一项'"></edition-combo>
       </nz-form-control>
     </nz-form-item>
 
     <!-- 无限时间订阅 -->
     <nz-form-control *ngIf="model.editionId">
-      <label nz-checkbox name="isUnlimited" #isUnlimitedInput="ngModel" [(ngModel)]="isUnlimited">{{l("IsUnlimited")}}</label>
+      <label nz-checkbox name="isUnlimited" #isUnlimitedInput="ngModel" [(ngModel)]="isUnlimited">是否无限订阅</label>
     </nz-form-control>
 
     <!-- 结束时间 -->
     <nz-form-item *ngIf="model.editionId&&!isUnlimited">
-      <nz-form-label nzFor="edition" nzRequired>{{l('SubscriptionEndDateUtc')}}</nz-form-label>
+      <nz-form-label nzFor="edition" nzRequired>订阅结束时间</nz-form-label>
       <nz-form-control nzHasFeedback nzRequired>
         <nz-date-picker name="subscriptionEndUtc" #subscriptionEndUtcInput="ngModel" [(ngModel)]="model.subscriptionEndUtc"
           required></nz-date-picker>
@@ -120,23 +120,23 @@
     <!-- 是否试用 -->
     <nz-form-control>
       <label nz-checkbox name="isInTrialPeriod" #isInTrialPeriodInput="ngModel" [(ngModel)]="model.isInTrialPeriod"
-        [nzDisabled]="edition&&edition.isFree">{{l("IsInTrialPeriod")}}</label>
+        [nzDisabled]="edition&&edition.isFree">是否在试用期</label>
     </nz-form-control>
 
     <!-- 下次登陆需要修改密码 -->
     <nz-form-control>
       <label nz-checkbox name="shouldChangePasswordOnNextLogin" #shouldChangePasswordOnNextLoginInput="ngModel"
-        [(ngModel)]="model.shouldChangePasswordOnNextLogin">{{l("ShouldChangePasswordOnNextLogin")}}</label>
+        [(ngModel)]="model.shouldChangePasswordOnNextLogin">下次登录需要修改密码.</label>
     </nz-form-control>
 
     <!-- 发送激活邮件 -->
     <nz-form-control>
-      <label nz-checkbox name="sendActivationEmail" #sendActivationEmailInput="ngModel" [(ngModel)]="model.sendActivationEmail">{{l("SendActivationEmail")}}</label>
+      <label nz-checkbox name="sendActivationEmail" #sendActivationEmailInput="ngModel" [(ngModel)]="model.sendActivationEmail">发送激活邮件.</label>
     </nz-form-control>
 
     <!-- 激活 -->
     <nz-form-control>
-      <label nz-checkbox name="isActive" #isActiveInput="ngModel" [(ngModel)]="model.isActive">{{l("IsActive")}}</label>
+      <label nz-checkbox name="isActive" #isActiveInput="ngModel" [(ngModel)]="model.isActive">是否启用</label>
     </nz-form-control>
 
 
diff --git a/src/app/admin/tenants/edit-tenant-features/edit-tenant-features.component.html b/src/app/admin/tenants/edit-tenant-features/edit-tenant-features.component.html
index 2b6e50c..9fc0892 100644
--- a/src/app/admin/tenants/edit-tenant-features/edit-tenant-features.component.html
+++ b/src/app/admin/tenants/edit-tenant-features/edit-tenant-features.component.html
@@ -1,5 +1,5 @@
 <div class="modal-header">
-    <div class="modal-title">{{l('EditTenantFeatures')}}</div>
+    <div class="modal-title">编辑租户功能</div>
   </div>
 
 
@@ -8,7 +8,7 @@
     <div class="modal-footer">
         <button nz-button type="button" [disabled]="saving" [nzLoading]="saving"
                 (click)="resetFeatures()" nz-tooltip [nzTitle]="l('ResetFeaturesTooltip')">
-            <span>{{l("ResetSpecialFeatures")}}</span>
+            <span>重置特殊的特性参数</span>
         </button>
         <button nz-button type="button" [disabled]="saving || resettingFeatures"
                 (click)="close()">
diff --git a/src/app/admin/tenants/edit-tenant/edit-tenant.component.html b/src/app/admin/tenants/edit-tenant/edit-tenant.component.html
index 897f9f0..5eb150d 100644
--- a/src/app/admin/tenants/edit-tenant/edit-tenant.component.html
+++ b/src/app/admin/tenants/edit-tenant/edit-tenant.component.html
@@ -1,6 +1,6 @@
 <div class="modal-header">
   <div class="modal-title">
-    {{l('EditTenant')}}:
+    修改租户:
     <span *ngIf="entity">{{entity.tenancyName}}</span>
   </div>
 </div>
@@ -10,9 +10,9 @@
 
     <!-- 名称 -->
     <nz-form-item>
-      <nz-form-label nzFor="Name" nzRequired>{{l('DisplayTenancyName')}}</nz-form-label>
+      <nz-form-label nzFor="Name" nzRequired>租户显示名称</nz-form-label>
       <nz-form-control nzHasFeedback>
-        <input nz-input name="name" #name="ngModel" [(ngModel)]="entity.name" [placeholder]="l('Name')" required>
+        <input nz-input name="name" #name="ngModel" [(ngModel)]="entity.name" [placeholder]="'名字'" required>
         <nz-form-explain *ngIf="name.control.dirty&&name.control.errors">
           <ng-container *ngIf="name.control.hasError('required')">请填写此项内容</ng-container>
         </nz-form-explain>
@@ -21,7 +21,7 @@
 
     <!-- 自定义数据库链接字符串 -->
     <nz-form-item *ngIf="connectionString">
-      <nz-form-label nzFor="connectionString" nzRequired>{{l('DatabaseConnectionString')}}</nz-form-label>
+      <nz-form-label nzFor="connectionString" nzRequired>数据库连接字符串</nz-form-label>
       <nz-form-control nzHasFeedback>
         <input nz-input name="connectionString" #connectionString="ngModel" [(ngModel)]="entity.connectionString"
           [placeholder]="l('DatabaseConnectionString')+l('Optional')" required>
@@ -33,20 +33,20 @@
 
     <!-- 版本 -->
     <nz-form-item>
-      <nz-form-label>{{l('Edition')}}</nz-form-label>
+      <nz-form-label>版本</nz-form-label>
       <nz-form-control>
-        <edition-combo [editionId]="entity.editionId" [placeholder]="l('PleaseSelect')" (selectedEditionChange)="selectedEditionChange($event)"></edition-combo>
+        <edition-combo [editionId]="entity.editionId" [placeholder]="'请选择'" (selectedEditionChange)="selectedEditionChange($event)"></edition-combo>
       </nz-form-control>
     </nz-form-item>
 
     <!-- 无限时间订阅 -->
     <nz-form-control *ngIf="entity.editionId">
-      <label nz-checkbox name="isUnlimited" #isUnlimitedInput="ngModel" [(ngModel)]="isUnlimited">{{l("IsUnlimited")}}</label>
+      <label nz-checkbox name="isUnlimited" #isUnlimitedInput="ngModel" [(ngModel)]="isUnlimited">是否无限订阅</label>
     </nz-form-control>
 
     <!-- 结束时间 -->
     <nz-form-item *ngIf="entity.editionId&&!isUnlimited">
-      <nz-form-label nzFor="subscriptionEndUtc" nzRequired>{{l('SubscriptionEndDateUtc')}}</nz-form-label>
+      <nz-form-label nzFor="subscriptionEndUtc" nzRequired>订阅结束时间</nz-form-label>
       <nz-form-control nzHasFeedback nzRequired>
         <nz-date-picker name="subscriptionEndUtc" #subscriptionEndUtcInput="ngModel" [(ngModel)]="subscriptionEndUtc"
           required></nz-date-picker>
@@ -59,12 +59,12 @@
     <!-- 是否试用 -->
     <nz-form-control>
       <label nz-checkbox name="isInTrialPeriod" #isInTrialPeriodInput="ngModel" [(ngModel)]="entity.isInTrialPeriod"
-        [nzDisabled]="edition&&edition.isFree">{{l("IsInTrialPeriod")}}</label>
+        [nzDisabled]="edition&&edition.isFree">是否在试用期</label>
     </nz-form-control>
 
     <!-- 激活 -->
     <nz-form-control>
-      <label nz-checkbox name="isActive" #isActiveInput="ngModel" [(ngModel)]="entity.isActive">{{l("IsActive")}}</label>
+      <label nz-checkbox name="isActive" #isActiveInput="ngModel" [(ngModel)]="entity.isActive">是否启用</label>
     </nz-form-control>
 
 
-- 
Gitee


From a5bed230e220c65bd3d166eca350c587433822a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E5=8D=8E?= <hua.fang@xin-lai.com>
Date: Wed, 27 Nov 2019 09:47:50 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E5=92=8C=E7=BC=96=E8=BE=91=E8=AF=AD=E8=A8=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../create-or-edit-role.component.html        | 20 ++++--------
 src/app/admin/roles/roles.component.html      | 32 +++++++++----------
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/src/app/admin/roles/create-or-edit-role/create-or-edit-role.component.html b/src/app/admin/roles/create-or-edit-role/create-or-edit-role.component.html
index 025ff02..809cf20 100644
--- a/src/app/admin/roles/create-or-edit-role/create-or-edit-role.component.html
+++ b/src/app/admin/roles/create-or-edit-role/create-or-edit-role.component.html
@@ -9,7 +9,7 @@
   </div>
   <!-- 模态框内部部分 -->
   <fieldset>
-    <nz-alert nzType="info" nzCloseable [nzShowIcon]="true" [nzMessage]="l('Note_RefreshPageForPermissionChanges')">
+    <nz-alert nzType="info" nzCloseable [nzShowIcon]="true" [nzMessage]="'如果您正在更改自己的权限，则可能需要刷新页面（F5），以在您所做的权限更改生效！'">
     </nz-alert>
     <!-- 标签页 -->
 
@@ -27,7 +27,7 @@
           <nz-form-control nz-col [nzSm]="20" nzHasFeedback>
             <nz-input-group nzPrefixIcon="anticon anticon-book">
               <input nz-input #roleNameInput="ngModel" name="RoleName" [(ngModel)]="role.displayName"
-                [placeholder]="l('RoleName')" required maxlength="64">
+                [placeholder]="'角色名称'" required maxlength="64">
             </nz-input-group>
             <nz-form-explain *ngIf="roleNameInput.control.dirty&&roleNameInput.control.errors">
               <ng-container *ngIf="roleNameInput.control.hasError('required')">请填写此项内容
@@ -35,22 +35,20 @@
               <ng-container *ngIf="roleNameInput.control.hasError('minlength')">{{l('MinLength')}}</ng-container>
               <ng-container *ngIf="roleNameInput.control.hasError('maxlength')">{{l('MaxLength')}}</ng-container>
             </nz-form-explain>
-
           </nz-form-control>
         </nz-form-item>
 
         <!-- 默认角色 -->
         <nz-form-item nz-row>
           <nz-form-label nz-col [nzSm]="4" nzFor="Default">
-            {{l("Default")}}
+            默认
             <em>
-              <i class="anticon anticon-info-circle-o" nz-tooltip [nzTitle]="l('DefaultRole_Description')"></i>
+              <i class="anticon anticon-info-circle-o" nz-tooltip [nzTitle]="'新用户将默认拥有此角色.'"></i>
             </em>
           </nz-form-label>
           <nz-form-control nz-col [nzSm]="20">
-            <nz-switch name="Default" [(ngModel)]="role.isDefault" [nzCheckedChildren]="l('Yes')"
-              [nzUnCheckedChildren]="l('No')"></nz-switch>
-
+            <nz-switch name="Default" [(ngModel)]="role.isDefault" [nzCheckedChildren]="'是'"
+              [nzUnCheckedChildren]="'否'"></nz-switch>
           </nz-form-control>
         </nz-form-item>
 
@@ -58,11 +56,10 @@
       <!-- 第二组标签 -->
       <nz-tab [nzTitle]="permissionsTitleTpl">
         <ng-template #permissionsTitleTpl>
-          <i class="anticon anticon-safety"></i>{{l('Permissions')}}
+          <i class="anticon anticon-safety"></i>权限
         </ng-template>
         <permission-tree #permissionTree></permission-tree>
       </nz-tab>
-
     </nz-tabset>
 
 
@@ -77,7 +74,4 @@
       <i class="anticon anticon-save" *ngIf="!saving"></i> 保存
     </button>
   </div>
-
-
-
 </form>
diff --git a/src/app/admin/roles/roles.component.html b/src/app/admin/roles/roles.component.html
index 5b0237c..3cbe881 100644
--- a/src/app/admin/roles/roles.component.html
+++ b/src/app/admin/roles/roles.component.html
@@ -1,4 +1,4 @@
-<page-header [title]="l('Roles')"></page-header>
+<page-header [title]="'角色'"></page-header>
 
 <!-- 表格部分 -->
 <nz-card [nzBordered]="false">
@@ -11,7 +11,7 @@
           <nz-form-control>
             <nz-input-group nzSearch [nzSuffix]="suffixSearchButton">
               <input type="text" nz-input [(ngModel)]="filterText" (keyup.enter)="refresh()" name="filterText"
-                [placeholder]="l('SearchWithThreeDot')">
+                [placeholder]="'搜索...'">
               <ng-template #suffixSearchButton>
                 <button nz-button nzType="primary" nzSearch type="submit">
                   <i class="anticon anticon-search"></i>
@@ -42,19 +42,19 @@
         <button nz-button [nzType]="'primary'"  (click)="exportList()">
           <i class="anticon anticon-file-excel"></i>
           <span>
-            {{l("ExportToExcel")}}
+            导出到Excel
           </span>
         </button>
         <button nz-button [nzType]="'primary'" *ngIf="isGranted('Pages.Administration.Roles.Create')" (click)="createOrEdit()">
           <i class="anticon anticon-plus"></i>
           <span>
-            {{l("CreateNewRole")}}
+            添加角色
           </span>
         </button>
         <button nz-button [nzType]="'danger'" *ngIf="isGranted('Pages.Administration.Roles.Delete')" (click)="batchDelete()">
           <i class="anticon anticon-delete"></i>
           <span>
-            {{l("BatchDelete")}}
+             批量删除
           </span>
         </button>
       </nz-col>
@@ -67,11 +67,11 @@
       <ng-template #message>
         <span [innerHTML]="l('GridSelectedXItemsTips',selectedDataItems.length)"></span>
         <a (click)="restCheckStatus(dataList)" class="ml-md">
-          {{l('ClearEmpty')}}
+          清空
         </a>
         <nz-divider nzType="vertical"></nz-divider>
         <a (click)="forceRefresh()">
-          {{l('Refresh')}}
+          刷新
         </a>
       </ng-template>
     </nz-alert>
@@ -97,14 +97,14 @@
           </th>
 
           <th nzShowSort nzSortKey="roleName">
-            <span>{{l('RoleName')}}</span>
+            <span>角色名称</span>
           </th>
           <th class="text-center" nzShowSort nzSortKey="creationTime">
-            <span>{{l('CreationTime')}}</span>
+            <span>创建时间</span>
           </th>
 
           <th nzWidth="230px" class="text-center">
-            <span>{{l('Actions')}}</span>
+            <span>交易状态</span>
           </th>
         </tr>
       </thead>
@@ -118,8 +118,8 @@
           <td>
             <ellipsis lines="1">
               <span nz-tooltip [nzTitle]="item.displayName"> {{item.displayName}}</span>
-              <nz-tag *ngIf="item.isStatic" [nzColor]="'#108ee9'" nz-tooltip [nzTitle]="l('StaticRole_Tooltip')">{{l('Static')}}</nz-tag>
-              <nz-tag *ngIf="item.isDefault" [nzColor]="'#2db7f5'" nz-tooltip [nzTitle]="l('DefaultRole_Description')">{{l('Default')}}</nz-tag>
+              <nz-tag *ngIf="item.isStatic" [nzColor]="'#108ee9'" nz-tooltip [nzTitle]="l('StaticRole_Tooltip')">系统</nz-tag>
+              <nz-tag *ngIf="item.isDefault" [nzColor]="'#2db7f5'" nz-tooltip [nzTitle]="l('DefaultRole_Description')">默认</nz-tag>
             </ellipsis>
           </td>
           <td class="text-center">
@@ -132,17 +132,17 @@
             <ng-container *ngIf="isGranted('Pages.Administration.Roles.Edit')">
               <a (click)="createOrEdit(item.id)">
                 <i class="anticon anticon-edit mr-sm"></i>
-                <span>{{l('Edit')}}</span>
+                <span>修改</span>
               </a>
               <nz-divider nzType="vertical"></nz-divider>
             </ng-container>
             <!-- 删除 -->
             <ng-container *ngIf="!item.isStatic&&isGranted('Pages.Administration.Roles.Delete')">
-              <nz-popconfirm [nzTitle]="l('ConfirmDeleteWarningMessage')" (nzOnConfirm)="delete(item)" [nzOkText]="l('Ok')"
-                [nzCancelText]="l('Cancel')">
+              <nz-popconfirm [nzTitle]="'确定要删除吗？'" (nzOnConfirm)="delete(item)" [nzOkText]="'确定'"
+                [nzCancelText]="'取消'">
                 <a nz-popconfirm>
                   <i class="anticon anticon-delete mr-sm"></i>
-                  <span>{{l('Delete')}}</span>
+                  <span>删除</span>
                 </a>
               </nz-popconfirm>
             </ng-container>
-- 
Gitee


From 8f1c10bab9dfd08cbc1e7b9b1eb1f9a89cc59657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E5=8D=8E?= <hua.fang@xin-lai.com>
Date: Wed, 27 Nov 2019 10:02:03 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E8=AF=AD=E8=A8=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../create-or-edit-user.component.html        | 58 +++++++++----------
 .../edit-user-permissions.component.html      | 10 ++--
 src/app/admin/users/users.component.html      | 46 +++++++--------
 3 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/src/app/admin/users/create-or-edit-user/create-or-edit-user.component.html b/src/app/admin/users/create-or-edit-user/create-or-edit-user.component.html
index 080545b..192c0e8 100644
--- a/src/app/admin/users/create-or-edit-user/create-or-edit-user.component.html
+++ b/src/app/admin/users/create-or-edit-user/create-or-edit-user.component.html
@@ -2,8 +2,8 @@
   <div class="modal-header">
     <div class="modal-title">
       <i class="anticon anticon-user mr-sm"></i>
-      <span *ngIf="user.id">{{l('Edit')}}:{{user.userName}}</span>
-      <span *ngIf="!user.id">{{l('CreateNewUser')}}</span>
+      <span *ngIf="user.id">修改:{{user.userName}}</span>
+      <span *ngIf="!user.id">添加用户</span>
     </div>
   </div>
 
@@ -11,21 +11,21 @@
     <nz-tabset>
       <nz-tab [nzTitle]="userInfoTabTitleTpl">
         <ng-template #userInfoTabTitleTpl>
-          <i class="anticon anticon-user"></i>{{l('UserInformations')}}
+          <i class="anticon anticon-user"></i>用户信息
         </ng-template>
         <nz-row nzGutter="8">
           <nz-col nzSpan="18">
             <nz-form-item nz-row>
               <nz-form-label nz-col [nzSm]="5" nzFor="userName" nzRequired>
-                {{l("UserName")}}
+                用户名
                 <em *ngIf="isAdmin">
-                  <i class="anticon anticon-info-circle-o" nz-tooltip [nzTitle]="l('CanNotChangeAdminUserName')"></i>
+                  <i class="anticon anticon-info-circle-o" nz-tooltip [nzTitle]="'管理用户，不能修改用户名.'"></i>
                 </em>
               </nz-form-label>
               <nz-form-control nz-col [nzSm]="19" nzHasFeedback>
                 <nz-input-group nzPrefixIcon="anticon anticon-user">
                   <input nz-input #userNameInput="ngModel" name="userName" [disabled]="isAdmin"
-                    [(ngModel)]="user.userName" [placeholder]="l('UserName')" required maxlength="32">
+                    [(ngModel)]="user.userName" [placeholder]="'用户名'" required maxlength="32">
                 </nz-input-group>
                 <nz-form-explain *ngIf="isAdmin">{{l('ThisAdminUser')}}</nz-form-explain>
                 <nz-form-explain *ngIf="!isAdmin&&userNameInput.control.dirty&&userNameInput.control.errors">
@@ -58,7 +58,7 @@
         </nz-row>
         <nz-form-item nz-row>
           <nz-form-label nz-col [nzSm]="4" nzFor="emailAddress" nzRequired>
-            {{l("EmailAddress")}}
+            邮箱地址
           </nz-form-label>
           <nz-form-control nz-col [nzSm]="20" nzHasFeedback>
             <nz-input-group nzPrefixIcon="anticon anticon-mail">
@@ -68,7 +68,7 @@
             <nz-form-explain *ngIf="emailAddressInput.control.dirty&&emailAddressInput.control.errors">
               <ng-container *ngIf="emailAddressInput.control.hasError('required')">请填写此项内容
               </ng-container>
-              <ng-container *ngIf="emailAddressInput.control.hasError('email')">{{l('InvalidEmailAddress')}}
+              <ng-container *ngIf="emailAddressInput.control.hasError('email')">邮箱地址无效
               </ng-container>
             </nz-form-explain>
           </nz-form-control>
@@ -76,12 +76,12 @@
 
         <nz-form-item nz-row>
           <nz-form-label nz-col [nzSm]="4" nzFor="PhoneNumber">
-            {{l("PhoneNumber")}}
+            电话号码
           </nz-form-label>
           <nz-form-control nz-col [nzSm]="20" nzHasFeedback>
             <nz-input-group nzPrefixIcon="anticon anticon-phone">
               <input nz-input #phoneNumberInput="ngModel" name="PhoneNumber" [(ngModel)]="user.phoneNumber"
-                [placeholder]="l('PhoneNumber')" maxlength="24">
+                [placeholder]="'电话号码'" maxlength="24">
             </nz-input-group>
             <nz-form-explain *ngIf="phoneNumberInput.control.dirty&&phoneNumberInput.control.errors">
               <ng-container *ngIf="phoneNumberInput.control.hasError('required')">请填写此项内容
@@ -94,17 +94,17 @@
         <!-- 设置随机密码 -->
         <nz-form-item nz-row>
           <nz-form-label nz-col [nzSm]="4" nzFor="SetRandomPassword">
-            {{l("SetRandomPassword")}}
+            使用随机密码.
           </nz-form-label>
           <nz-form-control nz-col [nzSm]="8">
-            <nz-switch name="SetRandomPassword" [(ngModel)]="setRandomPassword" [nzCheckedChildren]="l('Yes')"
-              [nzUnCheckedChildren]="l('No')"></nz-switch>
+            <nz-switch name="SetRandomPassword" [(ngModel)]="setRandomPassword" [nzCheckedChildren]="'是'"
+              [nzUnCheckedChildren]="'否'"></nz-switch>
           </nz-form-control>
           <!-- 验证双公约验证 -->
 
           <ng-container *ngIf="isTwoFactorEnabled">
             <nz-form-label nz-col [nzSm]="4" nzFor="IsTwoFactorEnabled">
-              {{l("IsTwoFactorEnabled")}}
+              是否启用双因素身份验证？
             </nz-form-label>
             <nz-form-control nz-col [nzSm]="8">
               <!-- <nz-switch name="IsTwoFactorEnabled" [(ngModel)]="user.isTwoFactorEnabled" [nzCheckedChildren]="l('Yes')" [nzUnCheckedChildren]="l('No')"></nz-switch> -->
@@ -115,7 +115,7 @@
         <!-- 设置密码 -->
         <nz-form-item nz-row *ngIf="!setRandomPassword">
           <nz-form-label nz-col [nzSm]="4" nzFor="Password" [nzRequired]="!user.id && !setRandomPassword">
-            {{l("Password")}}
+            密码
           </nz-form-label>
           <nz-form-control nz-col [nzSm]="20" nzHasFeedback>
             <nz-input-group nzPrefixIcon="anticon anticon-lock">
@@ -133,7 +133,7 @@
 
         <nz-form-item *ngIf="!setRandomPassword">
           <nz-form-label nz-col [nzSm]="4" nzFor="passwordRepeat" [nzRequired]="!user.id && !setRandomPassword">
-            {{l("PasswordRepeat")}}
+            密码 (核对)
           </nz-form-label>
           <nz-form-control nz-col [nzSm]="20" nzHasFeedback>
             <nz-input-group nzPrefixIcon="anticon anticon-lock">
@@ -151,40 +151,40 @@
 
         <nz-form-item nz-row>
           <nz-form-label nz-col [nzSm]="4" nzFor="ShouldChangePasswordOnNextLogin">
-            {{l("ShouldChangePasswordOnNextLogin")}}
+            下次登录需要修改密码.
           </nz-form-label>
           <nz-form-control nz-col [nzSm]="8">
 
             <nz-switch name="ShouldChangePasswordOnNextLogin" [(ngModel)]="user.shouldChangePasswordOnNextLogin"
-              [nzCheckedChildren]="l('Yes')" [nzUnCheckedChildren]="l('No')">
+              [nzCheckedChildren]="'是'" [nzUnCheckedChildren]="'否'">
             </nz-switch>
           </nz-form-control>
 
           <nz-form-label nz-col [nzSm]="4" nzFor="SendActivationEmail">
-            {{l("SendActivationEmail")}}
+            发送激活邮件.
           </nz-form-label>
           <nz-form-control nz-col [nzSm]="8">
-            <nz-switch name="SendActivationEmail" [(ngModel)]="sendActivationEmail" [nzCheckedChildren]="l('Yes')"
-              [nzUnCheckedChildren]="l('No')"></nz-switch>
+            <nz-switch name="SendActivationEmail" [(ngModel)]="sendActivationEmail" [nzCheckedChildren]="'是'"
+              [nzUnCheckedChildren]="'否'"></nz-switch>
           </nz-form-control>
         </nz-form-item>
 
         <nz-form-item nz-row>
           <nz-form-label nz-col [nzSm]="4" nzFor="Active">
-            {{l("Active")}}
+            激活
           </nz-form-label>
           <nz-form-control nz-col [nzSm]="8">
-            <nz-switch name="Active" [(ngModel)]="user.isActive" [nzCheckedChildren]="l('Yes')"
-              [nzUnCheckedChildren]="l('No')"></nz-switch>
+            <nz-switch name="Active" [(ngModel)]="user.isActive" [nzCheckedChildren]="'是'"
+              [nzUnCheckedChildren]="'否'"></nz-switch>
           </nz-form-control>
 
           <ng-container *ngIf="isLockoutEnabled">
             <nz-form-label nz-col [nzSm]="4" nzFor="IsLockoutEnabled">
-              {{l("IsLockoutEnabled")}}
+              是否启用锁定？
             </nz-form-label>
             <nz-form-control nz-col [nzSm]="8">
-              <nz-switch name="IsLockoutEnabled" [(ngModel)]="user.isLockoutEnabled" [nzCheckedChildren]="l('Yes')"
-                [nzUnCheckedChildren]="l('No')"></nz-switch>
+              <nz-switch name="IsLockoutEnabled" [(ngModel)]="user.isLockoutEnabled" [nzCheckedChildren]="'是'"
+                [nzUnCheckedChildren]="'否'"></nz-switch>
             </nz-form-control>
           </ng-container>
         </nz-form-item>
@@ -195,7 +195,7 @@
           <nz-badge [nzCount]="getAssignedRoleCount()">
             <i class="anticon anticon-medicine-box"></i>
             <span>
-              {{l('Roles')}}
+              角色
             </span>
           </nz-badge>
         </ng-template>
@@ -211,7 +211,7 @@
       </nz-tab>
       <nz-tab [nzTitle]="organizationUTitleTpl">
         <ng-template #organizationUTitleTpl>
-          <i class="anticon anticon-share-alt"></i>{{l('OrganizationUnits')}}
+          <i class="anticon anticon-share-alt"></i>组织机构
         </ng-template>
         <organization-unit-tree #organizationUnitTree></organization-unit-tree>
       </nz-tab>
diff --git a/src/app/admin/users/edit-user-permissions/edit-user-permissions.component.html b/src/app/admin/users/edit-user-permissions/edit-user-permissions.component.html
index 1d2f6fb..e44efa2 100644
--- a/src/app/admin/users/edit-user-permissions/edit-user-permissions.component.html
+++ b/src/app/admin/users/edit-user-permissions/edit-user-permissions.component.html
@@ -4,8 +4,8 @@
     <div class="modal-title">
       <i class="anticon anticon-safety mr-sm"></i>
       <span>
-        {{l("Permissions")}}
-        <span *ngIf="userName"> - {{userName}}</span>
+        权限
+        <span *ngIf="userName"> - 用户名</span>
       </span>
     </div>
   </div>
@@ -13,7 +13,7 @@
   <!-- 模态框内容 -->
 
   <fieldset>
-    <nz-alert nzType="warning" nzCloseable [nzShowIcon]="true" [nzMessage]="l('Note_RefreshPageForPermissionChanges')"
+    <nz-alert nzType="warning" nzCloseable [nzShowIcon]="true" [nzMessage]="'如果您正在更改自己的权限，则可能需要刷新页面（F5），以在您所做的权限更改生效！'"
       class="mb-md"></nz-alert>
     <permission-tree #permissionTree></permission-tree>
   </fieldset>
@@ -21,9 +21,9 @@
   <!-- 模态框底部内容 -->
   <div class="modal-footer">
     <button nz-button [nzType]="'default'" type="button" (click)="resetPermissions()" [disabled]="saving" [nzLoading]="resettingPermissions"
-      nz-tooltip [nzTitle]="l('ResetPermissionsTooltip')" class="mr-sm">
+      nz-tooltip [nzTitle]="'重置用户权限后，用户仅拥有所属角色包含的权限，为用户直接指定的权限将取消.'" class="mr-sm">
       <i class="anticon anticon-reload" *ngIf="!resettingPermissions"></i>
-      {{l("ResetSpecialPermissions")}}
+      重置直接指定权限
     </button>
 
     <button nz-button [nzType]="'default'" type="button" (click)="close($event)" [disabled]="saving || resettingPermissions">
diff --git a/src/app/admin/users/users.component.html b/src/app/admin/users/users.component.html
index 3e33a8b..0b68a77 100644
--- a/src/app/admin/users/users.component.html
+++ b/src/app/admin/users/users.component.html
@@ -1,4 +1,4 @@
-<page-header [title]="l('Users')"></page-header>
+<page-header [title]="'用户'"></page-header>
 <!-- 全屏显示 -->
 <!-- 表格部分 -->
 <nz-card [nzBordered]="false">
@@ -10,7 +10,7 @@
           <nz-form-control>
             <nz-input-group nzSearch [nzSuffix]="suffixSearchButton">
               <input type="text" nz-input [(ngModel)]="filterText" name="filterText" (keyup.enter)="refresh()"
-                [placeholder]="l('SearchWithThreeDot')">
+                [placeholder]="'搜索...'">
               <ng-template #suffixSearchButton>
                 <button nz-button nzType="primary" nzSearch (click)="onSearch($event)">
                   <i class="anticon anticon-search"></i>
@@ -38,25 +38,25 @@
       <button nz-button [nzType]="'primary'" *ngIf="isGranted('Pages.Administration.Users.Create')" (click)="createOrEdit()">
         <i class="anticon anticon-plus"></i>
         <span>
-          {{l("CreateNewUser")}}
+          添加用户
         </span>
       </button>
       <button nz-button [nzType]="'danger'" *ngIf="isGranted('Pages.Administration.Users.Delete')" (click)="batchDelete()">
         <i class="anticon anticon-delete"></i>
         <span>
-          {{l("BatchDelete")}}
+          批量删除
         </span>
       </button>
       <button nz-button nzType="default" *ngIf="isGranted('Pages.Administration.Users.ExportToExcel')" (click)="exportToExcel()">
         <i class="anticon anticon-file-excel"></i>
         <span>
-          {{l("ExportToExcel")}}
+          导出到Excel
         </span>
       </button>
     </nz-col>
     <nz-col nzMd="4" nzSm="12" class="text-right">
       <a (click)="advancedFiltersVisible=!advancedFiltersVisible">
-        {{advancedFiltersVisible ? l('HideAdvancedFilters') : l('ShowAdvancedFilters')}}
+        {{advancedFiltersVisible ? '隐藏高级过滤' : '显示高级过滤'}}
         <i class="anticon" [class.anticon-down]="!advancedFiltersVisible" [class.anticon-up]="advancedFiltersVisible"></i>
       </a>
     </nz-col>
@@ -67,11 +67,11 @@
       <ng-template #message>
         <span [innerHTML]="l('GridSelectedXItemsTips',selectedDataItems.length)"></span>
         <a (click)="restCheckStatus(dataList)" class="ml-md">
-          {{l('ClearEmpty')}}
+          清空
         </a>
         <nz-divider nzType="vertical"></nz-divider>
         <a (click)="forceRefresh()">
-          {{l('Refresh')}}
+          刷新
         </a>
       </ng-template>
     </nz-alert>
@@ -98,31 +98,31 @@
             (nzCheckedChange)="checkAll($event)"></th>
 
           <th nzShowSort nzSortKey="userName">
-            <span>{{l('UserName')}}</span>
+            <span>用户名</span>
           </th>
           <th>
-            <span>{{l('Roles')}}</span>
+            <span>角色</span>
           </th>
 
           <th nzShowSort nzSortKey="emailAddress">
-            <span>{{'邮箱地址'}}</span>
+            <span>邮箱地址</span>
           </th>
           <th nzShowSort nzSortKey="isEmailConfirmed" nzShowFilter [nzFilterMultiple]="false" [nzFilters]="booleanFilterList"
             (nzFilterChange)="isEmailConfirmedFilter($event)" class="text-center">
-            <span>{{l('EmailConfirm')}}</span>
+            <span>邮箱地址验认</span>
           </th>
           <th nzShowSort nzSortKey="isActive" nzShowFilter [nzFilterMultiple]="false" [nzFilters]="booleanFilterList"
             (nzFilterChange)="isActiveFilter($event)" class="text-center">
-            <span>{{l('Active')}}</span>
+            <span>激活</span>
           </th>
           <th nzShowSort nzSortKey="lastLoginTime" class="text-center">
-            <span>{{l('LastLoginTime')}}</span>
+            <span>上次登录时间</span>
           </th>
           <th nzShowSort nzSortKey="creationTime" class="text-center">
-            <span>{{l('CreationTime')}}</span>
+            <span>创建时间</span>
           </th>
           <th nzWidth="230px" class="text-center">
-            <span>{{l('Actions')}}</span>
+            <span>操作</span>
           </th>
         </tr>
       </thead>
@@ -174,17 +174,17 @@
             <ng-container *ngIf="isGranted('Pages.Administration.Users.Edit')">
               <a (click)="createOrEdit(item.id)">
                 <i class="anticon anticon-edit mr-sm"></i>
-                <span>{{l('Edit')}}</span>
+                <span>修改</span>
               </a>
               <nz-divider nzType="vertical"></nz-divider>
             </ng-container>
             <!-- 删除 -->
             <ng-container *ngIf="isGranted('Pages.Administration.Users.Delete')&&!isAdmin(item)">
-              <nz-popconfirm [nzTitle]="l('ConfirmDeleteWarningMessage')" (nzOnConfirm)="delete(item)" [nzOkText]="l('Ok')"
+              <nz-popconfirm [nzTitle]="'确定要删除吗？'" (nzOnConfirm)="delete(item)" [nzOkText]="l('Ok')"
                 [nzCancelText]="l('Cancel')">
                 <a nz-popconfirm>
                   <i class="anticon anticon-delete mr-sm"></i>
-                  <span>{{l('Delete')}}</span>
+                  <span>删除</span>
                 </a>
               </nz-popconfirm>
             </ng-container>
@@ -194,23 +194,23 @@
               <nz-dropdown>
                 <a nz-dropdown>
                   <i class="anticon anticon-down"></i>
-                  <span>{{l('More')}}</span>
+                  <span>更多...</span>
                 </a>
                 <ul nz-menu>
                   <li nz-menu-item>
                     <a *ngIf="isGranted('Pages.Administration.Users.Impersonation') && item.id !== appSession.userId"
-                      (click)="_impersonationService.impersonate(item.id, appSession.tenantId)">{{l('LoginAsThisUser')}}</a>
+                      (click)="_impersonationService.impersonate(item.id, appSession.tenantId)">使用这个用户登录</a>
                   </li>
                   <li nz-menu-item *ngIf="isGranted('Pages.Administration.Users.Edit')" (click)="editUserPermissions(item) ">
                     <a>
                       <i class="anticon anticon-safety mr-sm"></i>
-                      <span>{{l('Permissions')}}</span>
+                      <span>权限</span>
                     </a>
                   </li>
                   <li nz-menu-item *ngIf="enabledUnlock" (click)="unlockUser(item)">
                     <a>
                       <i class="anticon anticon-unlock mr-sm"></i>
-                      <span>{{l('Unlock')}}</span>
+                      <span>解锁</span>
                     </a>
                   </li>
 
-- 
Gitee


From c02511f0740881cd1938366ffe3883a69bd83275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E5=8D=8E?= <hua.fang@xin-lai.com>
Date: Wed, 27 Nov 2019 10:11:11 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=AF=AD=E8=A8=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../add-member/add-member.component.html      |  8 ++++----
 ...e-or-edit-organiaztion-unit.component.html |  8 ++++----
 ...nization-unit-members-panel.component.html | 20 +++++++++----------
 ...rganization-unit-tree-panel.component.html | 20 +++++++++----------
 .../organization-units.component.html         |  2 +-
 5 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/app/admin/organization-units/add-member/add-member.component.html b/src/app/admin/organization-units/add-member/add-member.component.html
index 81e19d1..ced48aa 100644
--- a/src/app/admin/organization-units/add-member/add-member.component.html
+++ b/src/app/admin/organization-units/add-member/add-member.component.html
@@ -2,13 +2,13 @@
   <div class="modal-header">
     <div class="modal-title">
       <i class="anticon anticon-team"></i>
-      {{l("SelectUsers")}}
+      选择用户
     </div>
   </div>
   <!-- 内容 -->
   <fieldset>
     <nz-input-group nzSearch [nzSuffix]="suffixSearchButton">
-      <input type="text" nz-input [(ngModel)]="filterText" (keyup.enter)="refresh()" name="filterText" [placeholder]="l('SearchWithThreeDot')">
+      <input type="text" nz-input [(ngModel)]="filterText" (keyup.enter)="refresh()" name="filterText" [placeholder]="'搜索...'">
       <ng-template #suffixSearchButton>
         <button nz-button nzType="primary" nzSearch (click)="refresh()">
           <i class="anticon anticon-search"></i>
@@ -21,7 +21,7 @@
         <ng-template #message>
           <span [innerHTML]="l('GridSelectedXItemsTips',selectedDataItems.length)"></span>
           <a (click)="restCheckStatus(dataList)" class="ml-md">
-            {{l('ClearEmpty')}}
+            清空
           </a>
         </ng-template>
       </nz-alert>
@@ -52,7 +52,7 @@
               <th nzShowCheckbox [(nzChecked)]="allChecked" [nzDisabled]="allCheckboxDisabled" [nzIndeterminate]="checkboxIndeterminate"
                 (nzCheckedChange)="checkAll($event)"></th>
               <th>
-                <span>{{l('Name')}}</span>
+                <span>名字</span>
               </th>
             </tr>
           </thead>
diff --git a/src/app/admin/organization-units/create-or-edit-organiaztion-unit/create-or-edit-organiaztion-unit.component.html b/src/app/admin/organization-units/create-or-edit-organiaztion-unit/create-or-edit-organiaztion-unit.component.html
index becbb0a..92cfb15 100644
--- a/src/app/admin/organization-units/create-or-edit-organiaztion-unit/create-or-edit-organiaztion-unit.component.html
+++ b/src/app/admin/organization-units/create-or-edit-organiaztion-unit/create-or-edit-organiaztion-unit.component.html
@@ -2,8 +2,8 @@
   <div class="modal-header">
     <div class="modal-title">
       <i class="anticon anticon-share-alt mr-sm"></i>
-      <span *ngIf="organizationUnit.id">{{l("Edit")}}: {{organizationUnit.displayName}}</span>
-      <span *ngIf="!organizationUnit.id&&!organizationUnit.parentId">{{l("NewOrganizationUnit")}}</span>
+      <span *ngIf="organizationUnit.id">修改: {{organizationUnit.displayName}}</span>
+      <span *ngIf="!organizationUnit.id&&!organizationUnit.parentId">新建组织机构</span>
       <span
         *ngIf="organizationUnit.parentId&&organizationUnit.parentDisplayName">{{l('AddSubNodeForXParentNode',organizationUnit.parentDisplayName)}}</span>
     </div>
@@ -12,12 +12,12 @@
   <fieldset>
     <nz-form-item nz-row>
       <nz-form-label nz-col [nzSm]="3" nzFor="DisplayName" nzRequired>
-        {{l("NameOfThings")}}
+        名称
       </nz-form-label>
       <nz-form-control nz-col [nzSm]="21" nzHasFeedback>
         <nz-input-group nzPrefixIcon="anticon anticon-book">
           <input nz-input #organizationUnitDisplayName="ngModel" name="DisplayName"
-            [(ngModel)]="organizationUnit.displayName" [placeholder]="l('NameOfThings')" required maxlength="128">
+            [(ngModel)]="organizationUnit.displayName" [placeholder]="'名称'" required maxlength="128">
         </nz-input-group>
 
         <nz-form-explain *ngIf="organizationUnitDisplayName.control.dirty&&organizationUnitDisplayName.control.errors">
diff --git a/src/app/admin/organization-units/organization-unit-members-panel/organization-unit-members-panel.component.html b/src/app/admin/organization-units/organization-unit-members-panel/organization-unit-members-panel.component.html
index 2c5111d..2452701 100644
--- a/src/app/admin/organization-units/organization-unit-members-panel/organization-unit-members-panel.component.html
+++ b/src/app/admin/organization-units/organization-unit-members-panel/organization-unit-members-panel.component.html
@@ -3,20 +3,20 @@
     <ellipsis lines="1" style="width: 400px">
       <i class="anticon anticon-team"></i>
       <span *ngIf="organizationUnit">{{organizationUnit.title}}</span>
-      <span *ngIf="!organizationUnit">{{l("Users")}}</span>
+      <span *ngIf="!organizationUnit">用户</span>
     </ellipsis>
   </ng-template>
   <ng-template #extraTemplate>
     <ng-container *ngIf="organizationUnit">
       <ng-container *ngIf="isGranted('Pages.Administration.OrganizationUnits.ManageMembers')">
         <a (click)="addUser()">
-          <i class="anticon anticon-plus"></i> {{l("AddUser")}}
+          <i class="anticon anticon-plus"></i> 添加用户
         </a>
         <nz-divider nzType="vertical"></nz-divider>
       </ng-container>
       <ng-container *ngIf="isGranted('Pages.Administration.OrganizationUnits.MemberBatchDelete')">
         <a (click)="batchDelete()">
-          <i class="anticon anticon-delete"></i> {{l("BatchDelete")}}
+          <i class="anticon anticon-delete"></i> 批量删除
         </a>
         <nz-divider nzType="vertical"></nz-divider>
       </ng-container>
@@ -32,7 +32,7 @@
       <nz-form-control>
         <nz-input-group nzSearch [nzSuffix]="suffixButton">
           <input type="text" nz-input [(ngModel)]="filterText" (keyup.enter)="refresh()" name="filterText"
-            [placeholder]="l('SearchWithThreeDot')">
+            [placeholder]="'搜索...'">
           <ng-template #suffixButton>
             <button nz-button nzType="primary" nzSearch type="submit">
               <i class="anticon anticon-search"></i>
@@ -46,7 +46,7 @@
         <ng-template #message>
           <span [innerHTML]="l('GridSelectedXItemsTips',selectedDataItems.length)"></span>
           <a (click)="restCheckStatus(dataList)" class="ml-md">
-            {{l('ClearEmpty')}}
+            清空
           </a>
         </ng-template>
       </nz-alert>
@@ -69,13 +69,13 @@
             <th nzShowCheckbox [(nzChecked)]="allChecked" [nzDisabled]="allCheckboxDisabled" [nzIndeterminate]="checkboxIndeterminate"
               (nzCheckedChange)="checkAll($event)"></th>
             <th nzShowSort nzSortKey="userName">
-              <span>{{l('UserName')}}</span>
+              <span>用户名</span>
             </th>
             <th nzShowSort nzSortKey="addedTime" class="text-center">
-              <span>{{l('AddedTime')}}</span>
+              <span>添加时间</span>
             </th>
             <th nzWidth="150px" class="text-center">
-              <span>{{l('Actions')}}</span>
+              <span>操作</span>
             </th>
           </tr>
         </thead>
@@ -96,7 +96,7 @@
                   (nzOnConfirm)="removeMember(item)" [nzOkText]="l('Ok')" [nzCancelText]="l('Cancel')">
                   <a nz-popconfirm>
                     <i class="anticon anticon-delete mr-sm"></i>
-                    <span>{{l('Delete')}}</span>
+                    <span>删除</span>
                   </a>
                 </nz-popconfirm>
               </ng-container>
@@ -108,6 +108,6 @@
   </ng-container>
 
   <div class="text-center" *ngIf="!organizationUnit">
-    <no-data [text]="l('SelectAnOrganizationUnitToSeeMembers')"></no-data>
+    <no-data [text]="'选择一个组织成员'"></no-data>
   </div>
 </nz-card>
diff --git a/src/app/admin/organization-units/organization-unit-tree-panel/organization-unit-tree-panel.component.html b/src/app/admin/organization-units/organization-unit-tree-panel/organization-unit-tree-panel.component.html
index 44dd2e6..20dd03f 100644
--- a/src/app/admin/organization-units/organization-unit-tree-panel/organization-unit-tree-panel.component.html
+++ b/src/app/admin/organization-units/organization-unit-tree-panel/organization-unit-tree-panel.component.html
@@ -2,21 +2,21 @@
   <ng-template #nzTitleTemplate>
     <i class="anticon anticon-share-alt"></i>
     <span>
-      {{l('OrganizationTree')}}
+      组织结构树
     </span>
   </ng-template>
   <ng-template #extraTemplate>
     <ng-container *ngIf="isGranted('Pages.Administration.OrganizationUnits.ManageOrganizationTree')">
       <a (click)="addUnit(null)">
-        <i class="anticon anticon-plus"></i> {{l("AddRootUnit")}}
+        <i class="anticon anticon-plus"></i> 添加根组织
       </a>
       <nz-divider nzType="vertical"></nz-divider>
     </ng-container>
     <a class="ml-sm">
-      <i class="anticon anticon-reload" nz-tooltip [nzTitle]="l('Refresh')" (click)="reload()"></i>
+      <i class="anticon anticon-reload" nz-tooltip [nzTitle]="'刷新'" (click)="reload()"></i>
     </a>
   </ng-template>
-  <nz-spin [nzTip]="l('MovingWithThreeDot')" [nzSpinning]="draging">
+  <nz-spin [nzTip]="'移动中...'" [nzSpinning]="draging">
     <nz-tree [(ngModel)]="_treeData" [nzShowExpand]="true" [nzDraggable]="true" (nzClick)="activeNode($event)"
       (nzDblClick)="openFolder($event)" (nzOnDragEnter)="dragEnter($event)" (nzOnDrop)="dragSaveData($event)"
       (nzOnDragEnd)="dragSaveData($event)">
@@ -25,20 +25,20 @@
           <li nz-menu-item (click)="editUnit()">
             <i class="anticon anticon-edit"></i>
             <span>
-              {{l('Edit')}}
+              修改
             </span>
           </li>
           <li nz-menu-item (click)="addSubUnit()">
             <i class="anticon anticon-file-add"></i>
             <span>
-              {{l('AddSubUnit')}}
+              添加子组织
             </span>
           </li>
-          <li nz-menu-item nz-popconfirm [nzTitle]="l('ConfirmDeleteWarningMessage')" (nzOnConfirm)="deleteUnit()"
-            [nzOkText]="l('Ok')" [nzCancelText]="l('Cancel')" nzPlacement="right">
+          <li nz-menu-item nz-popconfirm [nzTitle]="'确定要删除吗？'" (nzOnConfirm)="deleteUnit()"
+            [nzOkText]="'是'" [nzCancelText]="'取消'" nzPlacement="right">
             <i class="anticon anticon-delete"></i>
             <span>
-              {{l('Delete')}}
+              删除
             </span>
           </li>
         </ul>
@@ -75,7 +75,7 @@
     </nz-tree>
   </nz-spin>
   <div class="text-center" *ngIf="!totalUnitCount">
-    <no-data [text]="l('NoOrganizationUnitDefinedYet')"></no-data>
+    <no-data [text]="'没有定义组织机构.'"></no-data>
   </div>
 
 </nz-card>
diff --git a/src/app/admin/organization-units/organization-units.component.html b/src/app/admin/organization-units/organization-units.component.html
index 365992b..ac3d083 100644
--- a/src/app/admin/organization-units/organization-units.component.html
+++ b/src/app/admin/organization-units/organization-units.component.html
@@ -1,4 +1,4 @@
-<page-header [title]="l('OrganizationUnits')"></page-header>
+<page-header [title]="'组织机构'"></page-header>
 
 
 
-- 
Gitee