Skip to content

Changed "remove" to "delete", "update" to "edit" in lexicons #15155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 26, 2020
Merged

Changed "remove" to "delete", "update" to "edit" in lexicons #15155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1c46bb
Changed "remove" to "delete" in lexicons
Ruslan-Aleev Jul 8, 2020
1ea2fdd
Changed "update" to "edit" in lexicons
Ruslan-Aleev Jul 8, 2020
730776b
Changed "new" to "create" in lexicons
Ruslan-Aleev Jul 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions core/lexicon/en/access.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,38 +10,38 @@
$_lang['access_category_err_ae'] = 'An ACL for that Category already exists!';
$_lang['access_category_err_nf'] = 'Category ACL not found.';
$_lang['access_category_err_ns'] = 'Category ACL not specified.';
$_lang['access_category_err_remove'] = 'An error occurred while trying to remove the Category ACL.';
$_lang['access_category_remove'] = 'Remove Category Access';
$_lang['access_category_update'] = 'Update Category Access';
$_lang['access_confirm_remove'] = 'Are you sure you want to remove this security access control record?';
$_lang['access_category_err_remove'] = 'An error occurred while trying to delete the Category ACL.';
$_lang['access_category_remove'] = 'Delete Category Access';
$_lang['access_category_update'] = 'Edit Category Access';
$_lang['access_confirm_remove'] = 'Are you sure you want to delete this security access control record?';
$_lang['access_context_management_msg'] = 'Manage User Group member access to Contexts and optionally apply access policies.';
$_lang['access_context_err_ae'] = 'An ACL for that Context already exists!';
$_lang['access_context_err_nf'] = 'Context ACL not found.';
$_lang['access_context_err_ns'] = 'Context ACL not specified.';
$_lang['access_context_err_remove'] = 'An error occurred while trying to remove the Context ACL.';
$_lang['access_context_remove'] = 'Remove Context Access';
$_lang['access_context_update'] = 'Update Context Access';
$_lang['access_context_err_remove'] = 'An error occurred while trying to delete the Context ACL.';
$_lang['access_context_remove'] = 'Delete Context Access';
$_lang['access_context_update'] = 'Edit Context Access';
$_lang['access_err_ae'] = 'ACL already exists!';
$_lang['access_err_create_md'] = 'Cannot create ACL; missing data!';
$_lang['access_err_nf'] = 'Could not find specified ACL!';
$_lang['access_err_remove'] = 'Error removing ACL!';
$_lang['access_err_remove'] = 'An error occurred while trying to delete the ACL!';
$_lang['access_err_save'] = 'Error saving ACL!';
$_lang['access_grid_empty'] = 'No ACLs to display';
$_lang['access_grid_paginate'] = 'Displaying ACLs {0} - {1} of {2}';
$_lang['access_permissions'] = 'Access Permissions';
$_lang['access_permissions_add_document_group'] = 'Create a new document group';
$_lang['access_permissions_add_user_group'] = 'Create a new user group';
$_lang['access_permissions_documents_in_group'] = '<strong>Documents in group:</strong> ';
$_lang['access_permissions_documents_tab'] = 'Here you can see which document groups have been set up. You can also create new groups, rename groups, delete groups and see which documents are in the different groups (hover over the id of the document to see its name). To add a document to a group or remove a document from a group, edit the document directly.';
$_lang['access_permissions_documents_tab'] = 'Here you can see which document groups have been set up. You can also create new groups, rename groups, delete groups and see which documents are in the different groups (hover over the id of the document to see its name). To add a document to a group or delete a document from a group, edit the document directly.';
$_lang['access_permissions_document_groups'] = 'Document groups';
$_lang['access_permissions_introtext'] = 'Here you can manage the user groups and document groups used for access permissions. To add user groups or users to user groups, use the left tree and right click. To link User Groups to Document Groups, simply drag user groups from the left tree into document groups in the right tree.';
$_lang['access_permissions_links'] = 'User/Document group links';
$_lang['access_permissions_links_tab'] = 'This is where we specify which user groups are given access (i.e. can edit or create children) for the document groups. To link a document group to a user group, select the group from the dropdown, and click on \'Link\'. To remove the link for a certain group, press \'Remove ->\'. This will immediately remove the link.';
$_lang['access_permissions_links_tab'] = 'This is where we specify which user groups are given access (i.e. can edit or create children) for the document groups. To link a document group to a user group, select the group from the dropdown, and click on \'Link\'. To delete the link for a certain group, press \'Delete ->\'. This will immediately delete the link.';
$_lang['access_permissions_no_documents_in_group'] = 'None.';
$_lang['access_permissions_no_users_in_group'] = 'None.';
$_lang['access_permissions_off'] = '<span class="warning">Access Permissions are not activated.</span> This means any changes made here will not have any effect until Access Permissions are activated.';
$_lang['access_permissions_users_in_group'] = '<strong>Users in group:</strong> ';
$_lang['access_permissions_users_tab'] = 'Here you can see which user groups have been set up. You can also create new groups, rename groups, delete groups and see which users are members of the different groups. To add a new user to a group or to remove a user from a group, edit the user directly.';
$_lang['access_permissions_users_tab'] = 'Here you can see which user groups have been set up. You can also create new groups, rename groups, delete groups and see which users are members of the different groups. To add a new user to a group or to delete a user from a group, edit the user directly.';
$_lang['access_permissions_user_group'] = 'User group:';
$_lang['access_permissions_user_groups'] = 'User groups';
$_lang['access_permissions_user_group_access'] = 'Resource Groups this User Group has access to:';
Expand All @@ -56,16 +56,16 @@
$_lang['access_rgroup_err_ae'] = 'An ACL for that Resource Group already exists!';
$_lang['access_rgroup_err_nf'] = 'Resource Group ACL not found.';
$_lang['access_rgroup_err_ns'] = 'Resource Group ACL not specified.';
$_lang['access_rgroup_err_remove'] = 'An error occurred while trying to remove the Resource Group ACL.';
$_lang['access_rgroup_remove'] = 'Remove Resource Group Access';
$_lang['access_rgroup_update'] = 'Update Resource Group Access';
$_lang['access_rgroup_err_remove'] = 'An error occurred while trying to delete the Resource Group ACL.';
$_lang['access_rgroup_remove'] = 'Delete Resource Group Access';
$_lang['access_rgroup_update'] = 'Edit Resource Group Access';
$_lang['access_source_err_ae'] = 'An ACL for that Media Source already exists.';
$_lang['access_source_remove'] = 'Remove Media Source Access';
$_lang['access_source_update'] = 'Update Media Source Access';
$_lang['access_source_remove'] = 'Delete Media Source Access';
$_lang['access_source_update'] = 'Edit Media Source Access';
$_lang['access_to_contexts'] = 'Access to Contexts';
$_lang['access_to_resource_groups'] = 'Access to Resource Groups';
$_lang['access_type_err_ns'] = 'Target type or id not specified!';
$_lang['acl_add'] = 'Add Access Control';
$_lang['acl_add'] = 'Create Access Control';
$_lang['authority'] = 'Authority';
$_lang['authority_err_ns'] = 'Please specify a Minimum Role.';
$_lang['category'] = 'Category';
Expand All @@ -79,25 +79,25 @@
$_lang['permissions_in_policy'] = 'Permissions in Selected Policy';
$_lang['resource_group'] = 'Resource Group';
$_lang['resource_group_add'] = 'Add Resource Group';
$_lang['resource_group_access_remove'] = 'Remove Resource from Group';
$_lang['resource_group_access_remove_confirm'] = 'Are you sure you want to remove this resource from the resource group?';
$_lang['resource_group_create'] = 'New Resource Group';
$_lang['resource_group_access_remove'] = 'Delete Resource from Group';
$_lang['resource_group_access_remove_confirm'] = 'Are you sure you want to delete this resource from the resource group?';
$_lang['resource_group_create'] = 'Create Resource Group';
$_lang['resource_group_err_ae'] = 'A resource group with that name already exists.';
$_lang['resource_group_err_create'] = 'An error occurred while trying to create the resource group.';
$_lang['resource_group_err_nf'] = 'Resource group not found.';
$_lang['resource_group_err_ns'] = 'Resource group not specified.';
$_lang['resource_group_err_remove'] = 'An error occurred while trying to remove the resource group.';
$_lang['resource_group_err_remove'] = 'An error occurred while trying to delete the resource group.';
$_lang['resource_group_remove'] = 'Delete Resource Group';
$_lang['resource_group_remove_confirm'] = 'Are you sure you want to remove this resource group?';
$_lang['resource_group_remove_confirm'] = 'Are you sure you want to delete this resource group?';
$_lang['resource_group_resource_err_ae'] = 'The resource is already a part of that resource group.';
$_lang['resource_group_resource_err_create'] = 'An error occurred while trying to put the resource in the resource group.';
$_lang['resource_group_resource_err_nf'] = 'The resource is not a part of that resource group.';
$_lang['resource_group_resource_err_remove'] = 'An error occurred while trying to remove the resource from the resource group.';
$_lang['resource_group_resource_err_remove'] = 'An error occurred while trying to delete the resource from the resource group.';
$_lang['resource_group_untitled'] = 'Untitled Resource Group';
$_lang['resource_group_update'] = 'Update Resource Group';
$_lang['resource_group_update'] = 'Edit Resource Group';
$_lang['resource_group_access_contexts'] = 'A comma-separated list of Contexts that the Resource Group should pertain to for the following options.';
$_lang['resource_group_automatic_access'] = 'Access Wizard';
$_lang['resource_group_automatic_access_desc'] = 'Note: You may have to flush sessions after adding the Resource Group if you check any of the options below.';
$_lang['resource_group_automatic_access_desc'] = 'Note: You may have to flush sessions after creating the Resource Group if you check any of the options below.';
$_lang['resource_group_access_admin'] = 'Automatically Give Adminstrator Group Access';
$_lang['resource_group_access_admin_desc'] = 'If checked, will give the Administrator Group view and editing access to this Resource Group for the above contexts.';
$_lang['resource_group_access_anon'] = 'Automatically Give Anonymous Access';
Expand All @@ -109,12 +109,12 @@
$_lang['roles_msg'] = 'A role is, by definition, a position or status one holds within a certain situation. They can be used to group Users into a position or status within a User Group. Roles in MODX also have what is called "Authority". This is a number value that can be any valid integer. Authority levels are "inheritable downward", in the sense that a Role with Authority 1 will inherit any and all Group Policies assigned to itself, and to any Roles with higher Authority level than 1.';
$_lang['source_add'] = 'Add Media Source';
$_lang['namespace_add'] = 'Add Namespace';
$_lang['access_namespace_update'] = 'Update Namespace Access';
$_lang['access_namespace_remove'] = 'Remove Namespace Access';
$_lang['access_namespace_update'] = 'Edit Namespace Access';
$_lang['access_namespace_remove'] = 'Delete Namespace Access';
$_lang['filter_by_namespace'] = 'Filter by Namespace...';

