IBX-6314: Apply microcopy guidelines and adjust translation keys and domains

composer.json

@@ -60,7 +60,8 @@
         "willdurand/js-translation-bundle": "^4.0",
         "twig/twig": "^3.0",
         "twig/intl-extra": "^3.0",
-        "twig/string-extra": "^3.0"
+        "twig/string-extra": "^3.0",
+        "http-interop/http-factory-guzzle": "^1.2"
     },
     "require-dev": {
         "ibexa/ci-scripts": "^0.2@dev",

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"

features/personas/SubtreeEditor.feature

@@ -61,12 +61,12 @@ 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"
     Then the buttons are disabled
       | buttonName     |
       | Create content |
       | Edit           |
-    And the "Send to Trash" button is not visible
+    And the "Send to trash" button is not visible

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             |

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',

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',
         );

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');
         }

src/bundle/Resources/translations/bookmark.en.xliff

@@ -17,8 +17,8 @@
         <note>key: bookmark.headline</note>
       </trans-unit>
       <trans-unit id="5001931b6bf98acefb5138b1cdba97d97fed4844" resname="bookmark.list.content.edit">
-        <source>Edit content</source>
-        <target state="new">Edit content</target>
+        <source>Edit</source>
+        <target state="new">Edit</target>
         <note>key: bookmark.list.content.edit</note>
       </trans-unit>
       <trans-unit id="cf687b0218c513d53ad3f52b2547c23500242c48" resname="bookmark.list.content_type">

src/bundle/Resources/translations/content.en.xliff

@@ -57,8 +57,8 @@
         <note>key: content_edit.autosave.status_saved.message.full</note>
       </trans-unit>
       <trans-unit id="750bead6705b295c7b7d66c27b2768c1b9329ed5" resname="editing_details">
-        <source>under %location_name%</source>
-        <target state="new">under %location_name%</target>
+        <source>Location: %location%</source>
+        <target state="new">Location: %location%</target>
         <note>key: editing_details</note>
       </trans-unit>
       <trans-unit id="f6ae7078e77f584ad00c8003405ca11dc57c4d56" resname="preview_header.back">
@@ -77,8 +77,8 @@
         <note>key: trash.modal.message</note>
       </trans-unit>
       <trans-unit id="1e6a1d97cca01a288e47d2d14479274b90e6c6c1" resname="trash_container.modal.message_main">
-        <source>Sending '%content_name%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash.</source>
-        <target state="new">Sending '%content_name%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash.</target>
+        <source>Sending '%content%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash.</source>
+        <target state="new">Sending '%content%' and its %children_count% Content item(s) to Trash will also send the sub-items of this Location to Trash.</target>
         <note>key: trash_container.modal.message_main</note>
       </trans-unit>
       <trans-unit id="4492a79e25635e7612f98971e02b4d0e6a408394" resname="user.delete.success">

src/bundle/Resources/translations/content_create.en.xliff

@@ -12,8 +12,8 @@
         <note>key: creating</note>
       </trans-unit>
       <trans-unit id="750bead6705b295c7b7d66c27b2768c1b9329ed5" resname="editing_details">
-        <source>under %location_name% in %language%</source>
-        <target state="new">under %location_name% in %language%</target>
+        <source>Location: %location% Translation: %language</source>
+        <target state="new">Location: %location% Translation: %language</target>
         <note>key: editing_details</note>
       </trans-unit>
       <trans-unit id="32d50c07b2eacd6fa72742ff1c1f5963c26a251d" resname="new_content_item">

src/bundle/Resources/translations/content_edit.en.xliff

@@ -27,8 +27,8 @@
         <note>key: editing</note>
       </trans-unit>
       <trans-unit id="750bead6705b295c7b7d66c27b2768c1b9329ed5" resname="editing_details">
-        <source>under %location_name% in %language%</source>
-        <target state="new">under %location_name% in %language%</target>
+        <source>Location: %location% Translation: %language</source>
+        <target state="new">Location: %location% Translation: %language</target>
         <note>key: editing_details</note>
       </trans-unit>
       <trans-unit id="009667fab56f0bec66634f009a75ffd9425f2987" resname="fieldtype.translation_is_disabled">

src/bundle/Resources/translations/content_type.en.xliff

