Merge branch 'dev' of https://github.com/abpframework/abp into dev

abpframework · Oct 24, 2019 · 06287a1 · 06287a1
2 parents 2b39843 + 1d535b0
commit 06287a1
Show file tree

Hide file tree

Showing 26 changed files with 332 additions and 40 deletions.
diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Account/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Account/Localization/Resources/zh-Hans.json
@@ -1,5 +1,13 @@
 {
   "culture": "zh-Hans",
   "texts": {
+    "Account": "账户",
+    "Welcome": "欢迎",
+    "UseOneOfTheFollowingLinksToContinue": "使用下面的链接继续",
+    "FrameworkHomePage": "框架首页",
+    "FrameworkDocumentation": "框架文档",
+    "OfficialBlog": "官方博客",
+    "CommercialHomePage": "商业版首页",
+    "CommercialSupportWebSite": "商业版支持网站"
   }
 }
diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/zh-Hans.json
@@ -1,5 +1,60 @@
 {
   "culture": "zh-Hans",
   "texts": {
+    "Permission:NpmPackages": "NPM包",
+    "Permission:NugetPackages": "Nuget包",
+    "Permission:Maintenance": "维护",
+    "Permission:Maintain": "维护",
+    "Permission:ClearCaches": "清除缓存",
+    "Permission:Modules": "模块",
+    "Permission:Packages": "包",
+    "Permission:Edit": "编辑",
+    "Permission:Delete": "删除",
+    "Permission:Create": "创建",
+    "Menu:Packages": "包",
+    "NpmPackageDeletionWarningMessage": "该NPM包将会被删除. 你确定吗?",
+    "NugetPackageDeletionWarningMessage": "该Nuget包将会被删除. 你确定吗?",
+    "ModuleDeletionWarningMessage": "该模块将会被删除. 你确定吗?",
+    "Name": "名称",
+    "DisplayName": "显示名称",
+    "ShortDescription": "简述",
+    "NameFilter": "名称",
+    "CreationTime": "创建时间",
+    "IsPro": "是否为专业版",
+    "EfCoreConfigureMethodName": "配置方法法",
+    "IsProFilter": "是否为专业版",
+    "ApplicationType": "应用程序类型",
+    "Target": "目标",
+    "TargetFilter": "目标",
+    "ModuleClass": "模块分类",
+    "NugetPackageTarget.DomainShared": "Domain Shared",
+    "NugetPackageTarget.Domain": "Domain",
+    "NugetPackageTarget.Application": "Application",
+    "NugetPackageTarget.ApplicationContracts": "Application Contracts",
+    "NugetPackageTarget.HttpApi": "Http Api",
+    "NugetPackageTarget.HttpApiClient": "Http Api Client",
+    "NugetPackageTarget.Web": "Web",
+    "NugetPackageTarget.EntityFrameworkCore": "EntityFramework Core",
+    "NugetPackageTarget.MongoDB": "MongoDB",
+    "Edit": "编辑",
+    "Delete": "删除",
+    "Refresh": "刷新",
+    "NpmPackages": "NPM包",
+    "NugetPackages": "Nuget包",
+    "NpmPackageCount": "NPM包数量",
+    "NugetPackageCount": "Nuget包数量",
+    "Module": "模块",
+    "ModuleInfo": "模块信息",
+    "CreateANpmPackage": "创建NPM包",
+    "CreateAModule": "创建模块",
+    "CreateANugetPackage": "创建Nuget包",
+    "AddNew": "新建",
+    "PackageAlreadyExist{0}": "\"{0}\"已经被添加.",
+    "ClearCache": "清除缓存",
+    "SuccessfullyCleared": "清除成功",
+    "Menu:NpmPackages": "NPM包",
+    "Menu:Modules": "模块",
+    "Menu:Maintenance": "维护",
+    "Menu:NugetPackages": "Nuget包"
   }
 }
diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json
@@ -8,8 +8,8 @@
     "Volo.AbpIo.Domain:010008": "Allowed Developer Count can not be less then current developer count!",
     "Volo.AbpIo.Domain:010009": "Allowed Developer Count can not be less then 0!",
     "Volo.AbpIo.Domain:010010": "Maximum mac address count is exceeded!",
-	"Volo.AbpIo.Domain:010011": "Personal license can't have more than 1 developer!",
-	"Volo.AbpIo.Domain:010012": "License can't be extended one month after license expires!",
+    "Volo.AbpIo.Domain:010011": "Personal license can't have more than 1 developer!",
+    "Volo.AbpIo.Domain:010012": "License can't be extended one month after license expires!",
     "Volo.AbpIo.Domain:020001": "Could not delete this NPM Package because \"{NugetPackages}\" Nuget Packages are dependent to this package.",
     "Volo.AbpIo.Domain:020002": "Could not delete this NPM Package because \"{Modules}\" Modules are using this package.",
     "Volo.AbpIo.Domain:020003": "Could not delete this NPM Package because \"{Modules}\" Modules are using this package and \"{NugetPackages}\" Nuget Packages are dependent to this package.",

diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/zh-Hans.json
@@ -1,12 +1,31 @@
-{
+{
   "culture": "zh-Hans",
   "texts": {
     "Volo.AbpIo.Domain:010004": "超过最大成员数!",
     "Volo.AbpIo.Domain:010005": "超过最大所有者数!",
-    "Volo.AbpIo.Domain:010006": "T用户已经是该组织的所有者!",
+    "Volo.AbpIo.Domain:010006": "用户已经是该组织的所有者!",
     "Volo.AbpIo.Domain:010007": "该用户已经是该组织的开发者!",
     "Volo.AbpIo.Domain:010008": "允许的开发者数量不能低于当前开发者数量!",
     "Volo.AbpIo.Domain:010009": "允许的开发者数量不能小于零!",
-    "Volo.AbpIo.Domain:010010": "超出了最大mac地址数!"
+    "Volo.AbpIo.Domain:010010": "超出了最大mac地址数!",
+    "Volo.AbpIo.Domain:010011": "个人许可不允许超过1个开发者!",
+    "Volo.AbpIo.Domain:010012": "许可过期后许可不可延长1个月!",
+    "Volo.AbpIo.Domain:020001": "不能删除该NPM包因为\"{NugetPackages}\"Nuget包依赖此包.",
+    "Volo.AbpIo.Domain:020002": "不能删除该NPM包因为\"{Modules}\"模块正在使用此包.",
+    "Volo.AbpIo.Domain:020003": "不能删除该NPM包因为\"{Modules}\"模块正在使用此包并且\"{NugetPackages}\"Nuget包依赖此包.",
+    "Volo.AbpIo.Domain:020004": "不能删除该Nuget包因为\"{Modules}\"模块正在使用此包.",
+    "WantToLearn?": "想学习吗?",
+    "ReadyToGetStarted?": "准备开始了吗?",
+    "JoinOurCommunity": "加入我们的社区",
+    "GetStartedUpper": "开始",
+    "ForkMeOnGitHub": "Fork me on GitHub",
+    "Features": "功能",
+    "GetStarted": "开始",
+    "Documents": "文档",
+    "Community": "社区",
+    "ContributionGuide": "贡献指南",
+    "Blog": "博客",
+    "Commercial": "商业版",
+    "SeeDocuments": "见文档"
   }
-}
+}
diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json
@@ -21,10 +21,10 @@
     "Modules": "Modules",
     "LicenseExtendMessage": "Your license end date is extended to {0}",
     "LicenseUpgradeMessage": "Your license is upgraded to {0}",
-    "LicenseAddDeveloperMessage": "{0} developers added to your license" ,
+    "LicenseAddDeveloperMessage": "{0} developers added to your license",
     "Volo.AbpIo.Commercial:010004": "Can not find the specified user! The user must have already registered.",
-    "MyOrganizations":  "My organizations",
-	"ApiKey": "API key",
-	"UserNameNotFound": "There is no user with username {0}"
+    "MyOrganizations": "My organizations",
+    "ApiKey": "API key",
+    "UserNameNotFound": "There is no user with username {0}"
   }
 }
diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/zh-Hans.json
@@ -18,6 +18,13 @@
     "Manage": "管理",
     "StartDate": "开始日期",
     "EndDate": "结束日期",
-    "Modules":  "模块" 
+    "Modules": "模块",
+    "LicenseExtendMessage": "你的许可已经延长至{0}",
+    "LicenseUpgradeMessage": "你的许可已升级为{0}",
+    "LicenseAddDeveloperMessage": "{0}个开发者已添加到你的许可",
+    "Volo.AbpIo.Commercial:010004": "不能找到指定的用户! 用户必须已经注册.",
+    "MyOrganizations": "我的组织",
+    "ApiKey": "API key",
+    "UserNameNotFound": "没有用户名为{0}的用户"
   }
 }
diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json
@@ -155,6 +155,6 @@
     "SeeTheDocumentForMoreInformation": "See the <a href=\"{1}\">{0} document</a> for more information",
     "IndexPageHeroSection": "<span class=\"first-line shine\"><strong>open source</strong></span><span class=\"second-line text-uppercase\">Web Application<br />Framework </span><span class=\"third-line shine2\"><strong>for asp.net core</strong></span>",
     "UiFramework": "UI Framework",
-	"EmailAddress": "Email address"
+    "EmailAddress": "Email address"
   }
 }