Merge remote-tracking branch 'abpframework/dev' into docs

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Popovers.cshtml

@@ -25,7 +25,7 @@
 
 <h2>Popovers</h2>
 
-<p>Based on <a href="https://getbootstrap.com/docs/4.1/components/Popovers/" target="_blank"> Bootstrap Popovers</a>.</p>
+<p>Based on <a href="https://getbootstrap.com/docs/4.1/components/popovers/" target="_blank"> Bootstrap Popovers</a>.</p>
 
 
 <h4>Example</h4>

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/zh-Hant.json

@@ -15,6 +15,8 @@
     "Permission:Edit": "編輯",
     "Permission:Delete": "刪除",
     "Permission:ManageConnectionStrings": "管理資料庫連線字串",
-    "Permission:ManageFeatures": "管理功能"
+    "Permission:ManageFeatures": "管理功能",
+    "DisplayName:AdminEmailAddress": "管理者信箱", 
+    "DisplayName:AdminPassword": "管理者密碼"
   }
-}
+}