@@ -7,8 +7,8 @@
     </header>
     <body>
       <trans-unit id="7caaa79d36b0520845802cfa3f7ebcc94318115b" resname="content_type.action.copy">
-        <source>Copy</source>
-        <target state="new">Copy</target>
+        <source>Duplicate</source>
+        <target state="new">Duplicate</target>
         <note>key: content_type.action.copy</note>
       </trans-unit>
       <trans-unit id="779646634b8d89b40f5abaa2ccd6107b300bf429" resname="content_type.action.edit">
@@ -37,13 +37,13 @@
         <note>key: content_type.content_field_definitions</note>
       </trans-unit>
       <trans-unit id="e7a6e28719e705ca85e715114370d15deee0cd59" resname="content_type.copy.error">
-        <source>Error occoured while copying the '%name%' Content Type.</source>
-        <target state="new">Error occoured while copying the '%name%' Content Type.</target>
+        <source>Content Type '%name%' cannot be copied.</source>
+        <target state="new">Content Type '%name%' cannot be copied.</target>
         <note>key: content_type.copy.error</note>
       </trans-unit>
       <trans-unit id="31674753c7d944af06b98387a96ce93f36f6adb4" resname="content_type.copy.success">
-        <source>Content Type '%name%' successfully copied.</source>
-        <target state="new">Content Type '%name%' successfully copied.</target>
+        <source>Content Type '%name%' copied.</source>
+        <target state="new">Content Type '%name%' copied.</target>
         <note>key: content_type.copy.success</note>
       </trans-unit>
       <trans-unit id="529a1012c7fe5ca6fafdb5d070ac8ececfe94af6" resname="content_type.create">
@@ -868,7 +868,7 @@
       </trans-unit>
       <trans-unit id="84eed8c69d2ed1727569c36cda88c9781d37dd92" resname="field_definition.is_thumbnail">
         <source>Can be a thumbnail</source>
-        <target>Can be a thumbnail</target>
+        <target state="new">Can be a thumbnail</target>
         <note>key: field_definition.is_thumbnail</note>
       </trans-unit>
       <trans-unit id="83aba8c0c4c654d481c4520feb76e789fbc64c22" resname="field_definition.is_translatable">
@@ -902,8 +902,8 @@
         <note>key: location_update_form.update</note>
       </trans-unit>
       <trans-unit id="8c2261eecf1e143eaf524c34f4f89608929c5c81" resname="meta.enabled">
-        <source>Enable %type% for this content type</source>
-        <target state="new">Enable %type% for this content type</target>
+        <source>Enable %type% for this Content Type</source>
+        <target state="new">Enable %type% for this Content Type</target>
         <note>key: meta.enabled</note>
       </trans-unit>
       <trans-unit id="fd1286353570c5703799ba76999323b7c7447b06" resname="no">

src/bundle/Resources/translations/content_url.en.xliff

@@ -7,8 +7,8 @@
     </header>
     <body>
       <trans-unit id="5c48ac36c2a46c2dc2a89fd4c91a2a3d684eb5d8" resname="tab.urls.action.add">
-        <source>Add new</source>
-        <target state="new">Add new</target>
+        <source>Add</source>
+        <target state="new">Add</target>
         <note>key: tab.urls.action.add</note>
       </trans-unit>
       <trans-unit id="9b4504fd2e75dffb2c22283be3e9816e8142538a" resname="tab.urls.action.delete">
@@ -47,8 +47,8 @@
         <note>key: tab.urls.add.redirect.helper.unchecked</note>
       </trans-unit>
       <trans-unit id="c1277a6823f4d281355e706e54cd723b5ed4adf7" resname="tab.urls.add.root_location_id.helper_secondary">
-        <source>If you leave this empty, the alias will be placed at main root Location.</source>
-        <target state="new">If you leave this empty, the alias will be placed at main root Location.</target>
+        <source>If no SiteAccess selected, the alias will be placed at main root Location.</source>
+        <target state="new">If no SiteAccess selected, the alias will be placed at main root Location.</target>
         <note>key: tab.urls.add.root_location_id.helper_secondary</note>
       </trans-unit>
       <trans-unit id="f933f01aef7b171904b5c0b1ed4327413828f96f" resname="tab.urls.add.site_access">
