diff --git a/features/personas/ChangePassword.feature b/features/personas/ChangePassword.feature index a0d12666cf..b95ae09f62 100644 --- a/features/personas/ChangePassword.feature +++ b/features/personas/ChangePassword.feature @@ -5,7 +5,7 @@ Feature: Verify that an User allowed to change password can change his password Given I open Login page in admin SiteAccess And I log in as "UserPassword" with password "Passw0rd-42" When I go to user settings - And I switch to "My Account Settings" tab in User Settings + And I switch to "My account settings" tab in User settings And I click on the change password button And I change password from "Passw0rd-42" to "Passw0rd-43" And I click on the edit action bar button "Update" diff --git a/features/personas/SubtreeEditor.feature b/features/personas/SubtreeEditor.feature index fe2a6cb612..42f29fab2d 100644 --- a/features/personas/SubtreeEditor.feature +++ b/features/personas/SubtreeEditor.feature @@ -61,7 +61,7 @@ Feature: Verify that an Editor with Subtree limitations can perform all his task | buttonName | | Create content | | Edit | - And the "Send to Trash" button is not visible + And the "Send to trash" button is not visible Scenario: I cannot edit, create or send to trash Content outside my permissions Given I navigate to content "FolderGrandParent" of type "DedicatedFolder" in "root" @@ -69,4 +69,4 @@ Feature: Verify that an Editor with Subtree limitations can perform all his task | buttonName | | Create content | | Edit | - And the "Send to Trash" button is not visible + And the "Send to trash" button is not visible diff --git a/features/standard/Roles.feature b/features/standard/Roles.feature index 506c0a5df8..9433428b94 100644 --- a/features/standard/Roles.feature +++ b/features/standard/Roles.feature @@ -84,7 +84,7 @@ Feature: Roles management When I start assigning to "Test Role edited" from Roles page And I assign users to role | path | - | Users/Anonymous Users/Anonymous User | + | Users/Anonymous users/Anonymous User | | Users/Administrator users/Administrator User | And I assign groups to role | path | @@ -185,7 +185,7 @@ Feature: Roles management | option | | Article | | Folder | - And I select subtree limitation "Users/Anonymous Users" for policy through UDW + And I select subtree limitation "Users/Anonymous users" for policy through UDW And I select limitation for "State" | option | | Lock:Locked | @@ -194,7 +194,7 @@ Feature: Roles management And there are policies on the "Test Role edited" policies list | policy | limitation | | Content/Read | Content Type: Article, Folder | - | Content/Read | Subtree: /Users/Anonymous Users | + | Content/Read | Subtree: /Users/Anonymous users | | Content/Read | State: Lock:Locked | And there are assignments on the "Test Role edited" assignments list | User/Group | Limitation | diff --git a/src/bundle/Resources/public/js/scripts/admin.trash.js b/src/bundle/Resources/public/js/scripts/admin.trash.js index 9718d15a5c..6f9886272b 100644 --- a/src/bundle/Resources/public/js/scripts/admin.trash.js +++ b/src/bundle/Resources/public/js/scripts/admin.trash.js @@ -20,9 +20,9 @@ if (numberOfSubitems) { const message = Translator.trans( - /*@Desc("Sending '%content_name%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash.")*/ 'trash_container.modal.message_main', + /*@Desc("Sending '%content%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash.")*/ 'trash_container.modal.message_main', { - content_name: contentName, + content: contentName, children_count: numberOfSubitems, }, 'content', diff --git a/src/bundle/Resources/public/js/scripts/admin.trash.list.js b/src/bundle/Resources/public/js/scripts/admin.trash.list.js index acf4e559f1..1c742e5c1b 100644 --- a/src/bundle/Resources/public/js/scripts/admin.trash.list.js +++ b/src/bundle/Resources/public/js/scripts/admin.trash.list.js @@ -45,7 +45,7 @@ const form = event.target.closest('form[name="trash_item_restore"]'); const config = JSON.parse(event.currentTarget.dataset.udwConfig); const title = Translator.trans( - /*@Desc("Select a Location to restore the Content item(s)")*/ 'restore_under_new_location.title', + /*@Desc("Select a new location to restore the content items")*/ 'restore_under_new_location.title', {}, 'universal_discovery_widget', ); diff --git a/src/bundle/Resources/public/js/scripts/helpers/form.validation.helper.js b/src/bundle/Resources/public/js/scripts/helpers/form.validation.helper.js index f6c15b4c76..7cfedc9457 100644 --- a/src/bundle/Resources/public/js/scripts/helpers/form.validation.helper.js +++ b/src/bundle/Resources/public/js/scripts/helpers/form.validation.helper.js @@ -20,7 +20,7 @@ if (label) { const fieldName = label.innerText; - errorMessage = Translator.trans(/*@Desc("%fieldName% Field is required")*/ 'error.required.field', { fieldName }, 'forms'); + errorMessage = Translator.trans(/*@Desc("%fieldName% cannot be empty")*/ 'error.required.field', { fieldName }, 'forms'); } else { errorMessage = Translator.trans(/*@Desc("This value should not be blank")*/ 'error.required.field_not_blank', {}, 'forms'); } diff --git a/src/bundle/Resources/translations/bookmark.en.xliff b/src/bundle/Resources/translations/bookmark.en.xliff index d61739679a..813b22c152 100644 --- a/src/bundle/Resources/translations/bookmark.en.xliff +++ b/src/bundle/Resources/translations/bookmark.en.xliff @@ -17,8 +17,8 @@ key: bookmark.headline - Edit content - Edit content + Edit + Edit key: bookmark.list.content.edit diff --git a/src/bundle/Resources/translations/content.en.xliff b/src/bundle/Resources/translations/content.en.xliff index 460455b744..4c04367cf2 100644 --- a/src/bundle/Resources/translations/content.en.xliff +++ b/src/bundle/Resources/translations/content.en.xliff @@ -57,8 +57,8 @@ key: content_edit.autosave.status_saved.message.full - under %location_name% - under %location_name% + Location: %location% + Location: %location% key: editing_details @@ -77,8 +77,8 @@ key: trash.modal.message - Sending '%content_name%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash. - Sending '%content_name%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash. + Sending '%content%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash. + Sending '%content%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash. key: trash_container.modal.message_main diff --git a/src/bundle/Resources/translations/content_create.en.xliff b/src/bundle/Resources/translations/content_create.en.xliff index 1ed53a7915..3f841e9378 100644 --- a/src/bundle/Resources/translations/content_create.en.xliff +++ b/src/bundle/Resources/translations/content_create.en.xliff @@ -12,8 +12,8 @@ key: creating - under %location_name% in %language% - under %location_name% in %language% + Location: %location% Translation: %language + Location: %location% Translation: %language key: editing_details diff --git a/src/bundle/Resources/translations/content_edit.en.xliff b/src/bundle/Resources/translations/content_edit.en.xliff index 9b910e161b..83f16fd190 100644 --- a/src/bundle/Resources/translations/content_edit.en.xliff +++ b/src/bundle/Resources/translations/content_edit.en.xliff @@ -27,8 +27,8 @@ key: editing - under %location_name% in %language% - under %location_name% in %language% + Location: %location% Translation: %language + Location: %location% Translation: %language key: editing_details diff --git a/src/bundle/Resources/translations/content_type.en.xliff b/src/bundle/Resources/translations/content_type.en.xliff index b1a6261e8f..d2e3b4ffc2 100644 --- a/src/bundle/Resources/translations/content_type.en.xliff +++ b/src/bundle/Resources/translations/content_type.en.xliff @@ -7,8 +7,8 @@ - Copy - Copy + Duplicate + Duplicate key: content_type.action.copy @@ -37,13 +37,13 @@ key: content_type.content_field_definitions - Error occoured while copying the '%name%' Content Type. - Error occoured while copying the '%name%' Content Type. + Content Type '%name%' cannot be copied. + Content Type '%name%' cannot be copied. key: content_type.copy.error - Content Type '%name%' successfully copied. - Content Type '%name%' successfully copied. + Content Type '%name%' copied. + Content Type '%name%' copied. key: content_type.copy.success @@ -868,7 +868,7 @@ Can be a thumbnail - Can be a thumbnail + Can be a thumbnail key: field_definition.is_thumbnail @@ -902,8 +902,8 @@ key: location_update_form.update - Enable %type% for this content type - Enable %type% for this content type + Enable %type% for this Content Type + Enable %type% for this Content Type key: meta.enabled diff --git a/src/bundle/Resources/translations/content_url.en.xliff b/src/bundle/Resources/translations/content_url.en.xliff index 47717602a3..3d77f2fa18 100644 --- a/src/bundle/Resources/translations/content_url.en.xliff +++ b/src/bundle/Resources/translations/content_url.en.xliff @@ -7,8 +7,8 @@ - Add new - Add new + Add + Add key: tab.urls.action.add @@ -47,8 +47,8 @@ key: tab.urls.add.redirect.helper.unchecked - If you leave this empty, the alias will be placed at main root Location. - If you leave this empty, the alias will be placed at main root Location. + If no SiteAccess selected, the alias will be placed at main root Location. + If no SiteAccess selected, the alias will be placed at main root Location. key: tab.urls.add.root_location_id.helper_secondary @@ -92,8 +92,8 @@ key: tab.urls.language - Do you want to delete the selected custom URL alias(es)? - Do you want to delete the selected custom URL alias(es)? + Delete the selected custom URL aliases permanently? + Delete the selected custom URL aliases permanently? key: tab.urls.modal.message @@ -101,9 +101,14 @@ This item has no custom URL aliases. key: tab.urls.no_custom_urls + + Add new custom URL aliases manually + Add new custom URL aliases manually + key: tab.urls.no_custom_urls.action + - This Content item has no system URLs. - This Content item has no system URLs. + This item has no system URLs. + This item has no system URLs. key: tab.urls.no_system_urls diff --git a/src/bundle/Resources/translations/dashboard.en.xliff b/src/bundle/Resources/translations/dashboard.en.xliff index 537bf60842..5d167fe9ea 100644 --- a/src/bundle/Resources/translations/dashboard.en.xliff +++ b/src/bundle/Resources/translations/dashboard.en.xliff @@ -27,8 +27,8 @@ key: dashboard.tab.my_content.empty - No content. Drafts you create will show up here - No content. Drafts you create will show up here + You have no drafts yet. Your drafts will show up here. + You have no drafts yet. Your drafts will show up here. key: dashboard.tab.my_drafts.empty @@ -37,18 +37,18 @@ key: dashboard.tab.my_media.empty - Edit Content - Edit Content + Edit + Edit key: dashboard.table.all.content.edit - Edit Media - Edit Media + Edit + Edit key: dashboard.table.all.media.edit - Edit Content - Edit Content + Edit + Edit key: dashboard.table.content.edit @@ -67,8 +67,8 @@ key: dashboard.table.contributor.not_found - Edit Draft - Edit Draft + Edit + Edit key: dashboard.table.draft.edit @@ -77,13 +77,13 @@ key: dashboard.table.draft.unauthorized - Last Saved - Last Saved + Modified + Modified key: dashboard.table.last_saved - Edit Media - Edit Media + Edit + Edit key: dashboard.table.media.edit diff --git a/src/bundle/Resources/translations/draft_conflict.en.xliff b/src/bundle/Resources/translations/draft_conflict.en.xliff index 143378fed3..0f99af44ab 100644 --- a/src/bundle/Resources/translations/draft_conflict.en.xliff +++ b/src/bundle/Resources/translations/draft_conflict.en.xliff @@ -7,8 +7,8 @@ - Add new - Add new + Add + Add key: draft.conflict.add_new diff --git a/src/bundle/Resources/translations/drafts.en.xliff b/src/bundle/Resources/translations/drafts.en.xliff index 411df69090..42945eeb16 100644 --- a/src/bundle/Resources/translations/drafts.en.xliff +++ b/src/bundle/Resources/translations/drafts.en.xliff @@ -17,8 +17,8 @@ key: drafts.list - Edit draft - Edit draft + Edit + Edit key: drafts.list.action.edit @@ -47,8 +47,8 @@ key: drafts.list.empty - Last Saved - Last Saved + Modified + Modified key: drafts.list.last_saved diff --git a/src/bundle/Resources/translations/dropdown.en.xliff b/src/bundle/Resources/translations/dropdown.en.xliff index c8e1911459..6690860f3c 100644 --- a/src/bundle/Resources/translations/dropdown.en.xliff +++ b/src/bundle/Resources/translations/dropdown.en.xliff @@ -12,8 +12,8 @@ key: dropdown.clear - All - All + Choose an option + Choose an option key: dropdown.placeholder diff --git a/src/bundle/Resources/translations/edit_translation_button.en.xliff b/src/bundle/Resources/translations/edit_translation_button.en.xliff index 1268fca325..e13eab7bf1 100644 --- a/src/bundle/Resources/translations/edit_translation_button.en.xliff +++ b/src/bundle/Resources/translations/edit_translation_button.en.xliff @@ -7,8 +7,8 @@ - Edit Content - Edit Content + Edit + Edit key: edit_translation.edit.title diff --git a/src/bundle/Resources/translations/ezplatform_content_forms_policies.en.xliff b/src/bundle/Resources/translations/ezplatform_content_forms_policies.en.xliff index b7cbb27cc9..824a8d8ca4 100644 --- a/src/bundle/Resources/translations/ezplatform_content_forms_policies.en.xliff +++ b/src/bundle/Resources/translations/ezplatform_content_forms_policies.en.xliff @@ -8,144 +8,99 @@ Change Owner - Change Owner + Change Owner key: policy.limitation.identifier.changeowner Content Type - Content Type + Content Type key: policy.limitation.identifier.class - - Field Group - Field Group - key: policy.limitation.identifier.fieldgroup - Content Type Group - Content Type Group + Content Type Group key: policy.limitation.identifier.group Language - Language + Language key: policy.limitation.identifier.language - - MemberOf - MemberOf - key: policy.limitation.identifier.memberof - New Section - New Section + New Section key: policy.limitation.identifier.newsection New State - New State + New State key: policy.limitation.identifier.newstate Location - Location + Location key: policy.limitation.identifier.node Owner - Owner + Owner key: policy.limitation.identifier.owner Content Type of Parent - Content Type of Parent + Content Type of Parent key: policy.limitation.identifier.parentclass Parent Depth - Parent Depth + Parent Depth key: policy.limitation.identifier.parentdepth Content Type Group of Parent - Content Type Group of Parent + Content Type Group of Parent key: policy.limitation.identifier.parentgroup Owner of Parent - Owner of Parent + Owner of Parent key: policy.limitation.identifier.parentowner - - Personalization Access - Personalization Access - key: policy.limitation.identifier.personalizationaccess - - - Product Type - Product Type - key: policy.limitation.identifier.producttype - Role - Role + Role key: policy.limitation.identifier.role Section - Section + Section key: policy.limitation.identifier.section - - Segment Group - Segment Group - key: policy.limitation.identifier.segmentgroup - SiteAccess - SiteAccess + SiteAccess key: policy.limitation.identifier.siteaccess State - State + State key: policy.limitation.identifier.state Status - Status + Status key: policy.limitation.identifier.status Subtree - Subtree + Subtree key: policy.limitation.identifier.subtree - - Taxonomy - Taxonomy - key: policy.limitation.identifier.taxonomy - User Permissions - User Permissions + User Permissions key: policy.limitation.identifier.userpermissions - - Version Lock - Version Lock - key: policy.limitation.identifier.versionlock - - - Workflow Stage - Workflow Stage - key: policy.limitation.identifier.workflowstage - - - Workflow Transition - Workflow Transition - key: policy.limitation.identifier.workflowtransition - diff --git a/src/bundle/Resources/translations/ezplatform_url_management.en.xliff b/src/bundle/Resources/translations/ezplatform_url_management.en.xliff index 5e75c8f5fa..ead6351ce6 100644 --- a/src/bundle/Resources/translations/ezplatform_url_management.en.xliff +++ b/src/bundle/Resources/translations/ezplatform_url_management.en.xliff @@ -7,13 +7,13 @@ - URL Management - URL Management + URL management + URL management key: url_management.breadcrumb.list - URL Management - URL Management + URL management + URL management key: url_management.view.list.title diff --git a/src/bundle/Resources/translations/ezplatform_url_wildcard.en.xliff b/src/bundle/Resources/translations/ezplatform_url_wildcard.en.xliff index 10329d4875..974e18b6d9 100644 --- a/src/bundle/Resources/translations/ezplatform_url_wildcard.en.xliff +++ b/src/bundle/Resources/translations/ezplatform_url_wildcard.en.xliff @@ -7,8 +7,8 @@ - Edit URL wildcard - Edit URL wildcard + Edit + Edit key: url_wildcard.action.edit @@ -17,8 +17,8 @@ key: url_wildcard.breadcrumb.edit - URL Management - URL Management + URL management + URL management key: url_wildcard.breadcrumb.list diff --git a/src/bundle/Resources/translations/forms.en.xliff b/src/bundle/Resources/translations/forms.en.xliff index 94cafe252a..05f3b04704 100644 --- a/src/bundle/Resources/translations/forms.en.xliff +++ b/src/bundle/Resources/translations/forms.en.xliff @@ -47,8 +47,8 @@ key: content_types_delete_form.delete - %fieldName% Field is required - %fieldName% Field is required + %fieldName% cannot be empty + %fieldName% cannot be empty key: error.required.field @@ -132,18 +132,18 @@ key: location_move.move - Send only this Content item to Trash - Send only this Content item to Trash + Send only this Content item to trash + Send only this Content item to trash key: location_trash_form.default_trash - Send to Trash - Send to Trash + Send to trash + Send to trash key: location_trash_form.trash - Send the Content item and its related assets to Trash - Send the Content item and its related assets to Trash + Send the Content item and its related assets to trash + Send the Content item and its related assets to trash key: location_trash_form.trash_with_asset @@ -163,7 +163,7 @@ All modules - All modules + All modules key: role.policy.all_modules @@ -282,8 +282,8 @@ key: section_form.name - Change Section - Change Section + Change section + Change section key: section_subtree_assign_form.assign @@ -317,8 +317,8 @@ key: translation.language.label - Delete permanently - Delete permanently + Delete + Delete key: trash_empty_form.empty diff --git a/src/bundle/Resources/translations/ibexa_content_forms_policies.en.xliff b/src/bundle/Resources/translations/ibexa_content_forms_policies.en.xliff deleted file mode 100644 index ec2a8e95c7..0000000000 --- a/src/bundle/Resources/translations/ibexa_content_forms_policies.en.xliff +++ /dev/null @@ -1,16 +0,0 @@ - - - -
- - The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. -
- - - Change Owner - Change Owner - key: policy.limitation.identifier.changeowner - - - - diff --git a/src/bundle/Resources/translations/language.en.xliff b/src/bundle/Resources/translations/language.en.xliff index db08ac095a..4c22a0c8bf 100644 --- a/src/bundle/Resources/translations/language.en.xliff +++ b/src/bundle/Resources/translations/language.en.xliff @@ -92,8 +92,8 @@ key: language.list - Do you want to delete the language(s)? - Do you want to delete the language(s)? + Delete the languages? + Delete the languages? key: language.modal.message diff --git a/src/bundle/Resources/translations/linkmanager.en.xliff b/src/bundle/Resources/translations/linkmanager.en.xliff index db3428a3da..9aa5278707 100644 --- a/src/bundle/Resources/translations/linkmanager.en.xliff +++ b/src/bundle/Resources/translations/linkmanager.en.xliff @@ -12,13 +12,13 @@ key: tab.name.link_manager - Edit URL - Edit URL + Edit + Edit key: url.action.edit - Edit content - Edit content + Edit + Edit key: url.action.item.edit diff --git a/src/bundle/Resources/translations/locationview.en.xliff b/src/bundle/Resources/translations/locationview.en.xliff index 282e0f7711..8da59b53c9 100644 --- a/src/bundle/Resources/translations/locationview.en.xliff +++ b/src/bundle/Resources/translations/locationview.en.xliff @@ -22,8 +22,8 @@ key: content.create.create_content - under %content_name% - under %content_name% + Location: %content% + Location: %content% key: content.create.editing_details @@ -32,8 +32,8 @@ key: content.create.filters.desc - Type to refine - Type to refine + Search by Content Type + Search by Content Type key: content.create.input.placeholder @@ -67,8 +67,8 @@ key: dashboard.table.relation.unauthorized - Add to Bookmarks - Add to Bookmarks + Add to bookmarks + Add to bookmarks key: location.bookmark.add @@ -77,8 +77,8 @@ key: location.bookmark.remove - Email Address - Email Address + Email address + Email address key: modal.email_address @@ -87,8 +87,8 @@ key: modal.info - Change Section - Change Section + Change section + Change section key: tab.details.change_section @@ -197,8 +197,8 @@ key: tab.details.translations - Add new - Add new + Add + Add key: tab.locations.action.add @@ -207,8 +207,8 @@ key: tab.locations.action.delete - Content Locations - Content Locations + Content locations + Content locations key: tab.locations.content_locations @@ -342,8 +342,8 @@ key: tab.relations.table.relation_type.link - Add new - Add new + Add + Add key: tab.translations.action.add diff --git a/src/bundle/Resources/translations/menu.en.xliff b/src/bundle/Resources/translations/menu.en.xliff index f371e4a5c3..0e73d9eb2d 100644 --- a/src/bundle/Resources/translations/menu.en.xliff +++ b/src/bundle/Resources/translations/menu.en.xliff @@ -52,8 +52,8 @@ key: content__sidebar_right__reveal - Send to Trash - Send to Trash + Send to trash + Send to trash key: content__sidebar_right__send_to_trash @@ -212,8 +212,8 @@ key: main__admin__sections - URL Management - URL Management + URL management + URL management key: main__admin__url_management @@ -332,8 +332,8 @@ key: role_copy__sidebar_right__cancel - Save - Save + Copy + Copy key: role_copy__sidebar_right__save @@ -437,8 +437,8 @@ key: user__drafts - User Settings - User Settings + User settings + User settings key: user__settings diff --git a/src/bundle/Resources/translations/messages.en.xliff b/src/bundle/Resources/translations/messages.en.xliff index a742a595e7..e4274df093 100644 --- a/src/bundle/Resources/translations/messages.en.xliff +++ b/src/bundle/Resources/translations/messages.en.xliff @@ -12,13 +12,13 @@ key: anchor_navigation.close - Your current password will expire in %days% day(s). You can change it in User Settings/My Account Settings. - Your current password will expire in %days% day(s). You can change it in User Settings/My Account Settings. + Your current password will expire in %days% day(s). You can change it in User settings/My account settings. + Your current password will expire in %days% day(s). You can change it in User settings/My account settings. key: authentication.credentials_expire_in.warning - Your current password will expire today. You can change it in User Settings/My Account Settings. - Your current password will expire today. You can change it in User Settings/My Account Settings. + Your current password will expire today. You can change it in User settings/My account settings. + Your current password will expire today. You can change it in User settings/My account settings. key: authentication.credentials_expire_today.warning @@ -271,6 +271,11 @@ Delete key: custom_url_alias_add_form.remove + + None + None + key: custom_url_alias_add_form.site_access.placeholder + for the selected period]]> for the selected period]]> @@ -362,8 +367,8 @@ key: ezobjectrelationlist.cta.limit.multi - Set up a Relation with one Item - Set up a Relation with one Item + Set up a relation with one Content item + Set up a relation with one Content item key: ezobjectrelationlist.cta.limit.single @@ -504,8 +509,8 @@ key: language.delete - Do you want to delete the language(s)? - Do you want to delete the language(s)? + Delete the languages? + Delete the languages? key: language.modal.message @@ -559,12 +564,12 @@ key: object_state.modal.message - Add new - Add new + Add + Add key: object_state.new - Delete Object + Delete Delete key: object_state_group.delete.bulk_delete.submit @@ -584,8 +589,8 @@ key: policy.modal.message - Add new - Add new + Add + Add key: policy.view.list.action.add @@ -654,8 +659,8 @@ key: tab.versions.table.action.archived.edit - Edit draft - Edit draft + Edit + Edit key: tab.versions.table.action.draft.edit @@ -709,15 +714,10 @@ key: trash.delete - Are you sure you want to permanently delete %trashItemsCount% item(s)? - Are you sure you want to permanently delete %trashItemsCount% item(s)? + Permanently delete items: %trashItemsCount%? + Permanently delete items: %trashItemsCount%? key: trash.delete.all.confirm - - This action cannot be reversed - This action cannot be reversed - key: trash.delete.all.info - Cancel Cancel @@ -729,8 +729,8 @@ key: trash.form.cancel - Do you want to delete the selected item(s) from Trash? - Do you want to delete the selected item(s) from Trash? + Delete the selected items permanently? + Delete the selected items permanently? key: trash.modal.message @@ -749,18 +749,18 @@ key: trash_asset.modal.message_header - '%content_name%' has 1 or more asset Field(s). You have an option to send only the Content item to Trash, or to send the Content item and its assets to Trash. Please select your option: - '%content_name%' has 1 or more asset Field(s). You have an option to send only the Content item to Trash, or to send the Content item and its assets to Trash. Please select your option: + '%content%' has 1 or more asset Field(s). You have an option to send only the Content item to Trash, or to send the Content item and its assets to Trash. Please select your option: + '%content%' has 1 or more asset Field(s). You have an option to send only the Content item to Trash, or to send the Content item and its assets to Trash. Please select your option: key: trash_asset_single.modal.message_main - Sending '%content_name%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash. - Sending '%content_name%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash. + Sending '%content%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash. + Sending '%content%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash. key: trash_container.modal.message_main - '%content_name%' is in use by %reverse_relations% Content item(s). You should remove all reverse Relations before deleting the Content item. - '%content_name%' is in use by %reverse_relations% Content item(s). You should remove all reverse Relations before deleting the Content item. + '%content%' is in use by %reverse_relations% Content item(s). You should remove all reverse Relations before deleting the Content item. + '%content%' is in use by %reverse_relations% Content item(s). You should remove all reverse Relations before deleting the Content item. key: trash_container.modal.message_relations @@ -774,8 +774,8 @@ key: ui.component.tab.tabs_toggler.show - Add new - Add new + Add + Add key: url_wildcard.list.action.create diff --git a/src/bundle/Resources/translations/multi_file_upload.en.xliff b/src/bundle/Resources/translations/multi_file_upload.en.xliff index 1f1a192945..5bd15ec650 100644 --- a/src/bundle/Resources/translations/multi_file_upload.en.xliff +++ b/src/bundle/Resources/translations/multi_file_upload.en.xliff @@ -17,8 +17,8 @@ key: cannot_create_content_structure.message - Cannot get content type by identifier - Cannot get content type by identifier + Cannot get Content Type by identifier + Cannot get Content Type by identifier key: cannot_get_content_type_identifier.message diff --git a/src/bundle/Resources/translations/role.en.xliff b/src/bundle/Resources/translations/role.en.xliff index 4fd45dba2c..cb23112597 100644 --- a/src/bundle/Resources/translations/role.en.xliff +++ b/src/bundle/Resources/translations/role.en.xliff @@ -7,8 +7,8 @@ - No Limitations - No Limitations + No limitations + No limitations key: limitation_type.none @@ -22,8 +22,8 @@ key: limitation_type.subtree - Select Subtree - Select Subtree + Select subtree + Select subtree key: locations.select_subtree @@ -87,8 +87,8 @@ key: policy.view.edit.title - Edit Limitations - Edit Limitations + Edit + Edit key: policy.view.limitations.title diff --git a/src/bundle/Resources/translations/section.en.xliff b/src/bundle/Resources/translations/section.en.xliff index 5a105f2aa9..e54a7cefea 100644 --- a/src/bundle/Resources/translations/section.en.xliff +++ b/src/bundle/Resources/translations/section.en.xliff @@ -6,11 +6,6 @@ The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message. - - No content. Drafts you create will show up here - No content. Drafts you create will show up here - key: dashboard.tab.my_drafts.empty - Delete Delete diff --git a/src/bundle/Resources/translations/sub_items.en.xliff b/src/bundle/Resources/translations/sub_items.en.xliff index 69acbd2120..dfef857828 100644 --- a/src/bundle/Resources/translations/sub_items.en.xliff +++ b/src/bundle/Resources/translations/sub_items.en.xliff @@ -72,8 +72,8 @@ key: bulk_delete.error.modal.table_title.users_with_nonusers - Send to Trash - Send to Trash + Send to trash + Send to trash key: bulk_delete.popup.confirm.nonusers @@ -192,8 +192,8 @@ key: hide_locations_btn.label - Type to refine - Type to refine + Search by Content Type + Search by Content Type key: instant.filter.placeholder diff --git a/src/bundle/Resources/translations/trash.en.xliff b/src/bundle/Resources/translations/trash.en.xliff index 48da208e0b..263d24c3cf 100644 --- a/src/bundle/Resources/translations/trash.en.xliff +++ b/src/bundle/Resources/translations/trash.en.xliff @@ -7,8 +7,8 @@ - Type creator's name - Type creator's name + Search by creator + Search by creator key: search.creator_input.placeholder @@ -22,8 +22,8 @@ key: trash.button.restore - Restore in a new Location - Restore in a new Location + Restore in a new location + Restore in a new location key: trash.button.restore_new_location @@ -37,8 +37,8 @@ key: trash.creator - Sent to trash date - Sent to trash date + Trashed + Trashed key: trash.date @@ -62,8 +62,8 @@ key: trash.headline - Ancestor is in the Trash - Ancestor is in the Trash + Ancestor is unknown + Ancestor is unknown key: trash.item.ancesor_in_trash @@ -77,8 +77,8 @@ key: trash.name - Original Location - Original Location + Location + Location key: trash.original_location diff --git a/src/bundle/Resources/translations/universal_discovery_widget.en.xliff b/src/bundle/Resources/translations/universal_discovery_widget.en.xliff index 2be84109d8..0e9ef0e0cb 100644 --- a/src/bundle/Resources/translations/universal_discovery_widget.en.xliff +++ b/src/bundle/Resources/translations/universal_discovery_widget.en.xliff @@ -47,8 +47,8 @@ key: close.label - under %content_name% - under %content_name% + Location: %location% + Location: %location% key: content.create.editing_details @@ -67,8 +67,8 @@ key: content_create.label - Type to refine - Type to refine + Search by Content Type + Search by Content Type key: content_create.placeholder @@ -97,13 +97,13 @@ key: copy.title - Create new - Create new + Create + Create key: create_content.create - Create new content - Create new content + Create content + Create content key: create_content.label @@ -197,8 +197,8 @@ key: meta_preview.bookrmarks_remove - Creation Date - Creation Date + Created + Created key: meta_preview.creation_date @@ -212,8 +212,8 @@ key: meta_preview.edit_translation - Last Modified - Last Modified + Modified + Modified key: meta_preview.last_modified @@ -237,8 +237,8 @@ key: popup.close.label - Select a Location to restore the Content item(s) - Select a Location to restore the Content item(s) + Select a new location to restore the content items + Select a new location to restore the content items key: restore_under_new_location.title diff --git a/src/bundle/Resources/translations/user_create.en.xliff b/src/bundle/Resources/translations/user_create.en.xliff index e5e4b48277..e8644d0abc 100644 --- a/src/bundle/Resources/translations/user_create.en.xliff +++ b/src/bundle/Resources/translations/user_create.en.xliff @@ -12,8 +12,8 @@ key: Create - under %location_name% - under %location_name% + Location: %location% + Location: %location% key: editing_details diff --git a/src/bundle/Resources/translations/user_edit.en.xliff b/src/bundle/Resources/translations/user_edit.en.xliff index 0d11974fdc..5bbcbe8765 100644 --- a/src/bundle/Resources/translations/user_edit.en.xliff +++ b/src/bundle/Resources/translations/user_edit.en.xliff @@ -12,8 +12,8 @@ key: editing - under %location_name% - under %location_name% + Location: %location% + Location: %location% key: editing_details diff --git a/src/bundle/Resources/translations/user_invitation.en.xliff b/src/bundle/Resources/translations/user_invitation.en.xliff index 8dee4694d8..d609568654 100644 --- a/src/bundle/Resources/translations/user_invitation.en.xliff +++ b/src/bundle/Resources/translations/user_invitation.en.xliff @@ -72,8 +72,8 @@ key: modal.issue.bad_file.alert.message - Email is required - Email is required + Email cannot be empty + Email cannot be empty key: modal.issue.email.empty.message diff --git a/src/bundle/Resources/translations/user_settings.en.xliff b/src/bundle/Resources/translations/user_settings.en.xliff index b4cd4fe784..7a0ce0b32c 100644 --- a/src/bundle/Resources/translations/user_settings.en.xliff +++ b/src/bundle/Resources/translations/user_settings.en.xliff @@ -7,18 +7,18 @@ - User Settings - User Settings + User settings + User settings key: list.title - My Account Settings - My Account Settings + My account settings + My account settings key: section.my_account_settings - My Preferences - My Preferences + My preferences + My preferences key: section.my_preferences diff --git a/src/bundle/Resources/translations/validators.en.xliff b/src/bundle/Resources/translations/validators.en.xliff index 4aff42bc31..c1d09d5690 100644 --- a/src/bundle/Resources/translations/validators.en.xliff +++ b/src/bundle/Resources/translations/validators.en.xliff @@ -82,8 +82,8 @@ key: js.error.address_not_found - {fieldName} Field is required - {fieldName} Field is required + {fieldName} Field cannot be empty + {fieldName} Field cannot be empty key: js.error.empty.field diff --git a/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig b/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig index cdd5e2c722..d7db0bfb86 100644 --- a/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig @@ -56,7 +56,7 @@ {% if bookmark.userCanEdit %} {% endif %} diff --git a/src/bundle/Resources/views/themes/admin/content/modal/user_group_invitation_modal.html.twig b/src/bundle/Resources/views/themes/admin/content/modal/user_group_invitation_modal.html.twig index 946a13d2e5..1b442dfc03 100644 --- a/src/bundle/Resources/views/themes/admin/content/modal/user_group_invitation_modal.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/modal/user_group_invitation_modal.html.twig @@ -23,7 +23,7 @@ {% trans_default_domain 'locationview' %} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/content/tab/details.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/details.html.twig index 23989bdc1d..a3f3c76cbf 100644 --- a/src/bundle/Resources/views/themes/admin/content/tab/details.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/tab/details.html.twig @@ -78,7 +78,7 @@ content: section.name, }, { - label: 'tab.details.change_section '|trans()|desc('Change Section'), + label: 'tab.details.change_section '|trans()|desc('Change section'), content: section_details_change }, ] %} diff --git a/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig index 6e659361fe..ffa5f58557 100644 --- a/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/tab/locations/tab.html.twig @@ -91,7 +91,7 @@ {% endif %} {% embed '@ibexadesign/ui/component/table/table.html.twig' with { - headline: 'tab.locations.content_locations'|trans|desc('Content Locations'), + headline: 'tab.locations.content_locations'|trans|desc('Content locations'), head_cols: [ { has_checkbox: true }, { content: 'tab.locations.path'|trans|desc('Path'), @@ -158,7 +158,7 @@ - {{ 'tab.locations.action.add'|trans|desc('Add new') }} + {{ 'tab.locations.action.add'|trans|desc('Add') }} diff --git a/src/bundle/Resources/views/themes/admin/content/tab/translations/tab.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/translations/tab.html.twig index 384b85e980..f2af855485 100644 --- a/src/bundle/Resources/views/themes/admin/content/tab/translations/tab.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/tab/translations/tab.html.twig @@ -94,7 +94,7 @@ - {{ 'tab.translations.action.add'|trans|desc('Add new') }} + {{ 'tab.translations.action.add'|trans|desc('Add') }} diff --git a/src/bundle/Resources/views/themes/admin/content/tab/url/custom_urls_table.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/url/custom_urls_table.html.twig index ae21a8dfec..00e09a5a2d 100644 --- a/src/bundle/Resources/views/themes/admin/content/tab/url/custom_urls_table.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/tab/url/custom_urls_table.html.twig @@ -54,6 +54,7 @@ ], body_rows, empty_table_info_text: 'tab.urls.no_custom_urls'|trans|desc('This item has no custom URL aliases.'), + empty_table_action_text: 'tab.urls.no_custom_urls.action'|trans|desc('Add new custom URL aliases manually'), actions: actions, } %} {% block between_header_and_table %} diff --git a/src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig index dca42db1de..729855bc29 100644 --- a/src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/tab/url/modal_add_custom_url.html.twig @@ -44,7 +44,9 @@ {{ form_widget(form.site_access) }}
- {{ 'tab.urls.add.root_location_id.helper_secondary'|trans|desc("If you leave this empty, the alias will be placed at main root Location.") }} + {{ 'tab.urls.add.root_location_id.helper_secondary'|trans|desc( + "If no SiteAccess selected, the alias will be placed at main root Location." + ) }}
diff --git a/src/bundle/Resources/views/themes/admin/content/tab/urls.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/urls.html.twig index e3351dfb8e..3aeedfe320 100644 --- a/src/bundle/Resources/views/themes/admin/content/tab/urls.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/tab/urls.html.twig @@ -58,7 +58,7 @@ - {{ 'tab.urls.action.add'|trans|desc('Add new') }} + {{ 'tab.urls.action.add'|trans|desc('Add') }} @@ -80,7 +80,7 @@ {% include '@ibexadesign/ui/modal/bulk_delete_confirmation.html.twig' with { 'id': modal_data_target, - 'message': 'tab.urls.modal.message'|trans|desc('Do you want to delete the selected custom URL alias(es)?'), + 'message': 'tab.urls.modal.message'|trans|desc('Delete the selected custom URL aliases permanently?'), 'data_click': '#' ~ form_custom_url_remove.remove.vars.id, }%} {% endif %} diff --git a/src/bundle/Resources/views/themes/admin/content/tab/versions/table.html.twig b/src/bundle/Resources/views/themes/admin/content/tab/versions/table.html.twig index 8eea1f3e6b..d561667671 100644 --- a/src/bundle/Resources/views/themes/admin/content/tab/versions/table.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/tab/versions/table.html.twig @@ -104,7 +104,7 @@ @@ -123,7 +123,7 @@ data-content-id="{{ version.contentInfo.id }}" data-language-code="{{ version.initialLanguageCode }}" class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text mx-2 ibexa-btn--content-draft-edit {% if edit_draft_disabled %}ibexa-btn--prevented{% endif %}" - title="{{ 'tab.versions.table.action.draft.edit'|trans|desc('Edit draft') }}" + title="{{ 'tab.versions.table.action.draft.edit'|trans|desc('Edit') }}" {% if edit_draft_disabled %}disabled{% endif %} > diff --git a/src/bundle/Resources/views/themes/admin/content/widget/content_create.html.twig b/src/bundle/Resources/views/themes/admin/content/widget/content_create.html.twig index 6ca6f43436..b587c86817 100644 --- a/src/bundle/Resources/views/themes/admin/content/widget/content_create.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/widget/content_create.html.twig @@ -12,7 +12,7 @@
{% if content is defined %} - {{ 'content.create.editing_details'|trans({ '%content_name%': ibexa_content_name(content) })|desc('under %content_name%') }} + {{ 'content.create.editing_details'|trans({ '%content%': ibexa_content_name(content) })|desc('Location: %content%') }} {% endif %}
@@ -37,7 +37,7 @@ diff --git a/src/bundle/Resources/views/themes/admin/content_type/macros.html.twig b/src/bundle/Resources/views/themes/admin/content_type/macros.html.twig index 6be351aff8..70c1d3c314 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/macros.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/macros.html.twig @@ -17,7 +17,7 @@ {% macro content_type_copy(content_type, content_type_group, class_name) %} {% include '@ibexadesign/ui/modal/bulk_delete_confirmation.html.twig' with { 'id': modal_data_target, - 'message': 'trash.modal.message'|trans|desc('Do you want to delete the selected item(s) from Trash?'), + 'message': 'trash.modal.message'|trans|desc('Delete the selected items permanently?'), 'data_click': '#trash_item_delete_delete', }%} {% endif %} diff --git a/src/bundle/Resources/views/themes/admin/trash/modal/empty_trash_confirmation.html.twig b/src/bundle/Resources/views/themes/admin/trash/modal/empty_trash_confirmation.html.twig index c885e2f1e0..4c5966f9d9 100644 --- a/src/bundle/Resources/views/themes/admin/trash/modal/empty_trash_confirmation.html.twig +++ b/src/bundle/Resources/views/themes/admin/trash/modal/empty_trash_confirmation.html.twig @@ -7,10 +7,9 @@ {% block body_content %}

- {{ 'trash.delete.all.confirm'|trans({'%trashItemsCount%': trash_items_count})|desc('Are you sure you want to permanently delete %trashItemsCount% item(s)?') }} -

-

- {{ 'trash.delete.all.info'|trans|desc('This action cannot be reversed') }} + {{ 'trash.delete.all.confirm'|trans({'%trashItemsCount%': trash_items_count})|desc( + 'Permanently delete items: %trashItemsCount%?' + ) }}

{% endblock %} {% block footer_content %} diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/all_content.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/all_content.html.twig index d7ae469349..5c16ec42ba 100644 --- a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/all_content.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/all_content.html.twig @@ -28,9 +28,9 @@ {% set body_row_cols = body_row_cols|merge([ { content: row.type }, - { content: row.modified|ibexa_full_datetime }, { content: row.contributor is not null ? row.contributor.name : 'dashboard.table.contributor.not_found'|trans|desc('Can\'t fetch contributor') }, - { has_action_btns: true, content: macros.edit_content_button(row, 'dashboard.table.all.content.edit'|trans|desc('Edit Content')), raw: true }, + { content: row.modified|ibexa_full_datetime }, + { has_action_btns: true, content: macros.edit_content_button(row, 'dashboard.table.all.content.edit'|trans|desc('Edit')), raw: true }, ]) %} {% set body_rows = body_rows|merge([{ cols: body_row_cols }]) %} @@ -42,7 +42,7 @@ { content: 'dashboard.table.name'|trans|desc('Name') }, { content: 'dashboard.table.content_type'|trans|desc('Content Type') }, { content: 'dashboard.table.contributor'|trans|desc('Contributor') }, - { content: 'dashboard.table.last_saved'|trans|desc('Last Saved') }, + { content: 'dashboard.table.last_saved'|trans|desc('Modified') }, { }, ], body_rows, diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/all_media.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/all_media.html.twig index 56b2af6aa2..bd1dfa004f 100644 --- a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/all_media.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/all_media.html.twig @@ -31,7 +31,7 @@ { content: row.type }, { content: row.contributor is not null ? row.contributor.name : 'dashboard.table.contributor.not_found'|trans|desc('Can\'t fetch contributor') }, { content: row.modified|ibexa_full_datetime }, - { has_action_btns: true, content: macros.edit_content_button(row, 'dashboard.table.all.media.edit'|trans|desc('Edit Media')), raw: true }, + { has_action_btns: true, content: macros.edit_content_button(row, 'dashboard.table.all.media.edit'|trans|desc('Edit')), raw: true }, ]) %} {% set body_rows = body_rows|merge([{ cols: body_row_cols }]) %} @@ -43,7 +43,7 @@ { content: 'dashboard.table.name'|trans|desc('Name') }, { content: 'dashboard.table.content_type'|trans|desc('Content Type') }, { content: 'dashboard.table.contributor'|trans|desc('Contributor') }, - { content: 'dashboard.table.last_saved'|trans|desc('Last Saved') }, + { content: 'dashboard.table.last_saved'|trans|desc('Modified') }, { }, ], body_rows, diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_content.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_content.html.twig index 059ab2855a..452cef3cb8 100644 --- a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_content.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_content.html.twig @@ -30,7 +30,7 @@ {% set body_row_cols = body_row_cols|merge([ { content: row.type }, { content: row.modified|ibexa_full_datetime }, - { has_action_btns: true, content: macros.edit_content_button(row, 'dashboard.table.content.edit'|trans|desc('Edit Content')), raw: true }, + { has_action_btns: true, content: macros.edit_content_button(row, 'dashboard.table.content.edit'|trans|desc('Edit')), raw: true }, ]) %} {% set body_rows = body_rows|merge([{ cols: body_row_cols }]) %} @@ -41,7 +41,7 @@ { has_icon: true }, { content: 'dashboard.table.name'|trans|desc('Name') }, { content: 'dashboard.table.content_type'|trans|desc('Content Type') }, - { content: 'dashboard.table.last_saved'|trans|desc('Last Saved') }, + { content: 'dashboard.table.last_saved'|trans|desc('Modified') }, { }, ], body_rows, diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_draft_list.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_draft_list.html.twig index 5e0131d380..96081ddd22 100644 --- a/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_draft_list.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/dashboard/tab/my_draft_list.html.twig @@ -28,7 +28,7 @@ {% set col_raw %}