Merge branch 'master' into netcore2.0-2

Author: hikalkan

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/RoleAppService.cs

@@ -75,7 +75,7 @@ public override async Task Delete(EntityDto<int> input)
             var role = await _roleManager.FindByIdAsync(input.Id.ToString());
             if (role.IsStatic)
             {
-                throw new UserFriendlyException("CannotDeleteAStaticRole");
+                throw new UserFriendlyException(L("CanNotDeleteStaticRole"));
             }
 
             var users = await _userManager.GetUsersInRoleAsync(role.NormalizedName);

aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml

@@ -72,10 +72,17 @@
     <text name="Edit">Edit</text>
     <text name="Delete">Delete</text>
 
-    <text name="CreateNewRole">Create New Role</text>
+    <text name="CreateNewRole">Create new role</text>
     <text name="RoleName">Role Name</text>
     <text name="Actions">Actions</text>
 
     <text name="CouldNotCompleteLoginOperation">Could not complete login operation. Please try again later.</text>
+
+    <text name="CouldNotValidateExternalUser">Could not validate external user</text>
+    <text name="EditRole">Edit role</text>
+    <text name="EditTenant">Edit tenant</text>
+    <text name="EditUser">Edit user</text>
+    <text name="TenantIdIsNotActive{0}">TenantId {0} is not active</text>
+    <text name="UnknownTenantId{0}">Unknown tenantId {0}</text>
   </texts>
 </localizationDictionary>