@@ -92,18 +92,23 @@
         <note>key: tab.urls.language</note>
       </trans-unit>
       <trans-unit id="0d3138c0198569f427ab4568fffa5d9d894db72a" resname="tab.urls.modal.message">
-        <source>Do you want to delete the selected custom URL alias(es)?</source>
-        <target state="new">Do you want to delete the selected custom URL alias(es)?</target>
+        <source>Delete the selected custom URL aliases permanently?</source>
+        <target state="new">Delete the selected custom URL aliases permanently?</target>
         <note>key: tab.urls.modal.message</note>
       </trans-unit>
       <trans-unit id="56d218db883ed4cc59dbbca53364dc2e725013e4" resname="tab.urls.no_custom_urls">
         <source>This item has no custom URL aliases.</source>
         <target state="new">This item has no custom URL aliases.</target>
         <note>key: tab.urls.no_custom_urls</note>
       </trans-unit>
+      <trans-unit id="61f03f8e307131c37fed1b46302b43efcc519d07" resname="tab.urls.no_custom_urls.action">
+        <source>Add new custom URL aliases manually</source>
+        <target state="new">Add new custom URL aliases manually</target>
+        <note>key: tab.urls.no_custom_urls.action</note>
+      </trans-unit>
       <trans-unit id="c9fdd1434b44a4592626e8fe493c19141aab24d5" resname="tab.urls.no_system_urls">
-        <source>This Content item has no system URLs.</source>
-        <target state="new">This Content item has no system URLs.</target>
+        <source>This item has no system URLs.</source>
+        <target state="new">This item has no system URLs.</target>
         <note>key: tab.urls.no_system_urls</note>
       </trans-unit>
       <trans-unit id="902beb4ac170382cb95bd554cb1e763d8fdd413c" resname="tab.urls.system.title">

src/bundle/Resources/translations/dashboard.en.xliff

@@ -27,8 +27,8 @@
         <note>key: dashboard.tab.my_content.empty</note>
       </trans-unit>
       <trans-unit id="cf10aced822b4dfb2cb519a82ed0adabaa4e480e" resname="dashboard.tab.my_drafts.empty">
-        <source>No content. Drafts you create will show up here</source>
-        <target state="new">No content. Drafts you create will show up here</target>
+        <source>You have no drafts yet. Your drafts will show up here.</source>
+        <target state="new">You have no drafts yet. Your drafts will show up here.</target>
         <note>key: dashboard.tab.my_drafts.empty</note>
       </trans-unit>
       <trans-unit id="9ef83b3497fae569ba56b6a8ab96004f359ae918" resname="dashboard.tab.my_media.empty">
@@ -37,18 +37,18 @@
         <note>key: dashboard.tab.my_media.empty</note>
       </trans-unit>
       <trans-unit id="749d4759e304735bcec6ef6ec10af43e70f1f289" resname="dashboard.table.all.content.edit">
-        <source>Edit Content</source>
-        <target state="new">Edit Content</target>
+        <source>Edit</source>
+        <target state="new">Edit</target>
         <note>key: dashboard.table.all.content.edit</note>
       </trans-unit>
       <trans-unit id="d55b4e897f7b7f5748c600e865a61eae6c9fe3da" resname="dashboard.table.all.media.edit">
-        <source>Edit Media</source>
-        <target state="new">Edit Media</target>
+        <source>Edit</source>
+        <target state="new">Edit</target>
         <note>key: dashboard.table.all.media.edit</note>
       </trans-unit>
       <trans-unit id="f0adf5df30310686ce6864bef32325c9a6988b49" resname="dashboard.table.content.edit">
-        <source>Edit Content</source>
-        <target state="new">Edit Content</target>
+        <source>Edit</source>
+        <target state="new">Edit</target>
         <note>key: dashboard.table.content.edit</note>
       </trans-unit>
       <trans-unit id="e17a8999c9e44b7e8ea1ba0f5cff596ece264da5" resname="dashboard.table.content_type">
@@ -67,8 +67,8 @@
         <note>key: dashboard.table.contributor.not_found</note>
       </trans-unit>
       <trans-unit id="93a5fc53032106ea0ae1658261fd187e5c9c6a94" resname="dashboard.table.draft.edit">
