mirror of
https://github.com/scm-manager/scm-manager.git
synced 2026-03-09 22:00:20 +01:00
fixed smaller merge issues
This commit is contained in:
@@ -111,7 +111,7 @@
|
||||
"name-input-invalid": "Permission is not allowed to be empty! If it is not empty, your input name is invalid or it already exists!"
|
||||
},
|
||||
"help": {
|
||||
"groupPermissionHelpText": "States if a permission is a group permission.",
|
||||
"groupPermissionHelpText": "States if a permission is a group permission. If this is not checked, it is a user permission.",
|
||||
"nameHelpText": "Manage permissions for a specific user or group.",
|
||||
"roleHelpText": "READ = read; WRITE = read and write; OWNER = read, write and also the ability to manage the properties and permissions. If nothing is selected here, use the 'Advanced' Button to see detailed permissions.",
|
||||
"permissionsHelpText": "Use this to specify your own set of permissions regardless of predefined roles."
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
"displayNameHelpText": "Display name of the user.",
|
||||
"mailHelpText": "Email address of the user.",
|
||||
"adminHelpText": "An administrator is able to create, modify and delete repositories, groups and users.",
|
||||
"activeHelpText": "Activate or deactive the user."
|
||||
"activeHelpText": "Activate or deactivate the user."
|
||||
},
|
||||
"users": {
|
||||
"title": "Users",
|
||||
|
||||
Reference in New Issue
Block a user