$_lang['user_group_aw'] = 'Access Wizard';
$_lang['user_group_aw_desc'] = 'Note: You may have to flush sessions after adding the User Group if you check any of the options below.';
$_lang['user_group_aw_desc'] = 'Note: You may have to flush sessions after creating the User Group if you check any of the options below.';
$_lang['user_group_aw_contexts'] = 'Contexts';
$_lang['user_group_aw_contexts_desc'] = 'A comma-separated list of Contexts that this User Group should be able to view.';
$_lang['user_group_aw_manager_policy'] = 'Manager Policy';
Expand All @@ -135,28 +135,28 @@
$_lang['user_group_category_context_desc'] = 'The Context to target for Elements with the above Category associated to them.';
$_lang['user_group_category_err_ae'] = 'User Group already has access to that Category.';
$_lang['user_group_category_policy_desc'] = 'The Policy to apply to this Context with Elements in the Category for this User Group. This will grant all Users in this User Group with the selected minimum Role all the Permissions in the Policy.';
$_lang['user_group_category_remove_confirm'] = 'Are you sure you want to remove this Category from this User Group?';
$_lang['user_group_category_remove_confirm'] = 'Are you sure you want to delete this Category from this User Group?';
$_lang['user_group_context_access'] = 'Context Access';
$_lang['user_group_context_access_msg'] = 'Here you can set which Contexts this User Group can access.';
$_lang['user_group_context_authority_desc'] = 'The minimum Role that will have access to the Permissions in the selected Policy for this context. Roles with stronger Authority (lower numbers) will inherit this access as well. Most situations can leave this at "Member".';
$_lang['user_group_context_context_desc'] = 'The Context to grant access to.';
$_lang['user_group_context_policy_desc'] = 'The Policy to apply to this Context for this User Group. This will grant all Users in this User Group with the selected minimum Role all the Permissions in the Policy.';
$_lang['user_group_context_err_ae'] = 'User Group already has access to that context.';
$_lang['user_group_context_remove_confirm'] = 'Are you sure you want to remove this Context from this User Group?';
$_lang['user_group_context_remove_confirm'] = 'Are you sure you want to delete this Context from this User Group?';
$_lang['user_group_resourcegroup_access'] = 'Resource Group Access';
$_lang['user_group_resourcegroup_access_msg'] = 'Here you can set which Resource Groups this User Group can access.';
$_lang['user_group_resourcegroup_authority_desc'] = 'The minimum Role that will have access to the Permissions in the selected Policy for this context. Roles with stronger Authority (lower numbers) will inherit this access as well. Most situations can leave this at "Member".';
$_lang['user_group_resourcegroup_context_desc'] = 'The Context to target for items with the above Resource Group associated to them.';
$_lang['user_group_resourcegroup_err_ae'] = 'User Group already has access to that Resource Group.';
$_lang['user_group_resourcegroup_policy_desc'] = 'The Policy to apply to this Context with Resources in the Resource Group for this User Group. This will grant all Users in this User Group with the selected minimum Role all the Permissions in the Policy.';
$_lang['user_group_resourcegroup_remove_confirm'] = 'Are you sure you want to remove this Resource Group from this User Group?';
$_lang['user_group_resourcegroup_remove_confirm'] = 'Are you sure you want to delete this Resource Group from this User Group?';
$_lang['user_group_resourcegroup_resource_group_desc'] = 'The Resource Group to grant access to.';
$_lang['user_group_source_access'] = 'Media Source Access';
$_lang['user_group_source_access_msg'] = 'Here you can set which Media Sources this User Group can access.';
$_lang['user_group_source_authority_desc'] = 'The minimum Role that will have access to the Permissions in the selected Policy. Roles with stronger Authority (lower numbers) will inherit this access as well. Most situations can leave this at "Member".';
$_lang['user_group_source_err_ae'] = 'User Group already has access to that Media Source.';
$_lang['user_group_source_policy_desc'] = 'The Policy to apply to this Media Source for this User Group. This will grant all Users in this User Group with the selected minimum Role all the Permissions in the Policy.';
$_lang['user_group_source_remove_confirm'] = 'Are you sure you want to remove this Media Source from this User Group?';
$_lang['user_group_source_remove_confirm'] = 'Are you sure you want to delete this Media Source from this User Group?';
$_lang['user_group_source_source_desc'] = 'The Media Source to grant access to.';
$_lang['user_group_user_access_msg'] = 'Select which users you want in this User Group.';
$_lang['user_group_namespace_access'] = 'Namespace access';
Expand Down
6 changes: 3 additions & 3 deletions core/lexicon/en/category.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @subpackage lexicon
*/
$_lang['categories'] = 'Categories';
$_lang['category_confirm_delete'] = 'Are you sure you want to remove this category? All elements in this category will be filed to uncategorized.';
$_lang['category_confirm_delete'] = 'Are you sure you want to delete this category? All elements in this category will be filed to uncategorized.';
$_lang['category_create'] = 'Create Category';
$_lang['category_err_ae'] = 'A category already exists with that name. Please try a different name.';
$_lang['category_err_create'] = 'An error occurred while trying to create the category.';
Expand All @@ -16,7 +16,7 @@
$_lang['category_err_nfs'] = 'Category not found with key: %s';
$_lang['category_err_ns'] = 'Category not specified.';
$_lang['category_err_ns_name'] = 'Please specify a valid category name.';
$_lang['category_err_remove'] = 'An error occurred while trying to remove the category.';
$_lang['category_err_remove'] = 'An error occurred while trying to delete the category.';
$_lang['category_err_save'] = 'An error occurred while trying to save the category.';
$_lang['category_existing'] = 'Existing Category';
$_lang['category_heading'] = 'Category';
Expand All @@ -27,4 +27,4 @@
$_lang['category_no_templates'] = 'No templates for this category.';
$_lang['category_no_template_variables'] = 'No template variables for this category.';
$_lang['category_rename'] = 'Rename Category';
$_lang['category_remove'] = 'Remove Category';
$_lang['category_remove'] = 'Delete Category';
8 changes: 4 additions & 4 deletions core/lexicon/en/chunk.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@
$_lang['chunk_desc'] = 'Description';
$_lang['chunk_delete_confirm'] = 'Are you sure you want to delete this chunk?';
$_lang['chunk_duplicate_confirm'] = 'Are you sure you want to duplicate this chunk?';
$_lang['chunk_err_create'] = 'An error occurred while creating new chunk.';
$_lang['chunk_err_create'] = 'An error occurred while trying to create the chunk.';
$_lang['chunk_err_duplicate'] = 'Error duplicating chunk.';
$_lang['chunk_err_ae'] = 'There is already a chunk with the name "[[+name]]".';
$_lang['chunk_err_invalid_name'] = 'Chunk name is invalid.';
$_lang['chunk_err_locked'] = 'Chunk is locked.';
$_lang['chunk_err_remove'] = 'An error occurred while trying to remove the chunk.';
$_lang['chunk_err_remove'] = 'An error occurred while trying to delete the chunk.';
$_lang['chunk_err_save'] = 'An error occurred while saving the chunk.';
$_lang['chunk_err_nf'] = 'Chunk not found!';
$_lang['chunk_err_nfs'] = 'Chunk not found with id: [[+id]]';
$_lang['chunk_err_ns'] = 'Chunk not specified.';
$_lang['chunk_err_ns_name'] = 'Please specify a name.';
$_lang['chunk_lock'] = 'Lock chunk for editing';
$_lang['chunk_lock_msg'] = 'Users must have the edit_locked attribute in order to edit this chunk.';
$_lang['chunk_msg'] = 'Here you can add/edit chunks. Remember: Chunks are \'raw\' HTML code; so any PHP code won\'t be processed.';
$_lang['chunk_msg'] = 'Here you can create/edit chunks. Remember: Chunks are \'raw\' HTML code; so any PHP code won\'t be processed.';
$_lang['chunk_name'] = 'Chunk name';
$_lang['chunk_new'] = 'New Chunk';
$_lang['chunk_new'] = 'Create Chunk';
$_lang['chunk_properties'] = 'Default Properties';
$_lang['chunk_title'] = 'Create/edit chunk';
$_lang['chunk_untitled'] = 'Untitled Chunk';
Expand Down
Loading