-        <source>Edit Draft</source>
-        <target state="new">Edit Draft</target>
+        <source>Edit</source>
+        <target state="new">Edit</target>
         <note>key: dashboard.table.draft.edit</note>
       </trans-unit>
       <trans-unit id="5c6a58e397b164610db6371fe26b4e79aa3962f8" resname="dashboard.table.draft.unauthorized">
@@ -77,13 +77,13 @@
         <note>key: dashboard.table.draft.unauthorized</note>
       </trans-unit>
       <trans-unit id="3a857cc58c009830e22845ef1edbd43794206aed" resname="dashboard.table.last_saved">
-        <source>Last Saved</source>
-        <target state="new">Last Saved</target>
+        <source>Modified</source>
+        <target state="new">Modified</target>
         <note>key: dashboard.table.last_saved</note>
       </trans-unit>
       <trans-unit id="ec988391649c3e25028a629b4e38dc426f4c4615" resname="dashboard.table.media.edit">
-        <source>Edit Media</source>
-        <target state="new">Edit Media</target>
+        <source>Edit</source>
+        <target state="new">Edit</target>
         <note>key: dashboard.table.media.edit</note>
       </trans-unit>
       <trans-unit id="0ccebfdea2e8be0bcae0f3cab3f3db5ef47d71c8" resname="dashboard.table.modified_language">

src/bundle/Resources/translations/draft_conflict.en.xliff

@@ -7,8 +7,8 @@
     </header>
     <body>
       <trans-unit id="fa302fb6391baf4d4e0f2cda3a5d2cca51aa49c9" resname="draft.conflict.add_new">
-        <source>Add new</source>
-        <target state="new">Add new</target>
+        <source>Add</source>
+        <target state="new">Add</target>
         <note>key: draft.conflict.add_new</note>
       </trans-unit>
       <trans-unit id="1020ca59a2c9fa207ebe162fd6727fd1a81027c0" resname="draft.conflict.choice">

src/bundle/Resources/translations/drafts.en.xliff

@@ -17,8 +17,8 @@
         <note>key: drafts.list</note>
       </trans-unit>
       <trans-unit id="7a00fa1045089ab6b05a30314644f3f53477ecbf" resname="drafts.list.action.edit">
-        <source>Edit draft</source>
-        <target state="new">Edit draft</target>
+        <source>Edit</source>
+        <target state="new">Edit</target>
         <note>key: drafts.list.action.edit</note>
       </trans-unit>
       <trans-unit id="887b9056de68ebd1c33c43af14093c2cafb38c5d" resname="drafts.list.action.remove">
@@ -47,8 +47,8 @@
         <note>key: drafts.list.empty</note>
       </trans-unit>
       <trans-unit id="3cdd0ca8cb41c22f9120de646cc5734f7cad7ffb" resname="drafts.list.last_saved">
-        <source>Last Saved</source>
-        <target state="new">Last Saved</target>
+        <source>Modified</source>
+        <target state="new">Modified</target>
         <note>key: drafts.list.last_saved</note>
       </trans-unit>
       <trans-unit id="8c65a0cd673fa4c18f7e730f672579ed65debd3c" resname="drafts.list.modified_language">

src/bundle/Resources/translations/dropdown.en.xliff

@@ -12,8 +12,8 @@
         <note>key: dropdown.clear</note>
       </trans-unit>
       <trans-unit id="a3390555f717ffd9b3560f17198e5a437899967f" resname="dropdown.placeholder">
-        <source>All</source>
-        <target state="new">All</target>
+        <source>Choose an option</source>
+        <target state="new">Choose an option</target>
         <note>key: dropdown.placeholder</note>
       </trans-unit>
       <trans-unit id="bcf45496a8dbad6959111ca6eae0ab456d4ad1c7" resname="dropdown.placeholder.all">

src/bundle/Resources/translations/edit_translation_button.en.xliff

@@ -7,8 +7,8 @@
     </header>
     <body>
       <trans-unit id="d899cb1dbb25a42ea34f296bf7bef9821df66b72" resname="edit_translation.edit.title">
-        <source>Edit Content</source>
-        <target state="new">Edit Content</target>
+        <source>Edit</source>
+        <target state="new">Edit</target>
         <note>key: edit_translation.edit.title</note>
       </trans-unit>
       <trans-unit id="8ecff4fc7797b03440a0430a65abf71a62d0ffc9" resname="edit_translation.list.title">